From c1442c894230b3855fa74b1a915624d0c17cab0f Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Sat, 3 Feb 2024 09:56:02 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Login=20URL=20will=20get=20wrapped.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tidal_dl_ng/dialog.py | 2 +- tidal_dl_ng/ui/dialog_login.py | 22 ++++++++-------------- tidal_dl_ng/ui/dialog_login.ui | 32 ++++---------------------------- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/tidal_dl_ng/dialog.py b/tidal_dl_ng/dialog.py index 788aeba..43d14b1 100644 --- a/tidal_dl_ng/dialog.py +++ b/tidal_dl_ng/dialog.py @@ -37,7 +37,7 @@ class DialogLogin(QDialog): # Run the .setupUi() method to show the GUI self.ui.setupUi(self) # Set data. - self.ui.l_url_login.setText(f'{url_login}') + self.ui.tb_url_login.setText(f'{url_login}') self.ui.l_hint.setText(hint) # Show self.return_code = self.exec() diff --git a/tidal_dl_ng/ui/dialog_login.py b/tidal_dl_ng/ui/dialog_login.py index ffb8e76..bbc916f 100644 --- a/tidal_dl_ng/ui/dialog_login.py +++ b/tidal_dl_ng/ui/dialog_login.py @@ -6,9 +6,9 @@ ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import QCoreApplication, QMetaObject, QRect, QSize, Qt +from PySide6.QtCore import QCoreApplication, QMetaObject, QRect, Qt from PySide6.QtGui import QFont -from PySide6.QtWidgets import QDialogButtonBox, QLabel, QSizePolicy, QTextEdit, QVBoxLayout, QWidget +from PySide6.QtWidgets import QDialogButtonBox, QLabel, QSizePolicy, QTextBrowser, QTextEdit, QVBoxLayout, QWidget class Ui_DialogLogin: @@ -31,7 +31,7 @@ class Ui_DialogLogin: self.bb_dialog.setStandardButtons(QDialogButtonBox.Cancel | QDialogButtonBox.Ok) self.verticalLayoutWidget = QWidget(DialogLogin) self.verticalLayoutWidget.setObjectName("verticalLayoutWidget") - self.verticalLayoutWidget.setGeometry(QRect(20, 20, 411, 321)) + self.verticalLayoutWidget.setGeometry(QRect(20, 20, 411, 325)) self.lv_main = QVBoxLayout(self.verticalLayoutWidget) self.lv_main.setObjectName("lv_main") self.lv_main.setContentsMargins(0, 0, 0, 0) @@ -57,17 +57,11 @@ class Ui_DialogLogin: self.lv_main.addWidget(self.l_description) - self.l_url_login = QLabel(self.verticalLayoutWidget) - self.l_url_login.setObjectName("l_url_login") - sizePolicy.setHeightForWidth(self.l_url_login.sizePolicy().hasHeightForWidth()) - self.l_url_login.setSizePolicy(sizePolicy) - self.l_url_login.setMinimumSize(QSize(0, 50)) - self.l_url_login.setBaseSize(QSize(0, 0)) - self.l_url_login.setStyleSheet("border: 2px solid red; padding: 6px") - self.l_url_login.setWordWrap(True) - self.l_url_login.setOpenExternalLinks(True) + self.tb_url_login = QTextBrowser(self.verticalLayoutWidget) + self.tb_url_login.setObjectName("tb_url_login") + self.tb_url_login.setOpenExternalLinks(True) - self.lv_main.addWidget(self.l_url_login) + self.lv_main.addWidget(self.tb_url_login) self.te_url_redirect = QTextEdit(self.verticalLayoutWidget) self.te_url_redirect.setObjectName("te_url_redirect") @@ -101,7 +95,7 @@ class Ui_DialogLogin: None, ) ) - self.l_url_login.setText(QCoreApplication.translate("DialogLogin", "PLACEHOLDER URL...", None)) + self.tb_url_login.setPlaceholderText(QCoreApplication.translate("DialogLogin", "Copy this login URL...", None)) self.te_url_redirect.setPlaceholderText( QCoreApplication.translate("DialogLogin", "Copy and paste the redirect URL after login here...", None) ) diff --git a/tidal_dl_ng/ui/dialog_login.ui b/tidal_dl_ng/ui/dialog_login.ui index ae0a25a..c9c9774 100644 --- a/tidal_dl_ng/ui/dialog_login.ui +++ b/tidal_dl_ng/ui/dialog_login.ui @@ -50,7 +50,7 @@ 20 20 411 - 321 + 325 @@ -95,33 +95,9 @@ - - - - 0 - 0 - - - - - 0 - 50 - - - - - 0 - 0 - - - - border: 2px solid red; padding: 6px - - - PLACEHOLDER URL... - - - true + + + Copy this login URL... true