jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-27 17:53:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove remaining deprecated arguments from Option class

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-08-31 16:53:26 +02:00
parent fee52551c7
commit 5d2b9e4671
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py
View File

@@ -32,7 +32,7 @@ class KlipperNoFirmwareErrorMenu(BaseMenu):
self.previous_menu = previous_menu self.previous_menu = previous_menu
def set_options(self) -> None: def set_options(self) -> None:
self.default_option = Option(self.go_back, False) self.default_option = Option(method=self.go_back)
def print_menu(self) -> None: def print_menu(self) -> None:
header = "!!! NO FIRMWARE FILE FOUND !!!" header = "!!! NO FIRMWARE FILE FOUND !!!"
@@ -79,7 +79,7 @@ class KlipperNoBoardTypesErrorMenu(BaseMenu):
self.previous_menu = previous_menu self.previous_menu = previous_menu
def set_options(self) -> None: def set_options(self) -> None:
self.default_option = Option(self.go_back, False) self.default_option = Option(method=self.go_back)
def print_menu(self) -> None: def print_menu(self) -> None:
header = "!!! ERROR GETTING BOARD LIST !!!" header = "!!! ERROR GETTING BOARD LIST !!!"

5
kiauh/components/klipper_firmware/menus/klipper_flash_menu.py
View File

@@ -260,8 +260,7 @@ class KlipperSelectMcuIdMenu(BaseMenu):
def set_options(self) -> None: def set_options(self) -> None:
self.options = { self.options = {
f"{i}": Option(self.flash_mcu, False, f"{i}") f"{i}": Option(self.flash_mcu, f"{i}") for i in range(len(self.mcu_list))
for i in range(len(self.mcu_list))
} }
def print_menu(self) -> None: def print_menu(self) -> None:
@@ -323,7 +322,7 @@ class KlipperSelectSDFlashBoardMenu(BaseMenu):
def set_options(self) -> None: def set_options(self) -> None:
self.options = { self.options = {
f"{i}": Option(self.board_select, False, f"{i}") f"{i}": Option(self.board_select, f"{i}")
for i in range(len(self.available_boards)) for i in range(len(self.available_boards))
} }

2
kiauh/components/log_uploads/menus/log_upload_menu.py
View File

@@ -32,7 +32,7 @@ class LogUploadMenu(BaseMenu):
def set_options(self) -> None: def set_options(self) -> None:
self.options = { self.options = {
f"{index}": Option(self.upload, False, opt_index=f"{index}") f"{index}": Option(self.upload, opt_index=f"{index}")
for index in range(len(self.logfile_list)) for index in range(len(self.logfile_list))
} }

4
kiauh/core/menus/__init__.py
View File

@@ -10,7 +10,7 @@ from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass
from enum import Enum from enum import Enum
from typing import Any, Callable from typing import Any, Callable, Type
@dataclass @dataclass
@@ -22,7 +22,7 @@ class Option:
:param opt_data: Can be used to pass any additional data to the menu option :param opt_data: Can be used to pass any additional data to the menu option
""" """
method: Callable | None = None method: Type[Callable] | None = None
opt_index: str = "" opt_index: str = ""
opt_data: Any = None opt_data: Any = None

4
kiauh/extensions/extensions_menu.py
View File

@@ -38,9 +38,7 @@ class ExtensionsMenu(BaseMenu):
def set_options(self) -> None: def set_options(self) -> None:
self.options = { self.options = {
i: Option( i: Option(self.extension_submenu, opt_data=self.extensions.get(i))
self.extension_submenu, menu=True, opt_data=self.extensions.get(i)
)
for i in self.extensions for i in self.extensions
} }

2
kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py
View File

@@ -93,7 +93,7 @@ class MainsailThemeInstallMenu(BaseMenu):
def set_options(self) -> None: def set_options(self) -> None:
self.options = { self.options = {
f"{index}": Option(self.install_theme, False, opt_index=f"{index}") f"{index}": Option(self.install_theme, opt_index=f"{index}")
for index in range(len(self.themes)) for index in range(len(self.themes))
} }