Show active theme above, fix Plutonium submodule

XorTroll · Jul 1, 2024 · 7ddf25e · 7ddf25e
1 parent 19adf7d
commit 7ddf25e
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 42 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,8 +16,8 @@ jobs:
     - name: Update packages and install Python
       run: |
         sudo -n apt-get update
-        sudo -n apt-get upgrade -y patch autoconf automake diffutils pkgconf fakeroot git maven file tar bzip2 zstd python3 python3-pip
-        python3 -m pip install requests
+        sudo -n apt-get upgrade -y patch autoconf automake diffutils pkgconf fakeroot git maven file tar bzip2 zstd python python-pip
+        python -m pip install requests
         sudo -n dkp-pacman --noconfirm -U \
           "https://wii.leseratte10.de/devkitPro/other-stuff/dkp-toolchain-vars-1.0.2-1-any.pkg.tar.xz"
 

diff --git a/libs/Plutonium b/libs/Plutonium
diff --git a/libs/uCommon/include/ul/cfg/cfg_Config.hpp b/libs/uCommon/include/ul/cfg/cfg_Config.hpp
@@ -20,9 +20,14 @@ namespace ul::cfg {
         std::string name;
         ThemeManifest manifest;
 
-        inline bool IsValid() {
+        inline bool IsValid() const {
             return !this->name.empty();
         }
+
+        inline bool IsSame(const Theme &other) const {
+            // Compare filenames, those must be unique
+            return other.name == this->name;
+        }
     };
 
     enum class ConfigEntryId : u8 {

diff --git a/projects/uMenu/romfs/lang/en.json b/projects/uMenu/romfs/lang/en.json
@@ -79,7 +79,7 @@
     "startup_welcome_info": "Welcome! Please select a user.",
     "startup_add_user": "Add user",
     "theme_info_text": "Available themes",
-    "theme_no_active": "You don't currently have a custom theme.",
+    "theme_no_active": "You don't currently have an active theme.",
     "theme_reset": "Reset theme (default theme)",
     "theme_reset_conf": "Would you like to return to uLaunch's default theme?",
     "theme_changed": "uLaunch's theme was reset.",

diff --git a/projects/uMenu/source/ul/menu/ui/ui_ThemesMenuLayout.cpp b/projects/uMenu/source/ul/menu/ui/ui_ThemesMenuLayout.cpp
@@ -48,40 +48,63 @@ namespace ul::menu::ui {
         this->loaded_themes.clear();
 
         this->loaded_themes = cfg::FindThemes();
-
-        auto theme_reset_item = pu::ui::elm::MenuItem::New(GetLanguageString("theme_reset"));
-        theme_reset_item->AddOnKey(std::bind(&ThemesMenuLayout::theme_DefaultKey, this));
-        theme_reset_item->SetColor(g_MenuApplication->GetTextColor());
-        theme_reset_item->SetIcon(GetLogoTexture());
-        this->themes_menu->AddItem(theme_reset_item);
+        this->loaded_themes.insert(this->loaded_themes.begin(), cfg::Theme{}); // For the "default theme" entry
+
+        // Move active theme to top
+        for(u32 i = 0; i < this->loaded_themes.size(); i++) {
+            const auto theme = this->loaded_themes.at(i);
+            if(theme.IsSame(g_ActiveTheme)) {
+                this->loaded_themes.erase(this->loaded_themes.begin() + i);
+                this->loaded_themes.insert(this->loaded_themes.begin(), theme);
+                break;
+            }
+        }
 
         for(const auto &theme: this->loaded_themes) {
-            std::string theme_icon_path;
-            const auto rc = cfg::TryCacheLoadThemeIcon(theme, theme_icon_path);
-            if(R_FAILED(rc)) {
-                UL_LOG_INFO("Theme '%s' unable to load image: %s", theme.name.c_str(), util::FormatResultDisplay(rc).c_str());
-            }
+            if(theme.IsValid()) {
+                std::string theme_icon_path;
+                const auto rc = cfg::TryCacheLoadThemeIcon(theme, theme_icon_path);
+                if(R_FAILED(rc)) {
+                    UL_LOG_WARN("Theme '%s' unable to load image: %s", theme.name.c_str(), util::FormatResultDisplay(rc).c_str());
+                }
 
-            auto theme_icon = pu::sdl2::TextureHandle::New(pu::ui::render::LoadImage(theme_icon_path));
-            this->loaded_theme_icons.push_back(theme_icon);
+                auto theme_icon = pu::sdl2::TextureHandle::New(pu::ui::render::LoadImage(theme_icon_path));
+                this->loaded_theme_icons.push_back(theme_icon);
 
-            auto theme_item = pu::ui::elm::MenuItem::New(theme.manifest.name + " (v" + theme.manifest.release + ", " + theme.manifest.author + ")");
-            theme_item->AddOnKey(std::bind(&ThemesMenuLayout::theme_DefaultKey, this));
-            theme_item->SetColor(g_MenuApplication->GetTextColor());
-            theme_item->SetIcon(theme_icon);
-            this->themes_menu->AddItem(theme_item);
+                auto theme_item = pu::ui::elm::MenuItem::New(theme.manifest.name + " (v" + theme.manifest.release + ", " + theme.manifest.author + ")");
+                theme_item->AddOnKey(std::bind(&ThemesMenuLayout::theme_DefaultKey, this));
+                theme_item->SetColor(g_MenuApplication->GetTextColor());
+                theme_item->SetIcon(theme_icon);
+                this->themes_menu->AddItem(theme_item);
+            }
+            else {
+                this->loaded_theme_icons.emplace_back();
+                auto theme_reset_item = pu::ui::elm::MenuItem::New(GetLanguageString("theme_reset"));
+                theme_reset_item->AddOnKey(std::bind(&ThemesMenuLayout::theme_DefaultKey, this));
+                theme_reset_item->SetColor(g_MenuApplication->GetTextColor());
+                theme_reset_item->SetIcon(GetLogoTexture());
+                this->themes_menu->AddItem(theme_reset_item);
+            }
         }
 
         this->themes_menu->SetSelectedIndex(0);
     }
 
     void ThemesMenuLayout::theme_DefaultKey() {
         const auto idx = this->themes_menu->GetSelectedIndex();
-        if(idx == 0) {
-            if(g_ActiveTheme.IsValid()) {
-                const auto option = g_MenuApplication->DisplayDialog(GetLanguageString("theme_reset"), GetLanguageString("theme_reset_conf"), { GetLanguageString("yes"), GetLanguageString("cancel") }, true);
+        const auto &selected_theme = this->loaded_themes.at(idx);
+        if(selected_theme.IsValid()) {
+            if(selected_theme.IsSame(g_ActiveTheme)) {
+                g_MenuApplication->ShowNotification(GetLanguageString("theme_active_this"));
+            }
+            else {
+                std::string theme_conf_msg = selected_theme.manifest.name + "\n";
+                theme_conf_msg += selected_theme.manifest.release + ", " + selected_theme.manifest.author + "\n\n";
+                theme_conf_msg += GetLanguageString("theme_set_conf");
+
+                const auto option = g_MenuApplication->DisplayDialog(selected_theme.manifest.name, theme_conf_msg, { GetLanguageString("yes"), GetLanguageString("cancel") }, true, this->loaded_theme_icons.at(idx));
                 if(option == 0) {
-                    g_ActiveTheme = {};
+                    g_ActiveTheme = selected_theme;
                     UL_ASSERT_TRUE(g_Config.SetEntry(cfg::ConfigEntryId::ActiveThemeName, g_ActiveTheme.name));
                     cfg::SaveConfig(g_Config);
                     g_MenuApplication->ShowNotification(GetLanguageString("theme_cache"));
@@ -93,24 +116,12 @@ namespace ul::menu::ui {
                     UL_RC_ASSERT(ul::menu::smi::RestartMenu());
                 }
             }
-            else {
-                g_MenuApplication->ShowNotification(GetLanguageString("theme_no_active"));
-            }
         }
         else {
-            const auto theme_i = idx - 1;
-            const auto selected_theme = this->loaded_themes.at(theme_i);
-            if(selected_theme.name == g_ActiveTheme.name) {
-                g_MenuApplication->ShowNotification(GetLanguageString("theme_active_this"));
-            }
-            else {
-                std::string theme_conf_msg = selected_theme.manifest.name + "\n";
-                theme_conf_msg += selected_theme.manifest.release + ", " + selected_theme.manifest.author + "\n\n";
-                theme_conf_msg += GetLanguageString("theme_set_conf");
-
-                const auto option = g_MenuApplication->DisplayDialog(selected_theme.manifest.name, theme_conf_msg, { GetLanguageString("yes"), GetLanguageString("cancel") }, true, this->loaded_theme_icons.at(theme_i));
+            if(g_ActiveTheme.IsValid()) {
+                const auto option = g_MenuApplication->DisplayDialog(GetLanguageString("theme_reset"), GetLanguageString("theme_reset_conf"), { GetLanguageString("yes"), GetLanguageString("cancel") }, true);
                 if(option == 0) {
-                    g_ActiveTheme = selected_theme;
+                    g_ActiveTheme = {};
                     UL_ASSERT_TRUE(g_Config.SetEntry(cfg::ConfigEntryId::ActiveThemeName, g_ActiveTheme.name));
                     cfg::SaveConfig(g_Config);
                     g_MenuApplication->ShowNotification(GetLanguageString("theme_cache"));
@@ -122,6 +133,9 @@ namespace ul::menu::ui {
                     UL_RC_ASSERT(ul::menu::smi::RestartMenu());
                 }
             }
+            else {
+                g_MenuApplication->ShowNotification(GetLanguageString("theme_no_active"));
+            }
         }
     }
+16 −0		Plutonium/include/pu/sdl2/sdl2_Types.hpp
+3 −8		Plutonium/include/pu/ui/elm/elm_Image.hpp
+8 −15		Plutonium/include/pu/ui/elm/elm_Menu.hpp
+8 −4		Plutonium/include/pu/ui/ui_Application.hpp
+2 −6		Plutonium/include/pu/ui/ui_Container.hpp
+4 −3		Plutonium/include/pu/ui/ui_Dialog.hpp
+6 −6		Plutonium/include/pu/ui/ui_Layout.hpp
+10 −0		Plutonium/source/pu/sdl2/sdl2_Types.cpp
+1 −1		Plutonium/source/pu/ui/elm/elm_Button.cpp
+10 −16		Plutonium/source/pu/ui/elm/elm_Image.cpp
+8 −28		Plutonium/source/pu/ui/elm/elm_Menu.cpp
+1 −1		Plutonium/source/pu/ui/elm/elm_TextBlock.cpp
+1 −1		Plutonium/source/pu/ui/elm/elm_Toggle.cpp
+9 −1		Plutonium/source/pu/ui/render/render_Renderer.cpp
+48 −26		Plutonium/source/pu/ui/ui_Application.cpp
+31 −16		Plutonium/source/pu/ui/ui_Dialog.cpp
+3 −3		Plutonium/source/pu/ui/ui_Layout.cpp
+1 −2		Plutonium/source/pu/ui/ui_Types.cpp