Merge remote-tracking branch 'upstream/main'

Author: github-actions[bot]

lang/English.json

@@ -123,5 +123,7 @@
     "deleteRom" : "Delete ROM",
     "aboutThisDevice": "About this Device",
     "removeGameSwitcherGame": "Remove from GameSwitcher",
-    "addGameSwitcherGame":"Add to GameSwitcher"
+    "addGameSwitcherGame":"Add to GameSwitcher",
+    "showExtrasInSystemSelectMenu": "Show Apps/Settings/etc",
+    "mergeMainMenuAndGameMenu": "Merge Main Menu And Game Menu"
 }

main-ui/devices/miyoo_trim_common.py

@@ -9,6 +9,7 @@
 from devices.utils.process_runner import ProcessRunner
 from display.font_purpose import FontPurpose
 from menus.games.utils.rom_info import RomInfo
+from themes.theme import Theme
 from utils.logger import PyUiLogger
 
 
@@ -59,6 +60,7 @@ def delete_cmd_to_run():
 
     @staticmethod
     def run_game(device, rom_info: RomInfo, remap_sdcard_path = False, run_prefix ="") -> subprocess.Popen:
+        Theme.check_and_create_ra_assets()
         launch_path = os.path.join(rom_info.game_system.game_system_config.get_emu_folder(),rom_info.game_system.game_system_config.get_launch())
 
         #file_path = /mnt/SDCARD/Roms/FAKE08/Alpine Alpaca.p8

main-ui/menus/app/app_menu.py

@@ -133,8 +133,7 @@ def run_app_selection(self) :
                     selected.get_selection().get_value()()
                 elif(ControllerInput.B == selected.get_input()):
                     self.save_app_selection(selected)
-                    if(not Theme.skip_main_menu()):
-                        running = False
+                    running = False
                 elif(ControllerInput.MENU == selected.get_input()):
                     self.save_app_selection(selected)
                     if(selected.get_selection()):

main-ui/menus/common/top_bar.py

@@ -85,7 +85,8 @@ def render_top_bar_menu_not_skipped(self, title, hide_top_bar_icons = False) :
             self.top_bar_w = max(self.top_bar_w, text_w)
             self.top_bar_h = max(self.top_bar_h, text_h)
 
-        if(Device.supports_wifi()):
+        wifi_icon = None
+        if(Device.supports_wifi() and Device.is_wifi_enabled()):
             wifi_status = Device.get_wifi_status()
             wifi_icon = Theme.get_wifi_icon(wifi_status)
             wifi_w, wifi_h = Display.get_image_dimensions(wifi_icon)
@@ -113,7 +114,7 @@ def render_top_bar_menu_not_skipped(self, title, hide_top_bar_icons = False) :
                     battery_icon ,x_offset,center_of_bar,RenderMode.MIDDLE_RIGHT_ALIGNED)
                 x_offset = x_offset - w - padding
 
-            if(Device.supports_wifi()):
+            if(wifi_icon is not None):
                 #Wifi
                 w, h = Display.render_image(wifi_icon,x_offset,center_of_bar, RenderMode.MIDDLE_RIGHT_ALIGNED)
                 x_offset = x_offset - w - padding

main-ui/menus/games/game_system_select_menu.py

@@ -112,7 +112,12 @@ class GameSystemSelectMenu:
             "zxs": "ZX Spectrum"
         }
 
-    def __init__(self):
+    def __init__(self, app_menu, favorites_menu, collections_menu, recents_menu, settings_menu):
+        self.app_menu = app_menu
+        self.favorites_menu = favorites_menu
+        self.collections_menu = collections_menu
+        self.recents_menu = recents_menu
+        self.settings_menu = settings_menu
         self.game_utils : GameSystemUtils = Device.get_game_system_utils()
         self.rom_select_menu : GameSelectMenu = GameSelectMenu()
         self.use_emu_cfg = False
@@ -191,6 +196,81 @@ def get_rom_count_text(self, game_system):
                return f"{len(roms)} games"  
         else:
             return f"{len(roms)} game"
