feat(keyboard): consume shortcut category metadata

Read shortcut category metadata from dde-services on Wayland and use it to group, order, and label shortcut sections dynamically. Replace hardcoded category mapping with section keys and localized category names from D-Bus, while keeping the legacy X11 grouping fallback intact.

在 Wayland 下从 dde-services 读取快捷键分类元数据，并用它动态分组、排序和显示快捷键分区。移除硬编码分类映射，改为使用 D-Bus 返回的 section key 和本地化分类名，同时保留 X11 旧分组逻辑作为回退。

Log: consume shortcut category metadata
Pms: BUG-367657
Change-Id: I5a27eb227275e373aa3943b804c4128bbb6b7394

Author: yixinshark

src/plugin-keyboard/operation/keyboardcontroller.cpp

@@ -221,6 +221,8 @@ QSortFilterProxyModel *KeyboardController::shortcutSearchModel()
     connect(m_shortcutModel, &ShortcutModel::addCustomInfo, sourceModel, &ShortcutListModel::reset);
     connect(m_shortcutModel, &ShortcutModel::shortcutChanged, sourceModel, &ShortcutListModel::onUpdateShortcut);
     connect(m_shortcutModel, &ShortcutModel::windowSwitchChanged, sourceModel, &ShortcutListModel::reset);
+    // Wayland: re-layout rows when category ordering metadata arrives.
+    connect(m_shortcutModel, &ShortcutModel::categoryMetaChanged, sourceModel, &ShortcutListModel::reset);
 
     m_shortcutSearchModel->setSourceModel(sourceModel);
     m_shortcutSearchModel->setFilterRole(ShortcutListModel::SearchedTextRole);
@@ -229,6 +231,16 @@ QSortFilterProxyModel *KeyboardController::shortcutSearchModel()
     return m_shortcutSearchModel;
 }
 
+QString KeyboardController::sectionDisplayName(const QString &key) const
+{
+    return m_shortcutModel ? m_shortcutModel->sectionDisplayName(key) : key;
+}
+
+QString KeyboardController::customCategoryKey() const
+{
+    return m_shortcutModel ? m_shortcutModel->customCategoryKey() : QString();
+}
+
 void KeyboardController::updateKey(const QString &id, const int &type)
 {
     ShortcutInfo *shortcut = nullptr;

src/plugin-keyboard/operation/keyboardcontroller.h

@@ -67,6 +67,13 @@ public Q_SLOTS:
     QSortFilterProxyModel *layoutSearchModel();
     QSortFilterProxyModel *shortcutSearchModel();
 
+    // Wayland: category metadata is supplied by the service (ListCategories).
+    // Exposed to QML so the section delegate can render the display name for
+    // a section key and detect the user-editable (Custom) group without any
+    // hardcoded category strings.
+    Q_INVOKABLE QString sectionDisplayName(const QString &key) const;
+    Q_INVOKABLE QString customCategoryKey() const;
+
     void updateKey(const QString &id, const int &type);
     QStringList formatKeys(const QString &shortcuts);
     Q_INVOKABLE QString keyEventToAccels(int key, int modifiers);

src/plugin-keyboard/operation/keyboarddbusproxy.cpp

@@ -51,6 +51,11 @@ KeyboardDBusProxy::KeyboardDBusProxy(QObject *parent)
     qRegisterMetaType<QList<ShortcutInfoNew>>("QList<ShortcutInfoNew>");
     qDBusRegisterMetaType<QList<ShortcutInfoNew>>();
 
+    qRegisterMetaType<CategoryInfoNew>("CategoryInfoNew");
+    qDBusRegisterMetaType<CategoryInfoNew>();
+    qRegisterMetaType<QList<CategoryInfoNew>>("QList<CategoryInfoNew>");
+    qDBusRegisterMetaType<QList<CategoryInfoNew>>();
+
     init();
 }
 
@@ -59,17 +64,6 @@ bool KeyboardDBusProxy::isWayland() const
     return m_isWayland;
 }
 
