From 5c50c46c8cfba230a03bdd0ce683900b38b53f59 Mon Sep 17 00:00:00 2001 From: Tim Hatch Date: Wed, 24 Jun 2026 21:48:31 -0700 Subject: [PATCH] Fix component imports so it runs for me. I'm on a desktop that doesn't have nmcli; that startup error was previously fatal. --- rcp/components/home/elsbar.kv | 2 +- rcp/components/home/home_toolbar.kv | 4 ++-- rcp/components/screens/axes_setup_screen.kv | 2 +- rcp/components/screens/els_setup_screen.kv | 2 +- rcp/components/screens/inputs_setup_screen.kv | 2 +- rcp/components/screens/log_viewer_screen.kv | 2 +- rcp/components/screens/logs_screen.kv | 2 +- rcp/components/screens/network_screen.kv | 2 +- rcp/components/screens/network_screen.py | 9 ++++++--- rcp/components/screens/profiling_screen.kv | 2 +- rcp/components/screens/setup_screen.kv | 2 +- rcp/components/screens/system_screen.kv | 2 +- 12 files changed, 18 insertions(+), 15 deletions(-) diff --git a/rcp/components/home/elsbar.kv b/rcp/components/home/elsbar.kv index 639a509..bfe9e29 100644 --- a/rcp/components/home/elsbar.kv +++ b/rcp/components/home/elsbar.kv @@ -1,6 +1,6 @@ #: import Factory kivy.factory.Factory #: import Keypad rcp.components.popups.keypad -#: import FeedsTablePopup components.popups.feeds_table_popup +#: import FeedsTablePopup rcp.components.popups.feeds_table_popup #: import AutoSizeButton rcp.components.widgets.auto_size_button : diff --git a/rcp/components/home/home_toolbar.kv b/rcp/components/home/home_toolbar.kv index a4589bb..0d48b89 100644 --- a/rcp/components/home/home_toolbar.kv +++ b/rcp/components/home/home_toolbar.kv @@ -1,4 +1,4 @@ -#: import ToolbarButton components.toolbars.toolbar_button +#: import ToolbarButton rcp.components.toolbars.toolbar_button #: import Factory kivy.factory.Factory #: import Keypad rcp.components.popups.keypad #: import ModePopup rcp.components.popups.mode_popup @@ -44,4 +44,4 @@ on_press: app.manager.goto("setup_screen") Widget: - size_hint_y: 1 \ No newline at end of file + size_hint_y: 1 diff --git a/rcp/components/screens/axes_setup_screen.kv b/rcp/components/screens/axes_setup_screen.kv index 1d4bf04..a84266f 100644 --- a/rcp/components/screens/axes_setup_screen.kv +++ b/rcp/components/screens/axes_setup_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header : BoxLayout: diff --git a/rcp/components/screens/els_setup_screen.kv b/rcp/components/screens/els_setup_screen.kv index f9291a4..15a92a5 100644 --- a/rcp/components/screens/els_setup_screen.kv +++ b/rcp/components/screens/els_setup_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header #: import DropDownItem rcp.components.widgets.dropdown_item #: import TitleItem rcp.components.widgets.title_item diff --git a/rcp/components/screens/inputs_setup_screen.kv b/rcp/components/screens/inputs_setup_screen.kv index 7543e61..ce0f0e1 100644 --- a/rcp/components/screens/inputs_setup_screen.kv +++ b/rcp/components/screens/inputs_setup_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header : BoxLayout: diff --git a/rcp/components/screens/log_viewer_screen.kv b/rcp/components/screens/log_viewer_screen.kv index 08257d9..af8510f 100644 --- a/rcp/components/screens/log_viewer_screen.kv +++ b/rcp/components/screens/log_viewer_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header : BoxLayout: diff --git a/rcp/components/screens/logs_screen.kv b/rcp/components/screens/logs_screen.kv index 8d324c8..35a1165 100644 --- a/rcp/components/screens/logs_screen.kv +++ b/rcp/components/screens/logs_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header #: import LogsPanel rcp.components.setup.logs_panel : diff --git a/rcp/components/screens/network_screen.kv b/rcp/components/screens/network_screen.kv index d3aea58..00cbea4 100644 --- a/rcp/components/screens/network_screen.kv +++ b/rcp/components/screens/network_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header #: import TitleItem rcp.components.widgets.title_item #: import StringItem rcp.components.widgets.string_item #: import BooleanItem rcp.components.widgets.boolean_item diff --git a/rcp/components/screens/network_screen.py b/rcp/components/screens/network_screen.py index 7422a39..78af4bc 100644 --- a/rcp/components/screens/network_screen.py +++ b/rcp/components/screens/network_screen.py @@ -40,10 +40,13 @@ class NetworkScreen(Screen): def __init__(self, **kv): super().__init__(**kv) self.ids['grid_layout'].bind(minimum_height=self.ids['grid_layout'].setter('height')) - self.wifi_enabled = nmcli.radio().wifi + try: + self.wifi_enabled = nmcli.radio().wifi + except: + self.wifi_enabled = False + Clock.schedule_once(lambda dt: asyncio.ensure_future(self.refresh())) + self.status_update_task = Clock.schedule_interval(lambda dt: asyncio.ensure_future(self.status_update()), timeout=1) - Clock.schedule_once(lambda dt: asyncio.ensure_future(self.refresh())) - self.status_update_task = Clock.schedule_interval(lambda dt: asyncio.ensure_future(self.status_update()), timeout=1) def log(self, message: str): log.info(message) diff --git a/rcp/components/screens/profiling_screen.kv b/rcp/components/screens/profiling_screen.kv index c032a27..e5624a7 100644 --- a/rcp/components/screens/profiling_screen.kv +++ b/rcp/components/screens/profiling_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header #: import ProfilingPanel rcp.components.setup.profiling_panel : diff --git a/rcp/components/screens/setup_screen.kv b/rcp/components/screens/setup_screen.kv index d05a47c..dc29891 100644 --- a/rcp/components/screens/setup_screen.kv +++ b/rcp/components/screens/setup_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header : font_size: app.formats.font_size diff --git a/rcp/components/screens/system_screen.kv b/rcp/components/screens/system_screen.kv index 80cc1c4..e78f6f4 100644 --- a/rcp/components/screens/system_screen.kv +++ b/rcp/components/screens/system_screen.kv @@ -1,4 +1,4 @@ -#: import ScreenHeader components.widgets.screen_header +#: import ScreenHeader rcp.components.widgets.screen_header #: import TitleItem rcp.components.widgets.title_item #: import StringItem rcp.components.widgets.string_item #: import ButtonItem rcp.components.widgets.button_item