Merge lp:~gerardo-santana/gnome-control-center/gnome-control-center into lp:gnome-control-center

[Gerardo Santana]

adds a checkbox for "Enable natural scrolling" under "Enable horizontal scrolling" in Touchpad tab

[Gerardo Santana (gerardo-santana)]

This is related to a merge proposal for gnome-settings-daemon:

https://code.launchpad.net/~gerardo-santana/gnome-settings-daemon/gnome-settings-daemon/+merge/109476

[Sebastien Bacher (seb128)]

Thank you for taking the time to report this bug and helping to make Ubuntu better. The issue you are reporting is an upstream one and it would be nice if somebody having it could send the bug to the developers of the software by following the instructions at https://wiki.ubuntu.com/Bugs/Upstream/GNOME. If you have done so, please tell us the number of the upstream bug (or the link), so we can add a bugwatch that will inform us about its status. Thanks in advance.

[Sebastien Bacher (seb128)]

the current version has a checkbox for natural scrolling, the patch would need to be redone to add horizontal scrolling if that's still something wanted.

Closing since it was never forwarded upstream as asked in the previous comment

review: Disapprove

Unmerged revisions

11812. By Gerardo Santana on 2012-06-08

Enables natural scrolling setting

=== modified file 'panels/mouse/gnome-mouse-properties.c'
--- panels/mouse/gnome-mouse-properties.c	2012-03-13 18:12:47 +0000
+++ panels/mouse/gnome-mouse-properties.c	2012-06-08 11:54:44 +0000
@@ -174,6 +174,8 @@
 
         gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"),
                                   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("scroll_disabled_radio"))));
+        gtk_widget_set_sensitive (WID ("natural_scroll_toggle"),
+                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("scroll_disabled_radio"))));
 }
 
 static void
@@ -187,6 +189,8 @@
 
 	gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"),
 				  !gtk_toggle_button_get_active (disabled));
+	gtk_widget_set_sensitive (WID ("natural_scroll_toggle"),
+				  !gtk_toggle_button_get_active (disabled));
 
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("scroll_edge_radio"))))
 		method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;
@@ -304,6 +308,9 @@
 	g_settings_bind (touchpad_settings, "horiz-scroll-enabled",
 			 WID ("horiz_scroll_toggle"), "active",
 			 G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (touchpad_settings, "natural-scroll-enabled",
+			 WID ("natural_scroll_toggle"), "active",
+			 G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (touchpad_settings, "motion-acceleration",
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("touchpad_accel_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);

=== modified file 'panels/mouse/gnome-mouse-properties.ui'
--- panels/mouse/gnome-mouse-properties.ui	2012-04-22 11:57:19 +0000
+++ panels/mouse/gnome-mouse-properties.ui	2012-06-08 11:54:44 +0000
@@ -1087,6 +1087,50 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox17">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <child>
+                          <object class="GtkLabel" id="label37">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label">    </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="natural_scroll_toggle">
+                            <property name="label" translatable="yes">Enable _natural scrolling</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>