1
=== modified file 'debian/control'
2
--- debian/control	2016-05-19 18:39:19 +0000
3
+++ debian/control	2016-05-23 15:50:35 +0000
4
@@ -45,7 +45,7 @@
5
45
Depends: ${misc:Depends},
45
Depends: ${misc:Depends},
6
46
         ${shlibs:Depends},
46
         ${shlibs:Depends},
7
47
         fonts-liberation,
47
         fonts-liberation,
9
48
         liboxideqt-qmlplugin (>= 1.12),
48
         liboxideqt-qmlplugin (>= 1.15),
10
49
         libqt5sql5-sqlite,
49
         libqt5sql5-sqlite,
11
50
         qml-module-qt-labs-folderlistmodel,
50
         qml-module-qt-labs-folderlistmodel,
12
51
         qml-module-qt-labs-settings,
51
         qml-module-qt-labs-settings,
13
52
52
14
=== modified file 'src/app/webbrowser/Browser.qml'
15
--- src/app/webbrowser/Browser.qml	2016-05-19 18:39:30 +0000
16
+++ src/app/webbrowser/Browser.qml	2016-05-23 15:50:35 +0000
17
@@ -19,7 +19,7 @@
18
19
import QtQuick 2.4
19
import QtQuick 2.4
19
20
import QtQuick.Window 2.2
20
import QtQuick.Window 2.2
20
21
import Qt.labs.settings 1.0
21
import Qt.labs.settings 1.0
22
22
import com.canonical.Oxide 1.12 as Oxide
22
import com.canonical.Oxide 1.15 as Oxide
23
23
import Ubuntu.Components 1.3
23
import Ubuntu.Components 1.3
24
24
import Ubuntu.Components.Popups 1.3
24
import Ubuntu.Components.Popups 1.3
25
25
import Unity.InputInfo 0.1
25
import Unity.InputInfo 0.1
26
@@ -1457,6 +1457,18 @@
27
1457
        readonly property bool hasMouse: (miceModel.count + touchPadModel.count) > 0
1457
        readonly property bool hasMouse: (miceModel.count + touchPadModel.count) > 0
28
1458
        readonly property bool hasTouchScreen: touchScreenModel.count > 0
1458
        readonly property bool hasTouchScreen: touchScreenModel.count > 0
29
1459
1459
30
1460
        // Ref: https://code.google.com/p/chromium/codesearch#chromium/src/components/ui/zoom/page_zoom_constants.cc
31
1461
        readonly property var zoomFactors: [0.25, 0.333, 0.5, 0.666, 0.75, 0.9, 1.0,
32
1462
                                            1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0, 5.0]
33
1463
        function changeZoomFactor(offset) {
34
1464
            for (var i = 0; i < zoomFactors.length; ++i) {
35
1465
                if (Math.abs(zoomFactors[i] - currentWebview.zoomFactor) <= 0.001) {
36
1466
                    currentWebview.zoomFactor = zoomFactors[i + offset]
37
1467
                    return
38
1468
                }
39
1469
            }
40
1470
        }
