[gnome-disk-utility/udisks2-port] Rearrange Create Partition dialog so it's more visually pleasing

[David Zeuthen <davidz src gnome org>]

commit d606a738b1ffa6735c280e9420f977cf525895e5
Author: David Zeuthen <davidz redhat com>
Date:   Tue Nov 8 10:34:40 2011 -0500

    Rearrange Create Partition dialog so it's more visually pleasing
    
    Also initially focus the Name entry instead of the size spin button
    for two reasons
    
     - It suggests to the user that a name should be picked
     - Changing the size is not a common operation
    
    Compare and constrast:
    
     http://people.freedesktop.org/~david/gdu2-create-partition.png
     http://people.freedesktop.org/~david/gdu2-create-partition-rearranged.png
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 data/ui/create-partition-dialog.ui        |   53 +++++++++++++----------------
 src/palimpsest/gducreatepartitiondialog.c |    2 +-
 2 files changed, 25 insertions(+), 30 deletions(-)
---
diff --git a/data/ui/create-partition-dialog.ui b/data/ui/create-partition-dialog.ui
index a335626..221f7ca 100644
--- a/data/ui/create-partition-dialog.ui
+++ b/data/ui/create-partition-dialog.ui
@@ -83,22 +83,6 @@
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">10</property>
                 <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Free Space _Following:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">free-following-spinbutton</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -128,7 +112,7 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">2</property>
+                    <property name="width">4</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
@@ -174,6 +158,23 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">24</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Free Space _Following:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">free-following-spinbutton</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -182,13 +183,16 @@
                       <object class="GtkSpinButton" id="free-following-spinbutton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="has_tooltip">True</property>
                         <property name="tooltip_markup" translatable="yes">The free space following the partition, in megabytes</property>
+                        <property name="tooltip_text" translatable="yes">The free space following the partition, in megabytes</property>
                         <property name="invisible_char">â</property>
                         <property name="activates_default">True</property>
+                        <property name="invisible_char_set">True</property>
                         <property name="adjustment">free-following-adjustment</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
@@ -208,21 +212,12 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="left_attach">3</property>
+                    <property name="top_attach">1</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/src/palimpsest/gducreatepartitiondialog.c b/src/palimpsest/gducreatepartitiondialog.c
index 51fc671..41476cc 100644
--- a/src/palimpsest/gducreatepartitiondialog.c
+++ b/src/palimpsest/gducreatepartitiondialog.c
@@ -266,7 +266,7 @@ gdu_create_partition_dialog_show (GduWindow    *window,
   create_partition_update (data);
 
   gtk_widget_show_all (data->dialog);
-  gtk_widget_grab_focus (data->size_spinbutton);
+  gtk_widget_grab_focus (gdu_create_filesystem_widget_get_name_entry (GDU_CREATE_FILESYSTEM_WIDGET (data->create_filesystem_widget)));
 
   response = gtk_dialog_run (GTK_DIALOG (data->dialog));
   if (response == GTK_RESPONSE_OK)