diff --git a/debian/control b/debian/control index 16a549f93..c45385b8f 100644 --- a/debian/control +++ b/debian/control @@ -72,7 +72,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, onboard Description: deepin desktop-environment - dock plugin for onboard Dock plugin for onboard of deepin desktop-environment -Package: dcc-dock-settings-plugin +Package: dcc-dock-plugin Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, onboard Description: deepin desktop-environment - dcc plugin for dock settings diff --git a/debian/dcc-dock-plugin.install b/debian/dcc-dock-plugin.install new file mode 100644 index 000000000..140ba65be --- /dev/null +++ b/debian/dcc-dock-plugin.install @@ -0,0 +1 @@ +usr/lib/dde-control-center/modules/libdcc-dock-plugin.so diff --git a/debian/dcc-dock-settings-plugin.install b/debian/dcc-dock-settings-plugin.install deleted file mode 100644 index 732740dd0..000000000 --- a/debian/dcc-dock-settings-plugin.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/dde-control-center/modules/libdcc-dock-settings-plugin.so \ No newline at end of file diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index db8eb428b..862efe77b 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -11,4 +11,4 @@ add_subdirectory("overlay-warning") add_subdirectory("show-desktop") add_subdirectory("multitasking") add_subdirectory("bluetooth") -add_subdirectory("dcc-dock-settings-plugin") +add_subdirectory("dcc-dock-plugin") diff --git a/plugins/dcc-dock-plugin/.tx/config b/plugins/dcc-dock-plugin/.tx/config new file mode 100644 index 000000000..fa112435f --- /dev/null +++ b/plugins/dcc-dock-plugin/.tx/config @@ -0,0 +1,10 @@ +[main] +host = https://www.transifex.com +minimum_perc = 80 +mode = developer + +[deepin-desktop-environment.dcc-dock-plugin] +file_filter = translations/dcc-dock-plugin_.ts +source_file = translations/dcc-dock-plugin.ts +source_lang = en +type = QT diff --git a/plugins/dcc-dock-settings-plugin/CMakeLists.txt b/plugins/dcc-dock-plugin/CMakeLists.txt similarity index 92% rename from plugins/dcc-dock-settings-plugin/CMakeLists.txt rename to plugins/dcc-dock-plugin/CMakeLists.txt index 5411d6ea5..9cde11544 100644 --- a/plugins/dcc-dock-settings-plugin/CMakeLists.txt +++ b/plugins/dcc-dock-plugin/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.7) -set(PLUGIN_NAME "dcc-dock-settings-plugin") +set(PLUGIN_NAME "dcc-dock-plugin") project(${PLUGIN_NAME}) @@ -43,7 +43,7 @@ qt5_add_translation(QM_FILES ${TS_FILES}) add_custom_target(translations ALL DEPENDS ${QM_FILES}) install(FILES ${QM_FILES} DESTINATION share/${PLUGIN_NAME}/translations) -install(FILES com.deepin.dde.control-center.dock-settings.gschema.xml +install(FILES com.deepin.dde.control-center.dock-plugin.gschema.xml DESTINATION share/glib-2.0/schemas) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-control-center/modules) diff --git a/plugins/dcc-dock-settings-plugin/actions/icon_dock_32px.svg b/plugins/dcc-dock-plugin/actions/icon_dock_32px.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/actions/icon_dock_32px.svg rename to plugins/dcc-dock-plugin/actions/icon_dock_32px.svg diff --git a/plugins/dcc-dock-settings-plugin/com.deepin.dde.control-center.dock-settings.gschema.xml b/plugins/dcc-dock-plugin/com.deepin.dde.control-center.dock-plugin.gschema.xml similarity index 100% rename from plugins/dcc-dock-settings-plugin/com.deepin.dde.control-center.dock-settings.gschema.xml rename to plugins/dcc-dock-plugin/com.deepin.dde.control-center.dock-plugin.gschema.xml diff --git a/plugins/dcc-dock-settings-plugin/com_deepin_dde_dock.cpp b/plugins/dcc-dock-plugin/com_deepin_dde_dock.cpp similarity index 100% rename from plugins/dcc-dock-settings-plugin/com_deepin_dde_dock.cpp rename to plugins/dcc-dock-plugin/com_deepin_dde_dock.cpp diff --git a/plugins/dcc-dock-settings-plugin/com_deepin_dde_dock.h b/plugins/dcc-dock-plugin/com_deepin_dde_dock.h similarity index 100% rename from plugins/dcc-dock-settings-plugin/com_deepin_dde_dock.h rename to plugins/dcc-dock-plugin/com_deepin_dde_dock.h diff --git a/plugins/dcc-dock-settings-plugin/dock_settings.json b/plugins/dcc-dock-plugin/dock_settings.json similarity index 100% rename from plugins/dcc-dock-settings-plugin/dock_settings.json rename to plugins/dcc-dock-plugin/dock_settings.json diff --git a/plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp b/plugins/dcc-dock-plugin/gsetting_watcher.cpp similarity index 100% rename from plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp rename to plugins/dcc-dock-plugin/gsetting_watcher.cpp diff --git a/plugins/dcc-dock-settings-plugin/gsetting_watcher.h b/plugins/dcc-dock-plugin/gsetting_watcher.h similarity index 100% rename from plugins/dcc-dock-settings-plugin/gsetting_watcher.h rename to plugins/dcc-dock-plugin/gsetting_watcher.h diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/assistant.svg b/plugins/dcc-dock-plugin/icons/plugins/assistant.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/assistant.svg rename to plugins/dcc-dock-plugin/icons/plugins/assistant.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/desktop.svg b/plugins/dcc-dock-plugin/icons/plugins/desktop.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/desktop.svg rename to plugins/dcc-dock-plugin/icons/plugins/desktop.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/keyboard.svg b/plugins/dcc-dock-plugin/icons/plugins/keyboard.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/keyboard.svg rename to plugins/dcc-dock-plugin/icons/plugins/keyboard.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/notify.svg b/plugins/dcc-dock-plugin/icons/plugins/notify.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/notify.svg rename to plugins/dcc-dock-plugin/icons/plugins/notify.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/plug-in2.svg b/plugins/dcc-dock-plugin/icons/plugins/plug-in2.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/plug-in2.svg rename to plugins/dcc-dock-plugin/icons/plugins/plug-in2.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/power.svg b/plugins/dcc-dock-plugin/icons/plugins/power.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/power.svg rename to plugins/dcc-dock-plugin/icons/plugins/power.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/task.svg b/plugins/dcc-dock-plugin/icons/plugins/task.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/task.svg rename to plugins/dcc-dock-plugin/icons/plugins/task.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/time.svg b/plugins/dcc-dock-plugin/icons/plugins/time.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/time.svg rename to plugins/dcc-dock-plugin/icons/plugins/time.svg diff --git a/plugins/dcc-dock-settings-plugin/icons/plugins/trash.svg b/plugins/dcc-dock-plugin/icons/plugins/trash.svg similarity index 100% rename from plugins/dcc-dock-settings-plugin/icons/plugins/trash.svg rename to plugins/dcc-dock-plugin/icons/plugins/trash.svg diff --git a/plugins/dcc-dock-settings-plugin/module_widget.cpp b/plugins/dcc-dock-plugin/module_widget.cpp similarity index 100% rename from plugins/dcc-dock-settings-plugin/module_widget.cpp rename to plugins/dcc-dock-plugin/module_widget.cpp diff --git a/plugins/dcc-dock-settings-plugin/module_widget.h b/plugins/dcc-dock-plugin/module_widget.h similarity index 100% rename from plugins/dcc-dock-settings-plugin/module_widget.h rename to plugins/dcc-dock-plugin/module_widget.h diff --git a/plugins/dcc-dock-plugin/resources.qrc b/plugins/dcc-dock-plugin/resources.qrc new file mode 100644 index 000000000..62169dacd --- /dev/null +++ b/plugins/dcc-dock-plugin/resources.qrc @@ -0,0 +1,30 @@ + + + actions/icon_dock_32px.svg + + + icons/plugins/time.svg + icons/plugins/assistant.svg + icons/plugins/desktop.svg + icons/plugins/keyboard.svg + icons/plugins/notify.svg + icons/plugins/plug-in2.svg + icons/plugins/power.svg + icons/plugins/task.svg + icons/plugins/trash.svg + translations/dcc-dock-plugin.ts + translations/dcc-dock-plugin_bo.ts + translations/dcc-dock-plugin_az.ts + translations/dcc-dock-plugin_cs.ts + translations/dcc-dock-plugin_fi.ts + translations/dcc-dock-plugin_hu.ts + translations/dcc-dock-plugin_nl.ts + translations/dcc-dock-plugin_pt.ts + translations/dcc-dock-plugin_sq.ts + translations/dcc-dock-plugin_ug.ts + translations/dcc-dock-plugin_uk.ts + translations/dcc-dock-plugin_zh_CN.ts + translations/dcc-dock-plugin_zh_HK.ts + translations/dcc-dock-plugin_zh_TW.ts + + diff --git a/plugins/dcc-dock-settings-plugin/settings_module.cpp b/plugins/dcc-dock-plugin/settings_module.cpp similarity index 96% rename from plugins/dcc-dock-settings-plugin/settings_module.cpp rename to plugins/dcc-dock-plugin/settings_module.cpp index fd2bf92dd..1be9f0950 100644 --- a/plugins/dcc-dock-settings-plugin/settings_module.cpp +++ b/plugins/dcc-dock-plugin/settings_module.cpp @@ -75,7 +75,7 @@ QIcon SettingsModule::icon() const QString SettingsModule::translationPath() const { - return QString(":/translations/dcc-dock-settings-plugin_%1.ts"); + return QString(":/translations/dcc-dock-plugin_%1.ts"); } QString SettingsModule::path() const diff --git a/plugins/dcc-dock-settings-plugin/settings_module.h b/plugins/dcc-dock-plugin/settings_module.h similarity index 100% rename from plugins/dcc-dock-settings-plugin/settings_module.h rename to plugins/dcc-dock-plugin/settings_module.h diff --git a/plugins/dcc-dock-settings-plugin/translate_generation.sh b/plugins/dcc-dock-plugin/translate_generation.sh similarity index 100% rename from plugins/dcc-dock-settings-plugin/translate_generation.sh rename to plugins/dcc-dock-plugin/translate_generation.sh diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_az.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_az.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_az.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_az.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_bo.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_bo.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_bo.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_bo.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_cs.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_cs.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_cs.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_cs.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_fi.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_fi.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_fi.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_fi.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_hu.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_hu.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_hu.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_hu.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_nl.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_nl.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_nl.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_nl.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_pt.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_pt.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_pt.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_pt.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_sq.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_sq.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_sq.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_sq.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_ug.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_ug.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_ug.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_ug.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_uk.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_uk.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_uk.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_uk.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_zh_CN.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_zh_CN.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_zh_CN.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_zh_CN.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_zh_HK.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_zh_HK.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_zh_HK.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_zh_HK.ts diff --git a/plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_zh_TW.ts b/plugins/dcc-dock-plugin/translations/dcc-dock-plugin_zh_TW.ts similarity index 100% rename from plugins/dcc-dock-settings-plugin/translations/dcc-dock-settings-plugin_zh_TW.ts rename to plugins/dcc-dock-plugin/translations/dcc-dock-plugin_zh_TW.ts diff --git a/plugins/dcc-dock-settings-plugin/.tx/config b/plugins/dcc-dock-settings-plugin/.tx/config deleted file mode 100644 index de8549f94..000000000 --- a/plugins/dcc-dock-settings-plugin/.tx/config +++ /dev/null @@ -1,10 +0,0 @@ -[main] -host = https://www.transifex.com -minimum_perc = 80 -mode = developer - -[deepin-desktop-environment.dcc-dock-settings-plugin] -file_filter = translations/dcc-dock-settings-plugin_.ts -source_file = translations/dcc-dock-settings-plugin.ts -source_lang = en -type = QT diff --git a/plugins/dcc-dock-settings-plugin/resources.qrc b/plugins/dcc-dock-settings-plugin/resources.qrc deleted file mode 100644 index fc261882f..000000000 --- a/plugins/dcc-dock-settings-plugin/resources.qrc +++ /dev/null @@ -1,30 +0,0 @@ - - - actions/icon_dock_32px.svg - - - icons/plugins/time.svg - icons/plugins/assistant.svg - icons/plugins/desktop.svg - icons/plugins/keyboard.svg - icons/plugins/notify.svg - icons/plugins/plug-in2.svg - icons/plugins/power.svg - icons/plugins/task.svg - icons/plugins/trash.svg - translations/dcc-dock-settings-plugin.ts - translations/dcc-dock-settings-plugin_bo.ts - translations/dcc-dock-settings-plugin_az.ts - translations/dcc-dock-settings-plugin_cs.ts - translations/dcc-dock-settings-plugin_fi.ts - translations/dcc-dock-settings-plugin_hu.ts - translations/dcc-dock-settings-plugin_nl.ts - translations/dcc-dock-settings-plugin_pt.ts - translations/dcc-dock-settings-plugin_sq.ts - translations/dcc-dock-settings-plugin_ug.ts - translations/dcc-dock-settings-plugin_uk.ts - translations/dcc-dock-settings-plugin_zh_CN.ts - translations/dcc-dock-settings-plugin_zh_HK.ts - translations/dcc-dock-settings-plugin_zh_TW.ts - - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1594cd777..45994a1c4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,13 +20,13 @@ file(GLOB_RECURSE PLUGIN_SRCS "../plugins/bluetooth/*.cpp" "../plugins/bluetooth/componments/*.h" "../plugins/bluetooth/componments/*.cpp" - "../plugins/dcc-dock-settings-plugin/*.h" - "../plugins/dcc-dock-settings-plugin/*.cpp" + "../plugins/dcc-dock-plugin/*.h" + "../plugins/dcc-dock-plugin/*.cpp" "../frame/util/horizontalseperator.h" "../frame/util/horizontalseperator.cpp") # 其包含的"interface/moduleinterface.h"文件中定义了ModuleInterface_iid，任务栏插件框架的interface文件中也有定义 -list(FILTER PLUGIN_SRCS EXCLUDE REGEX "../plugins/dcc-dock-settings-plugin/settings_module.*") +list(FILTER PLUGIN_SRCS EXCLUDE REGEX "../plugins/dcc-dock-plugin/settings_module.*") # 用于测试覆盖率的编译条件 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -lgcov") @@ -77,7 +77,7 @@ target_include_directories(${BIN_NAME} PUBLIC fakedbus ../plugins/bluetooth ../plugins/bluetooth/componments - ../plugins/dcc-dock-settings-plugin + ../plugins/dcc-dock-plugin ) # 链接库