[Xfce4-commits] [apps/xfce4-notifyd] 16/29: Make alternative to primary display option more understandable
noreply at xfce.org
noreply at xfce.org
Sun Jan 29 20:52:06 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 e103b2d87fbb910dbdd1294a3d260fe76c68bd53
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Fri Jan 6 22:49:12 2017 +0100
Make alternative to primary display option more understandable
---
xfce4-notifyd-config/main.c | 2 +-
xfce4-notifyd-config/xfce4-notifyd-config.glade | 67 +++++++++++++------------
xfce4-notifyd/xfce-notify-daemon.c | 12 ++---
3 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 9135514..862dc71 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -686,7 +686,7 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
gtk_combo_box_set_active(GTK_COMBO_BOX(position_combo), GTK_CORNER_TOP_RIGHT);
primary_monitor = GTK_WIDGET(gtk_builder_get_object(builder, "primary_monitor"));
- xfconf_g_property_bind(channel, "/primary-monitor", G_TYPE_BOOLEAN,
+ xfconf_g_property_bind(channel, "/primary-monitor", G_TYPE_UINT,
G_OBJECT(primary_monitor), "active");
do_fadeout = GTK_WIDGET(gtk_builder_get_object(builder, "do_fadeout"));
diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade b/xfce4-notifyd-config/xfce4-notifyd-config.glade
index 2cb2bd3..573bc2f 100644
--- a/xfce4-notifyd-config/xfce4-notifyd-config.glade
+++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade
@@ -63,6 +63,20 @@
</row>
</data>
</object>
+ <object class="GtkListStore" id="liststore3">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">display with mouse pointer</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">primary display</col>
+ </row>
+ </data>
+ </object>
<object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
@@ -509,44 +523,36 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkComboBox" id="primary_monitor">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="model">liststore3</property>
+ <property name="active_id">1</property>
<child>
- <object class="GtkLabel" id="primary_label">
- <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="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="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="primary_monitor">
- <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="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
+ <object class="GtkCellRendererText" id="renderer5"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="primary_label">
+ <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="margin_left">12</property>
+ <property name="label" translatable="yes">Show notifications on</property>
+ <property name="ellipsize">end</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>
@@ -644,7 +650,6 @@
<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"/>
diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
index 982b33c..f7147f8 100644
--- a/xfce4-notifyd/xfce-notify-daemon.c
+++ b/xfce4-notifyd/xfce-notify-daemon.c
@@ -61,9 +61,9 @@ struct _XfceNotifyDaemon
gdouble initial_opacity;
GtkCornerType notify_location;
gboolean do_fadeout;
- gboolean primary_monitor;
gboolean do_not_disturb;
gboolean notification_log;
+ gint primary_monitor;
gint log_level;
gint log_level_apps;
@@ -724,7 +724,7 @@ xfce_notify_daemon_window_size_allocate(GtkWidget *widget,
gdk_device_get_position (pointer, &p_screen, &x, &y);
- if (xndaemon->primary_monitor == TRUE)
+ if (xndaemon->primary_monitor == 1)
monitor = gdk_screen_get_primary_monitor(widget_screen);
else
monitor = gdk_screen_get_monitor_at_point(p_screen, x, y);
@@ -1557,8 +1557,8 @@ xfce_notify_daemon_settings_changed(XfconfChannel *channel,
: TRUE;
} else if(!strcmp(property, "/primary-monitor")) {
xndaemon->primary_monitor = G_VALUE_TYPE(value)
- ? g_value_get_boolean(value)
- : TRUE;
+ ? g_value_get_uint(value)
+ : 0;
} else if(!strcmp(property, "/do-not-disturb")) {
xndaemon->do_not_disturb = G_VALUE_TYPE(value)
? g_value_get_boolean(value)
@@ -1609,8 +1609,8 @@ xfce_notify_daemon_load_config (XfceNotifyDaemon *xndaemon,
xndaemon->do_fadeout = xfconf_channel_get_bool(xndaemon->settings,
"/do-fadeout", TRUE);
- xndaemon->primary_monitor = xfconf_channel_get_bool(xndaemon->settings,
- "/primary-monitor", FALSE);
+ xndaemon->primary_monitor = xfconf_channel_get_uint(xndaemon->settings,
+ "/primary-monitor", 0);
xndaemon->do_not_disturb = xfconf_channel_get_bool(xndaemon->settings,
"/do-not-disturb",
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list