[gnome-disk-utility/udisks2-port] Use a hpane instead of a hbox for the main window
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Use a hpane instead of a hbox for the main window
- Date: Sat, 3 Sep 2011 15:54:24 +0000 (UTC)
commit dd93ff5c499682e12afc44223419bc30453c9e9f
Author: David Zeuthen <davidz redhat com>
Date: Sat Sep 3 11:53:58 2011 -0400
Use a hpane instead of a hbox for the main window
Signed-off-by: David Zeuthen <davidz redhat com>
data/ui/palimpsest.ui | 53 ++++++++++++++++++++++++++++++++++---------
src/palimpsest/gduwindow.c | 6 ++--
2 files changed, 45 insertions(+), 14 deletions(-)
---
diff --git a/data/ui/palimpsest.ui b/data/ui/palimpsest.ui
index e7e0118..96a5507 100644
--- a/data/ui/palimpsest.ui
+++ b/data/ui/palimpsest.ui
@@ -112,14 +112,16 @@
<property name="default_width">400</property>
<property name="default_height">500</property>
<child>
- <object class="GtkHBox" id="palimpsest-hbox">
+ <object class="GtkHPaned" id="main-hpane">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="position">300</property>
+ <property name="position_set">True</property>
<child>
<object class="GtkVBox" id="device-tree-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_right">6</property>
<child>
<object class="GtkScrolledWindow" id="device-tree-scrolledwindow">
<property name="width_request">300</property>
@@ -131,11 +133,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
<property name="show_expanders">False</property>
<property name="level_indentation">12</property>
<child internal-child="selection">
- <object class="GtkTreeSelection" id="device-tree-treeview-selection"/>
+ <object class="GtkTreeSelection" id="treeview-selection"/>
</child>
</object>
</child>
@@ -155,6 +156,8 @@
<object class="GtkToolButton" id="device-tree-attach-disk-image-button">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Attach Disk Image...</property>
<property name="tooltip_text" translatable="yes">Attach Disk Image...</property>
<property name="use_action_appearance">False</property>
<property name="icon_name">list-add-symbolic</property>
@@ -168,6 +171,8 @@
<object class="GtkToolButton" id="device-tree-detach-disk-image-button">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Detach Disk Image</property>
<property name="tooltip_text" translatable="yes">Detach Disk Image</property>
<property name="use_action_appearance">False</property>
<property name="icon_name">list-remove-symbolic</property>
@@ -186,15 +191,15 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="palimpsest-notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="margin_left">6</property>
<property name="hexpand">True</property>
<child>
<object class="GtkAlignment" id="alignment1">
@@ -535,6 +540,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-partition-create</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-add-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -546,6 +553,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-mount</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-playback-start-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -557,6 +566,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-unmount</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-playback-stop-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -568,6 +579,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-eject</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-eject-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -579,6 +592,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-unlock</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">changes-allow-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -590,6 +605,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-lock</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">changes-prevent-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -601,6 +618,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-activate-swap</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-playback-start-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -612,6 +631,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-deactivate-swap</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-playback-stop-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -623,6 +644,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="related_action">devtab-action-generic</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">system-run-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -941,6 +964,15 @@
<object class="GtkVBox" id="newtab_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">3</property>
@@ -965,9 +997,8 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
</packing>
</child>
</object>
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index bef6108..d75fe88 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -63,7 +63,7 @@ struct _GduWindow
GtkWidget *volume_grid;
- GtkWidget *main_hbox;
+ GtkWidget *main_hpane;
GtkWidget *details_notebook;
GtkWidget *device_scrolledwindow;
GtkWidget *device_treeview;
@@ -101,7 +101,7 @@ static const struct {
goffset offset;
const gchar *name;
} widget_mapping[] = {
- {G_STRUCT_OFFSET (GduWindow, main_hbox), "palimpsest-hbox"},
+ {G_STRUCT_OFFSET (GduWindow, main_hpane), "main-hpane"},
{G_STRUCT_OFFSET (GduWindow, device_scrolledwindow), "device-tree-scrolledwindow"},
{G_STRUCT_OFFSET (GduWindow, device_toolbar), "device-tree-add-remove-toolbar"},
{G_STRUCT_OFFSET (GduWindow, device_toolbar_attach_disk_image_button), "device-tree-attach-disk-image-button"},
@@ -704,7 +704,7 @@ gdu_window_constructed (GObject *object)
*p = G_OBJECT (gtk_builder_get_object (window->builder, widget_mapping[n].name));
}
- gtk_widget_reparent (window->main_hbox, GTK_WIDGET (window));
+ gtk_widget_reparent (window->main_hpane, GTK_WIDGET (window));
gtk_window_set_title (GTK_WINDOW (window), _("Disk Utility"));
gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
gtk_container_set_border_width (GTK_CONTAINER (window), 12);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
