From fae08ec1ecebe7e756617c0b87da341ccd3e3a81 Mon Sep 17 00:00:00 2001 From: Vincent Bermel Date: Tue, 10 Nov 2020 11:17:43 +0100 Subject: [PATCH 1/6] Xfce symlinks. Fixes #5623 --- data.json | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/data.json b/data.json index 89ec503115..9fd48b638e 100644 --- a/data.json +++ b/data.json @@ -318,6 +318,7 @@ "gnome-dictionary", "kthesaurus", "org.gnome.Dictionary", + "org.xfce.Dictionary", "verbiste", "xfce4-dict" ] @@ -409,6 +410,7 @@ "org.deepin.flatdeb.deepin-screenshot", "org.gnome.Screenshot", "org.kde.spectacle", + "org.xfce.screenshooter", "screengrab", "screenie", "screenie-qt", @@ -2613,6 +2615,8 @@ "media-cdrom", "nautilus-cd-burner", "org.kde.k3b", + "org.xfce.xfburn", + "stock_xfburn", "xfburn" ] } @@ -5170,6 +5174,7 @@ "linux": { "root": "desktop-environment-xfce", "symlinks": [ + "org.xfce.xfdesktop", "xfce-mouse", "xfce4-logo", "xfce4-panel-menu", @@ -9063,6 +9068,7 @@ "cs-power", "mate-power-manager", "org.gnome.BatteryBench", + "org.xfce.powermanager", "preferences-system-power", "unity-power-panel", "xfce4-power-manager-settings", @@ -9219,7 +9225,8 @@ "symlinks": [ "com.github.stsdc.monitor", "deepin-system-monitor", - "org.gnome.Usage" + "org.gnome.Usage", + "org.xfce.taskmanager" ] } }, @@ -9242,6 +9249,7 @@ "metacity", "obconf", "obconf-qt", + "org.xfce.xfwm4", "preferences-system-windows", "preferences-system-windows-actions", "window-manager", @@ -13881,7 +13889,8 @@ "linux": { "root": "mintupload", "symlinks": [ - "mintUpload" + "mintUpload", + "org.xfce.Gigolo", ] } }, @@ -14271,7 +14280,9 @@ "linux": { "root": "multimedia-video-player", "symlinks": [ - "io.elementary.videos" + "io.elementary.videos", + "multimedia-player", + "org.xfce.xfmp" ] } }, @@ -16901,6 +16912,7 @@ "root": "preferences-desktop-screensaver", "symlinks": [ "kscreensaver", + "org.xfce.ScreenSaver" "screensaver", "xscreensaver" ] @@ -16981,6 +16993,7 @@ "io.elementary.switchboard", "kcontrol", "org.gnome.Settings", + "org.xfce.settings.manager", "paprefs", "preferences-desktop", "redhat-server_settings", @@ -18484,7 +18497,8 @@ "linux": { "root": "ristretto", "symlinks": [ - "glViewImage" + "glViewImage", + "org.xfce.ristretto" ] } }, @@ -20603,6 +20617,7 @@ "root": "system-search", "symlinks": [ "catfish", + "org.xfce.catfish", "tracker" ] } @@ -20916,6 +20931,7 @@ "openterm", "org.gnome.Terminal", "org.kde.konsole", + "org.xfce.terminal", "qterminal", "Terminal", "tilda", @@ -21063,6 +21079,7 @@ "org.kde.blogilo", "org.kde.kate", "org.kde.kwrite", + "org.xfce.mousepad", "oxygen", "scratch-text-editor", "textadept", @@ -21222,6 +21239,7 @@ "linux": { "root": "thunar", "symlinks": [ + "org.xfce.thunar", "Thunar", "thunar-filemanager" ] @@ -22075,7 +22093,10 @@ }, "usbview": { "linux": { - "root": "usbview" + "root": "usbview", + "symlinks": [ + "org.xfce.volman" + ] } }, "userinfo": { @@ -23729,7 +23750,10 @@ }, "wmtweaks": { "linux": { - "root": "wmtweaks" + "root": "wmtweaks", + "symlinks": [ + "org.xfce.xfwm4-tweaks" + ] } }, "wolf4sdl": { @@ -23808,6 +23832,7 @@ "symlinks": [ "cs-workspaces", "gnome-panel-workspace-switcher", + "org.xfce.workspaces", "workspace-switcher", "xfce4-workspaces" ] @@ -24041,12 +24066,18 @@ }, "xfce4-appfinder": { "linux": { - "root": "xfce4-appfinder" + "root": "xfce4-appfinder", + "symlinks": [ + "org.xfce.appfinder" + ] } }, "xfce4-panel": { "linux": { - "root": "xfce4-panel" + "root": "xfce4-panel", + "symlinks": [ + "org.xfce.panel" + ] } }, "xfce4-panel-restart": { @@ -24056,7 +24087,10 @@ }, "xfdashboard": { "linux": { - "root": "xfdashboard" + "root": "xfdashboard", + "symlinks": [ + "org.xfce.xfdashboard" + ] } }, "xhydra": { From 03e0867ec487962fde95a8874c1eddf33c2f35ef Mon Sep 17 00:00:00 2001 From: Vincent Bermel Date: Tue, 10 Nov 2020 11:43:33 +0100 Subject: [PATCH 2/6] Xfce settings symlinks --- data.json | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/data.json b/data.json index 9fd48b638e..ab51811314 100644 --- a/data.json +++ b/data.json @@ -7205,6 +7205,7 @@ "nautilus-actions", "nautilus-actions-config-tool", "org.gnome.Nautilus", + "org.xfce.filemanager", "redhat-filemanager", "system-file-manager", "user-file-manager", @@ -8268,7 +8269,8 @@ "symlinks": [ "io.elementary.mail", "org.gnome.Geary", - "org.yorba.geary" + "org.yorba.geary", + "org.xfce.mailreader" ] } }, @@ -11080,6 +11082,7 @@ "input_device_settings", "kmousetool", "mouse", + "org.xfce.settings.mouse", "preferences-desktop-mouse" ] } @@ -16797,6 +16800,7 @@ "org.gnome.ColorProfileViewer", "org.gnome.ColorViewer", "org.kde.kcolorchooser", + "org.xfce.settings.color", "preferences-desktop-color", "unity-color-panel" ] @@ -16804,12 +16808,18 @@ }, "preferences-desktop-accessibility": { "linux": { - "root": "preferences-desktop-accessibility" + "root": "preferences-desktop-accessibility", + "symlinks": [ + "org.xfce.settings.accessibility" + ] } }, "preferences-desktop-default-applications": { "linux": { - "root": "preferences-desktop-default-applications" + "root": "preferences-desktop-default-applications", + "symlinks": [ + "org.xfce.settings.default-applications" + ] } }, "preferences-desktop-display": { @@ -16825,6 +16835,7 @@ "gnome-display-properties", "gnome-dsiplay-properties", "mate-preferences-desktop-display", + "org.xfce.settings.display", "system-config-displayca", "unity-display-panel" ] @@ -16856,7 +16867,8 @@ "symlinks": [ "cs-keyboard", "eekboard", - "input-keyboard" + "input-keyboard", + "org.xfce.settings.keyboard" ] } }, @@ -16912,7 +16924,7 @@ "root": "preferences-desktop-screensaver", "symlinks": [ "kscreensaver", - "org.xfce.ScreenSaver" + "org.xfce.ScreenSaver", "screensaver", "xscreensaver" ] @@ -16972,7 +16984,10 @@ }, "preferences-plugin-script": { "linux": { - "root": "preferences-plugin-script" + "root": "preferences-plugin-script", + "symlinks": [ + "org.xfce.settings.editor" + ] } }, "preferences-system": { @@ -20932,6 +20947,7 @@ "org.gnome.Terminal", "org.kde.konsole", "org.xfce.terminal", + "org.xfce.terminalemulator", "qterminal", "Terminal", "tilda", @@ -21199,6 +21215,7 @@ "cs-themes", "gnome-settings-theme", "gtk-theme-config", + "org.xfce.settings.appearance", "preferences-desktop-theme", "preferences-theme", "style", @@ -22813,6 +22830,7 @@ "MultiBrowser", "org.gnome.Epiphany", "org.gnome.Epiphany.Devel", + "org.xfce.webbrowser", "preferences-web-browser-shortcuts", "redhat-web-browser", "rekonq", From f0de554166b77e932c47dc74e20e05f578890879 Mon Sep 17 00:00:00 2001 From: Vincent Bermel Date: Tue, 10 Nov 2020 12:21:35 +0100 Subject: [PATCH 3/6] comma fix --- data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.json b/data.json index ab51811314..67cce2d54a 100644 --- a/data.json +++ b/data.json @@ -13893,7 +13893,7 @@ "root": "mintupload", "symlinks": [ "mintUpload", - "org.xfce.Gigolo", + "org.xfce.Gigolo" ] } }, From b4da938cc6f5a740fe400a3642d87cf92d92e97e Mon Sep 17 00:00:00 2001 From: Vincent Bermel Date: Tue, 10 Nov 2020 13:03:41 +0100 Subject: [PATCH 4/6] fix order --- data.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data.json b/data.json index 67cce2d54a..a8d54c0656 100644 --- a/data.json +++ b/data.json @@ -8269,8 +8269,8 @@ "symlinks": [ "io.elementary.mail", "org.gnome.Geary", - "org.yorba.geary", - "org.xfce.mailreader" + "org.xfce.mailreader", + "org.yorba.geary" ] } }, From 7f95df37b347fb0082285c4068624846f4b6b69f Mon Sep 17 00:00:00 2001 From: Vincent Bermel Date: Sun, 20 Dec 2020 20:31:44 +0100 Subject: [PATCH 5/6] more symlinks --- data.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data.json b/data.json index a8d54c0656..28246d11e1 100644 --- a/data.json +++ b/data.json @@ -5174,6 +5174,8 @@ "linux": { "root": "desktop-environment-xfce", "symlinks": [ + "org.xfce.about", + "org.xfce.session", "org.xfce.xfdesktop", "xfce-mouse", "xfce4-logo", @@ -15859,7 +15861,8 @@ "gnome-panel", "gnome-panel-drawer", "gnome-panel-window-list", - "mate-panel" + "mate-panel", + "org.xfce.PanelProfiles" ] } }, @@ -16909,6 +16912,7 @@ "symlinks": [ "linconnect", "linconnect-server", + "org.xfce.notification", "preferences-desktop-notification-bell", "preferences-desktop-notifications" ] From ba84844de9653dacc2080def05bc5c2725d98f85 Mon Sep 17 00:00:00 2001 From: "Joshua H. Fogg" Date: Wed, 14 Apr 2021 05:06:32 +0100 Subject: [PATCH 6/6] Update data.json --- data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.json b/data.json index 0375c2d0e1..f405249220 100644 --- a/data.json +++ b/data.json @@ -21179,8 +21179,8 @@ "org.gnome.Terminal", "org.kde.konsole", "org.xfce.terminal", - "org.xfce.terminalemulator", "org.xfce.terminal-settings", + "org.xfce.terminalemulator", "qterminal", "Terminal", "tilda",