From 0dadc92156b38c811124ef4aebfecaadc360f440 Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Tue, 6 Aug 2024 20:18:17 +0800 Subject: [PATCH] fix!: correct app id used by DConfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 纠正应用组件 ID 名称。 Log: --- debian/dde-shell-example.install | 2 +- debian/dde-shell.install | 1 + example/applet-example-data/exampleapplet.cpp | 2 +- example/containment-example/examplecontainment.cpp | 4 ++-- example/panel-example/CMakeLists.txt | 2 +- panels/dock/CMakeLists.txt | 9 ++++++--- panels/dock/docksettings.cpp | 4 ++-- panels/dock/taskmanager/CMakeLists.txt | 3 ++- panels/dock/taskmanager/taskmanagersettings.cpp | 3 +-- panels/dock/tray/quickpanel/quickpanelproxymodel.cpp | 2 +- panels/dock/tray/traysettings.cpp | 2 +- panels/dock/tray/traysortordermodel.cpp | 2 +- 12 files changed, 20 insertions(+), 16 deletions(-) diff --git a/debian/dde-shell-example.install b/debian/dde-shell-example.install index 377f42be0..9346f1961 100644 --- a/debian/dde-shell-example.install +++ b/debian/dde-shell-example.install @@ -1,3 +1,3 @@ usr/lib/*/dde-shell/org.deepin.ds.example* usr/share/dde-shell/org.deepin.ds.example*/ -usr/share/dsg/configs/org.deepin.ds.example/ +usr/share/dsg/configs/org.deepin.dde.shell/ diff --git a/debian/dde-shell.install b/debian/dde-shell.install index d97599841..9e4b3d3f3 100644 --- a/debian/dde-shell.install +++ b/debian/dde-shell.install @@ -13,5 +13,6 @@ usr/share/dde-shell/org.deepin.ds.dde-appearance*/ usr/lib/*/dde-shell/org.deepin.ds.dde-am* usr/share/dde-shell/org.deepin.ds.dde-am*/ usr/share/dsg/configs/org.deepin.ds.dock/ +usr/share/dsg/configs/org.deepin.dde.shell/ usr/share/dde-shell/*/translations usr/share/dde-dock/icons/dcc-setting/*.svg diff --git a/example/applet-example-data/exampleapplet.cpp b/example/applet-example-data/exampleapplet.cpp index ecfb798c6..28e080e93 100644 --- a/example/applet-example-data/exampleapplet.cpp +++ b/example/applet-example-data/exampleapplet.cpp @@ -24,7 +24,7 @@ QString ExampleApplet::mainText() const bool ExampleApplet::load() { DCORE_USE_NAMESPACE; - std::unique_ptr config(DConfig::create("org.deepin.ds.example", "org.deepin.ds.example")); + std::unique_ptr config(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.example")); return config->value("loadAppletExampleData").toBool(); } diff --git a/example/containment-example/examplecontainment.cpp b/example/containment-example/examplecontainment.cpp index d1e83c30c..9df2c7372 100644 --- a/example/containment-example/examplecontainment.cpp +++ b/example/containment-example/examplecontainment.cpp @@ -32,7 +32,7 @@ ExampleContainment::~ExampleContainment() } if (!res.isEmpty()) { const QJsonDocument doc(res); - std::unique_ptr config(DConfig::create("org.deepin.ds.example", "org.deepin.ds.example")); + std::unique_ptr config(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.example")); config->setValue("appletExamples", doc.toVariant()); } } @@ -40,7 +40,7 @@ ExampleContainment::~ExampleContainment() bool ExampleContainment::load() { DCORE_USE_NAMESPACE; - std::unique_ptr config(DConfig::create("org.deepin.ds.example", "org.deepin.ds.example")); + std::unique_ptr config(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.example")); QList groups; auto children = DPluginLoader::instance()->childrenPlugin(pluginId()); diff --git a/example/panel-example/CMakeLists.txt b/example/panel-example/CMakeLists.txt index a79261e66..d485ec0da 100644 --- a/example/panel-example/CMakeLists.txt +++ b/example/panel-example/CMakeLists.txt @@ -13,6 +13,6 @@ target_link_libraries(ds-panel-example PRIVATE find_package(Dtk${DTK_VERSION_MAJOR}DConfig REQUIRED) -dtk_add_config_meta_files(APPID "org.deepin.ds.example" FILES org.deepin.ds.example.json) +dtk_add_config_meta_files(APPID "org.deepin.dde.shell" FILES org.deepin.ds.example.json) ds_install_package(PACKAGE org.deepin.ds.example TARGET ds-panel-example) diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt index cc18997a4..dec080638 100644 --- a/panels/dock/CMakeLists.txt +++ b/panels/dock/CMakeLists.txt @@ -151,6 +151,9 @@ target_include_directories(dock-plugin ) install(DIRECTORY "${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/" DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/dock/") -dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.json) -dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.power.json) -dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.tray.json) +dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.json) # compat +dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.power.json) # compat +dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.tray.json) # compat +dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.json) +dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.power.json) +dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.tray.json) diff --git a/panels/dock/docksettings.cpp b/panels/dock/docksettings.cpp index b0fee2ec8..24cdff1f0 100644 --- a/panels/dock/docksettings.cpp +++ b/panels/dock/docksettings.cpp @@ -124,7 +124,7 @@ DockSettings* DockSettings::instance() DockSettings::DockSettings(QObject* parent) : QObject(parent) - , m_dockConfig(DConfig::create("org.deepin.ds.dock", "org.deepin.ds.dock", QString(), this)) + , m_dockConfig(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.dock", QString(), this)) , m_writeTimer(new QTimer(this)) , m_dockSize(dock::DEFAULT_DOCK_SIZE) , m_hideMode(dock::KeepShowing) @@ -267,7 +267,7 @@ QVariantMap DockSettings::pluginsVisible() void DockSettings::setPluginsVisible(const QVariantMap & pluginsVisible) { if (m_pluginsVisible == pluginsVisible) { - return; + return; } m_pluginsVisible = pluginsVisible; m_dockConfig->setValue(keyPluginsVisible, QVariant::fromValue(m_pluginsVisible)); diff --git a/panels/dock/taskmanager/CMakeLists.txt b/panels/dock/taskmanager/CMakeLists.txt index f3e31ccc1..3f4b909d4 100644 --- a/panels/dock/taskmanager/CMakeLists.txt +++ b/panels/dock/taskmanager/CMakeLists.txt @@ -107,5 +107,6 @@ if (BUILD_WITH_X11) endif(BUILD_WITH_X11) ds_install_package(PACKAGE org.deepin.ds.dock.taskmanager TARGET dock-taskmanager) -dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.taskmanager.json) +dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.taskmanager.json) # compat +dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.taskmanager.json) ds_handle_package_translation(PACKAGE org.deepin.ds.dock.taskmanager) diff --git a/panels/dock/taskmanager/taskmanagersettings.cpp b/panels/dock/taskmanager/taskmanagersettings.cpp index 779aad898..d657305f9 100644 --- a/panels/dock/taskmanager/taskmanagersettings.cpp +++ b/panels/dock/taskmanager/taskmanagersettings.cpp @@ -39,7 +39,7 @@ TaskManagerSettings* TaskManagerSettings::instance() TaskManagerSettings::TaskManagerSettings(QObject *parent) : QObject(parent) - , m_taskManagerDconfig(DConfig::create(QStringLiteral("org.deepin.ds.dock"), QStringLiteral("org.deepin.ds.dock.taskmanager"), QString(), this)) + , m_taskManagerDconfig(DConfig::create(QStringLiteral("org.deepin.dde.shell"), QStringLiteral("org.deepin.ds.dock.taskmanager"), QString(), this)) { connect(m_taskManagerDconfig, &DConfig::valueChanged, this, [this](const QString &key){ if (TASKMANAGER_ALLOWFOCEQUIT_KEY == key) { @@ -152,4 +152,3 @@ QJsonArray TaskManagerSettings::dockedDesktopFiles() } } - diff --git a/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp b/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp index 6d9a64c57..6a5285516 100644 --- a/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp +++ b/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp @@ -125,7 +125,7 @@ bool QuickPanelProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so void QuickPanelProxyModel::updateQuickPlugins() { - std::unique_ptr dconfig(DConfig::create("org.deepin.ds.dock", "org.deepin.ds.dock.tray")); + std::unique_ptr dconfig(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.dock.tray")); m_quickPlugins = dconfig->value("quickPlugins").toStringList(); qDebug() << "Fetched QuickPanel's plugin by DConfig," << "plugin list size:" << m_quickPlugins.size(); diff --git a/panels/dock/tray/traysettings.cpp b/panels/dock/tray/traysettings.cpp index fa578c6a8..c0cd495f6 100644 --- a/panels/dock/tray/traysettings.cpp +++ b/panels/dock/tray/traysettings.cpp @@ -19,7 +19,7 @@ TraySettings* TraySettings::instance() TraySettings::TraySettings(QObject* parent) : QObject(parent) - , m_trayConfig(DConfig::create("org.deepin.ds.dock", "org.deepin.ds.dock.tray", QString(), this)) + , m_trayConfig(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.dock.tray", QString(), this)) { init(); } diff --git a/panels/dock/tray/traysortordermodel.cpp b/panels/dock/tray/traysortordermodel.cpp index 6f567b3f7..4b88ade6b 100644 --- a/panels/dock/tray/traysortordermodel.cpp +++ b/panels/dock/tray/traysortordermodel.cpp @@ -17,7 +17,7 @@ const QString SECTION_PINNED = QLatin1String("pinned"); TraySortOrderModel::TraySortOrderModel(QObject *parent) : QStandardItemModel(parent) - , m_dconfig(Dtk::Core::DConfig::create("org.deepin.ds.dock", "org.deepin.ds.dock.tray")) + , m_dconfig(Dtk::Core::DConfig::create("org.deepin.dde.shell", "org.deepin.ds.dock.tray")) { QHash defaultRoleNames = roleNames(); defaultRoleNames.insert({