diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt index 8798a95..69c4d5d 100644 --- a/misc/CMakeLists.txt +++ b/misc/CMakeLists.txt @@ -51,28 +51,12 @@ install(FILES ${DBUS_APPLICATION_MANAGER_SERVICE_FILE} install(FILES ${CMAKE_CURRENT_LIST_DIR}/dpkg/dpkg.cfg.d/am-update-hook DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dpkg/dpkg.cfg.d) -# configure and install dde-dock hooks set(HOOKS_DEST_DIR ${CMAKE_INSTALL_DATADIR}/deepin/dde-application-manager/hooks.d) -configure_file( - hooks.d/1-dockEnv.json.in - hooks.d/1-dockEnv.json - @ONLY -) configure_file( hooks.d/2-debFix.json.in hooks.d/2-debFix.json @ONLY ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/hooks.d/1-dockEnv.json - DESTINATION ${HOOKS_DEST_DIR}) - -install(FILES ${CMAKE_CURRENT_LIST_DIR}/hooks.d/dockEnv.sh - DESTINATION ${AM_LIBEXEC_DIR} - PERMISSIONS - OWNER_READ OWNER_EXECUTE OWNER_WRITE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE -) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/hooks.d/2-debFix.json DESTINATION ${HOOKS_DEST_DIR}) @@ -85,17 +69,6 @@ install(FILES ${CMAKE_CURRENT_LIST_DIR}/hooks.d/debFix.sh WORLD_READ WORLD_EXECUTE ) -# FIXME: move to other project -set(DCONFIG_FILES - ${CMAKE_CURRENT_LIST_DIR}/dsg/configs/dde-application-manager/com.deepin.dde.launcher.json - ${CMAKE_CURRENT_LIST_DIR}/dsg/configs/dde-application-manager/com.deepin.dde.dock.json - ${CMAKE_CURRENT_LIST_DIR}/dsg/configs/dde-application-manager/com.deepin.dde.appearance.json - ${CMAKE_CURRENT_LIST_DIR}/dsg/configs/dde-application-manager/com.deepin.dde.startdde.json - ${CMAKE_CURRENT_LIST_DIR}/dsg/configs/dde-application-manager/com.deepin.xsettings.json -) - -install(FILES ${DCONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/dsg/configs/dde-application-manager) - dtk_add_config_meta_files(APPID ${APPLICATION_SERVICEID} FILES ${CMAKE_CURRENT_LIST_DIR}/dsg/configs/dde-application-manager/org.deepin.dde.am.json ) diff --git a/misc/dsg/configs/dde-application-manager/README.md b/misc/dsg/configs/dde-application-manager/README.md index 2d8008a..8143b19 100644 --- a/misc/dsg/configs/dde-application-manager/README.md +++ b/misc/dsg/configs/dde-application-manager/README.md @@ -1,3 +1 @@ -# NOTICE!!! - -Adding these file for compatible with old AM, ***we MUST remove them to corresponding project in future.*** +# Dtk Configs diff --git a/misc/dsg/configs/dde-application-manager/com.deepin.dde.appearance.json b/misc/dsg/configs/dde-application-manager/com.deepin.dde.appearance.json deleted file mode 100644 index c6e9186..0000000 --- a/misc/dsg/configs/dde-application-manager/com.deepin.dde.appearance.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "magic": "dsg.config.meta", - "version": "1.0", - "contents": { - "Extra_Picture_Uris": { - "serial": 0, - "flags": [], - "name": "Extra_Picture_Uris", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Font_Standard": { - "value": "Noto Sans", - "serial": 0, - "flags": [], - "name": "Font_Standard", - "name[zh_CN]": "*****", - "description": "The standard font for desktop", - "permissions": "readwrite", - "visibility": "private" - }, - "Theme_Auto": { - "value": false, - "serial": 0, - "flags": [], - "name": "Theme_Auto", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Wallpaper_Slideshow": { - "value": "", - "serial": 0, - "flags": [], - "name": "Wallpaper_Slideshow", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Cursor_Theme": { - "value": "bloom", - "serial": 0, - "flags": [], - "name": "Cursor_Theme", - "name[zh_CN]": "*****", - "description": "Cursor theme name. Used only by Xservers that support the Xcursor extension.", - "permissions": "readwrite", - "visibility": "private" - }, - "Font_Size": { - "value": 10.5, - "serial": 0, - "flags": [], - "name": "Font_Size", - "name[zh_CN]": "*****", - "description": "The desktop font size", - "permissions": "readwrite", - "visibility": "private" - }, - "Wallpaper_Uris": { - "value": "", - "serial": 0, - "flags": [], - "name": "Wallpaper_Uris", - "name[zh_CN]": "*****", - "description": "wallpaper json string", - "permissions": "readwrite", - "visibility": "private" - }, - "Icon_Theme": { - "value": "bloom", - "serial": 0, - "flags": [], - "name": "Icon_Theme", - "name[zh_CN]": "*****", - "description": "Icon theme to use for the panel, nautilus etc.", - "permissions": "readwrite", - "visibility": "private" - }, - "Opacity": { - "value": 0.4, - "serial": 0, - "flags": [], - "name": "Opacity", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Font_Monospace": { - "value": "Noto Mono", - "serial": 0, - "flags": [], - "name": "Font_Monospace", - "name[zh_CN]": "*****", - "description": "The monospace font for desktop", - "permissions": "readwrite", - "visibility": "private" - }, - "Excluded_Icon_Themes": { - "value": ["hicolor", "gnome", "Adwaita"], - "serial": 0, - "flags": [], - "name": "Excluded_Icon_Themes", - "name[zh_CN]": "*****", - "description": "Icon theme black list.", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Theme": { - "value": "deepin", - "serial": 0, - "flags": [], - "name": "Gtk_Theme", - "name[zh_CN]": "*****", - "description": "Basename of the default theme used by gtk+.", - "permissions": "readwrite", - "visibility": "private" - }, - "Sound_Theme": { - "value": "deepin", - "serial": 0, - "flags": [], - "name": "Sound_Theme", - "name[zh_CN]": "*****", - "description": "Set the system sound theme", - "permissions": "readwrite", - "visibility": "private" - }, - "Background_Uris": { - "value": ["file:///usr/share/backgrounds/default_background.jpg"], - "serial": 0, - "flags": [], - "name": "Background_Uris", - "name[zh_CN]": "*****", - "description": "Note that the backend only supports local (file://) URIs.", - "permissions": "readwrite", - "visibility": "private" - } - } -} diff --git a/misc/dsg/configs/dde-application-manager/com.deepin.dde.dock.json b/misc/dsg/configs/dde-application-manager/com.deepin.dde.dock.json deleted file mode 100644 index 970177b..0000000 --- a/misc/dsg/configs/dde-application-manager/com.deepin.dde.dock.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "magic": "dsg.config.meta", - "version": "1.0", - "contents": { - "Window_Size_Fashion": { - "value": 48, - "serial": 0, - "flags": [], - "name": "Window_Size_Fashion", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Icon_Size": { - "value": 36, - "serial": 0, - "flags": [], - "name": "Icon_Size", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Position": { - "value": "bottom", - "serial": 0, - "flags": [], - "name": "Position", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Wireless_Scan_Interval": { - "value": 5, - "serial": 0, - "flags": [], - "name": "Wireless_Scan_Interval", - "name[zh_CN]": "*****", - "description": "wireless scan interval", - "permissions": "readwrite", - "visibility": "private" - }, - "Hide_Timeout": { - "value": 0, - "serial": 0, - "flags": [], - "name": "Hide_Timeout", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Hide_Mode": { - "value": "keep-showing", - "serial": 0, - "flags": [], - "name": "Hide_Mode", - "name[zh_CN]": "*****", - "description": "The value will influence when the dock is shown or hidden.", - "permissions": "readwrite", - "visibility": "private" - }, - "Show_Timeout": { - "value": 100, - "serial": 0, - "flags": [], - "name": "Show_Timeout", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Window_Size_Efficient": { - "value": 40, - "serial": 0, - "flags": [], - "name": "Window_Size_Efficient", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Plugin_Settings": { - "value": "{}", - "serial": 0, - "flags": [], - "name": "Plugin_Settings", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Docked_Apps": { - "value": ["/usr/share/applications/dde-file-manager", "/usr/share/applications/uos-browser", "/usr/share/applications/org.deepin.browser", "/usr/share/applications/deepin-appstore", "/usr/share/applications/deepin-app-store", "/usr/share/applications/com.deepin.store.intranet", "/usr/share/applications/deepin-album", "/usr/share/applications/deepin-music", "/usr/share/applications/deepin-contacts", "/usr/share/applications/dde-calendar", "/usr/share/applications/dde-control-center"], - "serial": 0, - "flags": [], - "name": "Docked_Apps", - "name[zh_CN]": "*****", - "description": "The default apps which is docked when dock is started.", - "permissions": "readwrite", - "visibility": "private" - }, - "Win_Icon_Preferred_Apps": { - "value": ["apps.com.qq.im", "deepin.com.qq.im", "apps.com.qq.im.light", "apps.com.qq.b.eim", "apps.com.qq.rtxclient"], - "serial": 0, - "flags": [], - "name": "Win_Icon_Preferred_Apps", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Delay_Plugins_Time": { - "value": 0, - "serial": 0, - "flags": [], - "name": "Delay_Plugins_Time", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Force_Quit_App": { - "value": "enabled", - "serial": 0, - "flags": [], - "name": "Force_Quit_App", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Display_Mode": { - "value": "", - "serial": 0, - "flags": [], - "name": "Display_Mode", - "name[zh_CN]": "*****", - "description": "The dock gets different display mode, for instance, dock looks like win7 taskbar on classic mode.", - "permissions": "readwrite", - "visibility": "private" - }, - "Recent_App": { - "value": [], - "serial": 0, - "flags": [], - "name": "Recent_App", - "name[zh_CN]": "*****", - "description": "The apps which has been opened recently when dock is started", - "permissions": "readwrite", - "visibility": "private" - }, - "Show_Recent": { - "value": false, - "serial": 0, - "flags": [], - "name": "Show_Recent", - "name[zh_CN]": "*****", - "description": "show or hide recent app in dock", - "permissions": "readwrite", - "visibility": "private" - }, - "Show_MultiWindow": { - "value": false, - "serial": 0, - "flags": [], - "name": "Show_MultiWindow", - "name[zh_CN]": "*****", - "description": "show or hide Multi Window in dock when the Entry has subWindow", - "permissions": "readwrite", - "visibility": "private" - } - } -} diff --git a/misc/dsg/configs/dde-application-manager/com.deepin.dde.launcher.json b/misc/dsg/configs/dde-application-manager/com.deepin.dde.launcher.json deleted file mode 100644 index b853c96..0000000 --- a/misc/dsg/configs/dde-application-manager/com.deepin.dde.launcher.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "magic": "dsg.config.meta", - "version": "1.0", - "contents": { - "Apps_Disable_AutoStart": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Disable_AutoStart", - "name[zh_CN]": "*****", - "description": "apps not allowed to start up", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Order_Zh_Cn": { - "value": ["uos-browser", "org.deepin.browser", "dde-file-manager", "deepin-app-store", "deepin-appstore", "deepin-music", "deepin-movie", "deepin-screen-recorder", "deepin-image-viewer", "deepin-album", "deepin-draw", "deepin-reader", "deepin-editor", "deepin-mail", "thunderbird", "deepin-terminal", "terminal", "org.gnome.Terminal", "deepin-contacts", "deepin-voice-note", "downloader", "deepin-manual", "org.deepin.scanner", "org.deepin.scaner", "dde-computer", "dde-trash", "deepin-defender", "dde-control-center", "chineseime-setting", "fcitx-config-gtk3", "chineseime-setting-wizard", "deepin-system-monitor", "deepin-boot-maker", "deepin-devicemanager", "deepin-log-viewer", "dde-printer", "dde-calendar", "deepin-calculator", "deepin-font-manager", "deepin-compressor", "deepin-deb-installer", "deepin-diskmanager", "dde-introduction", "uos-service-support", "uos-remote-assistance", "deepin-camera", "deepin-phone-master", "gparted", "org.gnome.Cheese", "Cheese", "gnome.Cheese"], - "serial": 0, - "flags": [], - "name": "Apps_Order_Zh_Cn", - "name[zh_CN]": "*****", - "description": "launcher apps order, ensure that all lowercase.", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Icon_Ratio": { - "value": 0.5, - "serial": 0, - "flags": [], - "name": "Apps_Icon_Ratio", - "name[zh_CN]": "*****", - "description": "(null)", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Disable_UseProxy": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Disable_UseProxy", - "name[zh_CN]": "*****", - "description": "apps disable use proxy menu", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Without_AutoStart": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Without_AutoStart", - "name[zh_CN]": "*****", - "description": "apps hide function start up", - "permissions": "readwrite", - "visibility": "private" - }, - "Fullscreen": { - "value": true, - "serial": 0, - "flags": [], - "name": "Fullscreen", - "name[zh_CN]": "*****", - "description": "(null)", - "permissions": "readwrite", - "visibility": "private" - }, - "Mini_Frame_Right_Bar_Hide_List": { - "value": [], - "serial": 0, - "flags": [], - "name": "Mini_Frame_Right_Bar_Hide_List", - "name[zh_CN]": "*****", - "description": "icons not allowed to show on mini frame right bar", - "permissions": "readwrite", - "visibility": "private" - }, - "Auto_Exit": { - "value": false, - "serial": 0, - "flags": [], - "name": "Auto_Exit", - "name[zh_CN]": "*****", - "description": "(null)", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Order_Zh_Tw": { - "value": ["uos-browser", "org.deepin.browser", "dde-file-manager", "deepin-app-store", "deepin-appstore", "deepin-music", "deepin-movie", "deepin-screen-recorder", "deepin-image-viewer", "deepin-album", "deepin-draw", "deepin-reader", "deepin-editor", "deepin-mail", "thunderbird", "deepin-terminal", "terminal", "org.gnome.Terminal", "deepin-contacts", "deepin-voice-note", "downloader", "deepin-manual", "org.deepin.scanner", "org.deepin.scaner", "dde-computer", "dde-trash", "deepin-defender", "dde-control-center", "chineseime-setting", "fcitx-config-gtk3", "chineseime-setting-wizard", "deepin-system-monitor", "deepin-boot-maker", "deepin-devicemanager", "deepin-log-viewer", "dde-printer", "dde-calendar", "deepin-calculator", "deepin-font-manager", "deepin-compressor", "deepin-deb-installer", "deepin-diskmanager", "dde-introduction", "uos-service-support", "uos-remote-assistance", "deepin-camera", "deepin-phone-master", "gparted", "org.gnome.Cheese", "Cheese", "gnome.Cheese"], - "serial": 0, - "flags": [], - "name": "Apps_Order_Zh_Tw", - "name[zh_CN]": "*****", - "description": "launcher apps order, ensure that all lowercase.", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Disable_SendDock": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Disable_SendDock", - "name[zh_CN]": "*****", - "description": "apps not allowed to send to Dock", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Disable_SendDesktop": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Disable_SendDesktop", - "name[zh_CN]": "*****", - "description": "apps not allowed to send to Desktop", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Without_SendDesktop": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Without_SendDesktop", - "name[zh_CN]": "*****", - "description": "apps hide function send to desktop", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Hold_List": { - "value": ["dde-introduction", "dde-file-manager", "deepin-appstore", "deepin-app-store", "deepin-terminal", "deepin-manual", "dde-computer", "dde-trash", "deepin-defender", "dde-control-center", "fcitx-config-gtk3", "fcitx-configtool", "deepin-system-monitor", "deepin-devicemanager", "dde-printer", "dde-calendar", "uos-service-support", "deepin-toggle-desktop", "deepin-wm-multitaskingview", "kwin-wm-multitaskingview", "com.deepin.store.intranet", "chineseime-setting"], - "serial": 0, - "flags": [], - "name": "Apps_Hold_List", - "name[zh_CN]": "*****", - "description": "apps not allowed to uninstall", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Without_Open": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Without_Open", - "name[zh_CN]": "*****", - "description": "apps hide function open", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Disable_Open": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Disable_Open", - "name[zh_CN]": "*****", - "description": "apps not allowed to open", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Use_Proxy": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Use_Proxy", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Search_Package_Name": { - "value": false, - "serial": 0, - "flags": [], - "name": "Search_Package_Name", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Order": { - "value": ["uos-browser", "org.deepin.browser", "dde-file-manager", "deepin-app-store", "deepin-appstore", "deepin-music", "deepin-movie", "deepin-screen-recorder", "deepin-image-viewer", "deepin-album", "deepin-draw", "deepin-reader", "deepin-editor", "deepin-mail", "thunderbird", "deepin-terminal", "terminal", "org.gnome.Terminal", "deepin-contacts", "deepin-voice-note", "downloader", "deepin-manual", "org.deepin.scanner", "org.deepin.scaner", "dde-computer", "dde-trash", "deepin-defender", "dde-control-center", "chineseime-setting", "fcitx-config-gtk3", "chineseime-setting-wizard", "deepin-system-monitor", "deepin-boot-maker", "deepin-devicemanager", "deepin-log-viewer", "dde-printer", "dde-calendar", "deepin-calculator", "deepin-font-manager", "deepin-compressor", "deepin-deb-installer", "deepin-diskmanager", "dde-introduction", "uos-service-support", "uos-remote-assistance", "deepin-camera", "deepin-phone-master", "gparted", "org.gnome.Cheese", "Cheese", "gnome.Cheese"], - "serial": 0, - "flags": [], - "name": "Apps_Order", - "name[zh_CN]": "*****", - "description": "launcher apps order, ensure that all lowercase.", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Without_UseProxy": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Without_UseProxy", - "name[zh_CN]": "*****", - "description": "apps hide use proxy menu", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Disable_Scaling": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Disable_Scaling", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Hidden": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Hidden", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Without_SendDock": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Without_SendDock", - "name[zh_CN]": "*****", - "description": "apps hide function send to dock", - "permissions": "readwrite", - "visibility": "private" - }, - "Apps_Without_Uninstall": { - "value": [], - "serial": 0, - "flags": [], - "name": "Apps_Without_Uninstall", - "name[zh_CN]": "*****", - "description": "apps hide function uninstall", - "permissions": "readwrite", - "visibility": "private" - }, - "Display_Mode": { - "value": "free", - "serial": 0, - "flags": [], - "name": "Display_Mode", - "name[zh_CN]": "*****", - "description": "Launcher display mode.", - "permissions": "readwrite", - "visibility": "private" - } - } -} diff --git a/misc/dsg/configs/dde-application-manager/com.deepin.dde.startdde.json b/misc/dsg/configs/dde-application-manager/com.deepin.dde.startdde.json deleted file mode 100644 index 11db86b..0000000 --- a/misc/dsg/configs/dde-application-manager/com.deepin.dde.startdde.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "magic": "dsg.config.meta", - "version": "1.0", - "contents": { - "Wm_Cmd": { - "value": "", - "serial": 0, - "flags": [], - "name": "Wm_Cmd", - "name[zh_CN]": "*****", - "description": "This key will special window manager at startdde startup. If empty, using deepin-wm.", - "permissions": "readwrite", - "visibility": "private" - }, - "Quick_Black_Screen": { - "value": true, - "serial": 0, - "flags": [], - "name": "Quick_Black_Screen", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Swap_Sched_Enabled": { - "value": true, - "serial": 0, - "flags": [], - "name": "Swap_Sched_Enabled", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Launch_Welcome": { - "value": true, - "serial": 0, - "flags": [], - "name": "Launch_Welcome", - "name[zh_CN]": "*****", - "description": "This key will indicate whether showing dde-welcome.", - "permissions": "readwrite", - "visibility": "private" - }, - "Autostart_Delay": { - "value": 0, - "serial": 0, - "flags": [], - "name": "Autostart_Delay", - "name[zh_CN]": "*****", - "description": "The delay seconds for autostart", - "permissions": "readwrite", - "visibility": "private" - }, - "Turbo_Invoker_Enabled": { - "value": false, - "serial": 0, - "flags": [], - "name": "Turbo_Invoker_Enabled", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Login_Reminder": { - "value": false, - "serial": 0, - "flags": [], - "name": "Login_Reminder", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Iowait_Enabled": { - "value": false, - "serial": 0, - "flags": [], - "name": "Iowait_Enabled", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Memchecker_Enabled": { - "value": false, - "serial": 0, - "flags": [], - "name": "Memchecker_Enabled", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - } - } -} diff --git a/misc/dsg/configs/dde-application-manager/com.deepin.xsettings.json b/misc/dsg/configs/dde-application-manager/com.deepin.xsettings.json deleted file mode 100644 index ee4104a..0000000 --- a/misc/dsg/configs/dde-application-manager/com.deepin.xsettings.json +++ /dev/null @@ -1,337 +0,0 @@ -{ - "magic": "dsg.config.meta", - "version": "1.0", - "contents": { - "Qt_Active_Color": { - "value": "0,33153,65535,65535", - "serial": 0, - "flags": [], - "name": "Qt_Active_Color", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Xft_Antialias": { - "value": true, - "serial": 0, - "flags": [], - "name": "Xft_Antialias", - "name[zh_CN]": "*****", - "description": "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default.", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Cursor_Theme_Name": { - "value": "bloom", - "serial": 0, - "flags": [], - "name": "Gtk_Cursor_Theme_Name", - "name[zh_CN]": "*****", - "description": "Cursor theme name. Used only by Xservers that support the Xcursor extension.", - "permissions": "readwrite", - "visibility": "private" - }, - "Dtk_Window_Radius": { - "value": 18, - "serial": 0, - "flags": [], - "name": "Dtk_Window_Radius", - "name[zh_CN]": "*****", - "description": "The window radius last time", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Cursor_Blink_Timeout": { - "value": 10, - "serial": 0, - "flags": [], - "name": "Gtk_Cursor_Blink_Timeout", - "name[zh_CN]": "*****", - "description": "Time after which the cursor stops blinking, in seconds.", - "permissions": "readwrite", - "visibility": "private" - }, - "Scale_Factor": { - "value": 1.0, - "serial": 0, - "flags": [], - "name": "Scale_Factor", - "name[zh_CN]": "*****", - "description": "Text scale for Gdk.", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Key_Theme_Name": { - "value": "default", - "serial": 0, - "flags": [], - "name": "Gtk_Key_Theme_Name", - "name[zh_CN]": "*****", - "description": "Basename of the default keybinding theme used by gtk+.", - "permissions": "readwrite", - "visibility": "private" - }, - "Cursor_Blink_Time": { - "value": 1200, - "serial": 0, - "flags": [], - "name": "Cursor_Blink_Time", - "name[zh_CN]": "*****", - "description": "Length of the cursor blink cycle, in milliseconds.", - "permissions": "readwrite", - "visibility": "private" - }, - "Enable_Event_Sounds": { - "value": true, - "serial": 0, - "flags": [], - "name": "Enable_Event_Sounds", - "name[zh_CN]": "*****", - "description": "Whether to play any event sounds at all.", - "permissions": "readwrite", - "visibility": "private" - }, - "Qt_Font_Name": { - "value": "", - "serial": 0, - "flags": [], - "name": "Qt_Font_Name", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Theme_Name": { - "value": "deepin", - "serial": 0, - "flags": [], - "name": "Gtk_Theme_Name", - "name[zh_CN]": "*****", - "description": "Basename of the default theme used by gtk+.", - "permissions": "readwrite", - "visibility": "private" - }, - "Double_Click_Time": { - "value": 250, - "serial": 0, - "flags": [], - "name": "Double_Click_Time", - "name[zh_CN]": "*****", - "description": "Maximum time allowed between two clicks for them to be considered a double click (in milliseconds).", - "permissions": "readwrite", - "visibility": "private" - }, - "Icon_Theme_Name": { - "value": "deepin", - "serial": 0, - "flags": [], - "name": "Icon_Theme_Name", - "name[zh_CN]": "*****", - "description": "Icon theme to use for the panel, nautilus etc.", - "permissions": "readwrite", - "visibility": "private" - }, - "Primary_Monitor_Name": { - "value": "eDP-1", - "serial": 0, - "flags": [], - "name": "Primary_Monitor_Name", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Dnd_Drag_Threshold": { - "value": 8, - "serial": 0, - "flags": [], - "name": "Dnd_Drag_Threshold", - "name[zh_CN]": "*****", - "description": "A palette of named colors for use in themes.", - "permissions": "readwrite", - "visibility": "private" - }, - "Sound_Theme_Name": { - "value": "deepin", - "serial": 0, - "flags": [], - "name": "Sound_Theme_Name", - "name[zh_CN]": "*****", - "description": "Set the system sound theme", - "permissions": "readwrite", - "visibility": "private" - }, - "Double_Click_Distance": { - "value": 5, - "serial": 0, - "flags": [], - "name": "Double_Click_Distance", - "name[zh_CN]": "*****", - "description": "Maximum distance allowed between two clicks for them to be considered a double click (in pixels).", - "permissions": "readwrite", - "visibility": "private" - }, - "Xft_Hinting": { - "value": true, - "serial": 0, - "flags": [], - "name": "Xft_Hinting", - "name[zh_CN]": "*****", - "description": "Whether to hint Xft fonts; 0=no, 1=yes, -1=default.", - "permissions": "readwrite", - "visibility": "private" - }, - "Theme_Name": { - "value": "deepin", - "serial": 0, - "flags": [], - "name": "Theme_Name", - "name[zh_CN]": "*****", - "description": "Theme to use for gtk+ and qt.", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Cursor_Theme_Size": { - "value": 24, - "serial": 0, - "flags": [], - "name": "Gtk_Cursor_Theme_Size", - "name[zh_CN]": "*****", - "description": "Timeout in milliseconds before a click starts repeating (onspinner buttons for example).", - "permissions": "readwrite", - "visibility": "private" - }, - "Icon_Theme_Fallback": { - "value": "default", - "serial": 0, - "flags": [], - "name": "Icon_Theme_Fallback", - "name[zh_CN]": "*****", - "description": "Name of a icon theme to fall back to.", - "permissions": "readwrite", - "visibility": "private" - }, - "Xft_Rgba": { - "value": "rgb", - "serial": 0, - "flags": [], - "name": "Xft_Rgba", - "name[zh_CN]": "*****", - "description": "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr.", - "permissions": "readwrite", - "visibility": "private" - }, - "Window_Scale": { - "value": 1, - "serial": 0, - "flags": [], - "name": "Window_Scale", - "name[zh_CN]": "*****", - "description": "Window scale for Gdk.", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Recent_Files_Enabled": { - "value": true, - "serial": 0, - "flags": [], - "name": "Gtk_Recent_Files_Enabled", - "name[zh_CN]": "*****", - "description": "Whether GTK+ should keep track of items inside the recently used resources list.", - "permissions": "readwrite", - "visibility": "private" - }, - "Qt_Mono_Font_Name": { - "value": "", - "serial": 0, - "flags": [], - "name": "Qt_Mono_Font_Name", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Cursor_Blink": { - "value": true, - "serial": 0, - "flags": [], - "name": "Cursor_Blink", - "name[zh_CN]": "*****", - "description": "Whether the cursor should blink.", - "permissions": "readwrite", - "visibility": "private" - }, - "Individual_Scaling": { - "value": "", - "serial": 0, - "flags": [], - "name": "Individual_Scaling", - "name[zh_CN]": "*****", - "description": "Semicolon-separated list of name=value pairs, as used in QT_SCREEN_SCALE_FACTORS.", - "permissions": "readwrite", - "visibility": "private" - }, - "Xft_Dpi": { - "value": -1, - "serial": 0, - "flags": [], - "name": "Xft_Dpi", - "name[zh_CN]": "*****", - "description": "Resolution for Xft, in 1024 * dots/inch. -1 to use default value. Do not modify it manually.", - "permissions": "readwrite", - "visibility": "private" - }, - "Enable_Input_Feedback_Sounds": { - "value": true, - "serial": 0, - "flags": [], - "name": "Enable_Input_Feedback_Sounds", - "name[zh_CN]": "*****", - "description": "Whether to play event sounds as feedback to user input.", - "permissions": "readwrite", - "visibility": "private" - }, - "Xft_Hintstyle": { - "value": "hintfull", - "serial": 0, - "flags": [], - "name": "Xft_Hintstyle", - "name[zh_CN]": "*****", - "description": "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull.", - "permissions": "readwrite", - "visibility": "private" - }, - "Qt_Font_Point_Size": { - "value": 10.5, - "serial": 0, - "flags": [], - "name": "Qt_Font_Point_Size", - "name[zh_CN]": "*****", - "description": "", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Recent_Files_Max_Age": { - "value": 30, - "serial": 0, - "flags": [], - "name": "Gtk_Recent_Files_Max_Age", - "name[zh_CN]": "*****", - "description": "The maximum age, in days, of the items inside the recently used resources list. Items older than this setting will be excised from the list. If set to 0, the list will always be empty; if set to -1, no item will be removed.", - "permissions": "readwrite", - "visibility": "private" - }, - "Gtk_Font_Name": { - "value": "sans-serif 10.5", - "serial": 0, - "flags": [], - "name": "Gtk_Font_Name", - "name[zh_CN]": "*****", - "description": "Name of the default font used by gtk+.", - "permissions": "readwrite", - "visibility": "private" - } - } -} - diff --git a/misc/hooks.d/1-dockEnv.json.in b/misc/hooks.d/1-dockEnv.json.in deleted file mode 100644 index 05b7c39..0000000 --- a/misc/hooks.d/1-dockEnv.json.in +++ /dev/null @@ -1,5 +0,0 @@ - -{ - "Exec": "@CMAKE_INSTALL_PREFIX@/@AM_LIBEXEC_DIR@/dockEnv.sh", - "Args":[] -} diff --git a/misc/hooks.d/dockEnv.sh b/misc/hooks.d/dockEnv.sh deleted file mode 100644 index 0ef5331..0000000 --- a/misc/hooks.d/dockEnv.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd. -# -# SPDX-License-Identifier: LGPL-3.0-or-later - -# This hook is required by dde-dock that detect identity of Application. -# May be remove on later. - -export GIO_LAUNCHED_DESKTOP_FILE_PID=$$ -exec "$@" diff --git a/src/dbus/applicationservice.cpp b/src/dbus/applicationservice.cpp index 6f0c9b3..0f2af33 100644 --- a/src/dbus/applicationservice.cpp +++ b/src/dbus/applicationservice.cpp @@ -43,8 +43,6 @@ void ApplicationService::appendExtraEnvironments(QVariantMap &runtimeOptions) co envs.append(it->value()); } - // NOTE: dde-dock need this environment variable for now, maybe we could remove it after we finish refactoring dde-shell. - envs.append(QString{"GIO_LAUNCHED_DESKTOP_FILE=%1"}.arg(m_desktopSource.sourcePath())); // it's useful for App to get itself AppId. envs.append(QString{"DSG_APP_ID=%1"}.arg(id()));