Added typehints to two new files.

Makefile

@@ -5,7 +5,7 @@ SHELL := /bin/bash
 mypy: ## Run static type checker
 	@mypy --ignore-missing-imports securedrop_client
 	@# Add files that are 100% typed to the below call (eventually just the below line will run so that code without static type hints will fail CI)
-	@mypy --ignore-missing-imports --disallow-incomplete-defs --disallow-untyped-defs securedrop_client/db.py securedrop_client/crypto.py securedrop_client/config.py
+	@mypy --ignore-missing-imports --disallow-incomplete-defs --disallow-untyped-defs securedrop_client/db.py securedrop_client/crypto.py securedrop_client/config.py securedrop_client/gui/__init__.py securedrop_client/resources/__init__.py
 
 .PHONY: clean
 clean:  ## Clean the workspace of generated resources

securedrop_client/gui/__init__.py

@@ -38,7 +38,7 @@ class SvgToggleButton(QPushButton):
         The display size of the SVG, defaults to filling the entire size of the widget.
     """
 
-    def __init__(self, on: str, off: str, svg_size=None):
+    def __init__(self, on: str, off: str, svg_size: str=None):
         super().__init__()
 
         # Set layout
@@ -57,13 +57,13 @@ def __init__(self, on: str, off: str, svg_size=None):
         # Make this a toggle button
         self.setCheckable(True)
 
-    def enable(self):
+    def enable(self) -> None:
         self.setEnabled(True)
 
-    def disable(self):
+    def disable(self) -> None:
         self.setEnabled(False)
 
-    def set_icon(self, on: str, off: str):
+    def set_icon(self, on: str, off: str) -> None:
         self.icon = load_toggle_icon(on=on, off=off)
         self.setIcon(self.icon)
 
@@ -87,7 +87,7 @@ class SvgPushButton(QPushButton):
         The display size of the SVG, defaults to filling the entire size of the widget.
     """
 
-    def __init__(self, normal: str, disabled=None, active=None, selected=None, svg_size=None):
+    def __init__(self, normal: str, disabled: str=None, active: str=None, selected: str=None, svg_size:str=None) -> None:
         super().__init__()
 
         # Set layout
@@ -103,10 +103,10 @@ def __init__(self, normal: str, disabled=None, active=None, selected=None, svg_s
         self.setIcon(self.icon)
         self.setIconSize(svg_size) if svg_size else self.setIconSize(QSize())
 
-    def enable(self):
+    def enable(self) -> None:
         self.setEnabled(True)
 
-    def disable(self):
+    def disable(self) -> None:
         self.setEnabled(False)
 
 
@@ -122,7 +122,7 @@ class SvgLabel(QLabel):
         The display size of the SVG, defaults to filling the entire size of the widget.
     """
 
-    def __init__(self, filename: str, svg_size=None):
+    def __init__(self, filename: str, svg_size: str=None) -> None:
         super().__init__()
 
         # Remove margins and spacing

securedrop_client/resources/__init__.py

@@ -27,7 +27,7 @@
 QDir.addSearchPath('css', resource_filename(__name__, 'css'))
 
 
-def path(name, resource_dir="images/"):
+def path(name: str, resource_dir: str = "images/") -> str:
     """
     Return the filename for the referenced image.
 
@@ -63,7 +63,7 @@ def load_toggle_icon(on: str, off: str) -> QIcon:
     return icon
 
 
-def load_icon(normal: str, disabled: str = None, active=None, selected=None) -> QIcon:
+def load_icon(normal: str, disabled: str=None, active: str=None, selected: str=None) -> QIcon:
     """
     Add the contents of Scalable Vector Graphics (SVG) files provided for associated icon modes,
     see https://doc.qt.io/qt-5/qicon.html#Mode-enum.
@@ -102,21 +102,21 @@ def load_icon(normal: str, disabled: str = None, active=None, selected=None) ->
     return icon
 
 
-def load_svg(name):
+def load_svg(name: str) -> QSvgWidget:
     """
     Return a QSvgWidget representation of a file in the resources.
     """
     return QSvgWidget(path(name))
 
 
-def load_image(name):
+def load_image(name: str) -> QPixmap:
     """
     Return a QPixmap representation of a file in the resources.
     """
     return QPixmap(path(name))
 
 
-def load_css(name):
+def load_css(name: str) -> str:
     """
     Return the contents of the referenced CSS file in the resources.
     """