From 1917a940b794614f302f3f5efd010c200d6b070d Mon Sep 17 00:00:00 2001 From: Loren Eteval Date: Sun, 28 Apr 2024 20:22:04 +0800 Subject: [PATCH] Update UserSubsWindow.py Signed-off-by: Loren Eteval --- Furious/Window/UserSubsWindow.py | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/Furious/Window/UserSubsWindow.py b/Furious/Window/UserSubsWindow.py index 888fe132..c5e2574b 100644 --- a/Furious/Window/UserSubsWindow.py +++ b/Furious/Window/UserSubsWindow.py @@ -49,15 +49,17 @@ class AddSubsDialog(AppQDialog): self.setWindowTitle(_('Add Subscription')) - self.remarkText = QLabel(_('Enter subscription remark:')) + self.remarkText = AppQLabel(_('Enter subscription remark:')) self.remarkEdit = QLineEdit() - self.webURLText = QLabel(_('Enter subscription URL:')) + self.webURLText = AppQLabel(_('Enter subscription URL:')) self.webURLEdit = QLineEdit() - self.dialogBtns = QDialogButtonBox(QtCore.Qt.Orientation.Horizontal) - self.dialogBtns.addButton(_('OK'), QDialogButtonBox.ButtonRole.AcceptRole) - self.dialogBtns.addButton(_('Cancel'), QDialogButtonBox.ButtonRole.RejectRole) + self.dialogBtns = AppQDialogButtonBox(QtCore.Qt.Orientation.Horizontal) + self.dialogBtns.addButton(_('OK'), AppQDialogButtonBox.ButtonRole.AcceptRole) + self.dialogBtns.addButton( + _('Cancel'), AppQDialogButtonBox.ButtonRole.RejectRole + ) self.dialogBtns.accepted.connect(self.accept) self.dialogBtns.rejected.connect(self.reject) @@ -80,17 +82,6 @@ class AddSubsDialog(AppQDialog): def subsWebURL(self): return self.webURLEdit.text() - def retranslate(self): - self.setWindowTitle(_(self.windowTitle())) - - self.remarkText.setText(_(self.remarkText.text())) - self.webURLText.setText(_(self.webURLText.text())) - - for button in self.dialogBtns.buttons(): - button.setText(_(button.text())) - - moveToCenter(self) - needTrans( 'Edit Subscription', @@ -144,9 +135,10 @@ class UserSubsWindow(AppQMainWindow): self.setGeometry(100, 100, 360 * GOLDEN_RATIO, 360) def addSubs(self): - choice = self.addSubsDialog.exec() - - if choice == PySide6LegacyEnumValueWrapper(QDialog.DialogCode.Accepted): + # Show the Dialog and wait for user to close it + if self.addSubsDialog.exec() == PySide6LegacyEnumValueWrapper( + AppQDialog.DialogCode.Accepted + ): remark = self.addSubsDialog.subsRemark() webURL = self.addSubsDialog.subsWebURL()