[gnome-disk-utility] Add window title to Format Disk dialog

[David Zeuthen <davidz src gnome org>]

commit 9626f0e2e6d9e69f363c0140908ddabc3bf78080
Author: David Zeuthen <zeuthen gmail com>
Date:   Tue Sep 11 18:28:20 2012 -0400

    Add window title to Format Disk dialog
    
    In GNOME 3.6 the window manager now displays window titles even if the
    dialog is transient for its parent window (In GNOME 3.0 through 3.4
    the WM displayed the window as a sheet - e.g. without the window
    title). As no name has been set for the window, the window manager now
    simply shows "gnome-disks" which is not very friendly. The fix is
    simply to give the window a meaningful title.
    
    Also remove the GtkLabel saying "Format Disk" since this is now
    redundant with the window title
    
    Note that this commit does not break string freeze since it re-uses
    existing strings.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 data/ui/format-disk-dialog.ui |  131 ++++++++++++++++-------------------------
 1 files changed, 51 insertions(+), 80 deletions(-)
---
diff --git a/data/ui/format-disk-dialog.ui b/data/ui/format-disk-dialog.ui
index 1c72a33..0dab9e9 100644
--- a/data/ui/format-disk-dialog.ui
+++ b/data/ui/format-disk-dialog.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="format-disk-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="title" translatable="yes">Format Disk</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -59,104 +60,74 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box1">
+          <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
+            <property name="row_spacing">10</property>
+            <property name="column_spacing">10</property>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkComboBox" id="type-combobox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Format Disk</property>
-                <attributes>
-                  <attribute name="scale" value="1.2"/>
-                </attributes>
+                <property name="id_column">0</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
-                <property name="row_spacing">10</property>
-                <property name="column_spacing">10</property>
-                <child>
-                  <object class="GtkComboBox" id="type-combobox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="id_column">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Partitioning</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">type-combobox</property>
-                    <style><class name="dim-label"/></style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Erase</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">erase-combobox</property>
-                    <style><class name="dim-label"/></style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="erase-combobox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="id_column">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Partitioning</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">type-combobox</property>
+                <style><class name="dim-label"/></style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Erase</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">erase-combobox</property>
+                <style><class name="dim-label"/></style>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="erase-combobox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="id_column">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>