diff --git a/Makefile b/Makefile index 6c38243..c056c00 100644 --- a/Makefile +++ b/Makefile @@ -53,9 +53,22 @@ install-local: mkdir -p $(DESTDIR)/usr/share/plymouth/themes ln -s ../../desktop-base/active-theme/plymouth $(DESTDIR)/usr/share/plymouth/themes/debian-theme - # Set Plasma 5/KDE default wallpaper - install -d $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates - $(INSTALL_DATA) defaults/plasma5/desktop-base.js $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/ + # Set Plasma 5 customizations + install -d $(DESTDIR)/etc/xdg/autostart + $(INSTALL_DATA) defaults/kde/etc/xdg/kcm-about-distrorc $(DESTDIR)/etc/xdg + $(INSTALL_DATA) defaults/kde/etc/xdg/kickoffrc $(DESTDIR)/etc/xdg + $(INSTALL_DATA) $(wildcard defaults/kde/etc/xdg/autostart/*) $(DESTDIR)/etc/xdg/autostart/ + install -d $(DESTDIR)/etc/xdg/plasma-workspace/env + $(INSTALL_DATA) $(wildcard defaults/kde/etc/xdg/plasma-workspace/env/*) $(DESTDIR)/etc/xdg/plasma-workspace/env/ + install -d $(DESTDIR)/usr/share/desktop-base/kf5-settings + $(INSTALL_DATA) $(wildcard defaults/kde/kf5-settings/*) $(DESTDIR)/usr/share/desktop-base/kf5-settings/ + install -d $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop/contents + $(INSTALL_DATA) defaults/kde/plasma/look-and-feel/org.debian.desktop/metadata.json $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop + $(INSTALL_DATA) defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/defaults $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop/contents + install -d $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop/contents/layouts + $(INSTALL_DATA) $(wildcard defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/layouts/*) $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop/contents/layouts/ + install -d $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop/contents/previews + $(INSTALL_DATA) $(wildcard defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/*) $(DESTDIR)/usr/share/plasma/look-and-feel/org.debian.desktop/contents/previews/ # Xfce 4.6 mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml diff --git a/debian/changelog b/debian/changelog index 2f8ce3a..3de6cc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ desktop-base (12.0.3) UNRELEASED; urgency=medium * Update plymouth theme to implement Juliette’s proposal. + * Fix and improve Plasma desktop customization. (Closes: #954093) -- Aurélien COUDERC Fri, 10 Feb 2023 23:38:10 +0100 diff --git a/defaults/kde/etc/xdg/autostart/xdg-user-dirs-kde.desktop b/defaults/kde/etc/xdg/autostart/xdg-user-dirs-kde.desktop new file mode 100644 index 0000000..41c26cf --- /dev/null +++ b/defaults/kde/etc/xdg/autostart/xdg-user-dirs-kde.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=User folders update +TryExec=xdg-user-dirs-update +Exec=xdg-user-dirs-update +StartupNotify=false +NoDisplay=true + +X-KDE-autostart-phase=1 diff --git a/defaults/kde/etc/xdg/kcm-about-distrorc b/defaults/kde/etc/xdg/kcm-about-distrorc new file mode 100644 index 0000000..b1547cf --- /dev/null +++ b/defaults/kde/etc/xdg/kcm-about-distrorc @@ -0,0 +1,3 @@ +[General] +LogoPath=emblem-debian +Version=12 diff --git a/defaults/kde/etc/xdg/kickoffrc b/defaults/kde/etc/xdg/kickoffrc new file mode 100644 index 0000000..03ed62b --- /dev/null +++ b/defaults/kde/etc/xdg/kickoffrc @@ -0,0 +1,2 @@ +[Branding] +Homepage=https://www.debian.org/ diff --git a/defaults/kde/etc/xdg/plasma-workspace/env/env.sh b/defaults/kde/etc/xdg/plasma-workspace/env/env.sh new file mode 100644 index 0000000..3aacc07 --- /dev/null +++ b/defaults/kde/etc/xdg/plasma-workspace/env/env.sh @@ -0,0 +1,7 @@ +## from http://standards.freedesktop.org/menu-spec/latest/ + +# XDG_CONFIG_DIRS +if [ -z "${XDG_CONFIG_DIRS}" ] ; then + XDG_CONFIG_DIRS=/etc/xdg:/usr/share/desktop-base/kf5-settings + export XDG_CONFIG_DIRS +fi diff --git a/defaults/kde/kf5-settings/baloofilerc b/defaults/kde/kf5-settings/baloofilerc new file mode 100644 index 0000000..694400b --- /dev/null +++ b/defaults/kde/kf5-settings/baloofilerc @@ -0,0 +1,2 @@ +[General] +only basic indexing=true diff --git a/defaults/kde/kf5-settings/kdeglobals b/defaults/kde/kf5-settings/kdeglobals new file mode 100644 index 0000000..269fea2 --- /dev/null +++ b/defaults/kde/kf5-settings/kdeglobals @@ -0,0 +1,8 @@ +[General] +XftAntialias=true +XftHintStyle=hintslight +XftSubPixel=rgb +BrowserApplication=firefox-esr.desktop + +[KDE] +LookAndFeelPackage=org.debian.desktop diff --git a/defaults/kde/kf5-settings/kscreenlockerrc b/defaults/kde/kf5-settings/kscreenlockerrc new file mode 100644 index 0000000..b3761c0 --- /dev/null +++ b/defaults/kde/kf5-settings/kscreenlockerrc @@ -0,0 +1,2 @@ +[Greeter] +WallpaperPlugin=org.kde.image diff --git a/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/defaults b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/defaults new file mode 100644 index 0000000..d6dce34 --- /dev/null +++ b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/defaults @@ -0,0 +1,29 @@ +[kdeglobals][KDE] +widgetStyle=Breeze + +[kdeglobals][General] +ColorScheme=BreezeLight + +[kdeglobals][Icons] +Theme=breeze + +[plasmarc][Theme] +name=breeze-dark + +[Wallpaper] +Image=DebianTheme + +[kcminputrc][Mouse] +cursorTheme=breeze_cursors + +[kwinrc][WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][org.kde.kdecoration2] +library=org.kde.breeze + +[KSplash] +Theme=org.kde.Breeze diff --git a/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/layouts/org.kde.plasma.desktop-layout.js new file mode 100644 index 0000000..09fdfac --- /dev/null +++ b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -0,0 +1,6 @@ +loadTemplate("org.kde.plasma.desktop.defaultPanel") + +var desktopsArray = desktopsForActivity(currentActivity()); +for( var j = 0; j < desktopsArray.length; j++) { + desktopsArray[j].wallpaperPlugin = 'org.kde.image'; +} diff --git a/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/fullscreenpreview.jpg b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/fullscreenpreview.jpg new file mode 100644 index 0000000..beaae70 Binary files /dev/null and b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/fullscreenpreview.jpg differ diff --git a/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/preview.png b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/preview.png new file mode 100644 index 0000000..09629c3 Binary files /dev/null and b/defaults/kde/plasma/look-and-feel/org.debian.desktop/contents/previews/preview.png differ diff --git a/defaults/kde/plasma/look-and-feel/org.debian.desktop/metadata.json b/defaults/kde/plasma/look-and-feel/org.debian.desktop/metadata.json new file mode 100644 index 0000000..1632771 --- /dev/null +++ b/defaults/kde/plasma/look-and-feel/org.debian.desktop/metadata.json @@ -0,0 +1,64 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "debian-qt-kde@lists.debian.org", + "Name": "Debian Qt/KDE Maintainers" + }, + { + "Email": "plasma-devel@kde.org", + "Name": "KDE Visual Design Group", + "Name[ar]": "مجموعة التصميم المرئي لكدي", + "Name[az]": "KDE Vizual Dizayn Qrupu", + "Name[be]": "Суполка візуальнага дызайну KDE", + "Name[bg]": "KDE Visual Design Group", + "Name[ca@valencia]": "Grup de disseny visual de KDE", + "Name[ca]": "Grup de disseny visual de KDE", + "Name[cs]": "Skupina vizuálního návrhu KDE", + "Name[da]": "KDE Visual Design Group", + "Name[de]": "KDE Visual Design Group", + "Name[en_GB]": "KDE Visual Design Group", + "Name[es]": "El grupo de diseño visual de KDE", + "Name[eu]": "KDE Diseinu bisualeko taldea", + "Name[fi]": "KDE:n visuaalinen suunnitteluryhmä", + "Name[fr]": "Groupe de conception visuelle de KDE", + "Name[hu]": "KDE Visual Design Group", + "Name[ia]": "KDE Visual Design Group (Gruppo de Designo Visual de KDE)", + "Name[id]": "Grup Desain Visual KDE", + "Name[is]": "Myndrænn hönnunarhópur KDE", + "Name[it]": "KDE Visual Design Group", + "Name[ja]": "KDE Visual Design Group", + "Name[ka]": "KDE-ის ვიზუალური დიზაინის ჯგუფი", + "Name[ko]": "KDE 시각 디자인 그룹", + "Name[lt]": "KDE vaizdinio dizaino grupė", + "Name[nl]": "KDE Visuele ontwerpgroep", + "Name[nn]": "KDE Visual Design Group", + "Name[pl]": "Grupa oprawy graficznej KDE", + "Name[pt]": "Grupo de Desenho Visual do KDE", + "Name[pt_BR]": "Grupo de Design Visual do KDE", + "Name[ro]": "KDE Visual Design Group", + "Name[ru]": "Группа KDE Visual Design", + "Name[sk]": "KDE Visual Design Group", + "Name[sl]": "Skupina vizualnega designa KDE", + "Name[sv]": "KDE:s visuella designgrupp", + "Name[ta]": "கே.டீ.யீ. வரைகலை வடிவமைப்புக் குழு", + "Name[tr]": "KDE Görsel Tasarım Grubu", + "Name[uk]": "Група з візуального дизайну KDE", + "Name[vi]": "Đội Thiết kế Trực quan KDE", + "Name[x-test]": "xxKDE Visual Design Groupxx", + "Name[zh_CN]": "KDE 视觉设计团队" + } + ], + "Category": "", + "Description": "Breeze Twilight adapted to Debian", + "Id": "org.debian.desktop", + "License": "GPLv2+", + "Name": "Debian Breeze", + "ServiceTypes": [ + "Plasma/LookAndFeel" + ], + "Version": "2.0", + "Website": "https://www.kde.org" + }, + "X-Plasma-MainScript": "defaults" +} diff --git a/defaults/plasma5/desktop-base.js b/defaults/plasma5/desktop-base.js deleted file mode 100644 index 56d2b5a..0000000 --- a/defaults/plasma5/desktop-base.js +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2016 Aurélien COUDERC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -// This script is provided by desktop-base -// It is run by Plasma 5 on upgrade. -// Plasma checks that the script is only run once for each version. -d = desktops() - -for (i in d) { - // Only set up the wallpaper if the plugin is the default. - // Otherwise it means the user chose another plugin and we don’t want to override that. - if (d[i].wallpaperPlugin == 'org.kde.image') { - d[i].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General') - if (!d[i].readConfig('Image')) { - // Only set up the wallpaper if the wallpaper image is empty (=default). - // Otherwise it means the user selected a picture and we don’t want to override that. - d[i].writeConfig('Image', 'DebianTheme'); - } - } -} -