From c89662bacd6121a0cfd5bbccf699c7e02aabaf94 Mon Sep 17 00:00:00 2001
From: Valeria Fadeeva <valeria.fadeeva.me@gmail.com>
Date: Thu, 2 May 2024 22:51:04 +0500
Subject: [PATCH] Update
---
README.md | 2 +-
.../desktoptheme/Win11OS-dark/metadata.json | 2 +-
.../desktoptheme/Win11OS-light/metadata.json | 2 +-
.../org.kde.plasma.icontasks.js | 55 ++++++++++++-------
.../metadata.json | 7 +--
.../org.kde.plasma.icontasks.js | 55 ++++++++++++-------
.../metadata.json | 7 +--
.../org.kde.plasma.icontasks.js | 55 ++++++++++++-------
.../metadata.json | 7 +--
9 files changed, 111 insertions(+), 81 deletions(-)
diff --git a/README.md b/README.md
index 9cc62ba..fa7023a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# melawy-kde-theme-win11
+# melawy-kde-theme-win11-kde6
KDE theme for Melawy Linux
### Donate
diff --git a/usr/share/plasma/desktoptheme/Win11OS-dark/metadata.json b/usr/share/plasma/desktoptheme/Win11OS-dark/metadata.json
index 7cbdc01..9ce6994 100644
--- a/usr/share/plasma/desktoptheme/Win11OS-dark/metadata.json
+++ b/usr/share/plasma/desktoptheme/Win11OS-dark/metadata.json
@@ -18,7 +18,7 @@
"Name": "Win11OS-dark",
"Name[ru]": "Win11OS-dark",
"Name[x-test]": "xxWin11OS-darkxx",
- "Version": "5.111.0",
+ "Version": "6.0.0",
"Website": "https://github.com/yeyushengfan258/Win11OS-kde"
},
"X-Plasma-API": "5.0"
diff --git a/usr/share/plasma/desktoptheme/Win11OS-light/metadata.json b/usr/share/plasma/desktoptheme/Win11OS-light/metadata.json
index 029b661..a273d5e 100644
--- a/usr/share/plasma/desktoptheme/Win11OS-light/metadata.json
+++ b/usr/share/plasma/desktoptheme/Win11OS-light/metadata.json
@@ -18,7 +18,7 @@
"Name": "Win11OS-light",
"Name[ru]": "Win11OS-light",
"Name[x-test]": "xxWin11OS-lightxx",
- "Version": "5.111.0",
+ "Version": "6.0.0",
"Website": "https://github.com/yeyushengfan258/Win11OS-kde"
},
"X-Plasma-API": "5.0"
diff --git a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
index c37d7ad..61497e6 100644
--- a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
+++ b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
@@ -1,31 +1,44 @@
-let FullApps = [
-"melawy-welcome.desktop",
-"systemsettings.desktop",
-"pamac.desktop",
-"org.kde.dolphin.desktop",
-"org.kde.konsole.desktop",
-"org.kde.kcalc.desktop",
-"org.kde.kate.desktop",
-"code.desktop",
-"org.telegram.desktop.desktop",
-"discord.desktop",
-"Zoom.desktop",
-"firefoxdeveloperedition.desktop",
-"firefox.desktop",
-"brave-browser.desktop",
-"google-chrome.desktop"
+let baseApps = [
+ "melawy-welcome.desktop",
+ "systemsettings.desktop",
+ "pamac.desktop",
+ "org.kde.dolphin.desktop",
+ "org.kde.konsole.desktop",
+ "org.kde.kcalc.desktop",
+ "org.kde.kate.desktop"
];
+let addApps = [
+ ["code.desktop", "com.visualstudio.code.desktop"],
+ ["org.telegram.desktop.desktop", "org.telegram.desktop.desktop"],
+ ["discord.desktop", "com.discordapp.Discord.desktop"],
+ ["Zoom.desktop", "us.zoom.Zoom.desktop"],
+ ["firefoxdeveloperedition.desktop", "firefoxdeveloperedition.desktop"],
+ ["firefox.desktop", "org.mozilla.firefox.desktop"],
+ ["brave-browser.desktop", "com.brave.Browser.desktop"],
+ ["google-chrome.desktop", "com.google.Chrome.desktop"]
+];
+
+
let applications = '';
-FullApps.forEach((i) => {
- if (applicationExists(i)) {
- applications += 'applications:' + i + ',';
- }
+
+baseApps.forEach((i) => {
+ if (applicationExists(i)) {
+ applications += 'applications:' + i + ',';
+ }
+});
+
+addApps.forEach((i) => {
+ if (applicationExists(i[0])) {
+ applications += 'applications:' + i[0] + ',';
+ } else if (applicationExists(i[1])) {
+ applications += 'applications:' + i[1] + ',';
+ }
});
applications = applications.substring(0, applications.length - 1).split(',');
- /*dock*/
+/*dock*/
applet.currentConfigGroup = [];
applet.writeConfig("launchers", "")
applet.currentConfigGroup = ["General"];
diff --git a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/metadata.json b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/metadata.json
index c320012..ea44e9c 100644
--- a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/metadata.json
+++ b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-dark.desktop/metadata.json
@@ -1,4 +1,5 @@
{
+ "KPackageStructure": "Plasma/LookAndFeel",
"KPlugin": {
"Authors": [
{
@@ -17,15 +18,11 @@
"Name": "Win11OS-dark",
"Name[ru]": "Win11OS-dark",
"Name[x-test]": "xxWin11OS-darkxx",
- "ServiceTypes": [
- "Plasma/LookAndFeel"
- ],
"Version": "2.0",
"Website": "https://github.com/yeyushengfan258/Win11OS-kde"
},
"Keywords": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
"Keywords[ru]": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;рабочий стол;рабочая среда;внешний вид;визуальное представление;выход;завершение сеанса;блокировка;приостановка работы;завершение работы;выключение;спящий режим;ждущий режим;",
"Keywords[x-test]": "xxDesktopxx;xxWorkspacexx;xxAppearancexx;xxLook and Feelxx;xxLogoutxx;xxLockxx;xxSuspendxx;xxShutdownxx;xxHibernatexx;",
- "X-Plasma-APIVersion": "2",
- "X-Plasma-MainScript": "defaults"
+ "X-Plasma-APIVersion": "2"
}
diff --git a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
index c37d7ad..61497e6 100644
--- a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
+++ b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
@@ -1,31 +1,44 @@
-let FullApps = [
-"melawy-welcome.desktop",
-"systemsettings.desktop",
-"pamac.desktop",
-"org.kde.dolphin.desktop",
-"org.kde.konsole.desktop",
-"org.kde.kcalc.desktop",
-"org.kde.kate.desktop",
-"code.desktop",
-"org.telegram.desktop.desktop",
-"discord.desktop",
-"Zoom.desktop",
-"firefoxdeveloperedition.desktop",
-"firefox.desktop",
-"brave-browser.desktop",
-"google-chrome.desktop"
+let baseApps = [
+ "melawy-welcome.desktop",
+ "systemsettings.desktop",
+ "pamac.desktop",
+ "org.kde.dolphin.desktop",
+ "org.kde.konsole.desktop",
+ "org.kde.kcalc.desktop",
+ "org.kde.kate.desktop"
];
+let addApps = [
+ ["code.desktop", "com.visualstudio.code.desktop"],
+ ["org.telegram.desktop.desktop", "org.telegram.desktop.desktop"],
+ ["discord.desktop", "com.discordapp.Discord.desktop"],
+ ["Zoom.desktop", "us.zoom.Zoom.desktop"],
+ ["firefoxdeveloperedition.desktop", "firefoxdeveloperedition.desktop"],
+ ["firefox.desktop", "org.mozilla.firefox.desktop"],
+ ["brave-browser.desktop", "com.brave.Browser.desktop"],
+ ["google-chrome.desktop", "com.google.Chrome.desktop"]
+];
+
+
let applications = '';
-FullApps.forEach((i) => {
- if (applicationExists(i)) {
- applications += 'applications:' + i + ',';
- }
+
+baseApps.forEach((i) => {
+ if (applicationExists(i)) {
+ applications += 'applications:' + i + ',';
+ }
+});
+
+addApps.forEach((i) => {
+ if (applicationExists(i[0])) {
+ applications += 'applications:' + i[0] + ',';
+ } else if (applicationExists(i[1])) {
+ applications += 'applications:' + i[1] + ',';
+ }
});
applications = applications.substring(0, applications.length - 1).split(',');
- /*dock*/
+/*dock*/
applet.currentConfigGroup = [];
applet.writeConfig("launchers", "")
applet.currentConfigGroup = ["General"];
diff --git a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/metadata.json b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/metadata.json
index 0a55da5..f2192de 100644
--- a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/metadata.json
+++ b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-gray.desktop/metadata.json
@@ -1,4 +1,5 @@
{
+ "KPackageStructure": "Plasma/LookAndFeel",
"KPlugin": {
"Authors": [
{
@@ -17,15 +18,11 @@
"Name": "Win11OS-gray",
"Name[ru]": "Win11OS-gray",
"Name[x-test]": "xxWin11OS-grayxx",
- "ServiceTypes": [
- "Plasma/LookAndFeel"
- ],
"Version": "2.0",
"Website": "https://github.com/yeyushengfan258/Win11OS-kde"
},
"Keywords": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
"Keywords[ru]": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;рабочий стол;рабочая среда;внешний вид;визуальное представление;выход;завершение сеанса;блокировка;приостановка работы;завершение работы;выключение;спящий режим;ждущий режим;",
"Keywords[x-test]": "xxDesktopxx;xxWorkspacexx;xxAppearancexx;xxLook and Feelxx;xxLogoutxx;xxLockxx;xxSuspendxx;xxShutdownxx;xxHibernatexx;",
- "X-Plasma-APIVersion": "2",
- "X-Plasma-MainScript": "defaults"
+ "X-Plasma-APIVersion": "2"
}
diff --git a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
index c37d7ad..61497e6 100644
--- a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
+++ b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/contents/plasmoidsetupscripts/org.kde.plasma.icontasks.js
@@ -1,31 +1,44 @@
-let FullApps = [
-"melawy-welcome.desktop",
-"systemsettings.desktop",
-"pamac.desktop",
-"org.kde.dolphin.desktop",
-"org.kde.konsole.desktop",
-"org.kde.kcalc.desktop",
-"org.kde.kate.desktop",
-"code.desktop",
-"org.telegram.desktop.desktop",
-"discord.desktop",
-"Zoom.desktop",
-"firefoxdeveloperedition.desktop",
-"firefox.desktop",
-"brave-browser.desktop",
-"google-chrome.desktop"
+let baseApps = [
+ "melawy-welcome.desktop",
+ "systemsettings.desktop",
+ "pamac.desktop",
+ "org.kde.dolphin.desktop",
+ "org.kde.konsole.desktop",
+ "org.kde.kcalc.desktop",
+ "org.kde.kate.desktop"
];
+let addApps = [
+ ["code.desktop", "com.visualstudio.code.desktop"],
+ ["org.telegram.desktop.desktop", "org.telegram.desktop.desktop"],
+ ["discord.desktop", "com.discordapp.Discord.desktop"],
+ ["Zoom.desktop", "us.zoom.Zoom.desktop"],
+ ["firefoxdeveloperedition.desktop", "firefoxdeveloperedition.desktop"],
+ ["firefox.desktop", "org.mozilla.firefox.desktop"],
+ ["brave-browser.desktop", "com.brave.Browser.desktop"],
+ ["google-chrome.desktop", "com.google.Chrome.desktop"]
+];
+
+
let applications = '';
-FullApps.forEach((i) => {
- if (applicationExists(i)) {
- applications += 'applications:' + i + ',';
- }
+
+baseApps.forEach((i) => {
+ if (applicationExists(i)) {
+ applications += 'applications:' + i + ',';
+ }
+});
+
+addApps.forEach((i) => {
+ if (applicationExists(i[0])) {
+ applications += 'applications:' + i[0] + ',';
+ } else if (applicationExists(i[1])) {
+ applications += 'applications:' + i[1] + ',';
+ }
});
applications = applications.substring(0, applications.length - 1).split(',');
- /*dock*/
+/*dock*/
applet.currentConfigGroup = [];
applet.writeConfig("launchers", "")
applet.currentConfigGroup = ["General"];
diff --git a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/metadata.json b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/metadata.json
index 844ccc7..ad85c56 100644
--- a/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/metadata.json
+++ b/usr/share/plasma/look-and-feel/com.github.yeyushengfan258.Win11OS-light.desktop/metadata.json
@@ -1,4 +1,5 @@
{
+ "KPackageStructure": "Plasma/LookAndFeel",
"KPlugin": {
"Authors": [
{
@@ -17,15 +18,11 @@
"Name": "Win11OS-light",
"Name[ru]": "Win11OS-light",
"Name[x-test]": "xxWin11OS-lightxx",
- "ServiceTypes": [
- "Plasma/LookAndFeel"
- ],
"Version": "2.0",
"Website": "https://github.com/yeyushengfan258/Win11OS-kde"
},
"Keywords": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
"Keywords[ru]": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;рабочий стол;рабочая среда;внешний вид;визуальное представление;выход;завершение сеанса;блокировка;приостановка работы;завершение работы;выключение;спящий режим;ждущий режим;",
"Keywords[x-test]": "xxDesktopxx;xxWorkspacexx;xxAppearancexx;xxLook and Feelxx;xxLogoutxx;xxLockxx;xxSuspendxx;xxShutdownxx;xxHibernatexx;",
- "X-Plasma-APIVersion": "2",
- "X-Plasma-MainScript": "defaults"
+ "X-Plasma-APIVersion": "2"
}