[gnome-disk-utility] Use text for the RAID button, not an icon

[David Zeuthen <davidz src gnome org>]

commit c214b2a9d3d9d512012e21e5cefd63ce7ac45c53
Author: David Zeuthen <zeuthen gmail com>
Date:   Wed Oct 10 16:53:30 2012 -0400

    Use text for the RAID button, not an icon
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 data/ui/disks.ui      |   13 ++-----------
 src/disks/gduwindow.c |    6 ++++++
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/data/ui/disks.ui b/data/ui/disks.ui
index 82e7fbd..9d647e8 100644
--- a/data/ui/disks.ui
+++ b/data/ui/disks.ui
@@ -146,12 +146,11 @@
                         <property name="show_tabs">False</property>
                         <property name="show_border">False</property>
                         <child>
-                          <object class="GtkLabel" id="label8">
+                          <object class="GtkLabel" id="device-tree-selection-toolbar-static-label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Devices</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">device-tree-treeview</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -166,7 +165,6 @@
                             <property name="can_focus">False</property>
                             <property name="label">No _Devices Selected</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">device-tree-treeview</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
@@ -1919,17 +1917,10 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="overlay-toolbar-create-raid-button">
+                    <property name="label" translatable="yes">RAID</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <child>
-                      <object class="GtkImage" id="image11">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Click to select multiple disks to perform operations on</property>
-                        <property name="icon_name">list-add-symbolic</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index cca8f8d..9f1ccc3 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -73,6 +73,7 @@ struct _GduWindow
   GtkWidget *device_tree_selection_toolbar_center_notebook;
   GtkWidget *device_tree_selection_toolbar_select_button;
   GtkWidget *device_tree_selection_toolbar_done_button;
+  GtkWidget *device_tree_selection_toolbar_static_label;
   GtkWidget *device_tree_selection_toolbar_label;
 
   GtkWidget *devtab_drive_box;
@@ -175,6 +176,7 @@ static const struct {
   {G_STRUCT_OFFSET (GduWindow, device_tree_selection_toolbar_center_notebook), "device-tree-selection-toolbar-center-notebook"},
   {G_STRUCT_OFFSET (GduWindow, device_tree_selection_toolbar_select_button), "device-tree-selection-toolbar-select-button"},
   {G_STRUCT_OFFSET (GduWindow, device_tree_selection_toolbar_done_button), "device-tree-selection-toolbar-done-button"},
+  {G_STRUCT_OFFSET (GduWindow, device_tree_selection_toolbar_static_label), "device-tree-selection-toolbar-static-label"},
   {G_STRUCT_OFFSET (GduWindow, device_tree_selection_toolbar_label), "device-tree-selection-toolbar-label"},
 
   {G_STRUCT_OFFSET (GduWindow, device_tree_treeview), "device-tree-treeview"},
@@ -1202,6 +1204,10 @@ gdu_window_constructed (GObject *object)
       g_warn_if_fail (*p != NULL);
     }
 
+  /* bah, glade deletes this because it does not known about GtkOverlay :-/ */
+  gtk_label_set_mnemonic_widget (GTK_LABEL (window->device_tree_selection_toolbar_label), window->device_tree_treeview);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (window->device_tree_selection_toolbar_static_label), window->device_tree_treeview);
+
   gtk_widget_reparent (window->main_hpane, GTK_WIDGET (window));
   gtk_window_set_title (GTK_WINDOW (window), _("Disks"));
   gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);