[Xfce4-commits] [xfce/xfce4-settings] 13/22: mouse: Replace enabled toggle with GtkSwitch
noreply at xfce.org
noreply at xfce.org
Tue Sep 4 02:31:04 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e 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-settings.
commit 7c590e41ac03c9899b3ab698d5ea0a7ec5868400
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Sep 1 12:45:26 2018 -0400
mouse: Replace enabled toggle with GtkSwitch
---
dialogs/mouse-settings/main.c | 11 ++++----
dialogs/mouse-settings/mouse-dialog.glade | 43 ++++++++++++++-----------------
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 4f5d248..e0deddc 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -1125,15 +1125,16 @@ mouse_settings_synaptics_set_scroll_horiz (GtkWidget *widget,
#if defined(DEVICE_PROPERTIES) || defined (HAVE_LIBINPUT)
static void
-mouse_settings_device_set_enabled (GtkToggleButton *button,
- GtkBuilder *builder)
+mouse_settings_device_set_enabled (GtkSwitch *widget,
+ GParamSpec *pspec,
+ GtkBuilder *builder)
{
gchar *name = NULL;
gchar *prop;
gboolean enabled;
GObject *object;
- enabled = gtk_toggle_button_get_active (button);
+ enabled = gtk_switch_get_active (widget);
object = gtk_builder_get_object (builder, "device-notebook");
gtk_widget_set_sensitive (GTK_WIDGET (object), enabled);
@@ -1415,7 +1416,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder)
object = gtk_builder_get_object (builder, "device-enabled");
#ifdef DEVICE_PROPERTIES
gtk_widget_set_sensitive (GTK_WIDGET (object), is_enabled != -1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), is_enabled > 0);
+ gtk_switch_set_active (GTK_SWITCH (object), is_enabled > 0);
object = gtk_builder_get_object (builder, "device-notebook");
gtk_widget_set_sensitive (GTK_WIDGET (object), is_enabled == 1);
@@ -1946,7 +1947,7 @@ main (gint argc, gchar **argv)
/* connect signals */
#ifdef DEVICE_PROPERTIES
object = gtk_builder_get_object (builder, "device-enabled");
- g_signal_connect (G_OBJECT (object), "toggled",
+ g_signal_connect (G_OBJECT (object), "notify::active",
G_CALLBACK (mouse_settings_device_set_enabled), builder);
#endif
diff --git a/dialogs/mouse-settings/mouse-dialog.glade b/dialogs/mouse-settings/mouse-dialog.glade
index a5de56e..ae36db5 100644
--- a/dialogs/mouse-settings/mouse-dialog.glade
+++ b/dialogs/mouse-settings/mouse-dialog.glade
@@ -144,8 +144,8 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button2">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -155,12 +155,11 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-close</property>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -170,6 +169,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -191,7 +191,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
@@ -223,6 +223,17 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkSwitch" id="device-enabled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -231,22 +242,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="device-enabled">
- <property name="label" translatable="yes">_Enable this device</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkNotebook" id="device-notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -860,7 +855,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1246,8 +1241,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">button2</action-widget>
<action-widget response="0">button1</action-widget>
+ <action-widget response="-11">button2</action-widget>
</action-widgets>
</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