Skip to content

Commit

Permalink
fix resize issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Allie Crevier committed Feb 19, 2020
1 parent a271358 commit dd0e72a
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 59 deletions.
92 changes: 44 additions & 48 deletions securedrop_client/gui/widgets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from uuid import uuid4
from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal, QEvent, QTimer, QSize, pyqtBoundSignal, \
QObject, QPoint
from PyQt5.QtGui import QIcon, QPalette, QBrush, QColor, QFont, QLinearGradient,QKeySequence, \
from PyQt5.QtGui import QIcon, QPalette, QBrush, QColor, QFont, QLinearGradient, QKeySequence, \
QCursor
from PyQt5.QtWidgets import QApplication, QListWidget, QLabel, QWidget, QListWidgetItem, \
QHBoxLayout, QVBoxLayout, QLineEdit, QScrollArea, QDialog, QAction, QMenu, QMessageBox, \
Expand Down Expand Up @@ -2132,34 +2132,38 @@ class FramelessDialog(QDialog):
color: #2a319d;
}
#header_icon {
padding-left: 10px;
min-width: 80px;
max-width: 80px;
min-height: 64px;
max-height: 64px;
margin: 0px 0px 0px 30px;
}
#header {
min-height: 68px;
max-height: 68px;
margin: 0px 0px 0px 4px;
font-family: 'Montserrat';
font-size: 24px;
font-weight: 600;
color: #2a319d;
padding-bottom: 2px;
}
#header_line {
margin: 20px 0px 20px 0px;
margin: 0px 40px 20px 40px;
min-height: 2px;
max-height: 2px;
background-color: rgba(42, 49, 157, 0.15);
border: none;
}
#error_details {
margin: 0px 40px 0px 36px;
font-family: 'Montserrat';
font-size: 16px;
color: #ff0064;
padding-top: 20px;
padding-bottom: 10px;
}
#body {
font-family: 'Montserrat';
font-size: 16px;
color: #302aa3;
padding-bottom: 20px;
}
#button_box QPushButton {
margin: 0px 0px 0px 12px;
Expand Down Expand Up @@ -2187,9 +2191,8 @@ class FramelessDialog(QDialog):
}
'''

CONTENT_MARGIN = 40
HEADER_MARGIN = 0
BODY_MARGIN = 0
MARGIN = 40
NO_MARGIN = 0

dialog_closing = pyqtSignal()

Expand Down Expand Up @@ -2219,42 +2222,39 @@ def __init__(self):
close_button.clicked.connect(self.close)
titlebar_layout.addWidget(close_button, alignment=Qt.AlignRight)

# Content including: header, body, help menu, and buttons
content = QWidget()
content_layout = QVBoxLayout()
content.setLayout(content_layout)
content_layout.setContentsMargins(
self.CONTENT_MARGIN, 0, self.CONTENT_MARGIN, self.CONTENT_MARGIN)
# Header for icon and task title
header_container = QWidget()
header_container_layout = QHBoxLayout()
header_container_layout.setContentsMargins(
self.HEADER_MARGIN, self.HEADER_MARGIN, self.HEADER_MARGIN, self.HEADER_MARGIN)
header_container.setLayout(header_container_layout)
self.header_icon = SvgLabel('blank.svg', svg_size=QSize(64, 64))
self.header_icon.setObjectName('header_icon')
self.header_icon.setFixedWidth(80)
self.header = QLabel()
self.header.setObjectName('header')
self.header.setWordWrap(True)
header_container_layout.addWidget(self.header_icon, alignment=Qt.AlignLeft)
header_container_layout.addWidget(self.header, alignment=Qt.AlignLeft)
header_container_layout.addWidget(self.header_icon)
header_container_layout.addWidget(self.header, alignment=Qt.AlignCenter)
header_container_layout.addStretch()

self.header_line = QWidget()
self.header_line.setObjectName('header_line')

# Widget for displaying error messages
self.error_details = QLabel()
self.error_details.setObjectName('error_details')
self.error_details.setWordWrap(True)
self.error_details.hide()

# Body to display instructions and forms
self.body = QLabel()
self.body.setObjectName('body')
self.body.setWordWrap(True)
self.body.setScaledContents(True)
body_container = QWidget()
self.body_layout = QVBoxLayout()
self.body_layout.setContentsMargins(
self.BODY_MARGIN, self.BODY_MARGIN, self.BODY_MARGIN, self.BODY_MARGIN)
self.body_layout.setContentsMargins(self.MARGIN, self.NO_MARGIN, self.MARGIN, self.MARGIN)
body_container.setLayout(self.body_layout)
self.body_layout.addWidget(self.body)

# Buttons to continue and cancel
window_buttons = QWidget()
window_buttons.setObjectName('window_buttons')
button_layout = QVBoxLayout()
Expand All @@ -2270,18 +2270,18 @@ def __init__(self):
button_box.addButton(self.cancel_button, QDialogButtonBox.ActionRole)
button_box.addButton(self.continue_button, QDialogButtonBox.ActionRole)
button_layout.addWidget(button_box, alignment=Qt.AlignRight)
content_layout.addWidget(header_container)
content_layout.addWidget(self.header_line)
content_layout.addWidget(self.error_details)
content_layout.addWidget(body_container)
content_layout.addStretch()
content_layout.addWidget(window_buttons)

# Layout
button_layout.setContentsMargins(self.NO_MARGIN, self.NO_MARGIN, self.MARGIN, self.MARGIN)

# Main widget layout
layout = QVBoxLayout(self)
self.setLayout(layout)
layout.addWidget(titlebar)
layout.addWidget(content)
layout.addWidget(header_container)
layout.addWidget(self.header_line)
layout.addWidget(self.error_details)
layout.addWidget(body_container)
layout.addStretch()
layout.addWidget(window_buttons)

def close(self):
self.dialog_closing.emit()
Expand Down Expand Up @@ -2326,7 +2326,6 @@ def __init__(self, controller: Controller, file_uuid: str, file_name: str):
self.error_header = _('Unable to print')
self.starting_message = _(
'<h2>Managing printout risks</h2>'
'<br />'
'<b>QR-Codes and visible web addresses</b>'
'<br />'
'Never open web addresses or scan QR codes contained in printed documents without '
Expand All @@ -2353,7 +2352,7 @@ def _show_starting_instructions(self):

def _show_insert_usb_message(self):
self.continue_button.clicked.connect(self._run_preflight)
self.header.setText('\n{}'.format(self.insert_usb_header))
self.header.setText(self.insert_usb_header)
self.body.setText(self.insert_usb_message)
self.error_details.hide()
self.adjustSize()
Expand All @@ -2362,7 +2361,7 @@ def _show_insert_usb_message(self):
def _show_generic_error_message(self):
self.continue_button.clicked.connect(self.close)
self.continue_button.setText('DONE')
self.header.setText('\n{}'.format(self.error_header))
self.header.setText(self.error_header)
self.body.setText('{}: {}'.format(self.error_status, self.generic_error_message))
self.error_details.hide()
self.adjustSize()
Expand Down Expand Up @@ -2413,7 +2412,7 @@ class ExportDialog(FramelessDialog):
font-weight: 500;
font-size: 12px;
color: #2a319d;
padding-top: 10px;
padding-top: 6px;
}
#passphrase_form QLineEdit {
border-radius: 0px;
Expand All @@ -2425,7 +2424,7 @@ class ExportDialog(FramelessDialog):
'''

