diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index e164f320f..f7a250fea 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -803,7 +803,7 @@ void MainWindow::ReloadSettings() { if ((!showtrayicon || !QSystemTrayIcon::isSystemTrayAvailable()) && !isVisible()) show(); #endif - settings.beginGroup(PlaylistSettingsPage::kSettingsGroup); + settings.beginGroup(BehaviourSettingsPage::kSettingsGroup); doubleclick_addmode_ = AddBehaviour(settings.value("doubleclick_addmode", AddBehaviour_Append).toInt()); doubleclick_playmode_ = PlayBehaviour(settings.value("doubleclick_playmode", PlayBehaviour_IfStopped).toInt()); doubleclick_playlist_addmode_ = PlaylistAddBehaviour(settings.value("doubleclick_playlist_addmode", PlaylistAddBehaviour_Play).toInt()); diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index c71508b0e..77a5cea90 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -925,7 +925,7 @@ void PlaylistView::ReloadSettings() { QSettings s; - s.beginGroup(PlaybackSettingsPage::kSettingsGroup); + s.beginGroup(PlaylistSettingsPage::kSettingsGroup); glow_enabled_ = s.value("glow_effect", true).toBool(); s.endGroup(); @@ -1039,7 +1039,7 @@ void PlaylistView::SaveSettings() { QSettings s; - s.beginGroup(PlaybackSettingsPage::kSettingsGroup); + s.beginGroup(PlaylistSettingsPage::kSettingsGroup); s.setValue("glow_effect", glow_enabled_); s.endGroup(); diff --git a/src/settings/backendsettingspage.ui b/src/settings/backendsettingspage.ui index 1b33dec65..137b36d9b 100644 --- a/src/settings/backendsettingspage.ui +++ b/src/settings/backendsettingspage.ui @@ -214,7 +214,7 @@ - plughw + p&lughw @@ -268,7 +268,7 @@ - &Minimum buffer fill + Minimum buffer fill diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp index 2bf75b4c2..9937fb671 100644 --- a/src/settings/behavioursettingspage.cpp +++ b/src/settings/behavioursettingspage.cpp @@ -58,6 +58,19 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog) : SettingsP } #endif + ui_->combobox_doubleclickaddmode->setItemData(0, MainWindow::AddBehaviour_Append); + ui_->combobox_doubleclickaddmode->setItemData(1, MainWindow::AddBehaviour_Load); + ui_->combobox_doubleclickaddmode->setItemData(2, MainWindow::AddBehaviour_OpenInNew); + ui_->combobox_doubleclickaddmode->setItemData(3, MainWindow::AddBehaviour_Enqueue); + + ui_->combobox_doubleclickplaymode->setItemData(0, MainWindow::PlayBehaviour_Never); + ui_->combobox_doubleclickplaymode->setItemData(1, MainWindow::PlayBehaviour_IfStopped); + ui_->combobox_doubleclickplaymode->setItemData(2, MainWindow::PlayBehaviour_Always); + + ui_->combobox_menuplaymode->setItemData(0, MainWindow::PlayBehaviour_Never); + ui_->combobox_menuplaymode->setItemData(1, MainWindow::PlayBehaviour_IfStopped); + ui_->combobox_menuplaymode->setItemData(2, MainWindow::PlayBehaviour_Always); + } BehaviourSettingsPage::~BehaviourSettingsPage() { @@ -94,6 +107,11 @@ void BehaviourSettingsPage::Load() { } ui_->checkbox_resumeplayback->setChecked(s.value("resumeplayback", false).toBool()); + + ui_->combobox_doubleclickaddmode->setCurrentIndex(ui_->combobox_doubleclickaddmode->findData(s.value("doubleclick_addmode", MainWindow::AddBehaviour_Append).toInt())); + ui_->combobox_doubleclickplaymode->setCurrentIndex(ui_->combobox_doubleclickplaymode->findData(s.value("doubleclick_playmode", MainWindow::PlayBehaviour_Never).toInt())); + ui_->combobox_menuplaymode->setCurrentIndex(ui_->combobox_menuplaymode->findData(s.value("menu_playmode", MainWindow::PlayBehaviour_Never).toInt())); + ui_->spinbox_seekstepsec->setValue(s.value("seek_step_sec", 10).toInt()); s.endGroup(); @@ -103,18 +121,26 @@ void BehaviourSettingsPage::Load() { void BehaviourSettingsPage::Save() { QSettings s; + s.beginGroup(kSettingsGroup); MainWindow::StartupBehaviour behaviour = MainWindow::Startup_Remember; if (ui_->radiobutton_alwayshide->isChecked()) behaviour = MainWindow::Startup_AlwaysHide; if (ui_->radiobutton_alwaysshow->isChecked()) behaviour = MainWindow::Startup_AlwaysShow; if (ui_->radiobutton_remember->isChecked()) behaviour = MainWindow::Startup_Remember; - s.beginGroup(kSettingsGroup); + MainWindow::AddBehaviour doubleclick_addmode = MainWindow::AddBehaviour(ui_->combobox_doubleclickaddmode->itemData(ui_->combobox_doubleclickaddmode->currentIndex()).toInt()); + MainWindow::PlayBehaviour doubleclick_playmode = MainWindow::PlayBehaviour(ui_->combobox_doubleclickplaymode->itemData(ui_->combobox_doubleclickplaymode->currentIndex()).toInt()); + MainWindow::PlayBehaviour menu_playmode = MainWindow::PlayBehaviour(ui_->combobox_menuplaymode->itemData(ui_->combobox_menuplaymode->currentIndex()).toInt()); + s.setValue("showtrayicon", ui_->checkbox_showtrayicon->isChecked()); s.setValue("scrolltrayicon", ui_->checkbox_scrolltrayicon->isChecked()); s.setValue("keeprunning", ui_->checkbox_keeprunning->isChecked()); - s.setValue("startupbehaviour", int(behaviour)); s.setValue("resumeplayback", ui_->checkbox_resumeplayback->isChecked()); + s.setValue("startupbehaviour", int(behaviour)); + s.setValue("doubleclick_addmode", doubleclick_addmode); + s.setValue("doubleclick_playmode", doubleclick_playmode); + s.setValue("menu_playmode", menu_playmode); + s.setValue("seek_step_sec", ui_->spinbox_seekstepsec->value()); s.endGroup(); } diff --git a/src/settings/behavioursettingspage.ui b/src/settings/behavioursettingspage.ui index dfd730a60..4776a0c24 100644 --- a/src/settings/behavioursettingspage.ui +++ b/src/settings/behavioursettingspage.ui @@ -64,7 +64,7 @@ - When Strawberry starts + On startup @@ -101,6 +101,154 @@ + + + + Using the menu to add a song will... + + + + + + 0 + + + + Never start playing + + + + + Play if there is nothing already playing + + + + + Always start playing + + + + + + + + + + + Pressing "Previous" in player will... + + + + + + 0 + + + + Jump to previous song right away + + + + + Restart song, then jump to previous if pressed again + + + + + + + + + + + Double clicking a song will... + + + + + + 0 + + + + Append to the playlist + + + + + Replace the playlist + + + + + Open in new playlist + + + + + Add to the queue + + + + + + + + 1 + + + + Never start playing + + + + + Play if there is nothing already playing + + + + + Always start playing + + + + + + + + + + + Double clicking a song in the playlist will... + + + + + + 0 + + + + Change the currently playing song + + + + + Add to the queue + + + + + + + + + + + Qt::Horizontal + + + diff --git a/src/settings/playbacksettingspage.cpp b/src/settings/playbacksettingspage.cpp index 791da2a1c..3133de9b8 100644 --- a/src/settings/playbacksettingspage.cpp +++ b/src/settings/playbacksettingspage.cpp @@ -59,7 +59,6 @@ void PlaybackSettingsPage::Load() { QSettings s; s.beginGroup(kSettingsGroup); - ui_->checkbox_glowcurrenttrack->setChecked(s.value("glow_effect", true).toBool()); ui_->checkbox_fadeout_stop->setChecked(s.value("FadeoutEnabled", false).toBool()); ui_->checkbox_fadeout_cross->setChecked(s.value("CrossfadeEnabled", false).toBool()); ui_->checkbox_fadeout_auto->setChecked(s.value("AutoCrossfadeEnabled", false).toBool()); @@ -76,7 +75,6 @@ void PlaybackSettingsPage::Save() { QSettings s; s.beginGroup(kSettingsGroup); - s.setValue("glow_effect", ui_->checkbox_glowcurrenttrack->isChecked()); s.setValue("FadeoutEnabled", ui_->checkbox_fadeout_stop->isChecked()); s.setValue("CrossfadeEnabled", ui_->checkbox_fadeout_cross->isChecked()); s.setValue("AutoCrossfadeEnabled", ui_->checkbox_fadeout_auto->isChecked()); diff --git a/src/settings/playbacksettingspage.ui b/src/settings/playbacksettingspage.ui index c8b6dac8c..7ab366bc3 100644 --- a/src/settings/playbacksettingspage.ui +++ b/src/settings/playbacksettingspage.ui @@ -14,16 +14,6 @@ Playback - - - - Show a glowing animation on the current track - - - true - - - diff --git a/src/settings/playlistsettingspage.cpp b/src/settings/playlistsettingspage.cpp index 6512f5697..610844d5c 100644 --- a/src/settings/playlistsettingspage.cpp +++ b/src/settings/playlistsettingspage.cpp @@ -44,19 +44,6 @@ PlaylistSettingsPage::PlaylistSettingsPage(SettingsDialog* dialog) : SettingsPag ui_->setupUi(this); setWindowIcon(IconLoader::Load("document-new")); - ui_->combobox_doubleclickaddmode->setItemData(0, MainWindow::AddBehaviour_Append); - ui_->combobox_doubleclickaddmode->setItemData(1, MainWindow::AddBehaviour_Load); - ui_->combobox_doubleclickaddmode->setItemData(2, MainWindow::AddBehaviour_OpenInNew); - ui_->combobox_doubleclickaddmode->setItemData(3, MainWindow::AddBehaviour_Enqueue); - - ui_->combobox_doubleclickplaymode->setItemData(0, MainWindow::PlayBehaviour_Never); - ui_->combobox_doubleclickplaymode->setItemData(1, MainWindow::PlayBehaviour_IfStopped); - ui_->combobox_doubleclickplaymode->setItemData(2, MainWindow::PlayBehaviour_Always); - - ui_->combobox_menuplaymode->setItemData(0, MainWindow::PlayBehaviour_Never); - ui_->combobox_menuplaymode->setItemData(1, MainWindow::PlayBehaviour_IfStopped); - ui_->combobox_menuplaymode->setItemData(2, MainWindow::PlayBehaviour_Always); - } PlaylistSettingsPage::~PlaylistSettingsPage() { @@ -66,12 +53,10 @@ PlaylistSettingsPage::~PlaylistSettingsPage() { void PlaylistSettingsPage::Load() { QSettings s; + s.beginGroup(kSettingsGroup); - s.beginGroup(PlaylistSettingsPage::kSettingsGroup); - ui_->combobox_doubleclickaddmode->setCurrentIndex(ui_->combobox_doubleclickaddmode->findData(s.value("doubleclick_addmode", MainWindow::AddBehaviour_Append).toInt())); - ui_->combobox_doubleclickplaymode->setCurrentIndex(ui_->combobox_doubleclickplaymode->findData(s.value("doubleclick_playmode", MainWindow::PlayBehaviour_Never).toInt())); - ui_->combobox_menuplaymode->setCurrentIndex(ui_->combobox_menuplaymode->findData(s.value("menu_playmode", MainWindow::PlayBehaviour_Never).toInt())); - + ui_->checkbox_glowcurrenttrack->setChecked(s.value("glow_effect", true).toBool()); + ui_->checkbox_warncloseplaylist->setChecked(s.value("warn_close_playlist", true).toBool()); ui_->checkbox_continueonerror->setChecked(s.value("continue_on_error", false).toBool()); ui_->checkbox_greyout_songs_startup->setChecked(s.value("greyout_songs_startup", true).toBool()); ui_->checkbox_greyout_songs_play->setChecked(s.value("greyout_songs_play", true).toBool()); @@ -91,7 +76,6 @@ void PlaylistSettingsPage::Load() { ui_->radiobutton_askpath->setChecked(true); } - ui_->checkbox_warncloseplaylist->setChecked(s.value("warn_close_playlist", true).toBool()); ui_->checkbox_editmetadatainline->setChecked(s.value("editmetadatainline", false).toBool()); ui_->checkbox_writemetadata->setChecked(s.value(Playlist::kWriteMetadata, false).toBool()); @@ -103,10 +87,6 @@ void PlaylistSettingsPage::Save() { QSettings s; - MainWindow::AddBehaviour doubleclick_addmode = MainWindow::AddBehaviour(ui_->combobox_doubleclickaddmode->itemData(ui_->combobox_doubleclickaddmode->currentIndex()).toInt()); - MainWindow::PlayBehaviour doubleclick_playmode = MainWindow::PlayBehaviour(ui_->combobox_doubleclickplaymode->itemData(ui_->combobox_doubleclickplaymode->currentIndex()).toInt()); - MainWindow::PlayBehaviour menu_playmode = MainWindow::PlayBehaviour(ui_->combobox_menuplaymode->itemData(ui_->combobox_menuplaymode->currentIndex()).toInt()); - Playlist::Path path = Playlist::Path_Automatic; if (ui_->radiobutton_automaticpath->isChecked()) { path = Playlist::Path_Automatic; @@ -121,15 +101,13 @@ void PlaylistSettingsPage::Save() { path = Playlist::Path_Ask_User; } - s.beginGroup(PlaylistSettingsPage::kSettingsGroup); + s.beginGroup(kSettingsGroup); + s.setValue("glow_effect", ui_->checkbox_glowcurrenttrack->isChecked()); + s.setValue("warn_close_playlist", ui_->checkbox_warncloseplaylist->isChecked()); s.setValue("continue_on_error", ui_->checkbox_continueonerror->isChecked()); s.setValue("greyout_songs_startup", ui_->checkbox_greyout_songs_startup->isChecked()); s.setValue("greyout_songs_play", ui_->checkbox_greyout_songs_play->isChecked()); - s.setValue("doubleclick_addmode", doubleclick_addmode); - s.setValue("doubleclick_playmode", doubleclick_playmode); - s.setValue("menu_playmode", menu_playmode); s.setValue(Playlist::kPathType, static_cast(path)); - s.setValue("warn_close_playlist", ui_->checkbox_warncloseplaylist->isChecked()); s.setValue("editmetadatainline", ui_->checkbox_editmetadatainline->isChecked()); s.setValue(Playlist::kWriteMetadata, ui_->checkbox_writemetadata->isChecked()); s.endGroup(); diff --git a/src/settings/playlistsettingspage.ui b/src/settings/playlistsettingspage.ui index f212fb6b2..a8c86e3f9 100644 --- a/src/settings/playlistsettingspage.ui +++ b/src/settings/playlistsettingspage.ui @@ -14,6 +14,16 @@ Playlist + + + + Show a glowing animation on the current track + + + true + + + @@ -43,148 +53,7 @@ - - - Using the menu to add a song will... - - - - - - 0 - - - - Never start playing - - - - - Play if there is nothing already playing - - - - - Always start playing - - - - - - - - - - - Pressing "Previous" in player will... - - - - - - 0 - - - - Jump to previous song right away - - - - - Restart song, then jump to previous if pressed again - - - - - - - - - - - Double clicking a song will... - - - - - - 0 - - - - Append to the playlist - - - - - Replace the playlist - - - - - Open in new playlist - - - - - Add to the queue - - - - - - - - 1 - - - - Never start playing - - - - - Play if there is nothing already playing - - - - - Always start playing - - - - - - - - - - - Double clicking a song in the playlist will... - - - - - - 0 - - - - Change the currently playing song - - - - - Add to the queue - - - - - - - - - + When saving a playlist, file paths should be @@ -220,27 +89,11 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - + Metadata @@ -269,7 +122,7 @@ - + Qt::Vertical