[gnome-disk-utility] Add window title to Edit Partition dialogs

From: David Zeuthen <davidz src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-disk-utility] Add window title to Edit Partition dialogs
Date: Thu, 13 Sep 2012 14:42:10 +0000 (UTC)
commit 7a22b1ac9245b393a23d3822def5a35c7cb7f5f2
Author: David Zeuthen <zeuthen gmail com>
Date:   Tue Sep 11 18:52:01 2012 -0400

    Add window title to Edit Partition dialogs
    
    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 instances saying "Edit Partition" since this
    is now redundant with the window titles.
    
    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/edit-dos-partition-dialog.ui |   41 ++++-------------------------
 data/ui/edit-gpt-partition-dialog.ui |   38 ++++++++++-----------------
 data/ui/edit-partition-dialog.ui     |   46 +++------------------------------
 3 files changed, 25 insertions(+), 100 deletions(-)
---
diff --git a/data/ui/edit-dos-partition-dialog.ui b/data/ui/edit-dos-partition-dialog.ui
index 92d995c..e436375 100644
--- a/data/ui/edit-dos-partition-dialog.ui
+++ b/data/ui/edit-dos-partition-dialog.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="edit-dos-partition-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="title" translatable="yes">Edit Partition</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -22,6 +23,7 @@
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -37,6 +39,7 @@
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">C_hange</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -59,22 +62,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Edit Partition</property>
-            <attributes>
-              <attribute name="scale" value="1.2"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -89,9 +76,7 @@
                 <property name="label" translatable="yes">_Type</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">type-combobox</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <style><class name="dim-label"/></style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -116,6 +101,7 @@
             <child>
               <object class="GtkCheckButton" id="bootable-checkbutton">
                 <property name="label" translatable="yes">_Bootable</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -135,26 +121,11 @@
             <child>
               <placeholder/>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/data/ui/edit-gpt-partition-dialog.ui b/data/ui/edit-gpt-partition-dialog.ui
index 818d89e..99b5516 100644
--- a/data/ui/edit-gpt-partition-dialog.ui
+++ b/data/ui/edit-gpt-partition-dialog.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="edit-gpt-partition-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="title" translatable="yes">Edit Partition</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -22,6 +23,7 @@
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -37,6 +39,7 @@
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">C_hange</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -59,23 +62,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Edit Partition</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="1.2"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -90,9 +76,7 @@
                 <property name="label" translatable="yes">_Type</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">type-combobox</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <style><class name="dim-label"/></style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -122,9 +106,7 @@
                 <property name="label" translatable="yes">_Name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name-entry</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <style><class name="dim-label"/></style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -151,6 +133,7 @@
             <child>
               <object class="GtkCheckButton" id="system-checkbutton">
                 <property name="label" translatable="yes">_System partition</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -170,6 +153,7 @@
             <child>
               <object class="GtkCheckButton" id="bootable-checkbutton">
                 <property name="label" translatable="yes">Legacy BIOS _Bootable</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -189,6 +173,7 @@
             <child>
               <object class="GtkCheckButton" id="readonly-checkbutton">
                 <property name="label" translatable="yes">_Read-Only</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -208,6 +193,7 @@
             <child>
               <object class="GtkCheckButton" id="hidden-checkbutton">
                 <property name="label" translatable="yes">H_idden</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -227,6 +213,7 @@
             <child>
               <object class="GtkCheckButton" id="do-not-automount-checkbutton">
                 <property name="label" translatable="yes">Do Not _Automount</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -255,11 +242,14 @@
             <child>
               <placeholder/>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/data/ui/edit-partition-dialog.ui b/data/ui/edit-partition-dialog.ui
index 05c4fcc..959ecd7 100644
--- a/data/ui/edit-partition-dialog.ui
+++ b/data/ui/edit-partition-dialog.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="edit-partition-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="title" translatable="yes">Edit Partition</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -22,6 +23,7 @@
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -37,6 +39,7 @@
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">C_hange</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -59,22 +62,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Edit Partition</property>
-            <attributes>
-              <attribute name="scale" value="1.2"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -88,9 +75,7 @@
                 <property name="label" translatable="yes">_Type</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">type-combobox</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <style><class name="dim-label"/></style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -111,32 +96,11 @@
                 <property name="height">1</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]