summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <[email protected]>2016-12-20 18:13:39 +0100
committerAleix Pol <[email protected]>2016-12-20 18:13:39 +0100
commitbb41ef133f4be04d27f82f354e27dd55848ccfcb (patch)
tree82543ca4cc35a156573c3b33825ffd4fc6f4e3b4
parentace0347f2d70c22866aa03aa5fa72ffce685b56c (diff)
Use Kirigami.Action instead of QQC1.Action for the TopLevelPageData
Also remove duplicated entry
-rw-r--r--discover/qml/DiscoverWindow.qml23
-rw-r--r--discover/qml/TopLevelPageData.qml3
2 files changed, 8 insertions, 18 deletions
diff --git a/discover/qml/DiscoverWindow.qml b/discover/qml/DiscoverWindow.qml
index 0f4528e..81ec227 100644
--- a/discover/qml/DiscoverWindow.qml
+++ b/discover/qml/DiscoverWindow.qml
@@ -55,15 +55,13 @@ Kirigami.ApplicationWindow
}
}
- property list<Action> awesome: [
- TopLevelPageData {
- iconName: "tools-wizard"
- text: i18n("Discover")
- component: topBrowsingComp
- objectName: "discover"
- shortcut: "Alt+D"
- }
- ]
+ TopLevelPageData {
+ iconName: "tools-wizard"
+ text: i18n("Discover")
+ component: topBrowsingComp
+ objectName: "discover"
+ shortcut: "Alt+D"
+ }
TopLevelPageData {
id: installedAction
text: TransactionModel.count == 0 ? i18n("Installed") : i18n("Installing...")
@@ -88,13 +86,6 @@ Kirigami.ApplicationWindow
objectName: "settings"
shortcut: "Alt+S"
}
- TopLevelPageData {
- id: sources
- text: i18n("Configure Sources...")
- iconName: "repository"
- shortcut: "Alt+S"
- component: topSourcesComp
- }
Connections {
target: app
diff --git a/discover/qml/TopLevelPageData.qml b/discover/qml/TopLevelPageData.qml
index d6d3952..69176d7 100644
--- a/discover/qml/TopLevelPageData.qml
+++ b/discover/qml/TopLevelPageData.qml
@@ -18,12 +18,11 @@
*/
import QtQuick 2.1
-import QtQuick.Controls 1.2
+import org.kde.kirigami 2.0
import "navigation.js" as Navigation
Action {
property Component component
- checkable: window.currentTopLevel==component
checked: window.currentTopLevel==component
enabled: window.navigationEnabled