Add SettingsView and refactor settings handling to be generic

[coffee/qtwebbrowser.git] / src / qml / NavigationBar.qml

diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml
index 29114aa6666239db73061efe00dcc55035460799..7017d2d9f3acde20db315dbc9b131b6a9b7a9c55 100644 (file)
--- a/src/qml/NavigationBar.qml
+++ b/src/qml/NavigationBar.qml
@@ -20,7 +20,10 @@ ToolBar {
     }
 
     function refresh() {
-        bookmarksButton.bookmarked = homeScreen.contains(urlBar.text) !== -1
+        if (urlBar.text == "")
+            bookmarksButton.bookmarked = false
+        else
+            bookmarksButton.bookmarked = homeScreen.contains(urlBar.text) !== -1
     }
 
     state: "enabled"
@@ -285,6 +288,7 @@ ToolBar {
         }
         UIButton {
             id: bookmarksButton
+            enabled: urlBar.text != ""
             property bool bookmarked: false
             source: bookmarked ? "qrc:///star_checked" : "qrc:///star"
             onClicked: {
@@ -314,9 +318,10 @@ ToolBar {
         UIButton {
             id: settingsButton
             source: "qrc:///settings"
-            checkable: true
-            checked: false
-            onClicked: tabView.interactive = !checked
+            onClicked: {
+                tabView.interactive = false
+                settingsView.state = "enabled"
+            }
         }
     }
     ProgressBar {