-// Map new API category to section name (Wayland 3-category: System/App/Custom)
-static QString categoryToSection(int category)
-{
-    switch (category) {
-    case 1: return QStringLiteral("System");
-    case 2: return QStringLiteral("App");
-    case 3: return QStringLiteral("Custom");
-    default: return QString();
-    }
-}
-
 // Convert a single ShortcutInfo to old-API JSON object
 static QJsonObject shortcutInfoToJsonObject(const ShortcutInfoNew &info)
 {
@@ -80,12 +74,15 @@ static QJsonObject shortcutInfoToJsonObject(const ShortcutInfoNew &info)
     // dde-services already emits hotkeys in X11/XKB form ("<Control><Alt>T",
     // "XF86AudioMute"), so we just forward the first one to Accels.
     obj["Accels"] = QJsonArray{info.hotkeys.isEmpty() ? QString() : info.hotkeys.first()};
-    // Type: 0=System, 1=Custom (old API). App(category==2) must map to 0,
-    // otherwise IsCustomRole would mark App shortcuts as editable.
-    obj["Type"] = (info.category == 3) ? 1 : 0;
+    // Type is now driven by the explicit isCustom flag from dde-services
+    // (was derived from category==3). 0=System, 1=Custom.
+    obj["Type"] = info.isCustom ? 1 : 0;
     obj["Exec"] = QString();
-    // New API section: overrides old hardcoded ID-based categorization
-    obj["Section"] = categoryToSection(info.category);
+    // Section carries the stable logical category key (for grouping/ordering
+    // and Custom detection); SectionName carries the already-resolved display
+    // text for direct rendering — dcc no longer translates categories.
+    obj["Section"] = info.category;
+    obj["SectionName"] = info.localLanguageCategory;
     return obj;
 }
 
@@ -323,6 +320,33 @@ QDBusPendingReply<QString> KeyboardDBusProxy::ListAllShortcuts()
         m_dBusKeybingdingInter->asyncCallWithArgumentList(QStringLiteral("ListAllShortcuts"), argumentList));
 }
 
+// Wayland: fetch category metadata (key/displayName/order/isCustom) so the
+// model can group, order, and identify the Custom group without hardcoding
+// any category strings.
+QDBusPendingReply<> KeyboardDBusProxy::ListCategories()
+{
+    QList<QVariant> argumentList;
+    if (isWayland()) {
+        QDBusPendingCall call = m_dBusKeybingdingInter->asyncCallWithArgumentList(
+            QStringLiteral("ListCategories"), argumentList);
+        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
+        connect(watcher, &QDBusPendingCallWatcher::finished,
+                this, &KeyboardDBusProxy::onListCategoriesFinished);
+    }
+    return QDBusPendingReply<>();
+}
+
+void KeyboardDBusProxy::onListCategoriesFinished(QDBusPendingCallWatcher *w)
+{
+    QDBusPendingReply<QList<CategoryInfoNew>> reply = *w;
+    if (!reply.isError()) {
+        Q_EMIT categoriesReady(reply.value());
+    } else {
+        qWarning() << "Wayland ListCategories failed:" << reply.error();
+    }
+    w->deleteLater();
+}
+
 // Wayland: called when new API GetShortcut() async reply arrives.
 // The result is delivered via shortcutQueried so the downstream
 // model-update path never re-enters onShortcutChanged → Query → ...

src/plugin-keyboard/operation/keyboarddbusproxy.h

@@ -71,25 +71,55 @@ class DCCDBusInterface;
 struct ShortcutInfoNew {
     QString id;
     QString displayName;
-    int category;
+    QString category;               // Logical category key (e.g. "System", app-defined)
     QStringList hotkeys;
     QString localLanguageName;
+    QString localLanguageCategory;  // Resolved display text for the category
+    bool isCustom = false;          // True for runtime-added (service API) shortcuts
 };
 Q_DECLARE_METATYPE(ShortcutInfoNew)
 Q_DECLARE_METATYPE(QList<ShortcutInfoNew>)
 
 inline QDBusArgument &operator<<(QDBusArgument &argument, const ShortcutInfoNew &info) {
     argument.beginStructure();
     argument << info.id << info.displayName << info.category
-             << info.hotkeys << info.localLanguageName;
+             << info.hotkeys << info.localLanguageName
+             << info.localLanguageCategory << info.isCustom;
     argument.endStructure();
     return argument;
 }
 
 inline const QDBusArgument &operator>>(const QDBusArgument &argument, ShortcutInfoNew &info) {
     argument.beginStructure();
     argument >> info.id >> info.displayName >> info.category
-             >> info.hotkeys >> info.localLanguageName;
+             >> info.hotkeys >> info.localLanguageName
+             >> info.localLanguageCategory >> info.isCustom;
+    argument.endStructure();
+    return argument;
+}
+
+// New API category metadata (dde-services ListCategories()). The control
+// center treats this as the single source of truth for grouping/ordering/
+// display/custom-detection — it never hardcodes category strings.
+struct CategoryInfoNew {
+    QString key;
+    QString displayName;
+    int order = 0;
+    bool isCustom = false;
+};
+Q_DECLARE_METATYPE(CategoryInfoNew)
+Q_DECLARE_METATYPE(QList<CategoryInfoNew>)
+
+inline QDBusArgument &operator<<(QDBusArgument &argument, const CategoryInfoNew &info) {
+    argument.beginStructure();
+    argument << info.key << info.displayName << info.order << info.isCustom;
+    argument.endStructure();
+    return argument;
+}
+
+inline const QDBusArgument &operator>>(const QDBusArgument &argument, CategoryInfoNew &info) {
+    argument.beginStructure();
+    argument >> info.key >> info.displayName >> info.order >> info.isCustom;
     argument.endStructure();
     return argument;
 }