+        
+    def game_system_selected(self, input_value, game_system : GameSystem):
+        if(ControllerInput.A == input_value):
+            PyUiState.set_last_system_selection(game_system.display_name)
+            return_value = self.rom_select_menu.run_rom_selection(game_system)
+            if(return_value is not None):
+                if(ControllerInput.B == return_value):
+                    PyUiState.set_in_game_selection_screen(None)
+                if(Theme.skip_main_menu()):
+                    return return_value
+        elif(ControllerInput.MENU == input_value):
+            return_value = self.game_system_select_menu_popup.run_popup_menu_selection(game_system)
+            if(return_value is not None):
+                return return_value
+
+    def run_extra(self, input_value, primary_text, run_function):
+        PyUiState.set_last_system_selection(primary_text)
+        if(ControllerInput.A == input_value):
+            PyUiState.set_in_game_selection_screen(True)
+            run_function()
+            PyUiState.set_in_game_selection_screen(False)
+
+    def add_extras_to_systems_list(self, systems_list):
+        if((Theme.skip_main_menu() or Theme.merge_main_menu_and_game_menu()) and Theme.show_extras_in_system_select_menu()):
+            if(Theme.get_apps_enabled()):
+                systems_list.append(GridOrListEntry(
+                        primary_text="Apps",
+                        primary_text_long="Applications",
+                        image_path=Theme.get_system_icon("apps"),
+                        image_path_selected=Theme.get_system_icon_selected("apps"),
+                        description = "Launch Applications",
+                        icon=None,
+                        value=lambda input_value: self.run_extra(input_value, "Apps",self.app_menu.run_app_selection)
+             ))        
+            if(Theme.get_favorites_enabled()):
+                systems_list.append(GridOrListEntry(
+                        primary_text="Favorites",
+                        primary_text_long="Favorites",
+                        image_path=Theme.get_system_icon("favorites"),
+                        image_path_selected=Theme.get_system_icon_selected("favorites"),
+                        description = "Launch Favorites",
+                        icon=None,
+                        value=lambda input_value: self.run_extra(input_value, "Favorites", self.favorites_menu.run_rom_selection)
+                    ) )         
+            if(Theme.get_recents_enabled()):
+                systems_list.append(GridOrListEntry(
+                        primary_text="Recents",
+                        primary_text_long="Recents",
+                        image_path=Theme.get_system_icon("recents"),
+                        image_path_selected=Theme.get_system_icon_selected("recents"),
+                        description = "Launch Recents",
+                        icon=None,
+                        value=lambda input_value: self.run_extra(input_value, "Recents", self.recents_menu.run_rom_selection)
+                    )  )
+            if(Theme.get_collections_enabled()):
+                systems_list.append(GridOrListEntry(
+                        primary_text="Collections",
+                        primary_text_long="Collections",
+                        image_path=Theme.get_system_icon("collections"),
+                        image_path_selected=Theme.get_system_icon_selected("collections"),
+                        description = "Launch Collections",
+                        icon=None,
+                        value=lambda input_value: self.run_extra(input_value, "Collections", self.collections_menu.run_rom_selection)
+                    )          )    
+            if(Theme.get_settings_enabled() or Theme.merge_main_menu_and_game_menu()):
+                systems_list.append(GridOrListEntry(
+                        primary_text="Settings",
+                        primary_text_long="Settings",
+                        image_path=Theme.get_system_icon("settings"),
+                        image_path_selected=Theme.get_system_icon_selected("settings"),
+                        description = "Launch Settings",
+                        icon=None,
+                        value=lambda input_value: self.settings_menu.show_menu() if ControllerInput.A == input_value else None
+                    )  )
+
 
     def build_system_list(self):
         systems_list = []
@@ -210,19 +290,22 @@ def build_system_list(self):
                     image_path_selected=image_path_selected,
                     description = lambda idx=index, gs=game_system: f"{gs.display_name} - {self.get_rom_count_text(gs)} - System {idx} of {total_count}",
                     icon=icon,
-                    value=game_system
+                    value=lambda input_value, game_system=game_system: self.game_system_selected(input_value, game_system)
                 )          
             systems_list.append(option)
-            if(game_system.display_name == PyUiState.get_last_system_selection()):
-                selected = Selection(option,None,index-1)
-        
+
+        self.add_extras_to_systems_list(systems_list)        
+
+        for entry in systems_list:
+            if(entry.get_primary_text() == PyUiState.get_last_system_selection()):
+                selected = Selection(entry,None,systems_list.index(entry))
+                break
         return systems_list, selected
 
     def run_system_selection(self) :
-
         if(self.selected is not None):
             if(PyUiState.get_in_game_selection_screen()):
-                return_value = self.rom_select_menu.run_rom_selection(self.selected.get_selection().get_value())
+                return_value = self.selected.get_selection().get_value()(ControllerInput.A)
                 if(return_value is not None):
                     if(ControllerInput.B == return_value):
                         PyUiState.set_in_game_selection_screen(None)
@@ -260,6 +343,9 @@ def run_system_selection(self) :
                         carousel_selected_entry_width_percent=Theme.get_carousel_system_select_primary_img_width(),
                         carousel_shrink_further_away=Theme.get_carousel_system_select_shrink_further_away(),
                         carousel_sides_hang_off_edge=Theme.get_carousel_system_select_sides_hang_off(),
+                        carousel_x_pad=Theme.get_carousel_system_x_pad(),
+                        carousel_x_offset=Theme.get_carousel_system_external_x_offset(),
+                        grid_view_wrap_around_single_row=Theme.get_system_select_grid_wrap_around_single_row()
                      )
         else:
             view.set_options(self.systems_list)
@@ -271,16 +357,8 @@ def run_system_selection(self) :
 
         while(not exit):
             self.selected = view.get_selection(accepted_inputs)
-            if(ControllerInput.A == self.selected.get_input()):
-                PyUiState.set_last_system_selection(self.selected.get_selection().get_value().display_name)
-                return_value = self.rom_select_menu.run_rom_selection(self.selected.get_selection().get_value())
-                if(return_value is not None):
-                    if(ControllerInput.B == return_value):
-                        PyUiState.set_in_game_selection_screen(None)
-                    if(Theme.skip_main_menu()):
-                        return return_value
-            elif(ControllerInput.MENU == self.selected.get_input()):
-                return_value = self.game_system_select_menu_popup.run_popup_menu_selection(self.selected.get_selection().get_value())
+            if(ControllerInput.A == self.selected.get_input() or ControllerInput.MENU == self.selected.get_input()):
+                return_value = self.selected.get_selection().get_value()(self.selected.get_input())
                 if(return_value is not None):
                     return return_value
             elif(ControllerInput.B == self.selected.get_input() and not Theme.skip_main_menu()):

main-ui/menus/language/language.py

@@ -552,6 +552,14 @@ def sel_bg_resize_pad_height(cls):
     def skip_main_menu(cls):
         return cls._data.get("skipMainMenu","Skip Main Menu")
 
+    @classmethod
+    def merge_main_menu_and_game_menu(cls):
+        return cls._data.get("mergeMainMenuAndGameMenu","Merge Main Menu And Game Menu")
+
+    @classmethod
+    def show_extras_in_system_select_menu(cls):
+        return cls._data.get("showExtrasInSystemSelectMenu","Show Apps/Settings/etc")
+
     @classmethod
     def main_menu(cls):
         return cls._data.get("mainMenu","Main Menu")

main-ui/menus/main_menu.py

@@ -22,12 +22,13 @@
 
 class MainMenu:
     def __init__(self):
-        self.system_select_menu = GameSystemSelectMenu()
         self.app_menu = AppMenu()
         self.favorites_menu = FavoritesMenu()
         self.collections_menu = CollectionsMenu()
         self.recents_menu = RecentsMenu()
         self.settings_menu = BasicSettingsMenu()
+        self.system_select_menu = GameSystemSelectMenu(self.app_menu, self.favorites_menu, self.collections_menu, self.recents_menu, self.settings_menu)
+
         self.popup_menu = MainMenuPopup()
 
     def reorder_options(self,ordering, objects):
@@ -122,7 +123,9 @@ def build_main_menu_view(self, options, selected):
             cols=Theme.get_main_menu_column_count(), 
             rows=1,
             selected_index=selected.get_index(),
-            show_grid_text=Theme.get_main_menu_show_text_grid_mode())
+            show_grid_text=Theme.get_main_menu_show_text_grid_mode(),
+            grid_view_wrap_around_single_row=Theme.get_main_menu_grid_wrap_around_single_row()
+        )
 
     def launch_selection(self, selection):
         if("Game" == selection):
@@ -184,7 +187,7 @@ def run_main_menu_selection(self):
         self.check_for_boxart_resizing()
 
 
-        if(Theme.skip_main_menu()):
+        if(Theme.skip_main_menu() or Theme.merge_main_menu_and_game_menu()):
 
             selection = PyUiState.get_last_main_menu_selection()
             if(selection not in ["Game","App","Setting"]):

main-ui/menus/settings/theme/theme_selection_menu.py

@@ -1,6 +1,7 @@
 
 import os
 from controller.controller_inputs import ControllerInput
+from devices.device import Device
 from utils.logger import PyUiLogger
 from utils.py_ui_config import PyUiConfig
 from views.grid_or_list_entry import GridOrListEntry
