diff --git a/debian/dde-shell-example.install b/debian/dde-shell-example.install index 9346f1961..c1d52c1e0 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.dde.shell/ +usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.example.json diff --git a/debian/dde-shell.install b/debian/dde-shell.install index 9e4b3d3f3..94c505bed 100644 --- a/debian/dde-shell.install +++ b/debian/dde-shell.install @@ -13,6 +13,9 @@ 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/dsg/configs/org.deepin.dde.shell/org.deepin.dde.shell.json +usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.tray.json +usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.json +usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.taskmanager.json usr/share/dde-shell/*/translations usr/share/dde-dock/icons/dcc-setting/*.svg diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt index dec080638..a1832b728 100644 --- a/panels/dock/CMakeLists.txt +++ b/panels/dock/CMakeLists.txt @@ -152,8 +152,6 @@ 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) # 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/dconfig/org.deepin.ds.dock.power.json b/panels/dock/dconfig/org.deepin.ds.dock.power.json deleted file mode 100644 index 1e4cde87d..000000000 --- a/panels/dock/dconfig/org.deepin.ds.dock.power.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "magic": "dsg.config.meta", - "version": "1.0", - "contents": { - "control": { - "value": false, - "serial": 0, - "flags": [], - "name": "contorl", - "name[zh_CN]": "控制", - "description": "阻止鼠标事件", - "permissions": "readwrite", - "visibility": "private" - }, - "enable": { - "value": true, - "serial": 0, - "flags": [], - "name": "enable", - "name[zh_CN]": "使能", - "description": "使能电源管理模块。", - "permissions": "readwrite", - "visibility": "private" - }, - "showtimetofull":{ - "value": true, - "serial": 0, - "flags": [], - "name": "showtimetofull", - "name[zh_CN]": "显示完整时间", - "description": "是否显示电池使用时间/剩余充电时间。", - "permissions": "readwrite", - "visibility": "public" - }, - "menu-enable":{ - "value": true, - "serial": 0, - "flags": [], - "name": "menu-enable", - "name[zh_CN]": "使能菜单", - "description": "使能菜单。", - "permissions": "readwrite", - "visibility": "private" - } - } -} \ No newline at end of file