From 4ed2a67e4c887c7d25b2888a679e985136f1afd0 Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Mon, 5 Feb 2024 06:31:18 +0100 Subject: ✨ GUI user lists can be reloaded. Logout is possible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tidal_dl_ng/ui/dialog_settings.py | 8 +- tidal_dl_ng/ui/dialog_settings.ui | 2 +- tidal_dl_ng/ui/main.py | 33 +++-- tidal_dl_ng/ui/main.ui | 247 +++++++++++++++++++++----------------- 4 files changed, 166 insertions(+), 124 deletions(-) (limited to 'tidal_dl_ng/ui') diff --git a/tidal_dl_ng/ui/dialog_settings.py b/tidal_dl_ng/ui/dialog_settings.py index 019fdc6..eb358e1 100644 --- a/tidal_dl_ng/ui/dialog_settings.py +++ b/tidal_dl_ng/ui/dialog_settings.py @@ -378,10 +378,10 @@ class Ui_DialogSettings: self.horizontalLayout_3.addWidget(self.le_download_base_path) - self.b_download_base_path = QPushButton(self.gb_path) - self.b_download_base_path.setObjectName("b_download_base_path") + self.pb_download_base_path = QPushButton(self.gb_path) + self.pb_download_base_path.setObjectName("pb_download_base_path") - self.horizontalLayout_3.addWidget(self.b_download_base_path) + self.horizontalLayout_3.addWidget(self.pb_download_base_path) self.verticalLayout.addLayout(self.horizontalLayout_3) @@ -488,6 +488,6 @@ class Ui_DialogSettings: self.l_format_playlist.setText(QCoreApplication.translate("DialogSettings", "TextLabel", None)) self.l_icon_format_mix.setText(QCoreApplication.translate("DialogSettings", "TextLabel", None)) self.l_format_mix.setText(QCoreApplication.translate("DialogSettings", "TextLabel", None)) - self.b_download_base_path.setText(QCoreApplication.translate("DialogSettings", "...", None)) + self.pb_download_base_path.setText(QCoreApplication.translate("DialogSettings", "...", None)) # retranslateUi diff --git a/tidal_dl_ng/ui/dialog_settings.ui b/tidal_dl_ng/ui/dialog_settings.ui index 7826271..acdb1cf 100644 --- a/tidal_dl_ng/ui/dialog_settings.ui +++ b/tidal_dl_ng/ui/dialog_settings.ui @@ -538,7 +538,7 @@ - + ... diff --git a/tidal_dl_ng/ui/main.py b/tidal_dl_ng/ui/main.py index 65735e6..8ee8f4c 100644 --- a/tidal_dl_ng/ui/main.py +++ b/tidal_dl_ng/ui/main.py @@ -51,6 +51,8 @@ class Ui_MainWindow: self.a_version.setObjectName("a_version") self.a_exit = QAction(MainWindow) self.a_exit.setObjectName("a_exit") + self.a_logout = QAction(MainWindow) + self.a_logout.setObjectName("a_logout") self.w_central = QWidget(MainWindow) self.w_central.setObjectName("w_central") self.w_central.setEnabled(True) @@ -79,10 +81,12 @@ class Ui_MainWindow: self.lh_main = QHBoxLayout() self.lh_main.setObjectName("lh_main") self.lh_main.setSizeConstraint(QLayout.SetNoConstraint) + self.verticalLayout = QVBoxLayout() + self.verticalLayout.setObjectName("verticalLayout") self.tr_lists_user = QTreeWidget(self.w_central) __qtreewidgetitem = QTreeWidgetItem() __qtreewidgetitem.setText(1, "Info") - __qtreewidgetitem.setText(0, "Playlist") + __qtreewidgetitem.setText(0, "Name") self.tr_lists_user.setHeaderItem(__qtreewidgetitem) __qtreewidgetitem1 = QTreeWidgetItem(self.tr_lists_user) __qtreewidgetitem1.setFlags(Qt.ItemIsEnabled) @@ -115,7 +119,19 @@ class Ui_MainWindow: self.tr_lists_user.header().setHighlightSections(True) self.tr_lists_user.header().setProperty("showSortIndicator", True) - self.lh_main.addWidget(self.tr_lists_user) + self.verticalLayout.addWidget(self.tr_lists_user) + + self.pb_reload_user_lists = QPushButton(self.w_central) + self.pb_reload_user_lists.setObjectName("pb_reload_user_lists") + sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + sizePolicy1.setHorizontalStretch(0) + sizePolicy1.setVerticalStretch(0) + sizePolicy1.setHeightForWidth(self.pb_reload_user_lists.sizePolicy().hasHeightForWidth()) + self.pb_reload_user_lists.setSizePolicy(sizePolicy1) + + self.verticalLayout.addWidget(self.pb_reload_user_lists) + + self.lh_main.addLayout(self.verticalLayout) self.lv_search_result = QVBoxLayout() # ifndef Q_OS_MAC @@ -332,11 +348,11 @@ class Ui_MainWindow: self.te_debug = QPlainTextEdit(self.w_central) self.te_debug.setObjectName("te_debug") self.te_debug.setEnabled(True) - sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Maximum) - sizePolicy1.setHorizontalStretch(0) - sizePolicy1.setVerticalStretch(0) - sizePolicy1.setHeightForWidth(self.te_debug.sizePolicy().hasHeightForWidth()) - self.te_debug.setSizePolicy(sizePolicy1) + sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Maximum) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth(self.te_debug.sizePolicy().hasHeightForWidth()) + self.te_debug.setSizePolicy(sizePolicy2) self.te_debug.setMaximumSize(QSize(16777215, 16777215)) self.te_debug.setAcceptDrops(False) # if QT_CONFIG(tooltip) @@ -426,6 +442,7 @@ class Ui_MainWindow: self.menubar.addAction(self.m_file.menuAction()) self.m_file.addAction(self.a_preferences) self.m_file.addAction(self.a_version) + self.m_file.addAction(self.a_logout) self.m_file.addAction(self.a_exit) self.retranslateUi(MainWindow) @@ -438,6 +455,7 @@ class Ui_MainWindow: MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", "MainWindow", None)) self.a_version.setText(QCoreApplication.translate("MainWindow", "Version", None)) self.a_exit.setText(QCoreApplication.translate("MainWindow", "Exit", None)) + self.a_logout.setText(QCoreApplication.translate("MainWindow", "Logout", None)) ___qtreewidgetitem = self.tr_lists_user.headerItem() ___qtreewidgetitem.setText(2, QCoreApplication.translate("MainWindow", "obj", None)) @@ -451,6 +469,7 @@ class Ui_MainWindow: ___qtreewidgetitem3.setText(0, QCoreApplication.translate("MainWindow", "Favorites", None)) self.tr_lists_user.setSortingEnabled(__sortingEnabled) + self.pb_reload_user_lists.setText(QCoreApplication.translate("MainWindow", "Reload", None)) ___qtreewidgetitem4 = self.tr_results.headerItem() ___qtreewidgetitem4.setText(5, QCoreApplication.translate("MainWindow", "obj", None)) ___qtreewidgetitem4.setText(4, QCoreApplication.translate("MainWindow", "Duration", None)) diff --git a/tidal_dl_ng/ui/main.ui b/tidal_dl_ng/ui/main.ui index 7a5f86f..ea018c6 100644 --- a/tidal_dl_ng/ui/main.ui +++ b/tidal_dl_ng/ui/main.ui @@ -45,122 +45,139 @@ QLayout::SetNoConstraint - - - - - - - - - - - - - - - - - - QAbstractItemView::NoEditTriggers - - - false - - - 10 - - - true - - - true - - - true - - - true - - - true - - - - Playlist - - - - - - - - - - - - - - Info - - - - - - - - - - - - - - obj - - + - - Playlists - - - - - - - - - ItemIsEnabled - - - - - Mixes - - - - - - - - - ItemIsEnabled - + + + + + + + + + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + false + + + 10 + + + true + + + true + + + true + + + true + + + true + + + + Name + + + + + + + + + + + + + + Info + + + + + + + + + + + + + + obj + + + + + Playlists + + + + + + + + + ItemIsEnabled + + + + + Mixes + + + + + + + + + ItemIsEnabled + + + + + Favorites + + + + + + + + + ItemIsEnabled + + + - - Favorites - - - - - - - - - ItemIsEnabled - + + + + 0 + 0 + + + + Reload + + - + @@ -542,6 +559,7 @@ + @@ -596,6 +614,11 @@ Exit + + + Logout + + -- cgit v1.3.1