improve global shortcuts configuration

Author: mkiol

desktop/qml/SettingsAccessebilityPage.qml

@@ -44,7 +44,9 @@ ColumnLayout {
     }
 
     Button {
-        visible: _settings.hotkeys_enabled && app.feature_hotkeys
+        id: gsConfButton
+
+        visible: _settings.hotkeys_enabled && app.feature_hotkeys && (_settings.hotkeys_type === Settings.HotkeysTypeX11 || _settings.is_kde())
         text: qsTranslate("SettingsPage", "Configure global keyboard shortcuts")
         Layout.leftMargin: appWin.padding
         onClicked: {
@@ -59,6 +61,14 @@ ColumnLayout {
         }
     }
 
+    TipMessage {
+        color: palette.text
+        indends: 1
+        visible: _settings.hotkeys_enabled && app.feature_hotkeys && !gsConfButton.visible
+        text: qsTranslate("SettingsPage", "Global keyboard shortcuts are managed through the %1.").arg("<i>XDG Desktop Portal</i>") + " " +
+              qsTranslate("SettingsPage", "Use your desktop environment configuration tool to change key bindings.")
+    }
+
     Component {
         id: hotkeysEditDialog
 

src/dsnote_app.cpp

@@ -5713,6 +5713,6 @@ QString dsnote_app::stt_auto_lang_name() const {
 
 void dsnote_app::open_hotkeys_editor() {
 #ifdef USE_DESKTOP
-    m_gs_manager.set_portal_bindings();
+    m_gs_manager.reset_portal_connection();
 #endif
 }

src/global_hotkeys_manager.cpp

@@ -8,6 +8,7 @@
 #include "global_hotkeys_manager.hpp"
 
 #include <QDebug>
+#include <QRandomGenerator>
 
 #include "config.h"
 #include "dbus_portal_request_inf.h"
@@ -103,12 +104,16 @@ void global_hotkeys_manager::handle_portal_activated(
     emit hotkey_activated(action_id, {});
 }
 
-void global_hotkeys_manager::create_portal_session() {
+void global_hotkeys_manager::create_portal_session(bool force_bind) {
     LOGD("[dbus] call CreateSession");
 
+    auto handle_token = QStringLiteral(APP_ID "_%1")
+                            .arg(QRandomGenerator::global()->generate());
+    m_force_bind = force_bind;
+
     auto reply = m_portal_inf.CreateSession({
-        {QLatin1String("session_handle_token"), APP_ID},
-        {QLatin1String("handle_token"), APP_ID},
+        {QLatin1String("session_handle_token"), handle_token},
+        {QLatin1String("handle_token"), handle_token},
     });
 
     reply.waitForFinished();
@@ -152,7 +157,7 @@ void global_hotkeys_manager::fetch_portal_shortcuts() {
         return;
     }
 
-    auto req = new OrgFreedesktopPortalRequestInterface(
+    auto *req = new OrgFreedesktopPortalRequestInterface(
         DBUS_SERVICE_NAME, reply.value().path(), QDBusConnection::sessionBus(),
         this);
 
@@ -178,7 +183,6 @@ void global_hotkeys_manager::handle_list_shortcuts_response(
     const auto arg = results["shortcuts"].value<QDBusArgument>();
     arg >> s;
 
-    QString desc;
     for (auto it = s.cbegin(), it_end = s.cend(); it != it_end; ++it) {
         LOGD("portal hotkey: " << it->first << " "
                                << it->second["description"].toString() << " "
@@ -187,6 +191,7 @@ void global_hotkeys_manager::handle_list_shortcuts_response(
 
     if (s.isEmpty()) {
         set_portal_bindings();
+        m_force_bind = false;
         return;
     }
 
@@ -204,11 +209,13 @@ void global_hotkeys_manager::handle_list_shortcuts_response(
         return true;
     }();
 
-    if (all_shortcuts_configured) {
+    if (all_shortcuts_configured && !m_force_bind) {
         LOGD("portal global shortcuts already configured");
     } else {
         set_portal_bindings();
     }
+
+    m_force_bind = false;
 }
 
 void global_hotkeys_manager::handle_bind_shortcuts_response(
@@ -329,4 +336,15 @@ void global_hotkeys_manager::handle_x11_activated() {
     emit hotkey_activated(action_id, {});
 }
 
+void global_hotkeys_manager::reset_portal_connection() {
+    if (!is_portal_supported()) {
+        LOGW("portal not supported");
+        return;
+    }
+
+    disable_portal();
+
+    create_portal_session(/*force_bind=*/true);
+}
+
 #endif  // USE_X11_FEATURES

src/global_hotkeys_manager.hpp

@@ -31,6 +31,7 @@ class global_hotkeys_manager : public QObject {
     bool is_x11_supported() const;
     bool is_portal_supported() const;
     void set_portal_bindings();
+    void reset_portal_connection();
 
    Q_SIGNALS:
     void hotkey_activated(const QString& action_id, const QString& extra);
@@ -54,13 +55,14 @@ class global_hotkeys_manager : public QObject {
 #undef X
     };
     x11_hotkeys_t m_x11_hotkeys;
+    bool m_force_bind = false;
 
     void enable_x11();
     void disable_x11();
     void handle_x11_activated();
 #endif
 
-    void create_portal_session();
+    void create_portal_session(bool force_bind = false);
     void fetch_portal_shortcuts();
     QString get_portal_request_token();
     void enable_or_disable();

src/settings.cpp

@@ -1321,7 +1321,7 @@ QStringList settings::qt_styles() const {
 bool settings::is_native_style() const { return m_native_style; }
 
 #ifdef USE_DESKTOP
-static bool use_default_qt_style() {
+bool settings::use_default_qt_style() {
     const auto* desk_name_str = getenv("XDG_CURRENT_DESKTOP");
     if (!desk_name_str) {
         LOGD("no XDG_CURRENT_DESKTOP");
@@ -1332,7 +1332,9 @@ static bool use_default_qt_style() {
 
     QString desk_name{desk_name_str};
 
-    return desk_name.contains("KDE") || desk_name.contains("XFCE");
+    m_kde = desk_name.contains("KDE");
+
+    return m_kde || desk_name.contains("XFCE");
 }
 
 void settings::update_qt_style(QQmlApplicationEngine* engine) {

src/settings.h

@@ -669,6 +669,7 @@ class settings : public QSettings, public singleton<settings> {
     void disable_py_scan();
 #ifdef USE_DESKTOP
     void update_qt_style(QQmlApplicationEngine *engine);
+    bool use_default_qt_style();
 #endif
     // app
 #define X(name, _)     \
@@ -848,6 +849,7 @@ class settings : public QSettings, public singleton<settings> {
     Q_INVOKABLE bool is_wayland() const;
     Q_INVOKABLE bool is_xcb() const;
     Q_INVOKABLE bool is_flatpak() const;
+    Q_INVOKABLE bool is_kde() const { return m_kde; }
     Q_INVOKABLE QStringList qt_styles() const;
     Q_INVOKABLE bool file_exists(const QString &file_path) const;
     Q_INVOKABLE QString
@@ -1095,6 +1097,7 @@ class settings : public QSettings, public singleton<settings> {
     unsigned int m_error_flags = error_flags_t::ErrorNoError;
     unsigned int m_system_flags = system_flags_t::SystemNone;
     bool m_native_style = false;
+    bool m_kde = false;
 
     static QString settings_filepath();
     void set_restart_required(bool value);