[gnome-disk-utility] Fix-up toolbar in MD-RAID dialog
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] Fix-up toolbar in MD-RAID dialog
- Date: Thu, 29 Nov 2012 18:27:08 +0000 (UTC)
commit 708eb1d47c06e00fdeabbfea6cebbaec901a874b
Author: David Zeuthen <zeuthen gmail com>
Date: Thu Nov 29 13:26:04 2012 -0500
Fix-up toolbar in MD-RAID dialog
Use GtkButton inside custom GtkToolItem instances, otherwise it
doesn't look right :-/
Signed-off-by: David Zeuthen <zeuthen gmail com>
data/ui/md-raid-disks-dialog.ui | 97 ++++++++++++++++++++++++++++---------
src/disks/gdumdraiddisksdialog.c | 28 ++++++------
2 files changed, 87 insertions(+), 38 deletions(-)
---
diff --git a/data/ui/md-raid-disks-dialog.ui b/data/ui/md-raid-disks-dialog.ui
index 992d508..a005e71 100644
--- a/data/ui/md-raid-disks-dialog.ui
+++ b/data/ui/md-raid-disks-dialog.ui
@@ -78,29 +78,57 @@
<object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkToolButton" id="add-toolbutton">
+ <object class="GtkToolItem" id="toolbar-left">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Add Diskâ</property>
- <property name="label" translatable="yes">Add Diskâ</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-add-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="remove-toolbutton">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Remove Diskâ</property>
- <property name="label" translatable="yes">Remove Diskâ</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-remove-symbolic</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="add-disk-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-add-symbolic</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="remove-disk-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-remove-symbolic</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -118,13 +146,34 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="goto-disk-toolbutton">
+ <object class="GtkToolItem" id="toolbar-right">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Go To Disk</property>
- <property name="label" translatable="yes">Go To Disk</property>
- <property name="use_underline">True</property>
- <property name="icon_name">go-jump-symbolic</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="goto-disk-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-jump-symbolic</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/disks/gdumdraiddisksdialog.c b/src/disks/gdumdraiddisksdialog.c
index a9edeb5..d2982d1 100644
--- a/src/disks/gdumdraiddisksdialog.c
+++ b/src/disks/gdumdraiddisksdialog.c
@@ -41,9 +41,9 @@ typedef struct
GtkWidget *treeview;
GtkWidget *toolbar;
- GtkWidget *add_toolbutton;
- GtkWidget *remove_toolbutton;
- GtkWidget *goto_disk_toolbutton;
+ GtkWidget *add_disk_button;
+ GtkWidget *remove_disk_button;
+ GtkWidget *goto_disk_button;
GtkWidget *device_label;
GtkWidget *serial_label;
@@ -62,9 +62,9 @@ static const struct {
{G_STRUCT_OFFSET (DialogData, treeview), "treeview"},
{G_STRUCT_OFFSET (DialogData, toolbar), "toolbar"},
- {G_STRUCT_OFFSET (DialogData, add_toolbutton), "add-toolbutton"},
- {G_STRUCT_OFFSET (DialogData, remove_toolbutton), "remove-toolbutton"},
- {G_STRUCT_OFFSET (DialogData, goto_disk_toolbutton), "goto-disk-toolbutton"},
+ {G_STRUCT_OFFSET (DialogData, add_disk_button), "add-disk-button"},
+ {G_STRUCT_OFFSET (DialogData, remove_disk_button), "remove-disk-button"},
+ {G_STRUCT_OFFSET (DialogData, goto_disk_button), "goto-disk-button"},
{G_STRUCT_OFFSET (DialogData, device_label), "device-label"},
{G_STRUCT_OFFSET (DialogData, serial_label), "serial-label"},
@@ -335,8 +335,8 @@ remove_device_cb (GObject *source_object,
}
static void
-on_remove_toolbutton_clicked (GtkToolButton *tool_button,
- gpointer user_data)
+on_remove_disk_button_clicked (GtkButton *button,
+ gpointer user_data)
{
DialogData *data = user_data;
GVariantBuilder options_builder;
@@ -391,8 +391,8 @@ on_remove_toolbutton_clicked (GtkToolButton *tool_button,
/* ---------------------------------------------------------------------------------------------------- */
static void
-on_goto_disk_toolbutton_clicked (GtkToolButton *tool_button,
- gpointer user_data)
+on_goto_disk_button_clicked (GtkButton *button,
+ gpointer user_data)
{
DialogData *data = user_data;
UDisksBlock *selected_block = NULL;
@@ -818,14 +818,14 @@ init_dialog (DialogData *data)
/* ---------- */
- g_signal_connect (data->remove_toolbutton,
+ g_signal_connect (data->remove_disk_button,
"clicked",
- G_CALLBACK (on_remove_toolbutton_clicked),
+ G_CALLBACK (on_remove_disk_button_clicked),
data);
- g_signal_connect (data->goto_disk_toolbutton,
+ g_signal_connect (data->goto_disk_button,
"clicked",
- G_CALLBACK (on_goto_disk_toolbutton_clicked),
+ G_CALLBACK (on_goto_disk_button_clicked),
data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]