#114 Autentiserings-ikon oppdatert, subtraktorkoder har self.font

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)
 

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)

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)