From 2146818f5a7a4b857932e4ffaf325086d4a916f7 Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Thu, 16 Apr 2020 15:52:57 +0200
Subject: [PATCH] #114 Autentiserings-ikon oppdatert, subtraktorkoder har
 self.font

---
 soitool/media/subtractorcodesmodule.PNG       | Bin 3270 -> 3565 bytes
 soitool/modules/code_table_base.py            |   6 ++----
 .../modules/module_authentication_board.py    |   5 +----
 soitool/modules/module_subtractorcodes.py     |   7 ++++++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/soitool/media/subtractorcodesmodule.PNG b/soitool/media/subtractorcodesmodule.PNG
index a74e8c1a2b9bcec0b1a55e6205c137c53ca8aabc..7a3f581f62d58d2c88dbc909fdd06e27d5b8d404 100644
GIT binary patch
literal 3565
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
N3=K>WReFwb{|8}t&V~R0

literal 3270
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
R+WLDy?9t9Zz4h6|e*&&1BK`mX

diff --git a/soitool/modules/code_table_base.py b/soitool/modules/code_table_base.py
index 8321c85..47cb88e 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 f3c4f64..5399ddd 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 5ef03dd..8622f14 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)
 
-- 
GitLab