diff --git a/CMakeLists.txt b/CMakeLists.txt index 796ec368b..77ba8b5a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ endif () ## qm files file(GLOB QM_FILES "translations/*.qm") install(FILES ${QM_FILES} - DESTINATION share/dde-dock/translations) + DESTINATION share/org.deepin.dde.dock/translations) ## dev files install(FILES ${INTERFACES} @@ -126,8 +126,7 @@ install(FILES gschema/com.deepin.dde.dock.module.gschema.xml DESTINATION share/glib-2.0/schemas) #dconfig -file(GLOB DCONFIG_FILES "configs/*.json") -install(FILES ${DCONFIG_FILES} DESTINATION /usr/share/dsg/apps/dde-dock/configs/) +dconfig_meta_files(APPID org.deepin.dde.dock FILES configs/org.deepin.dde.dock.json) # Address Sanitizer 内存错误检测工具,打开下面的编译选项可以看到调试信息,正常运行时不需要这些信息 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2") diff --git a/configs/org.deepin.dock.json b/configs/org.deepin.dde.dock.json similarity index 100% rename from configs/org.deepin.dock.json rename to configs/org.deepin.dde.dock.json diff --git a/debian/dde-dock.install b/debian/dde-dock.install index 1091cba33..38d420a23 100644 --- a/debian/dde-dock.install +++ b/debian/dde-dock.install @@ -10,4 +10,3 @@ usr/lib/dde-dock/plugins/system-trays usr/lib/dde-dock/plugins/libmultitasking.so usr/lib/dde-dock/plugins/libshow-desktop.so usr/lib/dde-dock/plugins/system-trays/libkeyboard-layout.so -usr/share/dsg/apps/dde-dock/configs/ diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp index f51ec4c90..8e4cf73c7 100644 --- a/frame/item/appitem.cpp +++ b/frame/item/appitem.cpp @@ -667,7 +667,7 @@ void AppItem::showPreview() connect(m_appPreviewTips, &PreviewContainer::requestHidePopup, this, &AppItem::onResetPreview); // 预览标题显示方式的配置 - DConfig config(QString("org.deepin.dock"), QString()); + DConfig config(QString("org.deepin.dde.dock"), QString()); if (config.isValid() && config.keyList().contains("showWindowName")) m_appPreviewTips->setTitleDisplayMode(config.value("showWindowName").toInt()); diff --git a/frame/main.cpp b/frame/main.cpp index 76f0700a6..03d334058 100644 --- a/frame/main.cpp +++ b/frame/main.cpp @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) signal(SIGFPE, sig_crash); app.setOrganizationName("deepin"); - app.setApplicationName("dde-dock"); + app.setApplicationName("org.deepin.dde.dock"); app.setApplicationDisplayName("DDE Dock"); app.setApplicationVersion("2.0"); app.loadTranslator(); @@ -209,7 +209,7 @@ int main(int argc, char *argv[]) // 任务栏单进程限制 DGuiApplicationHelper::setSingleInstanceInterval(-1); - if (!app.setSingleInstance(QString("dde-dock_%1").arg(getuid()))) { + if (!app.setSingleInstance(QString("org.deepin.dde.dock_%1").arg(getuid()))) { qDebug() << "set single instance failed!"; return -1; } diff --git a/lupdate.sh b/lupdate.sh index 8faa1d0b0..e3ef59b9b 100755 --- a/lupdate.sh +++ b/lupdate.sh @@ -1,7 +1,7 @@ #!/bin/bash cp ".transifexrc" ${HOME}/ -lupdate ./ -ts -no-obsolete translations/dde-dock.ts +lupdate ./ -ts -no-obsolete translations/org.deepin.dde.dock.ts lupdate ./ -ts -no-obsolete plugins/dcc-dock-plugin/translations/dcc-dock-plugin.ts tx push -s -b m20 diff --git a/plugins/dcc-dock-plugin/CMakeLists.txt b/plugins/dcc-dock-plugin/CMakeLists.txt index 23225a318..1e4579c07 100644 --- a/plugins/dcc-dock-plugin/CMakeLists.txt +++ b/plugins/dcc-dock-plugin/CMakeLists.txt @@ -47,7 +47,7 @@ add_custom_target(translations ALL DEPENDS ${QM_FILES}) install(FILES ${QM_FILES} DESTINATION share/${PLUGIN_NAME}/translations) # dconfig -file(GLOB DCONFIG_FILES "org.deepin.dock.plugin.json") +file(GLOB DCONFIG_FILES "org.deepin.dde.dock.plugin.json") dconfig_meta_files(APPID dde-control-center FILES ${DCONFIG_FILES}) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-control-center/modules) diff --git a/plugins/dcc-dock-plugin/module_widget.cpp b/plugins/dcc-dock-plugin/module_widget.cpp index 4cfb6f0e8..51e3db6d2 100644 --- a/plugins/dcc-dock-plugin/module_widget.cpp +++ b/plugins/dcc-dock-plugin/module_widget.cpp @@ -74,7 +74,7 @@ ModuleWidget::ModuleWidget(QWidget *parent) , m_pluginModel(new QStandardItemModel(this)) , m_daemonDockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_dockInter(new DBusInter("com.deepin.dde.Dock", "/com/deepin/dde/Dock", QDBusConnection::sessionBus(), this)) - , m_dconfigWatcher(new ConfigWatcher("org.deepin.dock.plugin", this)) + , m_dconfigWatcher(new ConfigWatcher("org.deepin.dde.dock.plugin", this)) , m_sliderPressed(false) { //~ contents_path /personalization/Dock diff --git a/plugins/dcc-dock-plugin/org.deepin.dock.plugin.json b/plugins/dcc-dock-plugin/org.deepin.dde.dock.plugin.json similarity index 100% rename from plugins/dcc-dock-plugin/org.deepin.dock.plugin.json rename to plugins/dcc-dock-plugin/org.deepin.dde.dock.plugin.json diff --git a/plugins/dcc-dock-plugin/settings_module.cpp b/plugins/dcc-dock-plugin/settings_module.cpp index 1986ea960..28481e55e 100644 --- a/plugins/dcc-dock-plugin/settings_module.cpp +++ b/plugins/dcc-dock-plugin/settings_module.cpp @@ -34,7 +34,7 @@ SettingsModule::SettingsModule() : QObject() , ModuleInterface() , m_moduleWidget(nullptr) - , m_config(new DConfig("org.deepin.dock.plugin", QString(), this)) + , m_config(new DConfig("org.deepin.dde.dock.plugin", QString(), this)) { QTranslator *translator = new QTranslator(this); translator->load(QString("/usr/share/dcc-dock-plugin/translations/dcc-dock-plugin_%1.qm").arg(QLocale::system().name())); diff --git a/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp b/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp index b3a92983a..f6bb6290d 100644 --- a/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp +++ b/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp @@ -1,6 +1,7 @@ #include "config_watcher.h" #include +#include #include @@ -11,7 +12,9 @@ class Test_GSettingWatcher : public QObject, public ::testing::Test TEST_F(Test_GSettingWatcher, bind) { - ConfigWatcher watcher("org.deepin.dock.plugin"); + const QString &appName = qApp->applicationName(); + qApp->setApplicationName("dde-dock"); + ConfigWatcher watcher("org.deepin.dde.dock.plugin"); QWidget widget; watcher.bind("dockPlugins", &widget); @@ -19,20 +22,24 @@ TEST_F(Test_GSettingWatcher, bind) watcher.bind("invalid", &widget); watcher.bind("", &widget); watcher.bind("", nullptr); + qApp->setApplicationName(appName); } TEST_F(Test_GSettingWatcher, setStatus) { - ConfigWatcher watcher("org.deepin.dock.plugin"); + const QString &appName = qApp->applicationName(); + qApp->setApplicationName("dde-control-center"); + ConfigWatcher watcher("org.deepin.dde.dock.plugin"); QWidget widget; watcher.bind("dockPlugins", &widget); watcher.setStatus("dockPlugins", &widget); + qApp->setApplicationName(appName); } TEST_F(Test_GSettingWatcher, onStatusModeChanged) { - ConfigWatcher watcher("org.deepin.dock.plugin"); + ConfigWatcher watcher("org.deepin.dde.dock.plugin"); QWidget widget; watcher.bind("dockPlugins", &widget); diff --git a/translations/dde-dock.ts b/translations/org.deepin.dde.dock.ts similarity index 100% rename from translations/dde-dock.ts rename to translations/org.deepin.dde.dock.ts diff --git a/translations/dde-dock_af.ts b/translations/org.deepin.dde.dock_af.ts similarity index 100% rename from translations/dde-dock_af.ts rename to translations/org.deepin.dde.dock_af.ts diff --git a/translations/dde-dock_ak.ts b/translations/org.deepin.dde.dock_ak.ts similarity index 100% rename from translations/dde-dock_ak.ts rename to translations/org.deepin.dde.dock_ak.ts diff --git a/translations/dde-dock_am_ET.ts b/translations/org.deepin.dde.dock_am_ET.ts similarity index 100% rename from translations/dde-dock_am_ET.ts rename to translations/org.deepin.dde.dock_am_ET.ts diff --git a/translations/dde-dock_ar.ts b/translations/org.deepin.dde.dock_ar.ts similarity index 100% rename from translations/dde-dock_ar.ts rename to translations/org.deepin.dde.dock_ar.ts diff --git a/translations/dde-dock_ast.ts b/translations/org.deepin.dde.dock_ast.ts similarity index 100% rename from translations/dde-dock_ast.ts rename to translations/org.deepin.dde.dock_ast.ts diff --git a/translations/dde-dock_az.ts b/translations/org.deepin.dde.dock_az.ts similarity index 100% rename from translations/dde-dock_az.ts rename to translations/org.deepin.dde.dock_az.ts diff --git a/translations/dde-dock_bg.ts b/translations/org.deepin.dde.dock_bg.ts similarity index 100% rename from translations/dde-dock_bg.ts rename to translations/org.deepin.dde.dock_bg.ts diff --git a/translations/dde-dock_bn.ts b/translations/org.deepin.dde.dock_bn.ts similarity index 100% rename from translations/dde-dock_bn.ts rename to translations/org.deepin.dde.dock_bn.ts diff --git a/translations/dde-dock_bo.ts b/translations/org.deepin.dde.dock_bo.ts similarity index 100% rename from translations/dde-dock_bo.ts rename to translations/org.deepin.dde.dock_bo.ts diff --git a/translations/dde-dock_ca.ts b/translations/org.deepin.dde.dock_ca.ts similarity index 100% rename from translations/dde-dock_ca.ts rename to translations/org.deepin.dde.dock_ca.ts diff --git a/translations/dde-dock_cs.ts b/translations/org.deepin.dde.dock_cs.ts similarity index 100% rename from translations/dde-dock_cs.ts rename to translations/org.deepin.dde.dock_cs.ts diff --git a/translations/dde-dock_da.ts b/translations/org.deepin.dde.dock_da.ts similarity index 100% rename from translations/dde-dock_da.ts rename to translations/org.deepin.dde.dock_da.ts diff --git a/translations/dde-dock_de.ts b/translations/org.deepin.dde.dock_de.ts similarity index 100% rename from translations/dde-dock_de.ts rename to translations/org.deepin.dde.dock_de.ts diff --git a/translations/dde-dock_el.ts b/translations/org.deepin.dde.dock_el.ts similarity index 100% rename from translations/dde-dock_el.ts rename to translations/org.deepin.dde.dock_el.ts diff --git a/translations/dde-dock_en_AU.ts b/translations/org.deepin.dde.dock_en_AU.ts similarity index 100% rename from translations/dde-dock_en_AU.ts rename to translations/org.deepin.dde.dock_en_AU.ts diff --git a/translations/dde-dock_en_GB.ts b/translations/org.deepin.dde.dock_en_GB.ts similarity index 100% rename from translations/dde-dock_en_GB.ts rename to translations/org.deepin.dde.dock_en_GB.ts diff --git a/translations/dde-dock_eo.ts b/translations/org.deepin.dde.dock_eo.ts similarity index 100% rename from translations/dde-dock_eo.ts rename to translations/org.deepin.dde.dock_eo.ts diff --git a/translations/dde-dock_es.ts b/translations/org.deepin.dde.dock_es.ts similarity index 100% rename from translations/dde-dock_es.ts rename to translations/org.deepin.dde.dock_es.ts diff --git a/translations/dde-dock_es_419.ts b/translations/org.deepin.dde.dock_es_419.ts similarity index 100% rename from translations/dde-dock_es_419.ts rename to translations/org.deepin.dde.dock_es_419.ts diff --git a/translations/dde-dock_et.ts b/translations/org.deepin.dde.dock_et.ts similarity index 100% rename from translations/dde-dock_et.ts rename to translations/org.deepin.dde.dock_et.ts diff --git a/translations/dde-dock_fa.ts b/translations/org.deepin.dde.dock_fa.ts similarity index 100% rename from translations/dde-dock_fa.ts rename to translations/org.deepin.dde.dock_fa.ts diff --git a/translations/dde-dock_fi.ts b/translations/org.deepin.dde.dock_fi.ts similarity index 100% rename from translations/dde-dock_fi.ts rename to translations/org.deepin.dde.dock_fi.ts diff --git a/translations/dde-dock_fr.ts b/translations/org.deepin.dde.dock_fr.ts similarity index 100% rename from translations/dde-dock_fr.ts rename to translations/org.deepin.dde.dock_fr.ts diff --git a/translations/dde-dock_gl.ts b/translations/org.deepin.dde.dock_gl.ts similarity index 100% rename from translations/dde-dock_gl.ts rename to translations/org.deepin.dde.dock_gl.ts diff --git a/translations/dde-dock_gl_ES.ts b/translations/org.deepin.dde.dock_gl_ES.ts similarity index 100% rename from translations/dde-dock_gl_ES.ts rename to translations/org.deepin.dde.dock_gl_ES.ts diff --git a/translations/dde-dock_he.ts b/translations/org.deepin.dde.dock_he.ts similarity index 100% rename from translations/dde-dock_he.ts rename to translations/org.deepin.dde.dock_he.ts diff --git a/translations/dde-dock_hi.ts b/translations/org.deepin.dde.dock_hi.ts similarity index 100% rename from translations/dde-dock_hi.ts rename to translations/org.deepin.dde.dock_hi.ts diff --git a/translations/dde-dock_hi_IN.ts b/translations/org.deepin.dde.dock_hi_IN.ts similarity index 100% rename from translations/dde-dock_hi_IN.ts rename to translations/org.deepin.dde.dock_hi_IN.ts diff --git a/translations/dde-dock_hr.ts b/translations/org.deepin.dde.dock_hr.ts similarity index 100% rename from translations/dde-dock_hr.ts rename to translations/org.deepin.dde.dock_hr.ts diff --git a/translations/dde-dock_hu.ts b/translations/org.deepin.dde.dock_hu.ts similarity index 100% rename from translations/dde-dock_hu.ts rename to translations/org.deepin.dde.dock_hu.ts diff --git a/translations/dde-dock_hy.ts b/translations/org.deepin.dde.dock_hy.ts similarity index 100% rename from translations/dde-dock_hy.ts rename to translations/org.deepin.dde.dock_hy.ts diff --git a/translations/dde-dock_id.ts b/translations/org.deepin.dde.dock_id.ts similarity index 100% rename from translations/dde-dock_id.ts rename to translations/org.deepin.dde.dock_id.ts diff --git a/translations/dde-dock_it.ts b/translations/org.deepin.dde.dock_it.ts similarity index 100% rename from translations/dde-dock_it.ts rename to translations/org.deepin.dde.dock_it.ts diff --git a/translations/dde-dock_ja.ts b/translations/org.deepin.dde.dock_ja.ts similarity index 100% rename from translations/dde-dock_ja.ts rename to translations/org.deepin.dde.dock_ja.ts diff --git a/translations/dde-dock_kn_IN.ts b/translations/org.deepin.dde.dock_kn_IN.ts similarity index 100% rename from translations/dde-dock_kn_IN.ts rename to translations/org.deepin.dde.dock_kn_IN.ts diff --git a/translations/dde-dock_ko.ts b/translations/org.deepin.dde.dock_ko.ts similarity index 100% rename from translations/dde-dock_ko.ts rename to translations/org.deepin.dde.dock_ko.ts diff --git a/translations/dde-dock_ku_IQ.ts b/translations/org.deepin.dde.dock_ku_IQ.ts similarity index 100% rename from translations/dde-dock_ku_IQ.ts rename to translations/org.deepin.dde.dock_ku_IQ.ts diff --git a/translations/dde-dock_lo.ts b/translations/org.deepin.dde.dock_lo.ts similarity index 100% rename from translations/dde-dock_lo.ts rename to translations/org.deepin.dde.dock_lo.ts diff --git a/translations/dde-dock_lt.ts b/translations/org.deepin.dde.dock_lt.ts similarity index 100% rename from translations/dde-dock_lt.ts rename to translations/org.deepin.dde.dock_lt.ts diff --git a/translations/dde-dock_ml.ts b/translations/org.deepin.dde.dock_ml.ts similarity index 100% rename from translations/dde-dock_ml.ts rename to translations/org.deepin.dde.dock_ml.ts diff --git a/translations/dde-dock_mn.ts b/translations/org.deepin.dde.dock_mn.ts similarity index 100% rename from translations/dde-dock_mn.ts rename to translations/org.deepin.dde.dock_mn.ts diff --git a/translations/dde-dock_ms.ts b/translations/org.deepin.dde.dock_ms.ts similarity index 100% rename from translations/dde-dock_ms.ts rename to translations/org.deepin.dde.dock_ms.ts diff --git a/translations/dde-dock_nb.ts b/translations/org.deepin.dde.dock_nb.ts similarity index 100% rename from translations/dde-dock_nb.ts rename to translations/org.deepin.dde.dock_nb.ts diff --git a/translations/dde-dock_ne.ts b/translations/org.deepin.dde.dock_ne.ts similarity index 100% rename from translations/dde-dock_ne.ts rename to translations/org.deepin.dde.dock_ne.ts diff --git a/translations/dde-dock_nl.ts b/translations/org.deepin.dde.dock_nl.ts similarity index 100% rename from translations/dde-dock_nl.ts rename to translations/org.deepin.dde.dock_nl.ts diff --git a/translations/dde-dock_pa.ts b/translations/org.deepin.dde.dock_pa.ts similarity index 100% rename from translations/dde-dock_pa.ts rename to translations/org.deepin.dde.dock_pa.ts diff --git a/translations/dde-dock_pam.ts b/translations/org.deepin.dde.dock_pam.ts similarity index 100% rename from translations/dde-dock_pam.ts rename to translations/org.deepin.dde.dock_pam.ts diff --git a/translations/dde-dock_pl.ts b/translations/org.deepin.dde.dock_pl.ts similarity index 100% rename from translations/dde-dock_pl.ts rename to translations/org.deepin.dde.dock_pl.ts diff --git a/translations/dde-dock_pt.ts b/translations/org.deepin.dde.dock_pt.ts similarity index 100% rename from translations/dde-dock_pt.ts rename to translations/org.deepin.dde.dock_pt.ts diff --git a/translations/dde-dock_pt_BR.ts b/translations/org.deepin.dde.dock_pt_BR.ts similarity index 100% rename from translations/dde-dock_pt_BR.ts rename to translations/org.deepin.dde.dock_pt_BR.ts diff --git a/translations/dde-dock_ro.ts b/translations/org.deepin.dde.dock_ro.ts similarity index 100% rename from translations/dde-dock_ro.ts rename to translations/org.deepin.dde.dock_ro.ts diff --git a/translations/dde-dock_ru.ts b/translations/org.deepin.dde.dock_ru.ts similarity index 100% rename from translations/dde-dock_ru.ts rename to translations/org.deepin.dde.dock_ru.ts diff --git a/translations/dde-dock_si.ts b/translations/org.deepin.dde.dock_si.ts similarity index 100% rename from translations/dde-dock_si.ts rename to translations/org.deepin.dde.dock_si.ts diff --git a/translations/dde-dock_sk.ts b/translations/org.deepin.dde.dock_sk.ts similarity index 100% rename from translations/dde-dock_sk.ts rename to translations/org.deepin.dde.dock_sk.ts diff --git a/translations/dde-dock_sl.ts b/translations/org.deepin.dde.dock_sl.ts similarity index 100% rename from translations/dde-dock_sl.ts rename to translations/org.deepin.dde.dock_sl.ts diff --git a/translations/dde-dock_sq.ts b/translations/org.deepin.dde.dock_sq.ts similarity index 100% rename from translations/dde-dock_sq.ts rename to translations/org.deepin.dde.dock_sq.ts diff --git a/translations/dde-dock_sr.ts b/translations/org.deepin.dde.dock_sr.ts similarity index 100% rename from translations/dde-dock_sr.ts rename to translations/org.deepin.dde.dock_sr.ts diff --git a/translations/dde-dock_sv.ts b/translations/org.deepin.dde.dock_sv.ts similarity index 100% rename from translations/dde-dock_sv.ts rename to translations/org.deepin.dde.dock_sv.ts diff --git a/translations/dde-dock_sw.ts b/translations/org.deepin.dde.dock_sw.ts similarity index 100% rename from translations/dde-dock_sw.ts rename to translations/org.deepin.dde.dock_sw.ts diff --git a/translations/dde-dock_ta.ts b/translations/org.deepin.dde.dock_ta.ts similarity index 100% rename from translations/dde-dock_ta.ts rename to translations/org.deepin.dde.dock_ta.ts diff --git a/translations/dde-dock_tr.ts b/translations/org.deepin.dde.dock_tr.ts similarity index 100% rename from translations/dde-dock_tr.ts rename to translations/org.deepin.dde.dock_tr.ts diff --git a/translations/dde-dock_ug.ts b/translations/org.deepin.dde.dock_ug.ts similarity index 100% rename from translations/dde-dock_ug.ts rename to translations/org.deepin.dde.dock_ug.ts diff --git a/translations/dde-dock_uk.ts b/translations/org.deepin.dde.dock_uk.ts similarity index 100% rename from translations/dde-dock_uk.ts rename to translations/org.deepin.dde.dock_uk.ts diff --git a/translations/dde-dock_ur.ts b/translations/org.deepin.dde.dock_ur.ts similarity index 100% rename from translations/dde-dock_ur.ts rename to translations/org.deepin.dde.dock_ur.ts diff --git a/translations/dde-dock_vi.ts b/translations/org.deepin.dde.dock_vi.ts similarity index 100% rename from translations/dde-dock_vi.ts rename to translations/org.deepin.dde.dock_vi.ts diff --git a/translations/dde-dock_zh_CN.ts b/translations/org.deepin.dde.dock_zh_CN.ts similarity index 100% rename from translations/dde-dock_zh_CN.ts rename to translations/org.deepin.dde.dock_zh_CN.ts diff --git a/translations/dde-dock_zh_HK.ts b/translations/org.deepin.dde.dock_zh_HK.ts similarity index 100% rename from translations/dde-dock_zh_HK.ts rename to translations/org.deepin.dde.dock_zh_HK.ts diff --git a/translations/dde-dock_zh_TW.ts b/translations/org.deepin.dde.dock_zh_TW.ts similarity index 100% rename from translations/dde-dock_zh_TW.ts rename to translations/org.deepin.dde.dock_zh_TW.ts