Commit 4297707d authored by Nicolas Bruguier's avatar Nicolas Bruguier

debian/patches/fix-gnome-3.20-support.patch:

  - Refresh
parent b68d8449
......@@ -23,8 +23,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- switchboard-plug-mouse-touchpad-0.1.1+testing+bzr67.orig/src/Backend/TouchpadSettings.vala
+++ switchboard-plug-mouse-touchpad-0.1.1+testing+bzr67/src/Backend/TouchpadSettings.vala
Index: switchboard-plug-mouse-touchpad/src/Backend/TouchpadSettings.vala
===================================================================
--- switchboard-plug-mouse-touchpad.orig/src/Backend/TouchpadSettings.vala
+++ switchboard-plug-mouse-touchpad/src/Backend/TouchpadSettings.vala
@@ -22,7 +22,7 @@ public class MouseTouchpad.Backend.Touch
public string click_method { get; set; }
public double speed { get; set; }
......@@ -34,41 +36,40 @@ Last-Update: <YYYY-MM-DD>
public bool natural_scroll { get; set; }
public TouchpadSettings () {
--- switchboard-plug-mouse-touchpad-0.1.1+testing+bzr67.orig/src/Widgets/TouchpadSection.vala
+++ switchboard-plug-mouse-touchpad-0.1.1+testing+bzr67/src/Widgets/TouchpadSection.vala
@@ -24,7 +24,7 @@ public class MouseTouchpad.Widgets.Touch
private Gtk.Switch tap_to_click_switch;
private Gtk.ComboBoxText click_method_combobox;
private Gtk.Scale pointer_speed_scale;
- private Gtk.ComboBoxText scrolling_combobox;
+ private Gtk.Switch edge_scrolling_switch;
private Gtk.Switch horizontal_scrolling_switch;
private Gtk.Switch natural_scrolling_switch;
Index: switchboard-plug-mouse-touchpad/src/Widgets/TouchpadSection.vala
===================================================================
--- switchboard-plug-mouse-touchpad.orig/src/Widgets/TouchpadSection.vala
+++ switchboard-plug-mouse-touchpad/src/Widgets/TouchpadSection.vala
@@ -65,11 +65,9 @@ public class MouseTouchpad.Widgets.Touch
pointer_speed_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
Plug.end_size_group.add_widget (pointer_speed_scale);
@@ -56,10 +56,8 @@ public class MouseTouchpad.Widgets.Touch
pointer_speed_scale.draw_value = false;
pointer_speed_scale.set_size_request (160, -1);
- scrolling_combobox = new Gtk.ComboBoxText ();
- var scrolling_combobox = new Gtk.ComboBoxText ();
- scrolling_combobox.append ("two-finger-scrolling", _("Two-finger"));
- scrolling_combobox.append ("edge-scrolling", _("Edge"));
- scrolling_combobox.append ("disabled", _("Disabled"));
+ edge_scrolling_switch = new Gtk.Switch ();
-
+ var edge_scrolling_switch = new Gtk.Switch ();
+ edge_scrolling_switch.halign = Gtk.Align.START;
horizontal_scrolling_switch = new Gtk.Switch ();
+
var horizontal_scrolling_switch = new Gtk.Switch ();
horizontal_scrolling_switch.halign = Gtk.Align.START;
@@ -71,15 +69,15 @@ public class MouseTouchpad.Widgets.Touch
//this.add_entry (_("Disable while typing:"), disable_while_typing_switch);
this.add_entry (_("Tap to click:"), tap_to_click_switch);
this.add_entry (_("Physical clicking:"), click_method_combobox);
- this.add_entry (_("Scrolling:"), scrolling_combobox);
+ this.add_entry (_("Edge scrolling:"), edge_scrolling_switch);
//this.add_entry (_("Horizontal scrolling:"), horizontal_scrolling_switch);
this.add_entry (_("Natural scrolling:"), natural_scrolling_switch);
}
private void create_bindings () {
@@ -87,8 +85,8 @@ public class MouseTouchpad.Widgets.Touch
attach (new SettingLabel (_("Physical clicking:")), 0, 3, 1, 1);
attach (click_method_switch, 1, 3, 1, 1);
attach (click_method_combobox, 2, 3, 1, 1);
- attach (new SettingLabel (_("Scrolling:")), 0, 4, 1, 1);
- attach (scrolling_combobox, 1, 4, 2, 1);
+ attach (new SettingLabel (_("Edge scrolling:")), 0, 4, 1, 1);
+ attach (edge_scrolling_switch, 1, 4, 2, 1);
attach (new SettingLabel (_("Natural scrolling:")), 0, 5, 1, 1);
attach (natural_scrolling_switch, 1, 5, 1, 1);
@@ -102,9 +100,9 @@ public class MouseTouchpad.Widgets.Touch
}
});
- touchpad_settings.bind_property ("scroll-method",
- scrolling_combobox,
- "active-id",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment