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
=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml 2015-09-03 09:46:29 +0000
+++ src/app/webbrowser/Browser.qml 2015-09-13 21:23:23 +0000
@@ -367,21 +367,21 @@
367 objectName: "share"367 objectName: "share"
368 text: i18n.tr("Share")368 text: i18n.tr("Share")
369 iconName: "share"369 iconName: "share"
370 enabled: (formFactor == "mobile") && browser.currentWebview && browser.currentWebview.url.toString()370 visible: (formFactor == "mobile") && browser.currentWebview && browser.currentWebview.url.toString()
371 onTriggered: internal.shareLink(browser.currentWebview.url, browser.currentWebview.title)371 onTriggered: internal.shareLink(browser.currentWebview.url, browser.currentWebview.title)
372 },372 },
373 Action {373 Action {
374 objectName: "history"374 objectName: "history"
375 text: i18n.tr("History")375 text: i18n.tr("History")
376 iconName: "history"376 iconName: "history"
377 enabled: browser.historyModel377 visible: browser.historyModel
378 onTriggered: historyViewLoader.active = true378 onTriggered: historyViewLoader.active = true
379 },379 },
380 Action {380 Action {
381 objectName: "tabs"381 objectName: "tabs"
382 text: i18n.tr("Open tabs")382 text: i18n.tr("Open tabs")
383 iconName: "browser-tabs"383 iconName: "browser-tabs"
384 enabled: (formFactor != "mobile") && !browser.wide384 visible: (formFactor != "mobile") && !browser.wide
385 onTriggered: {385 onTriggered: {
386 recentView.state = "shown"386 recentView.state = "shown"
387 recentToolbar.state = "shown"387 recentToolbar.state = "shown"
@@ -391,14 +391,14 @@
391 objectName: "newtab"391 objectName: "newtab"
392 text: i18n.tr("New tab")392 text: i18n.tr("New tab")
393 iconName: browser.incognito ? "private-tab-new" : "tab-new"393 iconName: browser.incognito ? "private-tab-new" : "tab-new"
394 enabled: (formFactor != "mobile") && !browser.wide394 visible: (formFactor != "mobile") && !browser.wide
395 onTriggered: browser.openUrlInNewTab("", true)395 onTriggered: browser.openUrlInNewTab("", true)
396 },396 },
397 Action {397 Action {
398 objectName: "findinpage"398 objectName: "findinpage"
399 text: i18n.tr("Find in page")399 text: i18n.tr("Find in page")
400 iconName: "search"400 iconName: "search"
401 enabled: !chrome.findInPageMode && !newTabViewLoader.active401 visible: !chrome.findInPageMode && !newTabViewLoader.active
402 onTriggered: {402 onTriggered: {
403 chrome.findInPageMode = true403 chrome.findInPageMode = true
404 chrome.focus = true404 chrome.focus = true

Subscribers

People subscribed via source and target branches

to status/vote changes: