Merge remote-tracking branch 'upstream/main'

Author: github-actions[bot]

Themes/MINIMAL/config.json

@@ -1,13 +1,15 @@
 {
-    "showBottomBar": false,
+    "showBottomBar": true,
     "name": "Minimal",
     "author": "@chrisbastion",
     "description": "Minimal",
     "mainMenuViewType": "TEXT_ONLY",
     "systemSelectViewType": "TEXT_ONLY",
     "appMenuViewType": "TEXT_ONLY",
     "gameSelectionViewType": "TEXT_ONLY",
-    "showIndexText": false,
+    "showIndexText": true,
+    "confirmText":"",
+    "backText":"",
     "batteryPercentage": {
         "color": "#FFFFFF",
         "font": "nunwen.ttf",

Themes/MINIMAL/skin/tips-bar-bg.png

@@ -135,66 +135,69 @@ def show_config(self, rom_file_path) :
         while(selected is not None):
 
             config_list = []
-            for config_option in self.game_system.game_system_config.get_launchlist():
-                config_list.append(
-                    GridOrListEntry(
-                        primary_text=config_option.get('name'),
-                        image_path=None,
-                        image_path_selected=None,
-                        description=None,
-                        icon=None,
-                        value=lambda input_value, launch_option=config_option.get('launch')
-                                    : self.run_launch_option(input_value,launch_option)
-
-                        
+            if(not Device.get_system_config().simple_mode_enabled()):
+                for config_option in self.game_system.game_system_config.get_launchlist():
+                    config_list.append(
+                        GridOrListEntry(
+                            primary_text=config_option.get('name'),
+                            image_path=None,
+                            image_path_selected=None,
+                            description=None,
+                            icon=None,
+                            value=lambda input_value, launch_option=config_option.get('launch')
+                                        : self.run_launch_option(input_value,launch_option)
+
+                            
+                        )
                     )
-                )
 
 
             config_list.extend(self.gen_additional_game_options())
 
             menu_options = self.game_system.game_system_config.get_menu_options()
 
-            overridable_entries = []
-            for name, option in menu_options.items():
-                devices = option.get("devices")
-                supported_device = not devices or Device.get_device_name() in devices
-                if(supported_device):
-                    effective_value = self.game_system.game_system_config.get_effective_menu_selection(name,rom_file_path)
-                    display_name = option.get('display')
-                    contains_override = self.game_system.game_system_config.contains_menu_override(name,rom_file_path)
-                    if(contains_override):
-                        display_name = display_name + "*"
-                    
-                    overridable_entries.append(name)
+            if(not Device.get_system_config().simple_mode_enabled()):
+
+                overridable_entries = []
+                for name, option in menu_options.items():
+                    devices = option.get("devices")
+                    supported_device = not devices or Device.get_device_name() in devices
+                    if(supported_device):
+                        effective_value = self.game_system.game_system_config.get_effective_menu_selection(name,rom_file_path)
+                        display_name = option.get('display')
+                        contains_override = self.game_system.game_system_config.contains_menu_override(name,rom_file_path)
+                        if(contains_override):
+                            display_name = display_name + "*"
+                        
+                        overridable_entries.append(name)
+                        config_list.append(
+                                        GridOrListEntry(
+                                        primary_text=display_name,
+                                        value_text="<    " + effective_value + "    >",
+                                        image_path=None,
+                                        image_path_selected=None,
+                                        description=None,
+                                        icon=None,
+                                        value=lambda input_value, entry_name=name, rom_file_path=rom_file_path, contains_override=contains_override, 
+                                        all_options=option.get('options', []), current_value=effective_value,
+                                            update_value=self.game_system.game_system_config.set_menu_option, update_override=self.game_system.game_system_config.set_menu_override,
+                                            remove_override=self.game_system.game_system_config.delete_menu_override
+                                            : self.change_indexed_array_option(entry_name, input_value, rom_file_path, contains_override, all_options, current_value, update_value, update_override, remove_override)
+                                )
+                        )
+
+                if(overridable_entries):
                     config_list.append(
-                                    GridOrListEntry(
-                                    primary_text=display_name,
-                                    value_text="<    " + effective_value + "    >",
-                                    image_path=None,
-                                    image_path_selected=None,
-                                    description=None,
-                                    icon=None,
-                                    value=lambda input_value, entry_name=name, rom_file_path=rom_file_path, contains_override=contains_override, 
-                                    all_options=option.get('options', []), current_value=effective_value,
-                                        update_value=self.game_system.game_system_config.set_menu_option, update_override=self.game_system.game_system_config.set_menu_override,
-                                        remove_override=self.game_system.game_system_config.delete_menu_override
-                                        : self.change_indexed_array_option(entry_name, input_value, rom_file_path, contains_override, all_options, current_value, update_value, update_override, remove_override)
+                        GridOrListEntry(
+                            primary_text="Toggle Settings as Game Specific Override",
+                            image_path=None,
+                            image_path_selected=None,
+                            description=None,
+                            icon=None,
+                            value=lambda input_value,rom_file_path=rom_file_path, overridable_entries=overridable_entries,
+                                        : self.toggle_overridable_entries(input_value,rom_file_path,overridable_entries)
                             )
-                    )
-
-            if(overridable_entries):
-                config_list.append(
-                    GridOrListEntry(
-                        primary_text="Toggle Settings as Game Specific Override",
-                        image_path=None,
-                        image_path_selected=None,
-                        description=None,
-                        icon=None,
-                        value=lambda input_value,rom_file_path=rom_file_path, overridable_entries=overridable_entries,
-                                    : self.toggle_overridable_entries(input_value,rom_file_path,overridable_entries)
                         )
-                    )
 
             if(view is None):        
                 view = ViewCreator.create_view(

main-ui/menus/games/game_config_menu.py

@@ -119,14 +119,15 @@ def run_game_select_popup_menu(self, rom_info : RomInfo, additional_popup_option
 
         popup_options.extend(self.get_game_options(rom_info, additional_popup_options, rom_list, use_full_text=False)) 
 
-        popup_options.append(GridOrListEntry(
-            primary_text=f"Toggle View",
-            image_path=Theme.settings(),
-            image_path_selected=Theme.settings_selected(),
-            description=None,
-            icon=None,
-            value=lambda input_value: self.toggle_view()
-        ))
+        if(not Device.get_system_config().simple_mode_enabled()):
+            popup_options.append(GridOrListEntry(
+                primary_text=f"Toggle View",
+                image_path=Theme.settings(),
+                image_path_selected=Theme.settings_selected(),
+                description=None,
+                icon=None,
+                value=lambda input_value: self.toggle_view()
+            ))
 
         popup_view = ViewCreator.create_view(
             view_type=ViewType.POPUP,

main-ui/menus/games/game_select_menu_popup.py

@@ -177,7 +177,7 @@ def get_images(self, game_system : GameSystem):
         if(index is not None):
             icon = icon_system_name_priority[index]
             selected_icon = selected_icon_system_name_priority[index]
-            if not os.path.isfile(selected_icon):
+            if selected_icon is None or not os.path.isfile(selected_icon):
                 selected_icon = icon    
             return icon, selected_icon
         else:

main-ui/menus/games/game_system_select_menu.py

@@ -29,9 +29,7 @@ def __init__(self, ):
         self.in_game_menu_listener = InGameMenuListener()
         self.popup_menu = GameSelectMenuPopup()
 
-        system_config = Device.get_system_config()
-        self.support_only_game_launching = system_config.game_selection_only_mode_enabled() or system_config.simple_mode_enabled()
-        self.force_allow_b_button = not system_config.game_selection_only_mode_enabled() 
+        self.support_only_game_launching = Device.get_system_config().game_selection_only_mode_enabled()
 
     def _remove_extension(self,file_name):
         return os.path.splitext(file_name)[0]
@@ -248,7 +246,7 @@ def _run_rom_selection_for_rom_list(self, page_name, rom_list) :
                     new_length = len(rom_list)
                     if(Theme.get_game_selection_view_type() != prev_view or original_length != new_length):
                         view = self.create_view(page_name,rom_list,selected)
-                elif(ControllerInput.B == selected.get_input() and (not self.support_only_game_launching or self.force_allow_b_button)):
+                elif(ControllerInput.B == selected.get_input() and (not self.support_only_game_launching)):
 
                     #What is happening on muOS where this is becoming None?
                     if(selected is not None and selected.get_selection() is not None and selected.get_selection().get_value() is not None):

main-ui/menus/games/roms_menu_common.py

@@ -9,7 +9,8 @@
 from menus.settings.extra_settings_menu import ExtraSettingsMenu
 from menus.settings.bluetooth_menu import BluetoothMenu
 from menus.settings.sound_settings import SoundSettings
-from menus.settings.theme.list_of_options_selection_menu import ListOfOptionsSelectionMenu
+from menus.settings.list_of_options_selection_menu import ListOfOptionsSelectionMenu
+from menus.settings.theme.theme_selection_menu import ThemeSelectionMenu
 from menus.settings.theme.theme_settings_menu import ThemeSettingsMenu
 from menus.settings.wifi_menu import WifiMenu
 from themes.theme import Theme
@@ -90,10 +91,10 @@ def change_theme(self, input):
             selected_index+=1
             if(selected_index == len(theme_folders)):
                 selected_index = 0
-        elif(ControllerInput.X == input):
+        elif(ControllerInput.X == input and not Device.get_system_config().simple_mode_enabled()):
             ThemeSettingsMenu().show_theme_options_menu()
         elif(ControllerInput.A == input):
-            selected_index = ListOfOptionsSelectionMenu().get_selected_option_index(theme_folders, "Themes")
+            selected_index = ThemeSelectionMenu().get_selected_option_index(theme_folders, "Themes")
 
 
         if(selected_index is not None):
@@ -189,31 +190,31 @@ def build_options_list(self):
                             )
                     )
 
+        option_list.append(
+                GridOrListEntry(
+                        primary_text="Theme",
+                        value_text="<    " + Device.get_system_config().get_theme() + "    >",
+                        image_path=None,
+                        image_path_selected=None,
+                        description=None,
+                        icon=None,
+                        value=self.change_theme
+                    )
+        )
+            
+
+        if(not Device.get_system_config().simple_mode_enabled()):
             option_list.append(
                         GridOrListEntry(
-                                primary_text="Theme",
-                                value_text="<    " + Device.get_system_config().get_theme() + "    >",
+                                primary_text="Theme Settings",
+                                value_text=None,
                                 image_path=None,
                                 image_path_selected=None,
                                 description=None,
                                 icon=None,
-                                value=self.change_theme
-                            )
+                                value=self.launch_theme_settings
+                        )
             )
-            
-        option_list.append(
-                    GridOrListEntry(
-                            primary_text="Theme Settings",
-                            value_text=None,
-                            image_path=None,
-                            image_path_selected=None,
-                            description=None,
-                            icon=None,
-                            value=self.launch_theme_settings
-                    )
-        )
-
-        if(not Device.get_system_config().simple_mode_enabled()):
 
             option_list.append(
                 GridOrListEntry(

main-ui/menus/settings/basic_settings_menu.py

@@ -1,7 +1,7 @@
 
 from controller.controller_inputs import ControllerInput
 from menus.settings import settings_menu
-from menus.settings.theme.list_of_options_selection_menu import ListOfOptionsSelectionMenu
+from menus.settings.list_of_options_selection_menu import ListOfOptionsSelectionMenu
 from utils.py_ui_config import PyUiConfig
 from views.grid_or_list_entry import GridOrListEntry
 

main-ui/menus/settings/game_system_select_settings_menu.py

@@ -0,0 +1,50 @@
+
+import os
+from controller.controller_inputs import ControllerInput
+from utils.logger import PyUiLogger
+from utils.py_ui_config import PyUiConfig
+from views.grid_or_list_entry import GridOrListEntry
+from views.selection import Selection
+from views.view_creator import ViewCreator
+from views.view_type import ViewType
+
+
+class ThemeSelectionMenu:
+    def __init__(self):
+        pass
+
+    def get_selected_option_index(self, options, title):
+        selected = Selection(None, None, 0)
+        option_list = []
+        theme_dir = PyUiConfig.get("themeDir")
+        for index, opt in enumerate(options):
+            png_path = os.path.join(theme_dir,opt,"preview.png")
+            image_path = png_path
+            if(not os.path.exists(image_path)):
+                qoi_path = os.path.join(theme_dir,opt,"preview.qoi")
+                image_path = qoi_path
+            PyUiLogger.get_logger().info(f"{opt} : {image_path}")
+            option_list.append(
+                GridOrListEntry(
+                    primary_text=opt,
+                    value=index,
+                    image_path=image_path
+                )
+            )
+
+        #convert to text and desc and show the theme desc
+        #maybe preview too if theyre common
+        view = ViewCreator.create_view(
+            view_type=ViewType.TEXT_AND_IMAGE,
+            top_bar_text=title,
+            options=option_list,
+            selected_index=selected.get_index())
+
+        accepted_inputs = [ControllerInput.A, ControllerInput.B]
+
+        while (True):
+            selected = view.get_selection(accepted_inputs)
+            if (ControllerInput.A == selected.get_input()):
+                return selected.get_selection().get_value()
+            elif (ControllerInput.B == selected.get_input()):
+                return None