diff options
| author | Winman486 <harpsystems@gmail.com> | 2025-10-20 16:12:46 -0500 |
|---|---|---|
| committer | Winman486 <harpsystems@gmail.com> | 2025-10-20 16:12:46 -0500 |
| commit | 3c835c2d196f02871a1be23430223538bf2cd226 (patch) | |
| tree | 8d021fa04776f7bf67911dd4fd54a3e6f3dc912b /tidal_dl_ng/ui/dialog_settings.ui | |
| parent | 90ff7ea52ef7dd3c02afc313da4682b1fcb799eb (diff) | |
| parent | 0afd65c89b9033a5a9505dc193699396666e16f2 (diff) | |
| download | tidal-dl-ng-3c835c2d196f02871a1be23430223538bf2cd226.tar.gz | |
Merge upstream/master and resolve conflicts
- Resolved conflict in dialog_settings.py (kept both cb_use_primary_album_artist and cb_mark_explicit checkboxes)
- Fixed code quality issues found by make check:
* Removed duplicate on_download_album_from_track function (F811)
* Updated isinstance calls to use X | Y syntax instead of (X, Y) (UP038)
* Fixed unused loop variable album_stub (B007)
* Applied automatic formatting fixes (black, prettier, trailing whitespace)
- Only remaining issue is C901 complexity warning in on_download_all_albums_from_playlist (expected per maintainer feedback)
Diffstat (limited to 'tidal_dl_ng/ui/dialog_settings.ui')
| -rw-r--r-- | tidal_dl_ng/ui/dialog_settings.ui | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tidal_dl_ng/ui/dialog_settings.ui b/tidal_dl_ng/ui/dialog_settings.ui index 5287e38..95c6b52 100644 --- a/tidal_dl_ng/ui/dialog_settings.ui +++ b/tidal_dl_ng/ui/dialog_settings.ui @@ -250,7 +250,15 @@ </layout> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_4"/> + <layout class="QVBoxLayout" name="lv_mark_explicit"> + <item> + <widget class="QCheckBox" name="cb_mark_explicit"> + <property name="text"> + <string>CheckBox</string> + </property> + </widget> + </item> + </layout> </item> </layout> </item> |