diff options
| author | Hugo Parente Lima <hugo.lima@openbossa.org> | 2012-06-12 19:08:31 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.lima@openbossa.org> | 2012-06-13 11:49:15 -0300 |
| commit | b38be32a84ed0d3f4a8d1197cefac77e0d16046f (patch) | |
| tree | d7305b407c77788fb2c4991ef9127d681a2d85bf | |
| parent | 55ddacd95da1b1401a37299d9e0089f04380819d (diff) | |
Enable all panels (tabs and favorites) no matter if there's no webpages opened or favorites registered.
Reviewed-by: Caio Oliveira
| -rw-r--r-- | src/mobile/images/view_menu_bg_disable.png | bin | 29898 -> 0 bytes | |||
| -rw-r--r-- | src/mobile/qml/Main.qml | 1 | ||||
| -rw-r--r-- | src/mobile/qml/NavigationPanel.qml | 1 | ||||
| -rw-r--r-- | src/mobile/qml/PanelToggle.qml | 9 | ||||
| -rw-r--r-- | src/mobile/snowshoe-mobile.qrc | 1 |
5 files changed, 1 insertions, 11 deletions
diff --git a/src/mobile/images/view_menu_bg_disable.png b/src/mobile/images/view_menu_bg_disable.png Binary files differdeleted file mode 100644 index 2409f42..0000000 --- a/src/mobile/images/view_menu_bg_disable.png +++ /dev/null diff --git a/src/mobile/qml/Main.qml b/src/mobile/qml/Main.qml index 0e729cf..2a156b9 100644 --- a/src/mobile/qml/Main.qml +++ b/src/mobile/qml/Main.qml @@ -36,7 +36,6 @@ Rectangle { topMargin: 32 horizontalCenter: parent.horizontalCenter } - navigationEnabled: navigationPanel.hasOpennedTabs onTopSitesSelected: { rootPage.state = "favorites"; } diff --git a/src/mobile/qml/NavigationPanel.qml b/src/mobile/qml/NavigationPanel.qml index cf9afa1..e545c75 100644 --- a/src/mobile/qml/NavigationPanel.qml +++ b/src/mobile/qml/NavigationPanel.qml @@ -22,7 +22,6 @@ import "UiConstants.js" as UiConstants Item { id: navigationPanel - property bool hasOpennedTabs: TabsModel.count > 0 property alias url: navigationBar.url property QtObject visibleTab: TabsModel.currentWebView property QtObject lastVisibleTab diff --git a/src/mobile/qml/PanelToggle.qml b/src/mobile/qml/PanelToggle.qml index 92f5606..f0027a9 100644 --- a/src/mobile/qml/PanelToggle.qml +++ b/src/mobile/qml/PanelToggle.qml @@ -19,18 +19,12 @@ import QtQuick 2.0 Image { id: panelToggle - property bool navigationEnabled: true property alias topSitesButtonSelected: topsites.visible signal topSitesSelected() signal tabsSelected() - onNavigationEnabledChanged: { - if (!navigationEnabled) - topsites.visible = true; - } - - source: navigationEnabled ? "qrc:///mobile/app/menu_unpressed" : "qrc:///mobile/app/menu_disabled" + source: "qrc:///mobile/app/menu_unpressed" Image { id: topsites @@ -51,7 +45,6 @@ Image { } MouseArea { anchors.fill: tabs - visible: navigationEnabled onClicked: topsites.visible = false } } diff --git a/src/mobile/snowshoe-mobile.qrc b/src/mobile/snowshoe-mobile.qrc index cbf186a..914dd95 100644 --- a/src/mobile/snowshoe-mobile.qrc +++ b/src/mobile/snowshoe-mobile.qrc @@ -24,7 +24,6 @@ <file alias="app/bg_image">images/app_bg.png</file> <file alias="app/side_shadow">images/overlayer.png</file> <file alias="app/menu_unpressed">images/view_menu_bg_unpressed.png</file> - <file alias="app/menu_disabled">images/view_menu_bg_disable.png</file> <file alias="app/tabs_pressed">images/view_menu_tabs_pressed.png</file> <file alias="app/mysites_pressed">images/view_menu_mysites_pressed.png</file> <file alias="indicator/page_active">images/pagination_active.png</file> |
