Merge lp:~osomon/webbrowser-app/zoom-qwerty-keyboard into lp:webbrowser-app

[Olivier Tilloy]

Add "Ctrl+=" and "Ctrl+_" as shortcuts for zoom in and zoom out actions,
for improved compatibility with qwerty-based keyboard layouts.

[Andrew Hayzen (ahayzen)]

Tested on various keyboard layouts on unity7.

LGTM and unit tests pass :-)

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1536
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/645/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1555
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/363
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1555
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1403
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1403/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/645/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

works for me

review: Approve

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-07-01 08:52:37 +0000
+++ src/app/webbrowser/Browser.qml	2016-09-19 18:03:22 +0000
@@ -2144,6 +2144,14 @@
                  ((currentWebview.maximumZoomFactor - currentWebview.zoomFactor) > 0.001)
         onActivated: internal.changeZoomFactor(1)
     }
+    // For improved compatibility with qwerty-based keyboard layouts, where "="
+    // and "+" are on the same key (see https://launchpad.net/bugs/1624381):
+    Shortcut {
+        sequence: "Ctrl+="
+        enabled: currentWebview &&
+                 ((currentWebview.maximumZoomFactor - currentWebview.zoomFactor) > 0.001)
+        onActivated: internal.changeZoomFactor(1)
+    }
 
     // Ctrl+Minus: zoom out
     Shortcut {
@@ -2152,6 +2160,14 @@
                  ((currentWebview.zoomFactor - currentWebview.minimumZoomFactor) > 0.001)
         onActivated: internal.changeZoomFactor(-1)
     }
+    // For improved compatibility with qwerty-based keyboard layouts, where "-"
+    // and "_" are on the same key (see https://launchpad.net/bugs/1624381):
+    Shortcut {
+        sequence: "Ctrl+_"
+        enabled: currentWebview &&
+                 ((currentWebview.zoomFactor - currentWebview.minimumZoomFactor) > 0.001)
+        onActivated: internal.changeZoomFactor(-1)
+    }
 
     // Ctrl+0: reset zoom factor to 1.0
     Shortcut {

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-05-23 15:49:49 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-09-19 18:03:22 +0000
@@ -558,6 +558,17 @@
         self.main_window.press_key('Ctrl+0')
         self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
 
+    def test_zoom_qwerty_compatibility_shortcuts(self):
+        # Ref: https://launchpad.net/bugs/1624381
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
+
+        self.main_window.press_key('Ctrl+equal')
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.1)))
+
+        self.main_window.press_key('Ctrl+underscore')
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
+
     def test_zoom_affects_domain(self):
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))