@@ -194,6 +224,9 @@ class KeyboardDBusProxy : public QObject, public DCC_NAMESPACE::IKeyboardDeviceP
     // never reuse Deleted, whose X11 auto-wiring → KeyboardWorker::removed is a
     // dead-end relay. Carries only the id (the new-API signal has no type).
     void shortcutRemovedById(const QString &id);
+    // Wayland: category metadata from ListCategories() — drives grouping,
+    // ordering, display names, and custom-group identity in the model.
+    void categoriesReady(const QList<CategoryInfoNew> &categories);
 
     //wm
     void compositingEnabledChanged(bool enabled);
@@ -204,6 +237,8 @@ public slots:
     // Keybinding
     QDBusPendingReply<>  KeybindingReset();
     QDBusPendingReply<QString> ListAllShortcuts();
+    // Wayland: fetch category metadata (ordering/display/custom flag).
+    QDBusPendingReply<> ListCategories();
     QString LookupConflictingShortcut(const QString &in0);
     QDBusPendingReply<ShortcutInfoNew> LookupConflictShortcut(const QString &in0);
     QDBusPendingReply<> ClearShortcutKeystrokes(const QString &in0, int in1);
@@ -239,6 +274,7 @@ private slots:
     void onLangSelectorStartServiceProcessFinished(QDBusPendingCallWatcher *w);
     // New API -> Old API adapters (Wayland)
     void onListAllShortcutsNewFinished(QDBusPendingCallWatcher *w);
+    void onListCategoriesFinished(QDBusPendingCallWatcher *w);
     void onGetShortcutNewFinished(QDBusPendingCallWatcher *w);
     void onSearchShortcutsNewFinished(QDBusPendingCallWatcher *w);
     // Bridge: new dde-services D-Bus signals (ShortcutChanged/ShortcutRemoved)

src/plugin-keyboard/operation/keyboardwork.cpp

@@ -73,6 +73,24 @@ KeyboardWorker::KeyboardWorker(KeyboardModel *model, QObject *parent)
     connect(m_keyboardDBusProxy, &KeyboardDBusProxy::compositingEnabledChanged, this, &KeyboardWorker::onGetWindowWM);
     connect(m_keyboardDBusProxy, &KeyboardDBusProxy::Added, this, &KeyboardWorker::onAdded);
     connect(m_keyboardDBusProxy, &KeyboardDBusProxy::AllShortcutsReady, this, &KeyboardWorker::onAllShortcutsReady);
+    // Wayland: category metadata (ordering/display/custom flag) from the
+    // service's ListCategories(). Feeds the model so it never hardcodes
+    // category strings for grouping or Custom detection.
+    connect(m_keyboardDBusProxy, &KeyboardDBusProxy::categoriesReady, this, [this](const QList<CategoryInfoNew> &cats) {
+        if (!m_shortcutModel)
+            return;
+        QList<ShortcutModel::CategoryMeta> meta;
+        meta.reserve(cats.size());
+        for (const auto &c : cats) {
+            ShortcutModel::CategoryMeta m;
+            m.key = c.key;
+            m.displayName = c.displayName;
+            m.order = c.order;
+            m.isCustom = c.isCustom;
+            meta.append(m);
+        }
+        m_shortcutModel->setCategoryMeta(meta);
+    });
     connect(m_keyboardDBusProxy, &KeyboardDBusProxy::searchShortcutsReady, this, [this](const QString &json) {
         if (m_shortcutModel)
             m_shortcutModel->setSearchResult(json);
@@ -146,6 +164,8 @@ void KeyboardWorker::refreshShortcut()
     if (m_keyboardDBusProxy->isWayland()) {
         // Wayland: result is delivered asynchronously via AllShortcutsReady signal.
         m_keyboardDBusProxy->ListAllShortcuts();
+        // Also refresh category metadata (ordering/display/custom flag).
+        m_keyboardDBusProxy->ListCategories();
         return;
     }
     QDBusPendingCallWatcher *result = new QDBusPendingCallWatcher(m_keyboardDBusProxy->ListAllShortcuts(), this);