diff options
| author | Hugo Parente Lima <hugo.lima@openbossa.org> | 2012-06-12 16:35:32 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.lima@openbossa.org> | 2012-06-12 17:27:33 -0300 |
| commit | 73b724b2dd381574227e5d6c075165990681723c (patch) | |
| tree | e073a361b95b86c2e37e136c35ecfeb4e2b80626 | |
| parent | 0db638c6361a29e4bf9cd5e620f2fc0ab1b957ce (diff) | |
Replace resetToTabs function by a property alias.
Reviewed-by: Marcelo Lira
| -rw-r--r-- | src/mobile/qml/Main.qml | 5 | ||||
| -rw-r--r-- | src/mobile/qml/PanelToggle.qml | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/mobile/qml/Main.qml b/src/mobile/qml/Main.qml index 1991983..315ebe5 100644 --- a/src/mobile/qml/Main.qml +++ b/src/mobile/qml/Main.qml @@ -162,6 +162,7 @@ Rectangle { states: [ State { name: "favorites" + PropertyChanges { target: panelToggle; topSitesButtonSelected: true } PropertyChanges { target: plusButton; opacity: 1 } PropertyChanges { target: panelToggle; opacity: 1 } PropertyChanges { target: topSitesPanel; opacity: 1 } @@ -170,7 +171,7 @@ Rectangle { }, State { name: "navigation" - StateChangeScript { script: panelToggle.resetToTabs() } + PropertyChanges { target: panelToggle; topSitesButtonSelected: false } PropertyChanges { target: plusButton; opacity: 1 } PropertyChanges { target: panelToggle; opacity: 1 } PropertyChanges { target: topSitesPanel; opacity: 0 } @@ -179,7 +180,7 @@ Rectangle { }, State { name: "navigationFullScreen" - StateChangeScript { script: panelToggle.resetToTabs() } + PropertyChanges { target: panelToggle; topSitesButtonSelected: false } PropertyChanges { target: plusButton; opacity: 0 } PropertyChanges { target: panelToggle; opacity: 0 } PropertyChanges { target: topSitesPanel; opacity: 0 } diff --git a/src/mobile/qml/PanelToggle.qml b/src/mobile/qml/PanelToggle.qml index 7ca2f3b..92f5606 100644 --- a/src/mobile/qml/PanelToggle.qml +++ b/src/mobile/qml/PanelToggle.qml @@ -20,14 +20,11 @@ Image { id: panelToggle property bool navigationEnabled: true + property alias topSitesButtonSelected: topsites.visible signal topSitesSelected() signal tabsSelected() - function resetToTabs() { - topsites.visible = false; - } - onNavigationEnabledChanged: { if (!navigationEnabled) topsites.visible = true; |