Merge pull request #1103 from freedomofpress/screenresrefactor

reduce minimum size

Author: rmol

securedrop_client/api_jobs/downloads.py

@@ -83,7 +83,7 @@ def _get_realistic_timeout(self, size_in_bytes: int) -> int:
 
         * Minimum timeout allowed is 25 seconds
         """
-        TIMEOUT_BYTES_PER_SECOND = 100000.0
+        TIMEOUT_BYTES_PER_SECOND = 100_000.0
         TIMEOUT_ADJUSTMENT_FACTOR = 1.5
         TIMEOUT_BASE = 25
         timeout = math.ceil((size_in_bytes / TIMEOUT_BYTES_PER_SECOND) * TIMEOUT_ADJUSTMENT_FACTOR)

securedrop_client/config.py

@@ -27,7 +27,7 @@ def from_home_dir(cls: Type[T], sdc_home: str) -> T:
             logger.error("Error opening config file at {}: {}".format(full_path, e))
             json_config = {}
 
-        return cls(journalist_key_fingerprint=json_config.get("journalist_key_fingerprint", None),)
+        return cls(journalist_key_fingerprint=json_config.get("journalist_key_fingerprint", None))
 
     @property
     def is_valid(self) -> bool:

securedrop_client/export.py

@@ -59,9 +59,7 @@ class Export(QObject):
     DISK_TEST_METADATA = {"device": "disk-test"}
 
     PRINT_FN = "print_archive.sd-export"
-    PRINT_METADATA = {
-        "device": "printer",
-    }
+    PRINT_METADATA = {"device": "printer"}
 
     DISK_FN = "archive.sd-export"
     DISK_METADATA = {"device": "disk", "encryption_method": "luks"}

securedrop_client/gui/main.py

@@ -78,8 +78,8 @@ def __init__(self) -> None:
         self.main_pane.setLayout(layout)
         self.left_pane = LeftPane()
         self.main_view = MainView(self.main_pane)
-        layout.addWidget(self.left_pane, 1)
-        layout.addWidget(self.main_view, 8)
+        layout.addWidget(self.left_pane)
+        layout.addWidget(self.main_view)
 
         # Set the main window's central widget to show Top Pane and Main Pane
         self.central_widget = QWidget()

securedrop_client/gui/widgets.py

@@ -177,7 +177,6 @@ def __init__(self):
         layout.setSpacing(0)
         layout.setAlignment(Qt.AlignBottom)
         self.setFixedWidth(198)
-        self.setMinimumHeight(558)
 
         # Set background image
         self.logo = QWidget()
@@ -190,7 +189,6 @@ def __init__(self):
         )
         self.logo.setPalette(self.offline_palette)
         self.logo.setAutoFillBackground(True)
-        self.logo.setMaximumHeight(884)
         self.logo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.logo.setEnabled(False)
 
@@ -396,7 +394,6 @@ def __init__(self):
         palette.setBrush(QPalette.Background, QBrush(QColor("#0096DC")))
         self.setPalette(palette)
         self.setAutoFillBackground(True)
-        self.setMinimumHeight(20)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
 
         # Set layout
@@ -422,17 +419,12 @@ def __init__(self):
         self.user_icon_font.setLetterSpacing(QFont.AbsoluteSpacing, 0.58)
         self.user_icon.setFont(self.user_icon_font)
         self.user_icon.clicked.connect(self.user_button.click)
-        # Set cursor.
         self.user_icon.setCursor(QCursor(Qt.PointingHandCursor))
 
         # Add widgets to user auth layout
-        layout.addWidget(self.login_button, 1)
-        layout.addWidget(self.user_icon, 1)
-        layout.addWidget(self.user_button, 4)
-
-        # Align content to the top left
-        layout.addStretch()
-        layout.setAlignment(Qt.AlignTop)
+        layout.addWidget(self.login_button, alignment=Qt.AlignTop)
+        layout.addWidget(self.user_icon, alignment=Qt.AlignTop)
+        layout.addWidget(self.user_button, alignment=Qt.AlignTop)
 
     def setup(self, window, controller):
         self.user_button.setup(controller)
@@ -793,7 +785,6 @@ def __init__(self):
         super().__init__()
 
         self.setObjectName("SourceList")
-        self.setFixedWidth(540)
         self.setUniformItemSizes(True)
 
         # Set layout.
@@ -986,7 +977,7 @@ class SourceWidget(QWidget):
 
     SIDE_MARGIN = 10
     SOURCE_WIDGET_VERTICAL_MARGIN = 10
-    PREVIEW_WIDTH = 412
+    PREVIEW_WIDTH = 380
     PREVIEW_HEIGHT = 60
 
     def __init__(self, controller: Controller, source: Source):
@@ -1059,8 +1050,8 @@ def __init__(self, controller: Controller, source: Source):
         self.paperclip.setFixedSize(QSize(22, 22))
         self.timestamp = QLabel()
         self.timestamp.setObjectName("SourceWidget_timestamp")
-        metadata_layout.addWidget(self.paperclip, 0, Qt.AlignRight)
-        metadata_layout.addWidget(self.timestamp, 0, Qt.AlignRight)
+        metadata_layout.addWidget(self.paperclip, alignment=Qt.AlignRight)
+        metadata_layout.addWidget(self.timestamp, alignment=Qt.AlignRight)
         metadata_layout.addStretch()
 
         # Set up a source_widget
@@ -1321,7 +1312,7 @@ def _construct_message(self, source: Source) -> str:
 
         message_tuple = (
             "<big>Deleting the Source account for",
-            "<b>{}</b> will also".format(source.journalist_designation,),
+            "<b>{}</b> will also".format(source.journalist_designation),
             "delete {} files, {} replies, and {} messages.</big>".format(files, replies, messages),
             "<br>",
             "<small>This Source will no longer be able to correspond",

securedrop_client/logic.py

@@ -397,10 +397,7 @@ def call_api(
         new_api_thread.started.connect(new_api_runner.call_api)
 
         # Add the thread related objects to the api_threads dictionary.
-        self.api_threads[new_thread_id] = {
-            "thread": new_api_thread,
-            "runner": new_api_runner,
-        }
+        self.api_threads[new_thread_id] = {"thread": new_api_thread, "runner": new_api_runner}
 
         # Start the thread and related activity.
         new_api_thread.start()
@@ -834,7 +831,7 @@ def print_file(self, file_uuid: str) -> None:
 
     @login_required
     def on_submission_download(
-        self, submission_type: Union[Type[db.File], Type[db.Message]], submission_uuid: str,
+        self, submission_type: Union[Type[db.File], Type[db.Message]], submission_uuid: str
     ) -> None:
         """
         Download the file associated with the Submission (which may be a File or Message).

securedrop_client/resources/css/reply_message.css

@@ -1,6 +1,4 @@
 #ReplyWidget_message {
-    min-width: 508px;
-    max-width: 508px;
     font-family: 'Source Sans Pro';
     font-weight: 400;
     font-size: 15px;
@@ -10,8 +8,6 @@
 }
 
 #ReplyWidget_message_pending {
-    min-width: 508px;
-    max-width: 508px;
     font-family: 'Source Sans Pro';
     font-weight: 400;
     font-size: 15px;
@@ -21,8 +17,6 @@
 }
 
 #ReplyWidget_message_failed {
-    min-width: 508px;
-    max-width: 508px;
     font-family: 'Source Sans Pro';
     font-weight: 400;
     font-size: 15px;

securedrop_client/resources/css/sdclient.css

@@ -100,6 +100,7 @@
 
 #UserProfile {
     padding: 15px;
+    min-height: 200px
 }
 
 #UserProfile_icon {
@@ -148,7 +149,7 @@
 }
 
 #MainView_view_holder {
-    min-width: 667;
+    min-width: 500;
     border: none;
     background-color: #f3f5f9;
 }
@@ -171,19 +172,19 @@
 }
 
 #EmptyConversationView_no_sources QLabel#EmptyConversationView_instructions {
-    min-width: 520px;
     max-width: 600px;
 }
 
 #EmptyConversationView_no_source_selected QLabel#EmptyConversationView_instructions {
-    min-width: 520px;
     max-width: 520px;
 }
 
 QListView#SourceList {
     border: none;
     show-decoration-selected: 0;
     border-right: 3px solid #f3f5f9;
+    min-width: 500px;
+    max-width: 540px;
 }
 
 QListView#SourceList::item:selected {

securedrop_client/resources/css/speech_bubble_message.css

@@ -1,6 +1,4 @@
 #SpeechBubble_message {
-    min-width: 508px;
-    max-width: 508px;
     font-family: 'Source Sans Pro';
     font-weight: 400;
     font-size: 15px;
@@ -10,8 +8,6 @@
 }
 
 #SpeechBubble_message_decryption_error {
-    min-width: 508px;
-    max-width: 508px;
     font-family: 'Source Sans Pro';
     font-weight: 400;
     font-size: 15px;

setup.py

@@ -34,5 +34,5 @@
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
     ),
-    entry_points={"console_scripts": ["sd-client = securedrop_client.app:run",],},
+    entry_points={"console_scripts": ["sd-client = securedrop_client.app:run"]},
 )