webbrowser-app

Merge lp:~zsombi/webbrowser-app/fixToolbarCollision into lp:webbrowser-app

  1. fixToolbarCollision
  2. Merge into trunk
Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1298
Merged at revision: 1298
Proposed branch: lp:~zsombi/webbrowser-app/fixToolbarCollision
Merge into: lp:webbrowser-app
Diff against target: 139 lines (+14/-9)
5 files modified
src/app/webbrowser/BookmarksView.qml (+3/-2)
src/app/webbrowser/BookmarksViewWide.qml (+3/-2)
src/app/webbrowser/Browser.qml (+2/-1)
src/app/webbrowser/HistoryView.qml (+3/-2)
src/app/webbrowser/HistoryViewWide.qml (+3/-2)
To merge this branch: bzr merge lp:~zsombi/webbrowser-app/fixToolbarCollision
Reviewer Review Type Date Requested Status
Zoltan Balogh (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Olivier Tilloy Approve
Review via email: mp+280916@code.launchpad.net

Commit message

Fix local Toolbar collision with UITK 1.3 Toolbar.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
Revision history for this message
Olivier Tilloy (osomon) wrote :

Note: you’re also going to need to add https://code.launchpad.net/~osomon/webbrowser-app/workaround-1526940/+merge/280771 to silo 45 for it to successfully build.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1298
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2546/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5858
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1299/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1299
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1299/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1299/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5869
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26188

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2546/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

This made the MR work the browser just as before

http://people.canonical.com/~bzoltan/ap-2015_12_16-VIVID-SILO45-MAKO/ap-2015_12_17-23_08_48-webbrowser_app-1-045.tests

http://people.canonical.com/~bzoltan/ap-2015_12_16-VIVID-SILO45-MAKO/ap-2015_12_17-23_08_48-webbrowser_app-2-045.tests

review: Approve
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

And added the MR from Oliver's comment to the landing silo (45)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/webbrowser/BookmarksView.qml'
--- src/app/webbrowser/BookmarksView.qml 2015-11-12 16:16:45 +0000
+++ src/app/webbrowser/BookmarksView.qml 2015-12-17 20:26:43 +0000
@@ -20,6 +20,7 @@
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.3 as ListItems21import Ubuntu.Components.ListItems 1.3 as ListItems
22import webbrowserapp.private 0.122import webbrowserapp.private 0.1
23import "." as Local
2324
24FocusScope {25FocusScope {
25 id: bookmarksView26 id: bookmarksView
@@ -58,7 +59,7 @@
58 }59 }
59 }60 }
6061
61 Toolbar {62 Local.Toolbar {
62 id: topBar63 id: topBar
6364
64 height: units.gu(7)65 height: units.gu(7)
@@ -90,7 +91,7 @@
90 }91 }
91 }92 }
9293
93 Toolbar {94 Local.Toolbar {
94 id: toolbar95 id: toolbar
95 height: units.gu(7)96 height: units.gu(7)
9697
9798
=== modified file 'src/app/webbrowser/BookmarksViewWide.qml'
--- src/app/webbrowser/BookmarksViewWide.qml 2015-11-12 16:16:45 +0000
+++ src/app/webbrowser/BookmarksViewWide.qml 2015-12-17 20:26:43 +0000
@@ -20,6 +20,7 @@
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.3 as ListItems21import Ubuntu.Components.ListItems 1.3 as ListItems
22import webbrowserapp.private 0.122import webbrowserapp.private 0.1
23import "." as Local
2324
24FocusScope {25FocusScope {
25 id: bookmarksViewWide26 id: bookmarksViewWide
@@ -56,7 +57,7 @@
56 }57 }
57 }58 }
5859
59 Toolbar {60 Local.Toolbar {
60 id: topBar61 id: topBar
6162
62 height: units.gu(7)63 height: units.gu(7)
@@ -88,7 +89,7 @@
88 }89 }
89 }90 }
9091
91 Toolbar {92 Local.Toolbar {
92 id: toolbar93 id: toolbar
93 height: units.gu(7)94 height: units.gu(7)
9495
9596
=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml 2015-12-04 11:06:47 +0000
+++ src/app/webbrowser/Browser.qml 2015-12-17 20:26:43 +0000
@@ -28,6 +28,7 @@
28import "../UrlUtils.js" as UrlUtils28import "../UrlUtils.js" as UrlUtils
29import ".."29import ".."
30import "."30import "."
31import "." as Local
3132
32BrowserView {33BrowserView {
33 id: browser34 id: browser
@@ -365,7 +366,7 @@
365 onTabClosed: internal.closeTab(index)366 onTabClosed: internal.closeTab(index)
366 }367 }
367368
368 Toolbar {369 Local.Toolbar {
369 id: recentToolbar370 id: recentToolbar
370 objectName: "recentToolbar"371 objectName: "recentToolbar"
371372
372373
=== modified file 'src/app/webbrowser/HistoryView.qml'
--- src/app/webbrowser/HistoryView.qml 2015-11-23 09:41:48 +0000
+++ src/app/webbrowser/HistoryView.qml 2015-12-17 20:26:43 +0000
@@ -20,6 +20,7 @@
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.3 as ListItems21import Ubuntu.Components.ListItems 1.3 as ListItems
22import webbrowserapp.private 0.122import webbrowserapp.private 0.1
23import "." as Local
2324
24Item {25Item {
25 id: historyView26 id: historyView
@@ -94,7 +95,7 @@
94 }95 }
95 }96 }
9697
97 Toolbar {98 Local.Toolbar {
98 id: toolbar99 id: toolbar
99 height: units.gu(7)100 height: units.gu(7)
100101
@@ -137,7 +138,7 @@
137 }138 }
138 }139 }
139140
140 Toolbar {141 Local.Toolbar {
141 id: topBar142 id: topBar
142143
143 visible: domainsListView.ViewItems.selectMode144 visible: domainsListView.ViewItems.selectMode
144145
=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml 2015-12-04 11:06:47 +0000
+++ src/app/webbrowser/HistoryViewWide.qml 2015-12-17 20:26:43 +0000
@@ -21,6 +21,7 @@
21import Ubuntu.Components.ListItems 1.3 as ListItems21import Ubuntu.Components.ListItems 1.3 as ListItems
22import webbrowserapp.private 0.122import webbrowserapp.private 0.1
23import "Highlight.js" as Highlight23import "Highlight.js" as Highlight
24import "." as Local
2425
25FocusScope {26FocusScope {
26 id: historyViewWide27 id: historyViewWide
@@ -345,7 +346,7 @@
345 }346 }
346 }347 }
347348
348 Toolbar {349 Local.Toolbar {
349 id: topBar350 id: topBar
350351
351 height: units.gu(7)352 height: units.gu(7)
@@ -484,7 +485,7 @@
484 }485 }
485 }486 }
486487
487 Toolbar {488 Local.Toolbar {
488 id: bottomToolbar489 id: bottomToolbar
489 height: units.gu(7)490 height: units.gu(7)
490491

Subscribers

People subscribed via source and target branches

to status/vote changes: