diff --git a/soitool/new_module_dialog.py b/soitool/new_module_dialog.py index 31e431733ca2af2d0c79881456d23b2cf7b3d107..4687197d17a08204c2a0bb6630ea86c3e20dd618 100644 --- a/soitool/new_module_dialog.py +++ b/soitool/new_module_dialog.py @@ -20,36 +20,12 @@ from soitool.modules.module_authentification_board import ( ) -class ModulePlaceholder(ModuleBase): - """Dummy module used only to fill dialog with content while developing.""" - - def get_size(self): - """Not used.""" - raise NotImplementedError - - def get_data(self): - """Not used.""" - raise NotImplementedError - - @staticmethod - def get_user_friendly_name(): - """Get placeholder name.""" - return "Modul" - - @staticmethod - def get_icon(): - """Get standard placeholder icon.""" - return QIcon("soitool/media/placeholder.png") - - # Constant holding all modules the user can choose from. This is intended as a # point of extensibility. Further modules that are developed can simply be # placed here, and the rest of the program will respect them. MODULE_CHOICES = [ TableModule, AuthentificationBoardModule, - ModulePlaceholder, - ModulePlaceholder, ] diff --git a/soitool/soi_workspace_widget.py b/soitool/soi_workspace_widget.py index 520a3bbaed8d9261d9889fe5bc93f226a53bf5fb..ef8f9a796a14f2625b9f14dda9305edfa37a826c 100644 --- a/soitool/soi_workspace_widget.py +++ b/soitool/soi_workspace_widget.py @@ -16,7 +16,7 @@ from soitool.soi import SOI, ModuleType, ModuleNameTaken from soitool.module_list import ModuleList from soitool.inline_editable_soi_view import InlineEditableSOIView from soitool.setup_settings import Setup -from soitool.new_module_dialog import NewModuleDialog, ModulePlaceholder +from soitool.new_module_dialog import NewModuleDialog from soitool.dialog_wrappers import exec_warning_dialog @@ -102,41 +102,27 @@ class SOIWorkspaceWidget(QWidget): module_widget_implementation = chosen_module.widget_implementation is_attachment = new_module_dialog.checkbox_attachment.isChecked() - if module_widget_implementation is ModulePlaceholder: + # no module name means the user expects one to be generated + # autogenerated name is not meant to be pretty, it's just meant + # to be unique + if not module_name: + module_name = "{} {}".format( + module_choice, + str(len(self.soi.modules) + len(self.soi.attachments) + 1), + ) + + try: + self.soi.add_module( + module_name, module_widget_implementation(), is_attachment, + ) + except ModuleNameTaken: exec_warning_dialog( text="Modulen ble ikke lagt til.", - informative_text="Den valgte modulen er ikke " - "implementert. Modulen er trolig bare valgbar for å fylle " - "ut valgene til flere moduler er implementert.", + informative_text="Navnet du valgte er allerede i " + "bruk. Modulnavn må være unike. Velg et unikt " + "modulnavn, eller la programmet lage et navn " + "automatisk.", ) - else: - # no module name means the user expects one to be generated - # autogenerated name is not meant to be pretty, it's just meant - # to be unique - if not module_name: - module_name = "{} {}".format( - module_choice, - str( - len(self.soi.modules) - + len(self.soi.attachments) - + 1 - ), - ) - - try: - self.soi.add_module( - module_name, - module_widget_implementation(), - is_attachment, - ) - except ModuleNameTaken: - exec_warning_dialog( - text="Modulen ble ikke lagt til.", - informative_text="Navnet du valgte er allerede i " - "bruk. Modulnavn må være unike. Velg et unikt " - "modulnavn, eller la programmet lage et navn " - "automatisk.", - ) elif dialogcode == QDialog.DialogCode.Rejected: pass