From 41cda4d8c06111478e096b70413bf90c146f538b Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Tue, 31 Mar 2020 09:30:50 +0200
Subject: [PATCH] #86 Fjernet ModulePlaceholder
---
soitool/new_module_dialog.py | 24 ---------------
soitool/soi_workspace_widget.py | 52 ++++++++++++---------------------
2 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/soitool/new_module_dialog.py b/soitool/new_module_dialog.py
index 31e4317..4687197 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 520a3bb..ef8f9a7 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
--
GitLab