.isort.cfg

@@ -1,3 +1,6 @@
 [settings]
-multi_line_output = 3
-trailing_comma = True
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+line_length=88

piket_client/set_active.py

@@ -2,9 +2,13 @@
 Provides a helper tool to (de-)activate multiple people at once.
 """
 
+import math
 import sys
 
 # pylint: disable=E0611
+import qdarkstyle
+from PySide2.QtCore import QObject, QSize, Qt, Signal, Slot
+from PySide2.QtGui import QIcon
 from PySide2.QtWidgets import (
     QAction,
     QActionGroup,
@@ -19,14 +23,10 @@ from PySide2.QtWidgets import (
     QToolBar,
     QWidget,
 )
-from PySide2.QtGui import QIcon
-from PySide2.QtCore import QObject, QSize, Qt, Signal, Slot
 
-# pylint: enable=E0611
+from piket_client.model import NetworkError, Person, ServerStatus
 
-import qdarkstyle
-
-from piket_client.model import Person, ServerStatus
+# pylint: enable=E0611
 
 
 class ActivationButton(QPushButton):
@@ -55,7 +55,8 @@ class ActivationButtons(QWidget):
 
     def init_ui(self) -> None:
         ps = Person.get_all()
-        num_columns = round(len(ps) / 10) + 1
+        assert not isinstance(ps, NetworkError)
+        num_columns = math.ceil(math.sqrt(len(ps)))
 
         for index, person in enumerate(ps):
             button = ActivationButton(person, self)
@@ -66,7 +67,7 @@ class ActiveStateMainWindow(QMainWindow):
     def __init__(self) -> None:
         super().__init__()
 
-        self.toolbar = None
+        self.toolbar = QToolBar()
 
         self.init_ui()
 
@@ -79,7 +80,6 @@ class ActiveStateMainWindow(QMainWindow):
         icon_size = font_metrics.height() * 1.45
 
         # Toolbar
-        self.toolbar = QToolBar()
         self.toolbar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
         self.toolbar.setIconSize(QSize(icon_size, icon_size))
 
@@ -112,17 +112,16 @@ def main() -> None:
     app.setFont(font)
 
     # Test connectivity
-    server_running, info = ServerStatus.is_server_running()
+    server_running = ServerStatus.is_server_running()
 
-    if not server_running:
-        LOG.critical("Could not connect to server", extra={"info": info})
+    if not isinstance(server_running, bool):
         QMessageBox.critical(
             None,
             "Help er is iets kapot",
             "Kan niet starten omdat de server niet reageert, stuur een foto van "
-            "dit naar Maarten: " + repr(info),
+            "dit naar Maarten: " + repr(server_running.value),
         )
-        return 1
+        return
 
     # Load main window
     main_window = ActiveStateMainWindow()