Merge pull request #10 from Aryan20/main

Update to match upstream
ublue-os · Jun 18, 2024 · 58a7e4f · 58a7e4f
2 parents 11340a7 + a136c2b
commit 58a7e4f
Show file tree

Hide file tree

Showing 18 changed files with 396 additions and 383 deletions.
diff --git a/PrefsLib/adw.js b/PrefsLib/adw.js
@@ -466,10 +466,17 @@ export const LogoMenuOptionsPage = GObject.registerClass(class LogoMenuOptionsWi
 // Create the About page
 export const AboutPage = GObject.registerClass(class LogoMenuAboutPage extends Adw.PreferencesPage {
     _init(metadata) {
-        super._init({
-            title: _('About'),
-            icon_name: 'info-symbolic',
-        });
+        if (parseInt(Config.PACKAGE_VERSION) >= 46) {
+            super._init({
+                title: _('About'),
+                icon_name: 'help-about-symbolic',
+            });
+        } else {
+            super._init({
+                title: _('About'),
+                icon_name: 'info-symbolic',
+            });
+        }
 
         const PROJECT_IMAGE = 'settings-logo-menu-logo';
         const EXTERNAL_LINK_ICON = 'adw-external-link-symbolic'

diff --git a/extension.js b/extension.js
@@ -8,6 +8,7 @@ import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
 import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
 import * as Util from 'resource:///org/gnome/shell/misc/util.js';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
 
 import * as Constants from './constants.js';
 import * as Selection from './selection.js';
@@ -125,7 +126,12 @@ class LogoMenuMenuButton extends PanelMenu.Button {
     }
 
     _aboutThisDistro() {
-        Util.spawn(['gnome-control-center', 'info-overview']);
+        const gnomeMajorVersion = parseInt(Config.PACKAGE_VERSION.toString().split('.')[0]);
+        if (gnomeMajorVersion >= 46) {
+            Util.spawn(['gnome-control-center', 'system', 'about']);
+        } else {
+            Util.spawn(['gnome-control-center', 'info-overview']);
+        }
     }
 
     _systemPreferences() {

diff --git a/metadata.json b/metadata.json
@@ -9,6 +9,6 @@
   "shell-version": ["45", "46"],
   "url": "https://github.com/Aryan20/Logomenu",
   "uuid": "logomenu@aryan_k",
-  "version": 29,
-  "version-name": "22.6"
+  "version": 31,
+  "version-name": "23.0"
 }
diff --git a/po/be.po b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Logo Menu 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-14 15:03+0530\n"
+"POT-Creation-Date: 2024-06-17 05:04+0530\n"
 "PO-Revision-Date: 2022-11-17 23:23+0530\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -19,55 +19,55 @@ msgstr ""
 "n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: extension.js:74
+#: extension.js:75
 msgid "About My System"
 msgstr "Аб сістэме"
 
-#: extension.js:79
+#: extension.js:80
 msgid "Activities"
 msgstr "Агляд"
 
-#: extension.js:81
+#: extension.js:82
 msgid "App Grid"
 msgstr "Праграмы"
 
-#: extension.js:85
+#: extension.js:86
 msgid "Software Center..."
 msgstr "Менеджар праграм..."
 
-#: extension.js:87 PrefsLib/adw.js:332
+#: extension.js:88 PrefsLib/adw.js:332
 msgid "System Monitor"
 msgstr ""
 
-#: extension.js:88 PrefsLib/adw.js:294
+#: extension.js:89 PrefsLib/adw.js:294
 msgid "Terminal"
 msgstr "Тэрмінал"
 
-#: extension.js:89
+#: extension.js:90
 msgid "Extensions"
 msgstr "Пашырэнні"
 
-#: extension.js:93
+#: extension.js:94
 msgid "Force Quit App"
 msgstr "Прымусовы выхад"
 
-#: extension.js:98
+#: extension.js:99
 msgid "Sleep"
 msgstr "Сон"
 
-#: extension.js:99
+#: extension.js:100
 msgid "Restart..."
 msgstr "Перазапуск..."
 
-#: extension.js:100
+#: extension.js:101
 msgid "Shut Down..."
 msgstr "Выключыць..."
 
-#: extension.js:104 extension.js:109
+#: extension.js:105 extension.js:110
 msgid "Lock Screen"
 msgstr "Заблакіраваць"
 
-#: extension.js:106
+#: extension.js:107
 msgid "Log Out..."
 msgstr "Завяршыць сеанс..."
 
@@ -168,43 +168,43 @@ msgstr "Агляд"
 msgid "Hide Icon Shadow"
 msgstr ""
 
-#: PrefsLib/adw.js:470
+#: PrefsLib/adw.js:471 PrefsLib/adw.js:476
 msgid "About"
 msgstr "Аб праграме"
 
-#: PrefsLib/adw.js:493
+#: PrefsLib/adw.js:500
 msgid "Logo Menu"
 msgstr "Logo Menu"
 
-#: PrefsLib/adw.js:500
+#: PrefsLib/adw.js:507
 msgid "Quick access menu for GNOME"
 msgstr "Меню хуткага доступу для GNOME"
 
-#: PrefsLib/adw.js:517
+#: PrefsLib/adw.js:524
 msgid "Logo Menu Version"
 msgstr "Версія Logo Menu"
 
-#: PrefsLib/adw.js:529
+#: PrefsLib/adw.js:536
 msgid "GNOME Version"
 msgstr "Версія GNOME"
 
-#: PrefsLib/adw.js:536
+#: PrefsLib/adw.js:543
 msgid "Created with love by"
 msgstr ""
 
-#: PrefsLib/adw.js:543
+#: PrefsLib/adw.js:550
 msgid "Matrix/Element room"
 msgstr ""
 
-#: PrefsLib/adw.js:559
+#: PrefsLib/adw.js:566
 msgid "Contributors"
 msgstr ""
 
-#: PrefsLib/adw.js:576
+#: PrefsLib/adw.js:583
 msgid "This program comes with absolutely no warranty."
 msgstr ""
 
-#: PrefsLib/adw.js:577
+#: PrefsLib/adw.js:584
 #, javascript-format
 msgid "See the %sGNU General Public License, version 2 or later%s for details."
 msgstr ""

diff --git a/po/ca.po b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Logo Menu 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-14 15:03+0530\n"
+"POT-Creation-Date: 2024-06-17 05:04+0530\n"
 "PO-Revision-Date: 2023-07-07 11:54+0200\n"
 "Last-Translator: @jcatfor\n"
 "Language-Team: Catalan\n"
@@ -19,55 +19,55 @@ msgstr ""
 "X-Generator: Poedit 3.3.1\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: extension.js:74
+#: extension.js:75
 msgid "About My System"
 msgstr "Quant a aquest Ordinador"
 
-#: extension.js:79
+#: extension.js:80
 msgid "Activities"
 msgstr "Activitats"
 
-#: extension.js:81
+#: extension.js:82
 msgid "App Grid"
 msgstr "Aplicacions"
 
-#: extension.js:85
+#: extension.js:86
 msgid "Software Center..."
 msgstr "Programari..."
 
-#: extension.js:87 PrefsLib/adw.js:332
+#: extension.js:88 PrefsLib/adw.js:332
 msgid "System Monitor"
 msgstr ""
 
-#: extension.js:88 PrefsLib/adw.js:294
+#: extension.js:89 PrefsLib/adw.js:294
 msgid "Terminal"
 msgstr "Terminal"
 
-#: extension.js:89
+#: extension.js:90
 msgid "Extensions"
 msgstr "Extensions"
 
-#: extension.js:93
+#: extension.js:94
 msgid "Force Quit App"
 msgstr "Força la Sortida de l'App"
 
-#: extension.js:98
+#: extension.js:99
 msgid "Sleep"
 msgstr "Posa en Repòs"
 
-#: extension.js:99
+#: extension.js:100
 msgid "Restart..."
 msgstr "Reinicia..."
 
-#: extension.js:100
+#: extension.js:101
 msgid "Shut Down..."
 msgstr "Apaga..."
 
-#: extension.js:104 extension.js:109
+#: extension.js:105 extension.js:110
 msgid "Lock Screen"
 msgstr "Bloqueja la Pantalla"
 
-#: extension.js:106
+#: extension.js:107
 msgid "Log Out..."
 msgstr "Tanca la Sessió..."
 
@@ -168,43 +168,43 @@ msgstr "Activitats"
 msgid "Hide Icon Shadow"
 msgstr ""
 
-#: PrefsLib/adw.js:470
+#: PrefsLib/adw.js:471 PrefsLib/adw.js:476
 msgid "About"
 msgstr "Quant a"
 
-#: PrefsLib/adw.js:493
+#: PrefsLib/adw.js:500
 msgid "Logo Menu"
 msgstr "Logo Menu"
 
-#: PrefsLib/adw.js:500
+#: PrefsLib/adw.js:507
 msgid "Quick access menu for GNOME"
 msgstr "Menú d'accessos ràpids per al GNOME"
 
-#: PrefsLib/adw.js:517
+#: PrefsLib/adw.js:524
 msgid "Logo Menu Version"
 msgstr "Versió del Logo Menu"
 
-#: PrefsLib/adw.js:529
+#: PrefsLib/adw.js:536
 msgid "GNOME Version"
 msgstr "Versió del GNOME"
 
-#: PrefsLib/adw.js:536
+#: PrefsLib/adw.js:543
 msgid "Created with love by"
 msgstr "Creat amb amor per"
 
-#: PrefsLib/adw.js:543
+#: PrefsLib/adw.js:550
 msgid "Matrix/Element room"
 msgstr "Matrix/Element room"
 
-#: PrefsLib/adw.js:559
+#: PrefsLib/adw.js:566
 msgid "Contributors"
 msgstr ""
 
-#: PrefsLib/adw.js:576
+#: PrefsLib/adw.js:583
 msgid "This program comes with absolutely no warranty."
 msgstr ""
 
-#: PrefsLib/adw.js:577
+#: PrefsLib/adw.js:584
 #, javascript-format
 msgid "See the %sGNU General Public License, version 2 or later%s for details."
 msgstr ""