diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-10-01 16:20:02 (GMT) |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-10-01 16:20:02 (GMT) |
| commit | 0ed8636547965faf878dca873c5a319c4be8eba0 (patch) | |
| tree | 5aa4e2c3662c2e8457c1310d4ccb7b8661d1ca8c | |
| parent | 55052e80e393d3de35b8b5d157d67c05e15804b8 (diff) | |
Move the sources to the application menu
It's considered as less prominent by the new design.
| -rw-r--r-- | discover/MuonDiscoverMainWindow.cpp | 10 | ||||
| -rw-r--r-- | discover/MuonDiscoverMainWindow.h | 1 | ||||
| -rw-r--r-- | discover/qml/Main.qml | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/discover/MuonDiscoverMainWindow.cpp b/discover/MuonDiscoverMainWindow.cpp index 3aed283..091f036 100644 --- a/discover/MuonDiscoverMainWindow.cpp +++ b/discover/MuonDiscoverMainWindow.cpp @@ -236,6 +236,10 @@ void MuonDiscoverMainWindow::setupActions() QAction *quitAction = KStandardAction::quit(QCoreApplication::instance(), SLOT(quit()), actionCollection()); actionCollection()->addAction("file_quit", quitAction); + QAction* configureSourcesAction = new QAction(QIcon::fromTheme("repository"), i18n("Configure Sources"), this); + connect(configureSourcesAction, &QAction::triggered, this, &MuonDiscoverMainWindow::configureSources); + actionCollection()->addAction("configure_sources", configureSourcesAction); + menuBar()->setVisible(false); toolBar("discoverToolBar")->setVisible(false); @@ -255,6 +259,7 @@ void MuonDiscoverMainWindow::configureMenu() if (!m_moreMenu->isEmpty()) m_moreMenu->addSeparator(); + m_moreMenu->addAction(actionCollection()->action("configure_sources")); m_moreMenu->addAction(actionCollection()->action("options_configure_keybinding")); m_moreMenu->addSeparator(); m_moreMenu->addMenu(m_advancedMenu); @@ -264,6 +269,11 @@ void MuonDiscoverMainWindow::configureMenu() m_moreMenu->addAction(actionCollection()->action("help_report_bug")); } +void MuonDiscoverMainWindow::configureSources() +{ + openMode("Sources"); +} + bool MuonDiscoverMainWindow::queryClose() { return !ResourcesModel::global()->isBusy(); diff --git a/discover/MuonDiscoverMainWindow.h b/discover/MuonDiscoverMainWindow.h index a70bbb7..00f5455 100644 --- a/discover/MuonDiscoverMainWindow.h +++ b/discover/MuonDiscoverMainWindow.h @@ -78,6 +78,7 @@ class MuonDiscoverMainWindow : public KXmlGuiWindow void actualWidthChanged(qreal actualWidth); private: + void configureSources(); void configureMenu(); QString m_appToBeOpened; diff --git a/discover/qml/Main.qml b/discover/qml/Main.qml index 0f492c3..ae284c4 100644 --- a/discover/qml/Main.qml +++ b/discover/qml/Main.qml @@ -112,14 +112,6 @@ Rectangle component: topUpdateComp objectName: "update" shortcut: "Alt+U" - }, - TopLevelPageData { - iconName: "repository" - text: i18n("Sources") - component: topSourcesComp - objectName: "sources" - shortcut: "Alt+S" - enabled: SourcesModel.count>0 } ] |