41
1471
42
1460
        function getOpenPages() {
1472
        function getOpenPages() {
43
1461
            var urls = []
1473
            var urls = []
44
1462
            for (var i = 0; i < tabsModel.count; i++) {
1474
            for (var i = 0; i < tabsModel.count; i++) {
45
@@ -2114,6 +2126,29 @@
46
2114
        onActivated: currentWebview.findController.previous()
2126
        onActivated: currentWebview.findController.previous()
47
2115
    }
2127
    }
48
2116
2128
49
2129
    // Ctrl+Plus: zoom in
50
2130
    Shortcut {
51
2131
        sequence: StandardKey.ZoomIn
52
2132
        enabled: currentWebview &&
53
2133
                 ((currentWebview.maximumZoomFactor - currentWebview.zoomFactor) > 0.001)
54
2134
        onActivated: internal.changeZoomFactor(1)
55
2135
    }
56
2136
57
2137
    // Ctrl+Minus: zoom out
58
2138
    Shortcut {
59
2139
        sequence: StandardKey.ZoomOut
60
2140
        enabled: currentWebview &&
61
2141
                 ((currentWebview.zoomFactor - currentWebview.minimumZoomFactor) > 0.001)
62
2142
        onActivated: internal.changeZoomFactor(-1)
63
2143
    }
64
2144
65
2145
    // Ctrl+0: reset zoom factor to 1.0
66
2146
    Shortcut {
67
2147
        sequence: "Ctrl+0"
68
2148
        enabled: currentWebview && (currentWebview.zoomFactor != 1.0)
69
2149
        onActivated: currentWebview.zoomFactor = 1.0
70
2150
    }
71
2151
72
2117
    Loader {
2152
    Loader {
73
2118
        id: contentHandlerLoader
2153
        id: contentHandlerLoader
74
2119
        source: "../ContentHandler.qml"
2154
        source: "../ContentHandler.qml"
75
2120
2155
76
=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
77
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-05-05 10:09:48 +0000
78
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-05-23 15:50:35 +0000
79
@@ -19,7 +19,7 @@
80
19
import time
19
import time
81
20
import testtools
20
import testtools
82
21
21
84
22
from testtools.matchers import Equals, NotEquals, GreaterThan
22
from testtools.matchers import Equals, Mismatch, NotEquals, GreaterThan
85
23
from autopilot.matchers import Eventually
23
from autopilot.matchers import Eventually
86
24
from autopilot.platform import model
24
from autopilot.platform import model
87
25
25
88
@@ -57,6 +57,19 @@
89
57
        connection.close()
57
        connection.close()
90
58
58
91
59
59
92
60
class AlmostEquals(object):
93
61
94
62
    def __init__(self, expected):
95
63
        self.expected = expected
96
64
97
65
    def match(self, actual):
98
66
        if round(actual - self.expected, 3) == 0:
99
67
            return None
100
68
        else:
101
69
            msg = "{} is not almost equal to {}"
102
70
            return Mismatch(msg.format(actual, self.expected))
103
71
104
72
105
60
@testtools.skipIf(model() != "Desktop", "on desktop only")
73
@testtools.skipIf(model() != "Desktop", "on desktop only")
106
61
class TestKeyboard(PrepopulatedDatabaseTestCaseBase):
74
class TestKeyboard(PrepopulatedDatabaseTestCaseBase):
107
62
75
108
@@ -524,3 +537,38 @@
109
524
        self.main_window.press_key('Ctrl+t')
537
        self.main_window.press_key('Ctrl+t')
110
525
        self.address_bar.activeFocus.wait_for(True)
538
        self.address_bar.activeFocus.wait_for(True)
111
526
        self.assertThat(self.address_bar.text, Eventually(Equals("")))
539
        self.assertThat(self.address_bar.text, Eventually(Equals("")))
112
540
113
541
    def test_zoom_in_and_out(self):
114
542
        webview = self.main_window.get_current_webview()
115
543
        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
116
544
117
545
        zooms = [1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0, 5.0]
118
546
        for zoom in zooms:
119
547
            self.main_window.press_key('Ctrl+plus')
120
548
            self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(zoom)))
121
549
122
550
        self.main_window.press_key('Ctrl+0')
123
551
        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
124
552
125
553
        zooms = [0.9, 0.75, 0.666, 0.5, 0.333, 0.25]
126
554
        for zoom in zooms:
127
555
            self.main_window.press_key('Ctrl+minus')
128
556
            self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(zoom)))
129
557
130
558
        self.main_window.press_key('Ctrl+0')
131
559
        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
132
560
133
561
    def test_zoom_affects_domain(self):
134
562
        webview = self.main_window.get_current_webview()
135
563
        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
136
564
137
565
        self.open_tabs(1)
138
566
        self.check_tab_number(1)
139
567
        self.main_window.press_key('Ctrl+plus')
140
568
        webview = self.main_window.get_current_webview()
141
569
        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.1)))
142
570
143
571
        self.main_window.press_key('Ctrl+Tab')
144
572
        self.check_tab_number(0)
145
573
        webview = self.main_window.get_current_webview()
146
574
        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.1)))
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-05-23
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-04-22
Ubuntu Phablet Team		2016-04-22	Pending
Review via email: mp+292637@code.launchpad.net