Skip to content

fix!: correct app id used by DConfig #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BLumia merged 1 commit into from
Aug 8, 2024
Merged

fix!: correct app id used by DConfig #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/dde-shell-example.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
1 change: 1 addition & 0 deletions debian/dde-shell.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion example/applet-example-data/exampleapplet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ QString ExampleApplet::mainText() const
bool ExampleApplet::load()
{
DCORE_USE_NAMESPACE;
std::unique_ptr<DConfig> config(DConfig::create("org.deepin.ds.example", "org.deepin.ds.example"));
std::unique_ptr<DConfig> config(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.example"));
return config->value("loadAppletExampleData").toBool();
}

Expand Down
4 changes: 2 additions & 2 deletions example/containment-example/examplecontainment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ ExampleContainment::~ExampleContainment()
}
if (!res.isEmpty()) {
const QJsonDocument doc(res);
std::unique_ptr<DConfig> config(DConfig::create("org.deepin.ds.example", "org.deepin.ds.example"));
std::unique_ptr<DConfig> config(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.example"));
config->setValue("appletExamples", doc.toVariant());
}
}

bool ExampleContainment::load()
{
DCORE_USE_NAMESPACE;
std::unique_ptr<DConfig> config(DConfig::create("org.deepin.ds.example", "org.deepin.ds.example"));
std::unique_ptr<DConfig> config(DConfig::create("org.deepin.dde.shell", "org.deepin.ds.example"));

QList<DAppletData> groups;
auto children = DPluginLoader::instance()->childrenPlugin(pluginId());
Expand Down
2 changes: 1 addition & 1 deletion example/panel-example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
9 changes: 6 additions & 3 deletions panels/dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions panels/dock/docksettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 2 additions & 1 deletion panels/dock/taskmanager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 1 addition & 2 deletions panels/dock/taskmanager/taskmanagersettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -152,4 +152,3 @@ QJsonArray TaskManagerSettings::dockedDesktopFiles()
}

}

2 changes: 1 addition & 1 deletion panels/dock/tray/quickpanel/quickpanelproxymodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ bool QuickPanelProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so

void QuickPanelProxyModel::updateQuickPlugins()
{
std::unique_ptr<DConfig> dconfig(DConfig::create("org.deepin.ds.dock", "org.deepin.ds.dock.tray"));
std::unique_ptr<DConfig> 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();
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/traysettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/traysortordermodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int, QByteArray> defaultRoleNames = roleNames();
defaultRoleNames.insert({
Expand Down