diff options
Diffstat (limited to 'tidal_dl_ng/ui')
| -rw-r--r-- | tidal_dl_ng/ui/dialog_login.py | 43 | ||||
| -rw-r--r-- | tidal_dl_ng/ui/dialog_login.ui | 43 |
2 files changed, 63 insertions, 23 deletions
diff --git a/tidal_dl_ng/ui/dialog_login.py b/tidal_dl_ng/ui/dialog_login.py index bbc916f..59a78da 100644 --- a/tidal_dl_ng/ui/dialog_login.py +++ b/tidal_dl_ng/ui/dialog_login.py @@ -1,14 +1,14 @@ ################################################################################ ## Form generated from reading UI file 'dialog_login.ui' ## -## Created by: Qt User Interface Compiler version 6.6.1 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ from PySide6.QtCore import QCoreApplication, QMetaObject, QRect, Qt from PySide6.QtGui import QFont -from PySide6.QtWidgets import QDialogButtonBox, QLabel, QSizePolicy, QTextBrowser, QTextEdit, QVBoxLayout, QWidget +from PySide6.QtWidgets import QDialogButtonBox, QHBoxLayout, QLabel, QSizePolicy, QTextBrowser, QVBoxLayout, QWidget class Ui_DialogLogin: @@ -16,7 +16,7 @@ class Ui_DialogLogin: if not DialogLogin.objectName(): DialogLogin.setObjectName("DialogLogin") DialogLogin.resize(451, 400) - sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(DialogLogin.sizePolicy().hasHeightForWidth()) @@ -26,9 +26,10 @@ class Ui_DialogLogin: self.bb_dialog.setGeometry(QRect(20, 350, 411, 32)) sizePolicy.setHeightForWidth(self.bb_dialog.sizePolicy().hasHeightForWidth()) self.bb_dialog.setSizePolicy(sizePolicy) + self.bb_dialog.setLayoutDirection(Qt.LayoutDirection.LeftToRight) self.bb_dialog.setStyleSheet("") - self.bb_dialog.setOrientation(Qt.Horizontal) - self.bb_dialog.setStandardButtons(QDialogButtonBox.Cancel | QDialogButtonBox.Ok) + self.bb_dialog.setOrientation(Qt.Orientation.Horizontal) + self.bb_dialog.setStandardButtons(QDialogButtonBox.StandardButton.Cancel | QDialogButtonBox.StandardButton.Ok) self.verticalLayoutWidget = QWidget(DialogLogin) self.verticalLayoutWidget.setObjectName("verticalLayoutWidget") self.verticalLayoutWidget.setGeometry(QRect(20, 20, 411, 325)) @@ -63,16 +64,32 @@ class Ui_DialogLogin: self.lv_main.addWidget(self.tb_url_login) - self.te_url_redirect = QTextEdit(self.verticalLayoutWidget) - self.te_url_redirect.setObjectName("te_url_redirect") + self.horizontalLayout = QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.l_expires_description = QLabel(self.verticalLayoutWidget) + self.l_expires_description.setObjectName("l_expires_description") - self.lv_main.addWidget(self.te_url_redirect) + self.horizontalLayout.addWidget(self.l_expires_description) + + self.l_expires_date_time = QLabel(self.verticalLayoutWidget) + self.l_expires_date_time.setObjectName("l_expires_date_time") + font2 = QFont() + font2.setBold(True) + self.l_expires_date_time.setFont(font2) + self.l_expires_date_time.setAlignment( + Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignTrailing | Qt.AlignmentFlag.AlignVCenter + ) + + self.horizontalLayout.addWidget(self.l_expires_date_time) + + self.lv_main.addLayout(self.horizontalLayout) self.l_hint = QLabel(self.verticalLayoutWidget) self.l_hint.setObjectName("l_hint") sizePolicy.setHeightForWidth(self.l_hint.sizePolicy().hasHeightForWidth()) self.l_hint.setSizePolicy(sizePolicy) self.l_hint.setFont(font1) + self.l_hint.setWordWrap(True) self.lv_main.addWidget(self.l_hint) @@ -86,19 +103,17 @@ class Ui_DialogLogin: def retranslateUi(self, DialogLogin): DialogLogin.setWindowTitle(QCoreApplication.translate("DialogLogin", "Dialog", None)) - self.l_header.setText(QCoreApplication.translate("DialogLogin", "TIDAL PKCE Login", None)) + self.l_header.setText(QCoreApplication.translate("DialogLogin", "TIDAL Login (as Device)", None)) self.l_description.setText( QCoreApplication.translate( "DialogLogin", - 'Click the link below and login with your TIDAL credentials. You will be redirected to an "Ooops" page' - ' after a successful login. Copy the URL of this "Ooops" page and post it in the box below.', + "Click the link below and login with your TIDAL credentials. TIDAL will ask you, if you like to add this app as a new device. You need to confirm this.", 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) - ) + self.l_expires_description.setText(QCoreApplication.translate("DialogLogin", "This link expires at:", None)) + self.l_expires_date_time.setText(QCoreApplication.translate("DialogLogin", "COMPUTING", None)) self.l_hint.setText(QCoreApplication.translate("DialogLogin", "Waiting...", None)) # retranslateUi diff --git a/tidal_dl_ng/ui/dialog_login.ui b/tidal_dl_ng/ui/dialog_login.ui index c9c9774..2ff401f 100644 --- a/tidal_dl_ng/ui/dialog_login.ui +++ b/tidal_dl_ng/ui/dialog_login.ui @@ -34,14 +34,17 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="layoutDirection"> + <enum>Qt::LayoutDirection::LeftToRight</enum> + </property> <property name="styleSheet"> <string notr="true"/> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> <widget class="QWidget" name="verticalLayoutWidget"> @@ -69,7 +72,7 @@ </font> </property> <property name="text"> - <string>TIDAL PKCE Login</string> + <string>TIDAL Login (as Device)</string> </property> </widget> </item> @@ -87,7 +90,7 @@ </font> </property> <property name="text"> - <string>Click the link below and login with your TIDAL credentials. You will be redirected to an "Ooops" page after a successful login. Copy the URL of this "Ooops" page and post it in the box below.</string> + <string>Click the link below and login with your TIDAL credentials. TIDAL will ask you, if you like to add this app as a new device. You need to confirm this.</string> </property> <property name="wordWrap"> <bool>true</bool> @@ -105,11 +108,30 @@ </widget> </item> <item> - <widget class="QTextEdit" name="te_url_redirect"> - <property name="placeholderText"> - <string>Copy and paste the redirect URL after login here...</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="l_expires_description"> + <property name="text"> + <string>This link expires at:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="l_expires_date_time"> + <property name="font"> + <font> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>COMPUTING</string> + </property> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> + </property> + </widget> + </item> + </layout> </item> <item> <widget class="QLabel" name="l_hint"> @@ -127,6 +149,9 @@ <property name="text"> <string>Waiting...</string> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> </layout> |