ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify shortcuts code in hamburger menu

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
qml/main.qml
View File

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

5
src/controller.cpp
View File

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

5
src/controller.h
View File

@@ -33,9 +33,6 @@ class Controller : public QObject
Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged) Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
Q_PROPERTY(KAboutData aboutData READ aboutData WRITE setAboutData NOTIFY aboutDataChanged) 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: public:
static Controller &instance(); static Controller &instance();
@@ -54,8 +51,6 @@ public:
[[nodiscard]] int accountCount() const; [[nodiscard]] int accountCount() const;
[[nodiscard]] QList<QKeySequence> preferencesShortcuts() const;
[[nodiscard]] static bool quitOnLastWindowClosed(); [[nodiscard]] static bool quitOnLastWindowClosed();
void setQuitOnLastWindowClosed(bool value); void setQuitOnLastWindowClosed(bool value);