update pkg

nx-desktop · Dec 24, 2023 · 8d8c7e2 · 8d8c7e2
1 parent a6ce7dc
commit 8d8c7e2
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 24 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+nx-plasma-look-and-feel (2.0.9) nitrux; urgency=medium
+
+  * Fix arrays in layout.js files in look-and-feel packages.
+
+ -- Uri Herrera <uri_herrera@nxos.org>  Sun, 24 Dec 2023 17:01:00 -0500
+
 nx-plasma-look-and-feel (2.0.8) nitrux; urgency=medium
 
   * Fix layout.js files in look-and-feel packages to create the panels porperly.

diff --git a/look-and-feel/org.kde.nitrux.dark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/look-and-feel/org.kde.nitrux.dark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js
@@ -90,7 +90,7 @@ var SystrayContainmentId = topPanelSystray.readConfig("SystrayContainmentId");
 const systray = desktopById(SystrayContainmentId);
 systray.currentConfigGroup = ["General"];
 
-// Define arrays for extraItems (shows in submenu), hiddenItems (hidden), and knownItems (visible).
+// Define arrays for extraItems (shows in submenu), hiddenItems (hidden), knownItems (visible when necessary), shownItems (always visible).
 // If an item is not in extraItems or knownItems it will be disabled.
 let extraItemsArray = [
   "org.kde.kdeconnect",
@@ -99,16 +99,16 @@ let extraItemsArray = [
   "org.kde.plasma.battery",
   "org.kde.plasma.bluetooth",
   "org.kde.plasma.clipboard",
+  "org.kde.plasma.gamemode",
   "org.kde.plasma.keyboardindicator",
   "org.kde.plasma.keyboardlayout",
   "org.kde.plasma.manage-inputmethod",
   "org.kde.plasma.nightcolorcontrol",
   "org.kde.plasma.printmanager",
   "org.kde.plasma.vault",
+  "org.kde.plasma.volume",
   "org.nx.networkmanagement",
-  "org.nx.audio",
-  "org.nx.notifications",
-  "org.kde.plasma.gamemode"
+  "org.nx.notifications"
 ];
 
 let hiddenItemsArray = [
@@ -123,6 +123,7 @@ let knownItemsArray = [
   "org.kde.plasma.bluetooth",
   "org.kde.plasma.clipboard",
   "org.kde.plasma.devicenotifier",
+  "org.kde.plasma.gamemode",
   "org.kde.plasma.keyboardindicator",
   "org.kde.plasma.keyboardlayout",
   "org.kde.plasma.manage-inputmethod",
@@ -132,11 +133,16 @@ let knownItemsArray = [
   "org.kde.plasma.notifications",
   "org.kde.plasma.printmanager",
   "org.kde.plasma.vault",
+  "org.kde.plasma.volume",
+  "org.nx.networkmanagement",
+  "org.nx.notifications"
+];
+
+let shownItemsArray = [
   "org.kde.plasma.volume",
   "org.nx.audio",
   "org.nx.networkmanagement",
-  "org.nx.notifications",
-  "org.kde.plasma.gamemode"
+  "org.nx.notifications"
 ];
 
 // This code shows items in the system tray sub-menu.
@@ -146,14 +152,19 @@ if (applicationExists("org.kde.plasmashell.desktop")) {
 
 // This code hides items in the system tray.
 if (applicationExists("org.kde.plasmashell.desktop")) {
-  systray.writeConfig("knownItems", hiddenItemsArray);
+  systray.writeConfig("hiddenItems", hiddenItemsArray);
 }
 
-// This code makes items visible in the system tray.
+// This code makes items visible when necessary in the system tray.
 if (applicationExists("org.kde.plasmashell.desktop")) {
   systray.writeConfig("knownItems", knownItemsArray);
 }
 
+// This code makes items always visible in the system tray.
+if (applicationExists("org.kde.plasmashell.desktop")) {
+  systray.writeConfig("shownItems", shownItemsArray);
+}
+
 var latteSeparatorTop4 = menuPanel.addWidget("org.kde.latte.separator")
 latteSeparatorTop4.currentConfigGroup = ["Configuration", "General"]
 latteSeparatorTop4.writeConfig("lengthMargin", "10")

diff --git a/look-and-feel/org.kde.nitrux.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/look-and-feel/org.kde.nitrux.desktop/contents/layouts/org.kde.plasma.desktop-layout.js
@@ -90,7 +90,7 @@ var SystrayContainmentId = topPanelSystray.readConfig("SystrayContainmentId");
 const systray = desktopById(SystrayContainmentId);
 systray.currentConfigGroup = ["General"];
 
-// Define arrays for extraItems (shows in submenu), hiddenItems (hidden), and knownItems (visible).
+// Define arrays for extraItems (shows in submenu), hiddenItems (hidden), knownItems (visible when necessary), shownItems (always visible).
 // If an item is not in extraItems or knownItems it will be disabled.
 let extraItemsArray = [
   "org.kde.kdeconnect",
@@ -99,16 +99,16 @@ let extraItemsArray = [
   "org.kde.plasma.battery",
   "org.kde.plasma.bluetooth",
   "org.kde.plasma.clipboard",
+  "org.kde.plasma.gamemode",
   "org.kde.plasma.keyboardindicator",
   "org.kde.plasma.keyboardlayout",
   "org.kde.plasma.manage-inputmethod",
   "org.kde.plasma.nightcolorcontrol",
   "org.kde.plasma.printmanager",
   "org.kde.plasma.vault",
+  "org.kde.plasma.volume",
   "org.nx.networkmanagement",
-  "org.nx.audio",
-  "org.nx.notifications",
-  "org.kde.plasma.gamemode"
+  "org.nx.notifications"
 ];
 
 let hiddenItemsArray = [
@@ -123,6 +123,7 @@ let knownItemsArray = [
   "org.kde.plasma.bluetooth",
   "org.kde.plasma.clipboard",
   "org.kde.plasma.devicenotifier",
+  "org.kde.plasma.gamemode",
   "org.kde.plasma.keyboardindicator",
   "org.kde.plasma.keyboardlayout",
   "org.kde.plasma.manage-inputmethod",
@@ -132,11 +133,16 @@ let knownItemsArray = [
   "org.kde.plasma.notifications",
   "org.kde.plasma.printmanager",
   "org.kde.plasma.vault",
+  "org.kde.plasma.volume",
+  "org.nx.networkmanagement",
+  "org.nx.notifications"
+];
+
+let shownItemsArray = [
   "org.kde.plasma.volume",
   "org.nx.audio",
   "org.nx.networkmanagement",
-  "org.nx.notifications",
-  "org.kde.plasma.gamemode"
+  "org.nx.notifications"
 ];
 
 // This code shows items in the system tray sub-menu.
@@ -146,14 +152,19 @@ if (applicationExists("org.kde.plasmashell.desktop")) {
 
 // This code hides items in the system tray.
 if (applicationExists("org.kde.plasmashell.desktop")) {
-  systray.writeConfig("knownItems", hiddenItemsArray);
+  systray.writeConfig("hiddenItems", hiddenItemsArray);
 }
 
-// This code makes items visible in the system tray.
+// This code makes items visible when necessary in the system tray.
 if (applicationExists("org.kde.plasmashell.desktop")) {
   systray.writeConfig("knownItems", knownItemsArray);
 }
 
+// This code makes items always visible in the system tray.
+if (applicationExists("org.kde.plasmashell.desktop")) {
+  systray.writeConfig("shownItems", shownItemsArray);
+}
+
 var latteSeparatorTop4 = menuPanel.addWidget("org.kde.latte.separator")
 latteSeparatorTop4.currentConfigGroup = ["Configuration", "General"]
 latteSeparatorTop4.writeConfig("lengthMargin", "10")

diff --git a/look-and-feel/org.kde.nitrux.mix.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/look-and-feel/org.kde.nitrux.mix.desktop/contents/layouts/org.kde.plasma.desktop-layout.js
@@ -90,7 +90,7 @@ var SystrayContainmentId = topPanelSystray.readConfig("SystrayContainmentId");
 const systray = desktopById(SystrayContainmentId);
 systray.currentConfigGroup = ["General"];
 
-// Define arrays for extraItems (shows in submenu), hiddenItems (hidden), and knownItems (visible).
+// Define arrays for extraItems (shows in submenu), hiddenItems (hidden), knownItems (visible when necessary), shownItems (always visible).
 // If an item is not in extraItems or knownItems it will be disabled.
 let extraItemsArray = [
   "org.kde.kdeconnect",
@@ -99,16 +99,16 @@ let extraItemsArray = [
   "org.kde.plasma.battery",
   "org.kde.plasma.bluetooth",
   "org.kde.plasma.clipboard",
+  "org.kde.plasma.gamemode",
   "org.kde.plasma.keyboardindicator",
   "org.kde.plasma.keyboardlayout",
   "org.kde.plasma.manage-inputmethod",
   "org.kde.plasma.nightcolorcontrol",
   "org.kde.plasma.printmanager",
   "org.kde.plasma.vault",
+  "org.kde.plasma.volume",
   "org.nx.networkmanagement",
-  "org.nx.audio",
-  "org.nx.notifications",
-  "org.kde.plasma.gamemode"
+  "org.nx.notifications"
 ];
 
 let hiddenItemsArray = [
@@ -123,6 +123,7 @@ let knownItemsArray = [
   "org.kde.plasma.bluetooth",
   "org.kde.plasma.clipboard",
   "org.kde.plasma.devicenotifier",
+  "org.kde.plasma.gamemode",
   "org.kde.plasma.keyboardindicator",
   "org.kde.plasma.keyboardlayout",
   "org.kde.plasma.manage-inputmethod",
@@ -132,11 +133,16 @@ let knownItemsArray = [
   "org.kde.plasma.notifications",
   "org.kde.plasma.printmanager",
   "org.kde.plasma.vault",
+  "org.kde.plasma.volume",
+  "org.nx.networkmanagement",
+  "org.nx.notifications"
+];
+
+let shownItemsArray = [
   "org.kde.plasma.volume",
   "org.nx.audio",
   "org.nx.networkmanagement",
-  "org.nx.notifications",
-  "org.kde.plasma.gamemode"
+  "org.nx.notifications"
 ];
 
 // This code shows items in the system tray sub-menu.
@@ -146,14 +152,19 @@ if (applicationExists("org.kde.plasmashell.desktop")) {
 
 // This code hides items in the system tray.
 if (applicationExists("org.kde.plasmashell.desktop")) {
-  systray.writeConfig("knownItems", hiddenItemsArray);
+  systray.writeConfig("hiddenItems", hiddenItemsArray);
 }
 
-// This code makes items visible in the system tray.
+// This code makes items visible when necessary in the system tray.
 if (applicationExists("org.kde.plasmashell.desktop")) {
   systray.writeConfig("knownItems", knownItemsArray);
 }
 
+// This code makes items always visible in the system tray.
+if (applicationExists("org.kde.plasmashell.desktop")) {
+  systray.writeConfig("shownItems", shownItemsArray);
+}
+
 var latteSeparatorTop4 = menuPanel.addWidget("org.kde.latte.separator")
 latteSeparatorTop4.currentConfigGroup = ["Configuration", "General"]
 latteSeparatorTop4.writeConfig("lengthMargin", "10")