[Xfce4-commits] [xfce/xfce4-session] 01/01: More settings dialog UI improvements
noreply at xfce.org
noreply at xfce.org
Sat Apr 27 01:10:04 CEST 2019
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-session.
commit 34cde940399402c0e3bec802108ffb59899c6388
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Sat Apr 27 01:09:55 2019 +0200
More settings dialog UI improvements
---
settings/xfae-window.c | 6 ++
settings/xfce4-session-settings.ui | 160 ++++++++++++-------------------------
2 files changed, 55 insertions(+), 111 deletions(-)
diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index b3320fd..049f1f3 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -236,12 +236,16 @@ xfae_window_init (XfaeWindow *window)
gtk_widget_show (bbox);
button = gtk_button_new_with_label (_("Add"));
+ img = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (button), img);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (xfae_window_add), window);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
button = gtk_button_new_with_label (_("Remove"));
+ img = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (button), img);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (xfae_window_remove), window);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
@@ -252,6 +256,8 @@ xfae_window_init (XfaeWindow *window)
xfae_window_selection_changed (window->selection, button);
button = gtk_button_new_with_label (_("Edit"));
+ img = gtk_image_new_from_icon_name ("document-edit-symbolic", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (button), img);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (xfae_window_edit), window);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
diff --git a/settings/xfce4-session-settings.ui b/settings/xfce4-session-settings.ui
index 307bfad..5d513d0 100644
--- a/settings/xfce4-session-settings.ui
+++ b/settings/xfce4-session-settings.ui
@@ -3,6 +3,21 @@
<interface>
<requires lib="gtk+" version="3.12"/>
<requires lib="libxfce4ui-2" version="4.12"/>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">edit-clear-symbolic</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">document-save-symbolic</property>
+ </object>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">window-close-symbolic</property>
+ </object>
<object class="XfceTitledDialog" id="xfce4_session_settings_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Session and Startup</property>
@@ -206,12 +221,12 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
<object class="GtkBox" id="hbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
+ <property name="margin_bottom">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image10">
@@ -276,147 +291,69 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="btn_save_session">
- <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Save Sess_ion</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <child>
- <object class="GtkBox" id="hbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="stock">gtk-save</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Save Sess_ion</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="valign">center</property>
+ <property name="image">image2</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btn_clear_sessions">
- <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Clear Save_d Sessions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Empty the session cache</property>
- <child>
- <object class="GtkBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="stock">gtk-clear</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Clear save_d sessions</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="image">image1</property>
+ <property name="use_underline">True</property>
+ <property name="always_show_image">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="btn_quit_client">
- <property name="use_action_appearance">False</property>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Quit the program, and remove it from the session</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="hbox6">
+ <object class="GtkButton" id="btn_quit_client">
+ <property name="label" translatable="yes">_Quit Program</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="stock">gtk-quit</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Quit Program</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image3</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -663,6 +600,7 @@
<object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area2">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list