Runner Packs (#33)

win0err · Mar 16, 2023 · b76b84f · b76b84f
1 parent bc3aefb
commit b76b84f
Show file tree

Hide file tree

Showing 24 changed files with 352 additions and 38 deletions.
diff --git a/po/messages.pot b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-runcat-extension 21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-29 11:47-0600\n"
+"POT-Creation-Date: 2022-10-29 23:01-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/panelMenuButton.js:110
+#: src/panelMenuButton.js:106
 msgid "Open System Monitor"
 msgstr ""
 
-#: src/panelMenuButton.js:114
+#: src/panelMenuButton.js:110
 msgid "Settings"
 msgstr ""
 
-#: src/prefs.js:55
+#: src/prefs.js:63
 msgid "RunCat Settings"
 msgstr ""
 
-#: src/prefs.js:66
+#: src/prefs.js:74
 msgid "Version"
 msgstr ""
 
@@ -65,30 +65,42 @@ msgstr ""
 msgid "Character only"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:65
+#: src/resources/ui/preferences.ui:63
+msgid "Runner pack"
+msgstr ""
+
+#: src/resources/ui/preferences.ui:67
+msgid "Cat"
+msgstr ""
+
+#: src/resources/ui/preferences.ui:68
+msgid "Metronome"
+msgstr ""
+
+#: src/resources/ui/preferences.ui:79
 msgid "Reset preferences"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:66
+#: src/resources/ui/preferences.ui:80
 msgid "Reset RunCat preferences to defaults"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:79
+#: src/resources/ui/preferences.ui:93
 msgid "Reset"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:98
+#: src/resources/ui/preferences.ui:112
 msgid "The cat tells you the CPU usage by running speed"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:102
+#: src/resources/ui/preferences.ui:116
 msgid "Visit RunCat's GitHub page"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:112
+#: src/resources/ui/preferences.ui:126
 msgid "Visit Homepage"
 msgstr ""
 
-#: src/resources/ui/preferences.ui:116
+#: src/resources/ui/preferences.ui:130
 msgid "About RunCat"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
@@ -18,19 +18,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/panelMenuButton.js:110
+#: src/panelMenuButton.js:106
 msgid "Open System Monitor"
 msgstr "Открыть Системный монитор"
 
-#: src/panelMenuButton.js:114
+#: src/panelMenuButton.js:110
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/prefs.js:55
+#: src/prefs.js:63
 msgid "RunCat Settings"
 msgstr "Настройки RunCat"
 
-#: src/prefs.js:66
+#: src/prefs.js:74
 msgid "Version"
 msgstr "Версия"
 
@@ -66,32 +66,44 @@ msgstr "Только проценты"
 msgid "Character only"
 msgstr "Только персонаж"
 
-#: src/resources/ui/preferences.ui:65
+#: src/resources/ui/preferences.ui:63
+msgid "Runner pack"
+msgstr ""
+
+#: src/resources/ui/preferences.ui:67
+msgid "Cat"
+msgstr ""
+
+#: src/resources/ui/preferences.ui:68
+msgid "Metronome"
+msgstr ""
+
+#: src/resources/ui/preferences.ui:79
 msgid "Reset preferences"
 msgstr "Сбросить настройки"
 
-#: src/resources/ui/preferences.ui:66
+#: src/resources/ui/preferences.ui:80
 msgid "Reset RunCat preferences to defaults"
 msgstr "Сбросить настройки RunCat к значениям по умолчанию"
 
-#: src/resources/ui/preferences.ui:79
+#: src/resources/ui/preferences.ui:93
 msgid "Reset"
 msgstr "Сбрость"
 
-#: src/resources/ui/preferences.ui:98
+#: src/resources/ui/preferences.ui:112
 msgid "The cat tells you the CPU usage by running speed"
 msgstr ""
 "Котик, который показывает загрузку\n"
 " процессора скоростью бега"
 
-#: src/resources/ui/preferences.ui:102
+#: src/resources/ui/preferences.ui:116
 msgid "Visit RunCat's GitHub page"
 msgstr "Посетить страницу RunCat на GitHub"
 
-#: src/resources/ui/preferences.ui:112
+#: src/resources/ui/preferences.ui:126
 msgid "Visit Homepage"
 msgstr "Открыть домашнюю страницу"
 
-#: src/resources/ui/preferences.ui:116
+#: src/resources/ui/preferences.ui:130
 msgid "About RunCat"
 msgstr "О RunCat"
diff --git a/src/constants.js b/src/constants.js
@@ -13,14 +13,19 @@ var PanelMenuButtonVisibility = {
     [CHARACTER_ONLY]: { character: true, percentage: false },
 };
 
+const CAT = 0;
+const METRONOME = 1;
+
+var RunnerPack = {
+    [CAT]: 'cat',
+    [METRONOME]: 'metronome',
+};
+
 var Settings = {
     IDLE_THRESHOLD: 'idle-threshold',
     ANIMATED_IDLE: 'animated-idle',
     DISPLAYING_ITEMS: 'displaying-items',
-};
-
-var RunnerPacks = {
-    CAT: 'cat',
+    RUNNER_PACK: 'runner-pack',
 };
 
 var RunnerStates = {

diff --git a/src/panelMenuButton.js b/src/panelMenuButton.js
@@ -17,8 +17,8 @@ const {
     SYSTEM_MONITOR_COMMAND,
     SCHEMA_PATH,
     PanelMenuButtonVisibility,
+    RunnerPack,
     Settings,
-    RunnerPacks,
     RunnerStates,
 } = Extension.imports.constants;
 const { createGenerator: createCpuGenerator } = Extension.imports.dataProviders.cpu;
@@ -76,11 +76,7 @@ var PanelMenuButton = GObject.registerClass(
         initUi() {
             this.ui = {
                 builder: Gtk.Builder.new(),
-                icons: {
-                    idle: getGIcon(RunnerPacks.CAT, RunnerStates.IDLE, 0),
-                    idleGenerator: spritesGenerator(RunnerPacks.CAT, RunnerStates.IDLE),
-                    runningGenerator: spritesGenerator(RunnerPacks.CAT, RunnerStates.ACTIVE),
-                },
+                icons: this.loadUiIcons(),
             };
             this.ui.builder.set_translation_domain(Extension.metadata.uuid);
 
@@ -131,12 +127,23 @@ var PanelMenuButton = GObject.registerClass(
             this.ui.builder.get_object('labelBox')[percentageAction]();
         }
 
+        loadUiIcons() {
+            const runnerPack = RunnerPack[this.settings.runnerPack];
+
+            return {
+                idle: getGIcon(runnerPack, RunnerStates.IDLE, 0),
+                idleGenerator: spritesGenerator(runnerPack, RunnerStates.IDLE),
+                runningGenerator: spritesGenerator(runnerPack, RunnerStates.ACTIVE),
+            };
+        }
+
         initSettingsListeners() {
             this.gioSettings = ExtensionUtils.getSettings(SCHEMA_PATH);
             this.settings = {
                 idleThreshold: this.gioSettings.get_int(Settings.IDLE_THRESHOLD),
                 animatedIdle: this.gioSettings.get_boolean(Settings.ANIMATED_IDLE),
                 displayingItems: this.gioSettings.get_enum(Settings.DISPLAYING_ITEMS),
+                runnerPack: this.gioSettings.get_enum(Settings.RUNNER_PACK),
             };
 
             this.gioSettings.connect(`changed::${Settings.IDLE_THRESHOLD}`, () => {
@@ -158,6 +165,11 @@ var PanelMenuButton = GObject.registerClass(
                 this.ui.builder.get_object('icon')[characterAction]();
                 this.ui.builder.get_object('labelBox')[percentageAction]();
             });
+
+            this.gioSettings.connect(`changed::${Settings.RUNNER_PACK}`, () => {
+                this.settings.runnerPack = this.gioSettings.get_enum(Settings.RUNNER_PACK);
+                this.ui.icons = this.loadUiIcons();
+            });
         }
 
         async initSources() {

diff --git a/src/prefs.js b/src/prefs.js
@@ -35,17 +35,25 @@ function fillPreferencesWindow(window) {
         Gio.SettingsBindFlags.DEFAULT,
     );
 
-    const combo = builder.get_object(Settings.DISPLAYING_ITEMS);
-    combo.set_selected(settings.get_enum(Settings.DISPLAYING_ITEMS));
-    combo.connect('notify::selected', widget => {
+    const displayingItemsCombo = builder.get_object(Settings.DISPLAYING_ITEMS);
+    displayingItemsCombo.set_selected(settings.get_enum(Settings.DISPLAYING_ITEMS));
+    displayingItemsCombo.connect('notify::selected', widget => {
         settings.set_enum(Settings.DISPLAYING_ITEMS, widget.selected);
     });
 
+    const runnerPackCombo = builder.get_object(Settings.RUNNER_PACK);
+    runnerPackCombo.set_selected(settings.get_enum(Settings.RUNNER_PACK));
+    runnerPackCombo.connect('notify::selected', widget => {
+        settings.set_enum(Settings.RUNNER_PACK, widget.selected);
+    });
+
     builder.get_object('reset').connect('clicked', () => {
         settings.reset(Settings.IDLE_THRESHOLD);
         settings.reset(Settings.ANIMATED_IDLE);
         settings.reset(Settings.DISPLAYING_ITEMS);
-        combo.set_selected(settings.get_enum(Settings.DISPLAYING_ITEMS));
+        settings.reset(Settings.RUNNER_PACK);
+        displayingItemsCombo.set_selected(settings.get_enum(Settings.DISPLAYING_ITEMS));
+        runnerPackCombo.set_selected(settings.get_enum(Settings.RUNNER_PACK));
     });
 
     const page = builder.get_object('preferences-general');

diff --git a/src/resources/icons/metronome/my-active-0-symbolic.svg b/src/resources/icons/metronome/my-active-0-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-1-symbolic.svg b/src/resources/icons/metronome/my-active-1-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-10-symbolic.svg b/src/resources/icons/metronome/my-active-10-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-11-symbolic.svg b/src/resources/icons/metronome/my-active-11-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-12-symbolic.svg b/src/resources/icons/metronome/my-active-12-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-13-symbolic.svg b/src/resources/icons/metronome/my-active-13-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-14-symbolic.svg b/src/resources/icons/metronome/my-active-14-symbolic.svg
diff --git a/src/resources/icons/metronome/my-active-15-symbolic.svg b/src/resources/icons/metronome/my-active-15-symbolic.svg