$ git diff --patch-with-stat --summary 0df5f4ac29b223761b8141461348dc0e2aa61da8..477460a47f17015b7513c439c6458e3a76a60340
distro-plasma-config.spec | 14 ++-
kdeglobals | 2 +-
kscreenlockerrc | 2 +-
metadata-globalMenu.desktop | 16 +++
org.kde.plasma.desktop-layout.js | 24 ++---
...nmandriva.plasma.desktop.defaultPanel-layout.js | 29 ++----
...ndriva.plasma.desktop.globalMenuPanel-layout.js | 110 +++++++++++++++++++++
7 files changed, 158 insertions(+), 39 deletions(-)
create mode 100644 metadata-globalMenu.desktop
create mode 100644 org.openmandriva.plasma.desktop.globalMenuPanel-layout.js
diff --git a/distro-plasma-config.spec b/distro-plasma-config.spec
index 8e74ba1..cc33601 100644
--- a/distro-plasma-config.spec
+++ b/distro-plasma-config.spec
@@ -1,7 +1,7 @@
Summary: Plasma desktop configuration
Name: distro-plasma-config
Version: 0.6
-Release: 14
+Release: 16
License: GPLv2+
Group: Graphical desktop/KDE
Url: %{disturl}
@@ -31,6 +31,9 @@ Source24: discoverabstractnotifier.notifyrc
Source25: plasma_workspace.notifyrc
Source26: kdeglobals.sh
Source27: powermanagementprofilesrc
+# Alternative config to make Crapple converts feel at home
+Source50: org.openmandriva.plasma.desktop.globalMenuPanel-layout.js
+Source51: metadata-globalMenu.desktop
# (tpg) disable debug in Qt5 apps
Source100: qtlogging.ini
@@ -101,6 +104,10 @@ install -m 0644 %{SOURCE27} %{buildroot}%{_kde5_sysconfdir}/xdg/powermanagementp
install -m 0644 %{SOURCE100} %{buildroot}%{_kde5_sysconfdir}/xdg/QtProject/qtlogging.ini
install -m 0644 %{SOURCE101} %{buildroot}%{_datadir}/konsole/OMV.profile
+mkdir -p %{buildroot}%{_kde5_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.globalMenuPanel/contents
+install -m 0644 %{S:50} %{buildroot}%{_kde5_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.globalMenuPanel/contents/layout.js
+install -m 0644 %{S:51} %{buildroot}%{_kde5_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.globalMenuPanel/metadata.desktop
+
%post
# dont set theme here as it forces it over whatever the user has in ~/.config/gtk-3.0/settings.ini
if grep -q "GTK_THEME=Breeze" %{_sysconfdir}/environment ; then
@@ -118,6 +125,7 @@ fi
%{_kde5_sysconfdir}/xdg/*
%{_datadir}/konsole/OMV.profile
%{_kde5_datadir}/kservices5/plasma-layout-template-org.openmandriva.plasma.desktop.defaultPanel.desktop
-%{_kde5_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel/metadata.desktop
-%{_kde5_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel/contents/layout.js
+%{_kde5_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel
%{_kde5_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layout.js
+
+%{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.globalMenuPanel
diff --git a/kdeglobals b/kdeglobals
index 1c2d080..b0a01ef 100644
--- a/kdeglobals
+++ b/kdeglobals
@@ -170,7 +170,7 @@ Theme=breeze
AutoSelectDelay=-1
ChangeCursor=true
DoubleClickInterval=400
-SingleClick=false
+SingleClick=true
StartDragDist=4
StartDragTime=500
WheelScrollLines=3
diff --git a/kscreenlockerrc b/kscreenlockerrc
index a11a23e..b1cc48f 100644
--- a/kscreenlockerrc
+++ b/kscreenlockerrc
@@ -1,5 +1,5 @@
[Daemon]
-Autolock=true
+Autolock=false
LockGrace=5
LockOnResume=true
Timeout=5
diff --git a/metadata-globalMenu.desktop b/metadata-globalMenu.desktop
new file mode 100644
index 0000000..fd0d165
--- /dev/null
+++ b/metadata-globalMenu.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=OpenMandriva Global Menu Panel
+Type=Service
+ServiceTypes=Plasma/LayoutTemplate
+X-Plasma-Shell=plasmashell
+X-Plasma-ContainmentCategories=panel
+X-KDE-PluginInfo-Author=Bernhard Rosenkränzer
+X-KDE-PluginInfo-Email=bero@lindev.ch
+X-KDE-PluginInfo-Name=org.openmandriva.plasma.desktop.globalMenuPanel
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=https://www.openmandriva.org
+X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPLv3
+X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/org.kde.plasma.desktop-layout.js b/org.kde.plasma.desktop-layout.js
index 58b50ee..92ac95e 100644
--- a/org.kde.plasma.desktop-layout.js
+++ b/org.kde.plasma.desktop-layout.js
@@ -7,18 +7,18 @@ loadTemplate("org.openmandriva.plasma.desktop.defaultPanel")
var desktopsArray = desktopsForActivity(currentActivity());
for( var j = 0; j < desktopsArray.length; j++) {
- desktopsArray[j].wallpaperPlugin = 'org.kde.image';
- desktopsArray[j].wallpaperMode = 'SingleImage';
- desktopsArray[j].currentConfigGroup = new Array("General")
- desktopsArray[j].writeConfig("pressToMove",true)
- desktopsArray[j].writeConfig("showToolbox",false)
- desktopsArray[j].writeConfig("toolTips", true)
- desktopsArray[j].writeConfig("selectionMarkers",false)
- desktopsArray[j].writeConfig("arrangement","1")
- desktopsArray[j].writeConfig("iconSize","4")
- desktopsArray[j].currentConfigGroup = new Array("Wallpaper", "org.kde.image", "General")
- desktopsArray[j].writeConfig("Image", "file:///usr/share/mdk/backgrounds/default.png")
- desktopsArray[j].writeConfig("FillMode","2")
+ desktopsArray[j].wallpaperPlugin = 'org.kde.image';
+ desktopsArray[j].wallpaperMode = 'SingleImage';
+ desktopsArray[j].currentConfigGroup = new Array("General")
+ desktopsArray[j].writeConfig("pressToMove",true)
+ desktopsArray[j].writeConfig("showToolbox",false)
+ desktopsArray[j].writeConfig("toolTips", true)
+ desktopsArray[j].writeConfig("selectionMarkers",false)
+ desktopsArray[j].writeConfig("arrangement","1")
+ desktopsArray[j].writeConfig("iconSize","4")
+ desktopsArray[j].currentConfigGroup = new Array("Wallpaper", "org.kde.image", "General")
+ desktopsArray[j].writeConfig("Image", "file:///usr/share/mdk/backgrounds/default.png")
+ desktopsArray[j].writeConfig("FillMode","2")
}
sleep(0.5)
diff --git a/org.openmandriva.plasma.desktop.defaultPanel-layout.js b/org.openmandriva.plasma.desktop.defaultPanel-layout.js
index 021ad91..2ee2681 100644
--- a/org.openmandriva.plasma.desktop.defaultPanel-layout.js
+++ b/org.openmandriva.plasma.desktop.defaultPanel-layout.js
@@ -1,29 +1,14 @@
// Default Plasma panel for OpenMandriva
// Author: Tomasz Paweł Gajc (tpgxyz@gmail.com) 2013, 2014, 2015, 2016
-// Licensed under GPL
+// Bernhard Rosenkränzer <bero@lindev.ch> 2020
+// Licensed under GPLv2+
print("Loading OpenMandriva Plasma panel configuration")
-// helper function for removing panels
-function remove()
-{
- for (i in panelIds) {
- panelById(panelIds[1]).remove()
- }
-}
-
// remove already existing old panels
function removeOldPanels()
{
- for (i in panelIds) {
- p = panelById(panelIds[i])
- if (typeof p === "undefined") {
- print("Error: Couldn't find first panel")
- remove()
- }
- else {
- panelById(panelIds[i]).remove()
- }
- }
+ while(panelIds.length)
+ panelById(panelIds[0]).remove()
}
// remove already existing other panels
@@ -32,8 +17,8 @@ removeOldPanels()
// start new panel
var panel = new Panel
if (panelIds.length == 1) {
-// we are the only panel, so set the location for the user
- panel.location = "bottom";
+ // we are the only panel, so set the location for the user
+ panel.location = "bottom";
}
// let's calculate desired panel height based on scren's DPI
@@ -115,7 +100,7 @@ var langIds = ["as", // Assamese
"zh_TW"] // Traditional Chinese
if (langIds.indexOf(languageId) != -1) {
- panel.addWidget("org.kde.plasma.kimpanel");
+ panel.addWidget("org.kde.plasma.kimpanel");
}
var systray = panel.addWidget("org.kde.plasma.systemtray")
diff --git a/org.openmandriva.plasma.desktop.globalMenuPanel-layout.js b/org.openmandriva.plasma.desktop.globalMenuPanel-layout.js
new file mode 100644
index 0000000..2ee4f5e
--- /dev/null
+++ b/org.openmandriva.plasma.desktop.globalMenuPanel-layout.js
@@ -0,0 +1,110 @@
+// Plasma panel for global menu configurations for OpenMandriva
+// Author: Bernhard Rosenkränzer <bero@lindev.ch>, (C) 2020
+// Licensed under GPLv3+
+// Partially based on default panel config
+
+print("Loading OpenMandriva Plasma panel configuration")
+
+// remove already existing old panels
+function removeOldPanels()
+{
+ while(panelIds.length)
+ panelById(panelIds[0]).remove()
+}
+
+// remove already existing other panels
+removeOldPanels()
+
+// start new panel
+var panel = new Panel
+panel.location = "top";
+// let's calculate desired panel height based on screen's DPI
+panel.height = gridUnit*1.5
+panel.alignment = "left"
+panel.hiding = "none"
+
+// by default kicker is used, options are kickoff and kickerdash
+var launcher = panel.addWidget("org.kde.plasma.kicker")
+launcher.currentConfigGroup = ["Shortcuts"]
+launcher.writeConfig("global", "Alt+F1")
+launcher.currentConfigGroup = ["General"]
+launcher.writeConfig("favorites", "preferred://browser,org.kde.kmail.desktop,org.kde.konversation.desktop,kcm_kdeconnect.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.kde.konsole.desktop,systemsettings.desktop")
+launcher.writeConfig("limitDepth", false)
+launcher.writeConfig("useExtraRunners", true)
+launcher.writeConfig("alignResultsToBottom", true)
+launcher.writeConfig("appNameFormat", "3")
+launcher.writeConfig("showRecentContacts", "true")
+launcher.writeConfig("showRecentApps", "true")
+launcher.writeConfig("showRecentDocs", "true")
+launcher.writeConfig("appNameFormat", "0")
+
+panel.addWidget("org.kde.plasma.appmenu")
+panel.addWidget("org.kde.plasma.panelspacer")
+
+/* Next up is determining whether to add the Input Method Panel
+ * widget to the panel or not. This is done based on whether
+ * the system locale's language id is a member of the following
+ * white list of languages which are known to pull in one of
+ * our supported IME backends when chosen during installation
+ * of common distributions. */
+
+var langIds = ["as", // Assamese
+ "bn", // Bengali
+ "bo", // Tibetan
+ "brx", // Bodo
+ "doi", // Dogri
+ "gu", // Gujarati
+ "hi", // Hindi
+ "ja", // Japanese
+ "kn", // Kannada
+ "ko", // Korean
+ "kok", // Konkani
+ "ks", // Kashmiri
+ "lep", // Lepcha
+ "mai", // Maithili
+ "ml", // Malayalam
+ "mni", // Manipuri
+ "mr", // Marathi
+ "ne", // Nepali
+ "or", // Odia
+ "pa", // Punjabi
+ "sa", // Sanskrit
+ "sat", // Santali
+ "sd", // Sindhi
+ "si", // Sinhala
+ "ta", // Tamil
+ "te", // Telugu
+ "th", // Thai
+ "ur", // Urdu
+ "vi", // Vietnamese
+ "zh_CN", // Simplified Chinese
+ "zh_TW"] // Traditional Chinese
+
+if (langIds.indexOf(languageId) != -1) {
+ panel.addWidget("org.kde.plasma.kimpanel");
+}
+
+var systray = panel.addWidget("org.kde.plasma.systemtray")
+systray.currentConfigGroup = ["General"]
+systray.writeConfig("communicationsShow", "true")
+systray.writeConfig("applicationStatusShown","true")
+systray.writeConfig("ShowCommunications","true")
+systray.writeConfig("systemServicesShown","true")
+systray.writeConfig("hardwareControlShown","true")
+systray.writeConfig("miscellaneousShown","true")
+systray.writeConfig("extraItems", "org.kde.plasma.devicenotifier,org.kde.plasma.notifications,org.kde.plasma.bluetooth,org.kde.plasma.battery,org.kde.plasma.volume,org.kde.plasma.networkmanagement,org.kde.muonnotifier,org.kde.plasma.clipboard")
+systray.writeConfig("hiddenItems", "hp-systray,python3.4m")
+systray.writeConfig("knownItems", "org.kde.plasma.notifications,org.kde.plasma.bluetooth,org.kde.plasma.clipboard,org.kde.plasma.battery,org.kde.plasma.volume,org.kde.plasma.networkmanagement,org.kde.plasma.mediacontroller,org.kde.muonnotifier,org.kde.plasma.devicenotifier,org.kde.plasma.clipboard")
+
+var clock = panel.addWidget("org.kde.plasma.digitalclock")
+clock.currentConfigGroup = ["Appearance"]
+clock.writeConfig("showDate","false")
+clock.writeConfig("showWeekNumbers","false")
+clock.writeConfig("dateFormat", "isoDate")
+clock.writeConfig("use24hFormat", "2")
+clock.reloadConfig()
+
+sleep(0.5)
+panel.reloadConfig()
+// if set to true it is not possible to remove panel :)
+panel.locked = false;