[gnome-disk-utility] Don't default to "New Volume" for file system name

[David Zeuthen <davidz src gnome org>]

commit b9b50b0d43af7a6d36a4e18b740e1fd80e71d7e0
Author: David Zeuthen <zeuthen gmail com>
Date:   Sat Nov 24 15:39:23 2012 -0500

    Don't default to "New Volume" for file system name
    
    Instead, leave it empty and provide a helpful tip.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 data/ui/filesystem-create.ui          |  106 ++++++++++++++++++++++----------
 src/disks/gducreatefilesystemwidget.c |    3 -
 2 files changed, 73 insertions(+), 36 deletions(-)
---
diff --git a/data/ui/filesystem-create.ui b/data/ui/filesystem-create.ui
index 3959233..ebfed53 100644
--- a/data/ui/filesystem-create.ui
+++ b/data/ui/filesystem-create.ui
@@ -17,7 +17,9 @@
             <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>
@@ -31,10 +33,13 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
+            <property name="yalign">0</property>
             <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>
@@ -44,25 +49,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEntry" id="name-entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">The name to use for the filesystem. This is useful if you want to refer to the device via a symlink in the &lt;b&gt;/dev/disk/by-label&lt;/b&gt; directory</property>
-            <property name="tooltip_text" translatable="yes">The name to use for the filesystem. This is useful if you want to refer to the device via a symlink in the /dev/disk/by-label directory</property>
-            <property name="hexpand">True</property>
-            <property name="invisible_char">â</property>
-            <property name="activates_default">True</property>
-            <property name="invisible_char_set">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkLabel" id="filesystem-label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -71,7 +57,9 @@
             <property name="label" translatable="yes">F_ilesystem</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">filesystem-entry</property>
-            <style><class name="dim-label"/></style>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -109,7 +97,9 @@
             <property name="label" translatable="yes">_Passphrase</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">passphrase-entry</property>
-            <style><class name="dim-label"/></style>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -127,7 +117,9 @@
             <property name="label" translatable="yes">C_onfirm Passphrase</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">confirm-passphrase-entry</property>
-            <style><class name="dim-label"/></style>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -195,7 +187,6 @@
         <child>
           <object class="GtkCheckButton" id="show-passphrase-checkbutton">
             <property name="label" translatable="yes">Sho_w Passphrases</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>
@@ -203,7 +194,6 @@
             <property name="has_tooltip">True</property>
             <property name="tooltip_markup" translatable="yes">Check this box to see the passphrases entered above</property>
             <property name="tooltip_text" translatable="yes">Check this box to see the passphrases entered above</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -232,12 +222,6 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -245,7 +229,9 @@
             <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>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -267,6 +253,60 @@
             <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">4</property>
+            <child>
+              <object class="GtkEntry" id="name-entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">The name to use for the filesystem. This is useful if you want to refer to the device via a symlink in the &lt;b&gt;/dev/disk/by-label&lt;/b&gt; directory</property>
+                <property name="tooltip_text" translatable="yes">The name to use for the filesystem. This is useful if you want to refer to the device via a symlink in the /dev/disk/by-label directory</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">â</property>
+                <property name="activates_default">True</property>
+                <property name="invisible_char_set">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </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">For example, "My Files" or "Backup Data"</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
diff --git a/src/disks/gducreatefilesystemwidget.c b/src/disks/gducreatefilesystemwidget.c
index f302f7c..cb4921e 100644
--- a/src/disks/gducreatefilesystemwidget.c
+++ b/src/disks/gducreatefilesystemwidget.c
@@ -446,9 +446,6 @@ populate (GduCreateFilesystemWidget *widget)
       gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "ext4");
     }
 
-  /* Translators: this is the default name for the filesystem */
-  gtk_entry_set_text (GTK_ENTRY (widget->name_entry), _("New Volume"));
-
   /* Set 'btrfs' for the custom filesystem */
   gtk_entry_set_text (GTK_ENTRY (widget->filesystem_entry), "btrfs");