Simplify shortcuts code in hamburger menu

This commit is contained in:
Carl Schwan
2020-12-28 12:35:50 +01:00
parent a4cebe9b36
commit 1f065e46cf
3 changed files with 2 additions and 11 deletions

View File

@@ -175,7 +175,7 @@ Kirigami.ApplicationWindow {
icon.name: "settings-configure"
onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/SettingsPage.qml")
enabled: pageStack.layers.currentItem.title !== i18n("Settings")
shortcut: Controller.preferencesShortcuts[0]
shortcut: StandardKey.Preferences
},
Kirigami.Action {
text: i18n("About Neochat")
@@ -191,6 +191,7 @@ Kirigami.ApplicationWindow {
Kirigami.Action {
text: i18n("Quit")
icon.name: "gtk-quit"
shortcut: StandardKey.Quit
onTriggered: Qt.quit()
}
]

View File

@@ -557,11 +557,6 @@ void Controller::setActiveConnection(Connection *connection)
Q_EMIT activeConnectionChanged();
}
QList<QKeySequence> Controller::preferencesShortcuts() const
{
return KStandardShortcut::preferences();
}
NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
: Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId))
{

View File

@@ -33,9 +33,6 @@ class Controller : public QObject
Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
Q_PROPERTY(KAboutData aboutData READ aboutData WRITE setAboutData NOTIFY aboutDataChanged)
/// Get the list of shortcuts activating the preferences page
Q_PROPERTY(QList<QKeySequence> preferencesShortcuts READ preferencesShortcuts CONSTANT)
public:
static Controller &instance();
@@ -54,8 +51,6 @@ public:
[[nodiscard]] int accountCount() const;
[[nodiscard]] QList<QKeySequence> preferencesShortcuts() const;
[[nodiscard]] static bool quitOnLastWindowClosed();
void setQuitOnLastWindowClosed(bool value);