[Xfce4-commits] [apps/xfce4-notifyd] 15/29: Reorganize the settings dialog
noreply at xfce.org
noreply at xfce.org
Sun Jan 29 20:52:05 CET 2017
This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository apps/xfce4-notifyd.
commit 2bdb68200d0a34067069414e5ad6f8aa268a893a
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Fri Jan 6 22:14:04 2017 +0100
Reorganize the settings dialog
---
xfce4-notifyd-config/main.c | 14 +-
xfce4-notifyd-config/xfce4-notifyd-config.glade | 594 +++++++++++++-----------
2 files changed, 330 insertions(+), 278 deletions(-)
diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 7599108..9135514 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -45,7 +45,6 @@
typedef struct
{
GtkWidget *log_level;
- GtkWidget *log_level_label;
GtkWidget *log_level_apps;
GtkWidget *log_level_apps_label;
GtkWidget *infobar_label;
@@ -460,7 +459,6 @@ xfce4_notifyd_log_activated (GtkSwitch *log_switch,
gtk_switch_set_state (GTK_SWITCH (log_switch), state);
gtk_widget_set_sensitive (GTK_WIDGET (log_widgets->log_level), state);
- gtk_widget_set_sensitive (GTK_WIDGET (log_widgets->log_level_label), state);
gtk_widget_set_sensitive (GTK_WIDGET (log_widgets->log_level_apps), state);
gtk_widget_set_sensitive (GTK_WIDGET (log_widgets->log_level_apps_label), state);
markup = g_markup_printf_escaped (format, state ? "enabled" : "disabled");
@@ -619,6 +617,9 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
GtkWidget *log_switch;
GtkWidget *log_scrolled_window;
GtkWidget *log_listbox;
+ GtkToolbar *log_toolbar;
+ GtkToolItem *log_clear_toolbar_btn;
+ GtkToolItem *log_refresh_toolbar_btn;
GtkWidget *clear_log_button;
GtkWidget *refresh_log_button;
GtkWidget *primary_monitor;
@@ -723,8 +724,8 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
G_CALLBACK (xfce4_notifyd_known_applications_changed), known_applications_listbox);
/* Notification log settings */
+ log_toolbar = GTK_TOOLBAR (gtk_builder_get_object (builder, "log_toolbar"));
log_widgets.log_level = GTK_WIDGET (gtk_builder_get_object (builder, "log_level"));
- log_widgets.log_level_label = GTK_WIDGET (gtk_builder_get_object (builder, "log_level_label"));
log_widgets.log_level_apps = GTK_WIDGET (gtk_builder_get_object (builder, "log_level_apps"));
log_widgets.log_level_apps_label = GTK_WIDGET (gtk_builder_get_object (builder, "log_level_apps_label"));
log_widgets.infobar_label = GTK_WIDGET (gtk_builder_get_object (builder, "infobar_label"));
@@ -761,6 +762,13 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
refresh_log_button = GTK_WIDGET (gtk_builder_get_object (builder, "refresh_log_button"));
g_signal_connect (G_OBJECT (refresh_log_button), "clicked",
G_CALLBACK (xfce4_notifyd_log_refresh), log_listbox);
+ log_clear_toolbar_btn = gtk_tool_item_new ();
+ gtk_container_add (GTK_CONTAINER(log_clear_toolbar_btn), clear_log_button);
+ gtk_toolbar_insert(log_toolbar, GTK_TOOL_ITEM(log_clear_toolbar_btn), 0);
+ log_refresh_toolbar_btn = gtk_tool_item_new ();
+ gtk_container_add (GTK_CONTAINER(log_refresh_toolbar_btn), refresh_log_button);
+ gtk_toolbar_insert(log_toolbar, GTK_TOOL_ITEM(log_refresh_toolbar_btn), 1);
+ gtk_widget_show_all (GTK_WIDGET(log_toolbar));
help_button = GTK_WIDGET(gtk_builder_get_object(builder, "help_btn"));
g_signal_connect(G_OBJECT(help_button), "clicked",
diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade b/xfce4-notifyd-config/xfce4-notifyd-config.glade
index fa7e73a..2cb2bd3 100644
--- a/xfce4-notifyd-config/xfce4-notifyd-config.glade
+++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade
@@ -22,6 +22,13 @@
<property name="can_focus">False</property>
<property name="stock">gtk-clear</property>
</object>
+ <object class="GtkButton" id="clear_log_button">
+ <property name="label" translatable="yes">Clear log</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image2</property>
+ </object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray -->
@@ -142,16 +149,107 @@
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<child>
+ <object class="GtkRevealer" id="do_not_disturb_info">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">12</property>
+ <property name="reveal_child">True</property>
+ <child>
+ <object class="GtkInfoBar" id="infobar1">
+ <property name="visible">True</property>
+ <property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="infobar-action_area">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="content_area">
+ <object class="GtkBox" id="infobar-content_area">
+ <property name="name">8</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">dialog-information-symbolic</property>
+ <property name="icon_size">1</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="infobar_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Currently only urgent notifications are shown.</b></property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">end</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkStackSwitcher" id="stack_switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
<property name="stack">stack</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -160,7 +258,7 @@
<property name="can_focus">False</property>
<property name="transition_type">slide-left-right</property>
<child>
- <object class="GtkGrid" id="general">
+ <object class="GtkGrid" id="appearance">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
@@ -169,187 +267,139 @@
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkLabel" id="do_not_disturb_label">
+ <object class="GtkScale" id="opacity_slider">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">Do not disturb</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="round_digits">2</property>
+ <property name="digits">2</property>
+ <property name="value_pos">right</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkSwitch" id="do_not_disturb">
+ <object class="GtkButton" id="preview_button">
+ <property name="label" translatable="yes">Show Notification _Preview</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">end</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkRevealer" id="do_not_disturb_info">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="reveal_child">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkInfoBar" id="infobar1">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="app_paintable">True</property>
<property name="can_focus">False</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="infobar-action_area">
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="layout_style">start</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child internal-child="content_area">
- <object class="GtkBox" id="infobar-content_area">
- <property name="name">8</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">dialog-information-symbolic</property>
- <property name="icon_size">1</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="infobar_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Currently only urgent notifications are shown.</b></property>
- <property name="use_markup">True</property>
- <property name="ellipsize">end</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="label" translatable="yes">seconds</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="expire_timeout_sbtn">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="numeric">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="log_label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">1</property>
- <property name="label" translatable="yes"><b>Notification log</b></property>
- <property name="use_markup">True</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">_Disappear after</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">expire_timeout_sbtn</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
- <object class="GtkSwitch" id="log_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="primary_label">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">By default the notification bubbles will be shown on the display on which the mouse pointer is located.</property>
- <property name="label" translatable="yes">Always show notifications on primary display</property>
- <property name="ellipsize">end</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">_Opacity</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkSwitch" id="primary_monitor">
+ <object class="GtkSwitch" id="do_fadeout">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="log_level_label">
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Log notifications</property>
+ <property name="label" translatable="yes">Fade out</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="log_level_apps_label">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Log applications</property>
+ <property name="label" translatable="yes">Default _position</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -358,14 +408,12 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="log_level">
+ <object class="GtkComboBox" id="position_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">liststore1</property>
- <property name="popup_fixed_width">False</property>
- <property name="active_id">1</property>
+ <property name="model">model1</property>
<child>
- <object class="GtkCellRendererText" id="renderer2"/>
+ <object class="GtkCellRendererText" id="renderer3"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -373,17 +421,16 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="log_level_apps">
+ <object class="GtkComboBox" id="theme_combo">
+ <property name="name">theme</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">liststore2</property>
- <property name="active_id">0</property>
<child>
- <object class="GtkCellRendererText" id="renderer4"/>
+ <object class="GtkCellRendererText" id="renderer1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -391,212 +438,127 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="name">general</property>
- <property name="title" translatable="yes">General</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="appearance">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
- <child>
- <object class="GtkScale" id="opacity_slider">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="round_digits">2</property>
- <property name="digits">2</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="preview_button">
- <property name="label" translatable="yes">Show Notification _Preview</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">_Theme</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="do_not_disturb_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Theme</property>
- <property name="use_underline">True</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Do not disturb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="theme_combo">
- <property name="name">theme</property>
+ <object class="GtkSwitch" id="do_not_disturb">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Default _position</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes"><b>Behavior</b></property>
+ <property name="use_markup">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="position_combo">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">model1</property>
- <child>
- <object class="GtkCellRendererText" id="renderer3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="margin_top">12</property>
+ <property name="label" translatable="yes"><b>Appearance</b></property>
+ <property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox4">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="primary_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">seconds</property>
+ <property name="tooltip_text" translatable="yes">By default the notification bubbles will be shown on the display on which the mouse pointer is located.</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">Always show notifications on primary display</property>
+ <property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="expire_timeout_sbtn">
+ <object class="GtkSwitch" id="primary_monitor">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">adjustment1</property>
- <property name="numeric">True</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Disappear after</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">expire_timeout_sbtn</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Opacity</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Fade out</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <object class="GtkSwitch" id="do_fadeout">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
- <property name="name">appearance</property>
- <property name="title" translatable="yes">Appearance</property>
- <property name="position">1</property>
+ <property name="name">general</property>
+ <property name="title" translatable="yes">General</property>
</packing>
</child>
<child>
@@ -640,7 +602,7 @@
<packing>
<property name="name">applications</property>
<property name="title" translatable="yes">Applications</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -654,59 +616,135 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkScrolledWindow" id="log_scrolled_window">
+ <object class="GtkLabel" id="log_level_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Log notifications</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="clear_log_button">
- <property name="label" translatable="yes">Clear log</property>
+ <object class="GtkSwitch" id="log_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image2</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="log_level">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ <property name="popup_fixed_width">False</property>
+ <property name="active_id">1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="log_level_apps_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Log applications</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="refresh_log_button">
- <property name="label" translatable="yes">Refresh</property>
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkScrolledWindow" id="log_scrolled_window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="log_toolbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </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">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="log_level_apps">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore2</property>
+ <property name="active_id">0</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="name">log</property>
<property name="title" translatable="yes">Log</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -722,4 +760,10 @@
<action-widget response="1">close_btn</action-widget>
</action-widgets>
</object>
+ <object class="GtkButton" id="refresh_log_button">
+ <property name="label" translatable="yes">Refresh</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
</interface>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list