diff --git a/soitool/media/subtractorcodesmodule.PNG b/soitool/media/subtractorcodesmodule.PNG index a74e8c1a2b9bcec0b1a55e6205c137c53ca8aabc..7a3f581f62d58d2c88dbc909fdd06e27d5b8d404 100644 Binary files a/soitool/media/subtractorcodesmodule.PNG and b/soitool/media/subtractorcodesmodule.PNG differ diff --git a/soitool/modules/code_table_base.py b/soitool/modules/code_table_base.py index 8321c85ed2510b953ad3cde4ef01201e294afaf1..47cb88e32ea4dd39f0527f7c0b2e78f49f00c1ab 100644 --- a/soitool/modules/code_table_base.py +++ b/soitool/modules/code_table_base.py @@ -114,10 +114,8 @@ class CodeTableBase(ModuleBase, QTableWidget, metaclass=Meta): for i in range(self.start_no_of_codes): # Insert non-editable code in third column item_third = QTableWidgetItem(codes[i]) - if self.type == SUBTRACTORCODES_MODULE: - item_third.setTextAlignment(Qt.AlignCenter) - elif self.type == AUTHENTICATIONBOARD_MODULE: - item_third.setFont(self.code_font) + item_third.setTextAlignment(Qt.AlignCenter) + item_third.setFont(self.code_font) item_third.setFlags(item_third.flags() ^ Qt.ItemIsEditable) self.setItem(i, 2, item_third) diff --git a/soitool/modules/module_authentication_board.py b/soitool/modules/module_authentication_board.py index f3c4f6432486da5a72eff4be501b6adf3618bc3b..5399ddd044a96a382011def70db29adad7acf48a 100644 --- a/soitool/modules/module_authentication_board.py +++ b/soitool/modules/module_authentication_board.py @@ -16,7 +16,7 @@ CODE_LENGTH = 25 CODE_CHARACTER_TYPE = "ascii" # Font for authentication codes, should be a monospaced font -CODE_FONT = QtGui.QFont("Consolas", 10) +CODE_FONT = QtGui.QFont("Consolas", 10, QtGui.QFont.SansSerif) # Characters for first column, # it's length determines maximum number of codes (rows). @@ -140,9 +140,6 @@ class AuthenticationBoardModule(CodeTableBase): item_third.setFlags(item_third.flags() ^ Qt.ItemIsEditable) self.setItem(selected_row_index + 1, 2, item_third) - # Resize code-column in case it got wider - # Example: 'BGD' is wider than 'III' (depending on font) - self.resizeColumnToContents(2) self.resizeRowToContents(selected_row_index + 1) resize_table(self, columns=False, rows=False, has_headline=True) diff --git a/soitool/modules/module_subtractorcodes.py b/soitool/modules/module_subtractorcodes.py index 5ef03ddbde0ef4e611a1356f0faeb497ae5ae8ac..8622f14b415973186a6e8a1e76eef606a0503b05 100644 --- a/soitool/modules/module_subtractorcodes.py +++ b/soitool/modules/module_subtractorcodes.py @@ -10,13 +10,16 @@ from soitool.modules.code_table_base import CodeTableBase START_NO_OF_CODES = 7 CODE_LENGTH = 8 +# Font for subtractorcodes +CODE_FONT = QtGui.QFont("Arial", 10, QtGui.QFont.SansSerif) + # Characters for first and second column ROW_IDENTIFIERS = string.ascii_uppercase # Adds space between sets of characters, 0 => no spaces. # If code is 12345678 and interval is 2, code will be 1234 5678 SPACE_INTERVAL = 4 -SPACE_AMOUNT = 5 +SPACE_AMOUNT = 3 HEADLINE_TEXT = "Subtraktorkoder" @@ -56,6 +59,7 @@ class SubtractorcodesModule(CodeTableBase): self.space_interval = SPACE_INTERVAL self.space_amount = SPACE_AMOUNT self.code_character_type = "digits" + self.code_font = CODE_FONT CodeTableBase.__init__(self, size, data) @@ -114,6 +118,7 @@ class SubtractorcodesModule(CodeTableBase): # Insert code item_code = QTableWidgetItem(code) item_code.setTextAlignment(Qt.AlignCenter) + item_code.setFont(self.code_font) item_code.setFlags(item_code.flags() ^ Qt.ItemIsEditable) self.setItem(selected_row_index + 1, 2, item_code)