PASSPHRASE_LABEL_SPACING = 0.5
PASSPHRASE_MARGIN = 0
NO_MARGIN = 0

def __init__(self, controller: Controller, file_uuid: str, file_name: str):
super().__init__()
Expand Down Expand Up @@ -2488,10 +2487,7 @@ def __init__(self, controller: Controller, file_uuid: str, file_name: str):
self.passphrase_form.setObjectName('passphrase_form')
passphrase_form_layout = QVBoxLayout()
passphrase_form_layout.setContentsMargins(
self.PASSPHRASE_MARGIN,
self.PASSPHRASE_MARGIN,
self.PASSPHRASE_MARGIN,
self.PASSPHRASE_MARGIN)
self.NO_MARGIN, self.NO_MARGIN, self.NO_MARGIN, self.NO_MARGIN)
self.passphrase_form.setLayout(passphrase_form_layout)
passphrase_label = SecureQLabel(_('Passphrase'))
passphrase_label.setObjectName('passphrase_label')
Expand Down Expand Up @@ -2521,7 +2517,7 @@ def _show_starting_instructions(self):

def _show_passphrase_request_message(self):
self.continue_button.clicked.connect(self._export_file)
self.header.setText('\n{}'.format(self.passphrase_header))
self.header.setText(self.passphrase_header)
self.continue_button.setText('SUBMIT')
self.header_line.hide()
self.error_details.hide()
Expand All @@ -2532,7 +2528,7 @@ def _show_passphrase_request_message(self):

