Merge lp:~osomon/webbrowser-app/drawer-menu-actions-visible into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Ugo Riboni
Approved revision: 1177
Merged at revision: 1182
Proposed branch: lp:~osomon/webbrowser-app/drawer-menu-actions-visible
Merge into: lp:webbrowser-app
Diff against target: 45 lines (+5/-5)
1 file modified
src/app/webbrowser/Browser.qml (+5/-5)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/drawer-menu-actions-visible
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+270914@code.launchpad.net

Commit message

Set the 'visible' property of actions instead of 'enabled' to ensure the visibility of the corresponding entries in the drawer menu matches.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/webbrowser/Browser.qml'
2--- src/app/webbrowser/Browser.qml 2015-09-03 09:46:29 +0000
3+++ src/app/webbrowser/Browser.qml 2015-09-13 21:23:23 +0000
4@@ -367,21 +367,21 @@
5 objectName: "share"
6 text: i18n.tr("Share")
7 iconName: "share"
8- enabled: (formFactor == "mobile") && browser.currentWebview && browser.currentWebview.url.toString()
9+ visible: (formFactor == "mobile") && browser.currentWebview && browser.currentWebview.url.toString()
10 onTriggered: internal.shareLink(browser.currentWebview.url, browser.currentWebview.title)
11 },
12 Action {
13 objectName: "history"
14 text: i18n.tr("History")
15 iconName: "history"
16- enabled: browser.historyModel
17+ visible: browser.historyModel
18 onTriggered: historyViewLoader.active = true
19 },
20 Action {
21 objectName: "tabs"
22 text: i18n.tr("Open tabs")
23 iconName: "browser-tabs"
24- enabled: (formFactor != "mobile") && !browser.wide
25+ visible: (formFactor != "mobile") && !browser.wide
26 onTriggered: {
27 recentView.state = "shown"
28 recentToolbar.state = "shown"
29@@ -391,14 +391,14 @@
30 objectName: "newtab"
31 text: i18n.tr("New tab")
32 iconName: browser.incognito ? "private-tab-new" : "tab-new"
33- enabled: (formFactor != "mobile") && !browser.wide
34+ visible: (formFactor != "mobile") && !browser.wide
35 onTriggered: browser.openUrlInNewTab("", true)
36 },
37 Action {
38 objectName: "findinpage"
39 text: i18n.tr("Find in page")
40 iconName: "search"
41- enabled: !chrome.findInPageMode && !newTabViewLoader.active
42+ visible: !chrome.findInPageMode && !newTabViewLoader.active
43 onTriggered: {
44 chrome.findInPageMode = true
45 chrome.focus = true

Subscribers

People subscribed via source and target branches

to status/vote changes: