From 81c47c3b30271a3bdbead66bad5e4f781539508f Mon Sep 17 00:00:00 2001 From: Anon McHacker Date: Mon, 28 Nov 2022 17:56:04 -0800 Subject: [PATCH] Various UI fixes --- src/sgui/_main.py | 2 +- src/sgui/daw/sequencer/__init__.py | 4 +-- src/sgui/project.py | 2 +- src/sgui/sgqt.py | 46 ++++++++++++++++++++++++++---- src/sgui/util.py | 2 +- 5 files changed, 45 insertions(+), 11 deletions(-) diff --git a/src/sgui/_main.py b/src/sgui/_main.py index 02456ca6..00975e63 100644 --- a/src/sgui/_main.py +++ b/src/sgui/_main.py @@ -120,7 +120,7 @@ def _yes(): f_reply = QMessageBox.question( self, _('Message'), - _("Are you sure you want to quit?"), + _("Are you sure you want to close Stargate DAW?"), ( QMessageBox.StandardButton.Yes | diff --git a/src/sgui/daw/sequencer/__init__.py b/src/sgui/daw/sequencer/__init__.py index 876084ba..0d0f65fd 100644 --- a/src/sgui/daw/sequencer/__init__.py +++ b/src/sgui/daw/sequencer/__init__.py @@ -132,7 +132,7 @@ def __init__(self): self.hzoom_slider.setRange(0, 30) self.last_hzoom = 3 self.hzoom_slider.setValue(self.last_hzoom) - self.hzoom_slider.setFixedWidth(90) + self.hzoom_slider.setFixedWidth(75) self.hzoom_slider.sliderPressed.connect(self.hzoom_pressed) self.hzoom_slider.sliderReleased.connect(self.hzoom_released) self.hzoom_slider.valueChanged.connect(self.set_hzoom) @@ -146,7 +146,7 @@ def __init__(self): self.vzoom_slider.setRange(0, 60) self.last_vzoom = 0 self.vzoom_slider.setValue(self.last_vzoom) - self.vzoom_slider.setFixedWidth(60) + self.vzoom_slider.setFixedWidth(75) self.vzoom_slider.sliderPressed.connect(self.vzoom_pressed) self.vzoom_slider.sliderReleased.connect(self.vzoom_released) self.vzoom_slider.valueChanged.connect(self.set_vzoom) diff --git a/src/sgui/project.py b/src/sgui/project.py index 16960d03..05bbad0b 100644 --- a/src/sgui/project.py +++ b/src/sgui/project.py @@ -179,7 +179,7 @@ def check_project_version(parent, project_file): else: msg = _( "Please update to the latest version of Stargate. " - "This project {} was created with version '{}', however, " + "This project {} was last edited with version '{}', however, " "you are using version '{}'" ).format( project_file, diff --git a/src/sgui/sgqt.py b/src/sgui/sgqt.py index 2fd35594..17e4785f 100644 --- a/src/sgui/sgqt.py +++ b/src/sgui/sgqt.py @@ -523,7 +523,17 @@ def add_button(_int, name): dialog = QDialog() layout = QVBoxLayout(dialog) #layout.addWidget(QLabel(title)) - layout.addWidget(QLabel(message)) + label = QLabel(message) + label.setObjectName('transparent') + layout.addWidget(label) + layout.addItem( + QSpacerItem( + 1, + 1, + QSizePolicy.Policy.Minimum, + QSizePolicy.Policy.Expanding, + ), + ) buttons_layout = QHBoxLayout() layout.addLayout(buttons_layout) for _int, name in _QMESSAGEBOX_STANDARDBUTTON_NAMES: @@ -535,19 +545,43 @@ def add_button(_int, name): return answer @staticmethod - def information(parent, title, message): - QMessageBox.warning(parent, title, message) + def information(parent, title, message, callback=None): + QMessageBox.warning(parent, title, message, callback) @staticmethod - def warning(parent, title, message): + def warning(parent, title, message, callback=None): dialog = QDialog() layout = QVBoxLayout(dialog) - layout.addWidget(QLabel(title)) - layout.addWidget(QLabel(message)) + if title: + title_label = QLabel(title) + title_label.setAlignment( + QtCore.Qt.AlignmentFlag.AlignTop + | + QtCore.Qt.AlignmentFlag.AlignCenter + ) + title_label.setSizePolicy( + QSizePolicy.Policy.Expanding, + QSizePolicy.Policy.Minimum, + ) + layout.addWidget(title_label) + label = QLabel(message) + label.setObjectName('transparent') + label.setWordWrap(True) + layout.addWidget(label) + layout.addItem( + QSpacerItem( + 1, + 1, + QSizePolicy.Policy.Minimum, + QSizePolicy.Policy.Expanding, + ), + ) buttons_layout = QHBoxLayout() layout.addLayout(buttons_layout) button = QPushButton("OK") button.pressed.connect(dialog.close) + if callback: + button.pressed.connect(callback) buttons_layout.addWidget(button) dialog.exec() diff --git a/src/sgui/util.py b/src/sgui/util.py index 8e481ec2..48d041e5 100644 --- a/src/sgui/util.py +++ b/src/sgui/util.py @@ -250,7 +250,7 @@ def setup_theme(app): ) except Exception as ex: LOG.exception(ex) - f_answer = QMessageBox.question( + f_answer = orig_QMessageBox.question( None, _("Warning"), _(