def _show_passphrase_request_message_again(self):
self.continue_button.clicked.connect(self._export_file)
self.header.setText('\n{}'.format(self.passphrase_header))
self.header.setText(self.passphrase_header)
self.error_details.setText(self.passphrase_error_message)
self.continue_button.setText('SUBMIT')
self.header_line.hide()
Expand All @@ -2544,7 +2540,7 @@ def _show_passphrase_request_message_again(self):

def _show_success_message(self):
self.continue_button.clicked.connect(self.close)
self.header.setText('\n{}'.format(self.success_header))
self.header.setText(self.success_header)
self.continue_button.setText('DONE')
self.body.setText(self.success_message)
self.cancel_button.hide()
Expand All @@ -2557,7 +2553,7 @@ def _show_success_message(self):

def _show_insert_usb_message(self):
self.continue_button.clicked.connect(self._run_preflight)
self.header.setText('\n{}'.format(self.insert_usb_header))
self.header.setText(self.insert_usb_header)
self.continue_button.setText('CONTINUE')
self.body.setText(self.insert_usb_message)
self.error_details.hide()
Expand All @@ -2569,7 +2565,7 @@ def _show_insert_usb_message(self):

def _show_insert_encrypted_usb_message(self):
self.continue_button.clicked.connect(self._run_preflight)
self.header.setText('\n{}'.format(self.insert_usb_header))
self.header.setText(self.insert_usb_header)
self.error_details.setText(self.usb_error_message)
self.continue_button.setText('CONTINUE')
self.body.setText(self.insert_usb_message)
Expand All @@ -2583,7 +2579,7 @@ def _show_insert_encrypted_usb_message(self):
def _show_generic_error_message(self):
self.continue_button.clicked.connect(self.close)
self.continue_button.setText('DONE')
self.header.setText('\n{}'.format(self.error_header))
self.header.setText(self.error_header)
self.body.setText('{}: {}'.format(self.error_status, self.generic_error_message))
self.error_details.hide()
self.passphrase_form.hide()
Expand Down
21 changes: 10 additions & 11 deletions tests/gui/test_widgets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ def test_FileWidget__unset_dialog_in_progress(mocker, source, session):
get_file = mocker.MagicMock(return_value=file)
controller = mocker.MagicMock(get_file=get_file)

fw = FileWidget(file.uuid, controller, mocker.MagicMock())
fw = FileWidget(file.uuid, controller, mocker.MagicMock(), mocker.MagicMock(), 0)
fw.update = mocker.MagicMock()
mocker.patch('securedrop_client.gui.widgets.QDialog.exec')
controller.run_export_preflight_checks = mocker.MagicMock()
Expand Down Expand Up @@ -1810,7 +1810,7 @@ def test_FileWidget__on_print_clicked(mocker, session, source):

fw._on_print_clicked()