@@ -24,13 +25,16 @@ def get_selected_option_index(self, options, title):
                 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(
+            option = GridOrListEntry(
                     primary_text=opt,
                     value=index,
                     image_path=image_path
                 )
+            option_list.append(
+                option
             )
+            if(opt == Device.get_system_config().get_theme()):
+                selected = Selection(option, None, index)
 
         #convert to text and desc and show the theme desc
         #maybe preview too if theyre common

main-ui/menus/settings/theme/theme_settings_main_menu.py

@@ -35,6 +35,23 @@ def build_options_list(self) -> list[GridOrListEntry]:
             )
         )
 
+        option_list.append(
+            self.build_enabled_disabled_entry(
+                primary_text=Language.merge_main_menu_and_game_menu(),
+                get_value_func=Theme.merge_main_menu_and_game_menu,
+                set_value_func=Theme.set_merge_main_menu_and_game_menu
+            )
+        )
+
+        if(Theme.skip_main_menu() or Theme.merge_main_menu_and_game_menu()):
+            option_list.append(
+                self.build_enabled_disabled_entry(
+                    primary_text=Language.show_extras_in_system_select_menu(),
+                    get_value_func=Theme.show_extras_in_system_select_menu,
+                    set_value_func=Theme.set_show_extras_in_system_select_menu
+                )
+            )
+
         if(not Theme.skip_main_menu()):
             option_list.append(
                 self.build_view_type_entry(
@@ -59,7 +76,12 @@ def build_options_list(self) -> list[GridOrListEntry]:
                         set_value_func=Theme.set_main_menu_show_text_grid_mode
                     )
                 )
-            
+                option_list.append(
+                    self.build_enabled_disabled_entry("Wrap-Around", 
+                        Theme.get_main_menu_grid_wrap_around_single_row, 
+                        Theme.set_main_menu_grid_wrap_around_single_row)
+                    )            
+        if(not Theme.skip_main_menu() or Theme.show_extras_in_system_select_menu()):
             option_list.append(
                 self.build_enabled_disabled_entry(
                     primary_text=Language.show_recents(),

main-ui/menus/settings/theme/theme_settings_system_select_menu.py

@@ -34,13 +34,14 @@ def build_options_list(self) -> list[GridOrListEntry]:
                                 set_value_func=Theme.set_list_system_select_img_height
                             )
                         )                       
-
-        if(ViewType.GRID == Theme.get_view_type_for_system_select_menu()):
+        if(ViewType.CAROUSEL == Theme.get_view_type_for_system_select_menu() or ViewType.GRID == Theme.get_view_type_for_system_select_menu()):        
             option_list.append(
                 self.build_numeric_entry("Columns", 
                                         Theme.get_game_system_select_col_count, 
                                         Theme.set_game_system_select_col_count)
             )
+
+        if(ViewType.GRID == Theme.get_view_type_for_system_select_menu()):
             option_list.append(
                 self.build_numeric_entry("Rows", 
                                         Theme.get_game_system_select_row_count, 
@@ -77,7 +78,14 @@ def build_options_list(self) -> list[GridOrListEntry]:
                                 get_value_func=Theme.get_grid_system_select_img_height,
                                 set_value_func=Theme.set_grid_system_select_img_height
                             )
-                        )                       
+                        )                  
+            if(Theme.get_game_system_select_row_count() == 1):
+                option_list.append(
+                    self.build_enabled_disabled_entry("Wrap-Around", 
+                                            Theme.get_system_select_grid_wrap_around_single_row, 
+                                            Theme.set_system_select_grid_wrap_around_single_row)
+                )
+
         if(ViewType.FULLSCREEN_GRID == Theme.get_view_type_for_system_select_menu()):
             option_list.append(
                 self.build_enabled_disabled_entry("Show Text", 
@@ -117,7 +125,18 @@ def build_options_list(self) -> list[GridOrListEntry]:
                         Theme.get_carousel_system_select_sides_hang_off,
                         Theme.set_carousel_system_select_sides_hang_off)
                 )
-
+            option_list.append(
+                self.build_numeric_entry("Internal Padding", 
+                                        Theme.get_carousel_system_x_pad, 
+                                        Theme.set_carousel_system_x_pad,
+                                        min=0)
+            )
+            option_list.append(
+                self.build_numeric_entry("X-Offset", 
+                                        Theme.get_carousel_system_external_x_offset, 
+                                        Theme.set_carousel_system_external_x_offset,
+                                        min=-99999)
+            )
         if(ViewType.CAROUSEL == Theme.get_view_type_for_system_select_menu() or ViewType.CAROUSEL == Theme.get_view_type_for_system_select_menu()):        
             option_list.append(
                 self.build_enabled_disabled_entry(