From b380db51fa24a92b7224ef6fcc8600a4e91e05e0 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 27 Mar 2019 01:23:15 +0100 Subject: [PATCH] Add lines to settings --- src/settings/appearancesettingspage.ui | 16 ++++++- src/settings/behavioursettingspage.ui | 20 ++++----- src/settings/collectionsettingspage.ui | 42 +++++++++++++---- src/settings/networkproxysettingspage.ui | 14 +++--- src/settings/notificationssettingspage.cpp | 4 +- src/settings/notificationssettingspage.ui | 52 +++++++++++++++++----- src/settings/playlistsettingspage.ui | 20 +++++++-- src/settings/scrobblersettingspage.ui | 12 ++--- src/settings/shortcutssettingspage.ui | 8 ++-- src/settings/tidalsettingspage.ui | 42 +++++++++++------ src/settings/transcodersettingspage.ui | 4 +- 11 files changed, 165 insertions(+), 69 deletions(-) diff --git a/src/settings/appearancesettingspage.ui b/src/settings/appearancesettingspage.ui index 7703771c5..8c8d7cccc 100644 --- a/src/settings/appearancesettingspage.ui +++ b/src/settings/appearancesettingspage.ui @@ -13,7 +13,7 @@ Appearance - + @@ -85,6 +85,13 @@ + + + + Qt::Horizontal + + + @@ -353,6 +360,13 @@ + + + + Qt::Horizontal + + + diff --git a/src/settings/behavioursettingspage.ui b/src/settings/behavioursettingspage.ui index 311f41889..ae8bed11f 100644 --- a/src/settings/behavioursettingspage.ui +++ b/src/settings/behavioursettingspage.ui @@ -13,7 +13,7 @@ Behavior - + @@ -73,7 +73,7 @@ On startup - + @@ -113,7 +113,7 @@ Language - + @@ -141,11 +141,11 @@ - + Using the menu to add a song will... - + @@ -176,7 +176,7 @@ Pressing "Previous" in player will... - + @@ -202,7 +202,7 @@ Double clicking a song will... - + @@ -260,7 +260,7 @@ Double clicking a song in the playlist will... - + @@ -321,7 +321,7 @@ - + Qt::Horizontal @@ -337,7 +337,7 @@ - + Qt::Vertical diff --git a/src/settings/collectionsettingspage.ui b/src/settings/collectionsettingspage.ui index 5c67ebc36..e3ee3f41e 100644 --- a/src/settings/collectionsettingspage.ui +++ b/src/settings/collectionsettingspage.ui @@ -7,13 +7,13 @@ 0 0 509 - 695 + 697 Collection - + @@ -77,7 +77,7 @@ Automatic updating - + @@ -110,12 +110,19 @@ If there are no matches then it will use the largest image in the directory. + + + + Qt::Horizontal + + + Display options - + @@ -140,12 +147,19 @@ If there are no matches then it will use the largest image in the directory. + + + + Qt::Horizontal + + + Saving album covers - + @@ -158,10 +172,22 @@ If there are no matches then it will use the largest image in the directory. Filename: - + - - + + + + 0 + + + 0 + + + 0 + + + 0 + diff --git a/src/settings/networkproxysettingspage.ui b/src/settings/networkproxysettingspage.ui index 3d2ac7834..542c2dba7 100644 --- a/src/settings/networkproxysettingspage.ui +++ b/src/settings/networkproxysettingspage.ui @@ -13,7 +13,7 @@ Network Proxy - + @@ -43,12 +43,12 @@ false - + 24 - + @@ -67,7 +67,7 @@ - + Port @@ -101,7 +101,7 @@ QFormLayout::AllNonFixedFieldsGrow - + Username @@ -111,7 +111,7 @@ - + Password @@ -131,7 +131,7 @@ - + Qt::Vertical diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp index 3b7c8bdc5..be8d0a217 100644 --- a/src/settings/notificationssettingspage.cpp +++ b/src/settings/notificationssettingspage.cpp @@ -293,8 +293,8 @@ void NotificationsSettingsPage::NotificationCustomTextChanged(bool enabled) { ui_->notifications_exp_chooser1->setEnabled(enabled); ui_->notifications_exp_chooser2->setEnabled(enabled); ui_->notifications_preview->setEnabled(enabled); - ui_->label_19->setEnabled(enabled); - ui_->label_20->setEnabled(enabled); + ui_->label_summary->setEnabled(enabled); + ui_->label_body->setEnabled(enabled); } diff --git a/src/settings/notificationssettingspage.ui b/src/settings/notificationssettingspage.ui index 8c6d5c213..00e98dd75 100644 --- a/src/settings/notificationssettingspage.ui +++ b/src/settings/notificationssettingspage.ui @@ -7,22 +7,29 @@ 0 0 526 - 668 + 689 Notifications - + - + Strawberry can show a message when the track changes. - + + + Qt::Horizontal + + + + + Notification type @@ -58,15 +65,22 @@ + + + + Qt::Horizontal + + + General settings - + - + 0 @@ -143,14 +157,21 @@ + + + + Qt::Horizontal + + + Custom message settings - + - + QFrame::NoFrame @@ -235,14 +256,14 @@ - + Summary - + Body @@ -271,12 +292,19 @@ + + + + Qt::Horizontal + + + Pretty OSD options - + @@ -342,7 +370,7 @@ - + Qt::Vertical diff --git a/src/settings/playlistsettingspage.ui b/src/settings/playlistsettingspage.ui index a8c86e3f9..90b1ee087 100644 --- a/src/settings/playlistsettingspage.ui +++ b/src/settings/playlistsettingspage.ui @@ -13,7 +13,7 @@ Playlist - + @@ -52,12 +52,19 @@ + + + + Qt::Horizontal + + + When saving a playlist, file paths should be - + @@ -92,12 +99,19 @@ + + + + Qt::Horizontal + + + Metadata - + diff --git a/src/settings/scrobblersettingspage.ui b/src/settings/scrobblersettingspage.ui index 41e5311ad..01dc9a70f 100644 --- a/src/settings/scrobblersettingspage.ui +++ b/src/settings/scrobblersettingspage.ui @@ -120,7 +120,7 @@ - + @@ -163,7 +163,7 @@ Libre.fm - + @@ -176,7 +176,7 @@ - + @@ -219,7 +219,7 @@ Listenbrainz - + @@ -259,7 +259,7 @@ - + @@ -291,7 +291,7 @@ - + Qt::Vertical diff --git a/src/settings/shortcutssettingspage.ui b/src/settings/shortcutssettingspage.ui index 014970772..bd252b48c 100644 --- a/src/settings/shortcutssettingspage.ui +++ b/src/settings/shortcutssettingspage.ui @@ -17,10 +17,10 @@ :/icons/64x64/strawberry.png:/icons/64x64/strawberry.png - + - + 0 @@ -148,7 +148,7 @@ - + 0 @@ -240,7 +240,7 @@ Shortcut for %1 - + diff --git a/src/settings/tidalsettingspage.ui b/src/settings/tidalsettingspage.ui index 4e6bd3e03..a961f7c49 100644 --- a/src/settings/tidalsettingspage.ui +++ b/src/settings/tidalsettingspage.ui @@ -7,13 +7,13 @@ 0 0 715 - 547 + 594 Tidal - + @@ -21,6 +21,13 @@ + + + + Qt::Horizontal + + + @@ -32,7 +39,7 @@ Account details - + @@ -74,14 +81,21 @@ + + + + Qt::Horizontal + + + Preferences - + - + @@ -114,7 +128,7 @@ - + @@ -163,9 +177,9 @@ - + - + 150 @@ -191,7 +205,7 @@ - + Qt::Horizontal @@ -206,7 +220,7 @@ - + @@ -249,7 +263,7 @@ - + @@ -299,7 +313,7 @@ - + @@ -332,7 +346,7 @@ - + @@ -381,7 +395,7 @@ - + diff --git a/src/settings/transcodersettingspage.ui b/src/settings/transcodersettingspage.ui index 69e6783c3..1c079d3ad 100644 --- a/src/settings/transcodersettingspage.ui +++ b/src/settings/transcodersettingspage.ui @@ -13,7 +13,7 @@ Transcoding - + @@ -208,7 +208,7 @@ MP3 - + 0