Merge lp:~osomon/webbrowser-app/new-panel-api into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Merge reported by: Olivier Tilloy
Merged at revision: not available
Proposed branch: lp:~osomon/webbrowser-app/new-panel-api
Merge into: lp:webbrowser-app
Diff against target: 46 lines (+5/-5)
1 file modified
src/app/Browser.qml (+5/-5)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/new-panel-api
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Tim Peeters (community) Approve
Review via email: mp+185222@code.launchpad.net

Commit message

Use the new Panel API (open() and close() methods instead of setting the value of the 'opened' property).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

Code looks good, but it looks as if jenkins uses an UITK version from before the changes that add open() and close() to the Panel.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/Browser.qml'
2--- src/app/Browser.qml 2013-08-30 15:07:14 +0000
3+++ src/app/Browser.qml 2013-09-12 09:14:52 +0000
4@@ -170,7 +170,7 @@
5 if (currentWebview) {
6 currentWebview.forceActiveFocus()
7 }
8- panel.item.opened = false
9+ panel.item.close()
10 }
11 }
12
13@@ -198,7 +198,7 @@
14 }
15 height: units.gu(8)
16
17- opened: true
18+ Component.onCompleted: open()
19 onOpenedChanged: {
20 if (!opened) {
21 Qt.inputMethod.hide()
22@@ -225,13 +225,13 @@
23 onLoadingChanged: {
24 if (loading) {
25 if (panel.item) {
26- panel.item.opened = true
27+ panel.item.open()
28 }
29 } else if (stopped) {
30 stopped = false
31 } else if (!addressBar.activeFocus) {
32 if (panel.item) {
33- panel.item.opened = false
34+ panel.item.close()
35 }
36 if (currentWebview) {
37 currentWebview.forceActiveFocus()
38@@ -386,7 +386,7 @@
39 if (!browser.chromeless) {
40 if (!url) {
41 panel.chrome.addressBar.forceActiveFocus()
42- panel.item.opened = true
43+ panel.item.open()
44 }
45 }
46 }

Subscribers

People subscribed via source and target branches

to status/vote changes: