1
=== modified file 'debian/control'
2
--- debian/control	2015-05-27 05:31:12 +0000
3
+++ debian/control	2015-06-12 09:40:41 +0000
4
@@ -21,6 +21,7 @@
5
21
               qtdeclarative5-dev,
21
               qtdeclarative5-dev,
6
22
               qtdeclarative5-private-dev,
22
               qtdeclarative5-private-dev,
7
23
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
23
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
8
24
               qtdeclarative5-ubuntu-keyboard-extensions0.1,
9
24
               xvfb,
25
               xvfb,
10
25
Standards-Version: 3.9.5
26
Standards-Version: 3.9.5
11
26
Homepage: https://launchpad.net/webbrowser-app
27
Homepage: https://launchpad.net/webbrowser-app
12
@@ -41,6 +42,7 @@
13
41
         qml-module-qtquick2 (>= 5.4) | qtdeclarative5-qtquick2-plugin (>= 5.4),
42
         qml-module-qtquick2 (>= 5.4) | qtdeclarative5-qtquick2-plugin (>= 5.4),
14
42
         qml-module-qtquick-dialogs | qtdeclarative5-dialogs-plugin,
43
         qml-module-qtquick-dialogs | qtdeclarative5-dialogs-plugin,
15
43
         qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
44
         qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
16
45
         qtdeclarative5-ubuntu-keyboard-extensions0.1,
17
44
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
46
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
18
45
         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
47
         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
19
46
         qtdeclarative5-unity-action-plugin,
48
         qtdeclarative5-unity-action-plugin,
20
47
49
21
=== modified file 'src/app/webbrowser/AddressBar.qml'
22
--- src/app/webbrowser/AddressBar.qml	2015-05-26 21:42:54 +0000
23
+++ src/app/webbrowser/AddressBar.qml	2015-06-12 09:40:41 +0000
24
@@ -17,6 +17,7 @@
25
17
 */
17
 */
26
18
18
27
19
import QtQuick 2.0
19
import QtQuick 2.0
28
20
import Ubuntu.Keyboard 0.1
29
20
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.1
30
21
import Ubuntu.Components.Popups 1.0
22
import Ubuntu.Components.Popups 1.0
31
22
import com.canonical.Oxide 1.0 as Oxide
23
import com.canonical.Oxide 1.0 as Oxide
32
@@ -57,9 +58,11 @@
33
57
        primaryItem: Item {
58
        primaryItem: Item {
34
58
            id: icons
59
            id: icons
35
59
60
37
60
            width: iconsRow.width + units.gu(1)
61
            width: visible ? iconsRow.width + units.gu(1) : 0
38
61
            height: units.gu(2)
62
            height: units.gu(2)
39
62
63
40
64
            visible: !(Qt.inputMethod.visible && addressbar.activeFocus)
41
65
42
63
            Row {
66
            Row {
43
64
                id: iconsRow
67
                id: iconsRow
44
65
68
45
@@ -84,7 +87,8 @@
46
84
                    height: parent.height
87
                    height: parent.height
47
85
                    width: height
88
                    width: height
48
86
89
50
87
                    visible: addressbar.activeFocus || addressbar.loading || !addressbar.text
90
                    visible: (addressbar.activeFocus && !Qt.inputMethod.visible) ||
51
91
                                addressbar.loading || !addressbar.text
52
88
92
53
89
                    enabled: addressbar.text
93
                    enabled: addressbar.text
54
90
                    opacity: enabled ? 1.0 : 0.3
94
                    opacity: enabled ? 1.0 : 0.3
55
@@ -97,6 +101,10 @@
56
97
                          reload ? "reload" :
101
                          reload ? "reload" :
57
98
                          looksLikeAUrl ? "stock_website" : "search"
102
                          looksLikeAUrl ? "stock_website" : "search"
58
99
103
59
104
                    InputMethod.extensions: {
60
105
                        "enterKeyIconSource": action.reload ? "reload" : "keyboard-enter"
61
106
                    }
62
107
63
100
                    MouseArea {
108
                    MouseArea {
64
101
                        objectName: "actionButton"
109
                        objectName: "actionButton"
65
102
110
66
103
111
67
=== modified file 'src/app/webbrowser/Chrome.qml'
68
--- src/app/webbrowser/Chrome.qml	2015-05-26 21:42:54 +0000
69
+++ src/app/webbrowser/Chrome.qml	2015-06-12 09:40:41 +0000
70
@@ -50,7 +50,9 @@
71
50
            iconColor: internal.iconColor
50
            iconColor: internal.iconColor
72
51
51
73
52
            height: chrome.height
52
            height: chrome.height
75
53
            width: height * 0.8
53
            width: visible ? height * 0.8 : 0
76
54
77
55
            visible: !addressbar.activeFocus
78
54
56
79
55
            anchors {
57
            anchors {
80
56
                left: parent.left
58
                left: parent.left
81
@@ -70,7 +72,7 @@
82
70
            iconColor: internal.iconColor
72
            iconColor: internal.iconColor
83
71
73
84
72
            height: chrome.height
74
            height: chrome.height
86
73
            visible: enabled
75
            visible: enabled && !addressbar.activeFocus
87
74
            width: visible ? height * 0.8 : 0
76
            width: visible ? height * 0.8 : 0
88
75
77
89
76
            anchors {
78
            anchors {
90
@@ -103,10 +105,12 @@
91
103
                chrome.webview.forceActiveFocus()
105
                chrome.webview.forceActiveFocus()
92
104
                chrome.webview.url = requestedUrl
106
                chrome.webview.url = requestedUrl
93
105
            }
107
            }
94
108
95
106
            onRequestReload: {
109
            onRequestReload: {
96
107
                chrome.webview.forceActiveFocus()
110
                chrome.webview.forceActiveFocus()
97
108
                chrome.webview.reload()
111
                chrome.webview.reload()
98
109
            }
112
            }
99
113
100
110
            onRequestStop: chrome.webview.stop()
114
            onRequestStop: chrome.webview.stop()
101
111
115
102
112
            Connections {
116
            Connections {
103
@@ -136,7 +140,9 @@
104
136
            iconColor: internal.iconColor
140
            iconColor: internal.iconColor
105
137
141
106
138
            height: chrome.height
142
            height: chrome.height
108
139
            width: height * 0.8
143
            width: visible ? height * 0.8: 0
109
144
110
145
            visible: !addressbar.activeFocus
111
140
146
112
141
            anchors {
147
            anchors {
113
142
                right: parent.right
148
                right: parent.right
114
143
149
115
=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_states.py'
116
--- tests/autopilot/webbrowser_app/tests/test_addressbar_states.py	2015-02-17 20:52:30 +0000
117
+++ tests/autopilot/webbrowser_app/tests/test_addressbar_states.py	2015-06-12 09:40:41 +0000
118
@@ -14,8 +14,14 @@
119
14
# You should have received a copy of the GNU General Public License
14
# You should have received a copy of the GNU General Public License
120
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
121
16
16
122
17
from testtools.matchers import Equals
123
18
from autopilot.matchers import Eventually
124
19
from autopilot.platform import model
125
20
126
17
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
21
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
127
18
22
128
23
import unittest
129
24
130
19
25
131
20
class TestAddressBarStates(StartOpenRemotePageTestCaseBase):
26
class TestAddressBarStates(StartOpenRemotePageTestCaseBase):
132
21
27
133
@@ -42,6 +48,7 @@
134
42
        self.main_window.go_to_url(url)
48
        self.main_window.go_to_url(url)
135
43
        address_bar.activeFocus.wait_for(False)
49
        address_bar.activeFocus.wait_for(False)
136
44
50
137
51
    @unittest.skipIf(model() != "Desktop", "on desktop only")
138
45
    def test_looses_focus_when_reloading(self):
52
    def test_looses_focus_when_reloading(self):
139
46
        address_bar = self.main_window.address_bar
53
        address_bar = self.main_window.address_bar
140
47
        self.pointing_device.click_object(address_bar)
54
        self.pointing_device.click_object(address_bar)
141
@@ -51,5 +58,8 @@
142
51
        # button.
58
        # button.
143
52
        address_bar.clear()
59
        address_bar.clear()
144
53
        address_bar.write(self.url)
60
        address_bar.write(self.url)
145
61
        chrome = self.main_window.chrome
146
62
        drawer_button = chrome.get_drawer_button()
147
63
        self.assertThat(drawer_button.opacity, Eventually(Equals(1)))
148
54
        address_bar.click_action_button()
64
        address_bar.click_action_button()
149
55
        address_bar.activeFocus.wait_for(False)
65
        address_bar.activeFocus.wait_for(False)
150
56
66
151
=== modified file 'tests/autopilot/webbrowser_app/tests/test_suggestions.py'
152
--- tests/autopilot/webbrowser_app/tests/test_suggestions.py	2015-05-20 05:45:29 +0000
153
+++ tests/autopilot/webbrowser_app/tests/test_suggestions.py	2015-06-12 09:40:41 +0000
154
@@ -285,6 +285,8 @@
155
285
        self.assertThat(webview.url, Eventually(Contains(url)))
285
        self.assertThat(webview.url, Eventually(Contains(url)))
156
286
286
157
287
    def test_special_characters(self):
287
    def test_special_characters(self):
158
288
        self.address_bar.focus()
159
289
        self.assert_suggestions_eventually_shown()
160
288
        self.address_bar.clear()
290
        self.address_bar.clear()
161
289
        self.address_bar.write('(phil')
291
        self.address_bar.write('(phil')
162
290
        self.assert_suggestions_eventually_shown()
292
        self.assert_suggestions_eventually_shown()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-06-12
Olivier Tilloy		2014-10-21	Needs Fixing on 2015-01-28
Review via email: mp+239039@code.launchpad.net