dialog.assert_called_once_with(controller, file.uuid, file.original_filename)
dialog.assert_called_once_with(controller, file.uuid, file.filename)


def test_FileWidget__on_print_clicked_missing_file(mocker, session, source):
Expand Down Expand Up @@ -1905,7 +1905,7 @@ def test_ExportDialog___show_passphrase_request_message(mocker):

dialog._show_passphrase_request_message()

assert dialog.header.text() == '\nEnter passphrase for USB drive'
assert dialog.header.text() == 'Enter passphrase for USB drive'
assert not dialog.header.isHidden()
assert dialog.header_line.isHidden()
assert dialog.error_details.isHidden()
Expand All @@ -1922,7 +1922,7 @@ def test_ExportDialog__show_passphrase_request_message_again(mocker):

dialog._show_passphrase_request_message_again()

assert dialog.header.text() == '\nEnter passphrase for USB drive'
assert dialog.header.text() == 'Enter passphrase for USB drive'
assert dialog.error_details.text() == 'The passphrase provided did not work. Please try again.'
assert dialog.body.isHidden()
assert not dialog.header.isHidden()
Expand All @@ -1941,7 +1941,7 @@ def test_ExportDialog__show_success_message(mocker):

dialog._show_success_message()

assert dialog.header.text() == '\nExport successful'
assert dialog.header.text() == 'Export successful'
assert dialog.body.text() == \
'Remember to be careful when working with files outside of your Workstation machine.'
assert not dialog.header.isHidden()
Expand All @@ -1960,7 +1960,7 @@ def test_ExportDialog__show_insert_usb_message(mocker):

dialog._show_insert_usb_message()

assert dialog.header.text() == '\nInsert encrypted USB drive'
assert dialog.header.text() == 'Insert encrypted USB drive'
assert dialog.body.text() == \
'Please insert one of the export drives provisioned specifically ' \
'for the SecureDrop Workstation.'
Expand All @@ -1980,7 +1980,7 @@ def test_ExportDialog__show_insert_encrypted_usb_message(mocker):

dialog._show_insert_encrypted_usb_message()

assert dialog.header.text() == '\nInsert encrypted USB drive'
assert dialog.header.text() == 'Insert encrypted USB drive'
assert dialog.error_details.text() == \
'Either the drive is not encrypted or there is something else wrong with it.'
assert dialog.body.text() == \
Expand All @@ -2003,7 +2003,7 @@ def test_ExportDialog__show_generic_error_message(mocker):

dialog._show_generic_error_message()

assert dialog.header.text() == '\nUnable to export'
assert dialog.header.text() == 'Unable to export'
assert dialog.body.text() == 'mock_error_status: See your administrator for help.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand Down Expand Up @@ -2235,7 +2235,6 @@ def test_PrintDialog__show_starting_instructions(mocker):
'<span style="font-weight:normal">mock.jpg</span>'
assert dialog.body.text() == \
'<h2>Managing printout risks</h2>' \
'<br />' \
'<b>QR-Codes and visible web addresses</b>' \
'<br />' \
'Never open web addresses or scan QR codes contained in printed documents without ' \
Expand All @@ -2262,7 +2261,7 @@ def test_PrintDialog__show_insert_usb_message(mocker):

dialog._show_insert_usb_message()

assert dialog.header.text() == '\nInsert USB printer'
assert dialog.header.text() == 'Insert USB printer'
assert dialog.body.text() == 'Please connect your printer to a USB port.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand All @@ -2280,7 +2279,7 @@ def test_PrintDialog__show_generic_error_message(mocker):

dialog._show_generic_error_message()

assert dialog.header.text() == '\nUnable to print'
assert dialog.header.text() == 'Unable to print'
assert dialog.body.text() == 'mock_error_status: See your administrator for help.'
assert not dialog.header.isHidden()
assert not dialog.header_line.isHidden()
Expand Down

0 comments on commit dd0e72a

Please sign in to comment.