Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move some settings

Browse Source
This commit is contained in:
Jonas Kvinge 2018-10-31 19:44:24 +01:00
parent 26459763e5
commit bc9ec8025c
9 changed files with 201 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/mainwindow.cpp
View File

@ -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());

4
src/playlist/playlistview.cpp
View File

@ -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();

4
src/settings/backendsettingspage.ui
View File

@ -214,7 +214,7 @@
</size>
</property>
<property name="text">
<string>plughw</string>
<string>p&amp;lughw</string>
</property>
</widget>
</item>
@ -268,7 +268,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_bufferminfill">
<property name="text">
<string>&amp;Minimum buffer fill</string>
<string>Minimum buffer fill</string>
</property>
</widget>
</item>

30
src/settings/behavioursettingspage.cpp
View File

@ -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();
}

150
src/settings/behavioursettingspage.ui
View File

@ -64,7 +64,7 @@
<item>
<widget class="QGroupBox" name="groupbox_startup">
<property name="title">
<string>When Strawberry starts</string>
<string>On startup</string>
</property>
<layout class="QVBoxLayout" name="layout_mainwindow">
<item>
@ -101,6 +101,154 @@
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_1">
<property name="title">
<string>Using the menu to add a song will...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
<item>
<widget class="QComboBox" name="combobox_menuplaymode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Never start playing</string>
</property>
</item>
<item>
<property name="text">
<string>Play if there is nothing already playing</string>
</property>
</item>
<item>
<property name="text">
<string>Always start playing</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_previous">
<property name="title">
<string>Pressing &quot;Previous&quot; in player will...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
<item>
<widget class="QComboBox" name="combobox_previousmode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Jump to previous song right away</string>
</property>
</item>
<item>
<property name="text">
<string>Restart song, then jump to previous if pressed again</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_doubleclickaddmode">
<property name="title">
<string>Double clicking a song will...</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QComboBox" name="combobox_doubleclickaddmode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Append to the playlist</string>
</property>
</item>
<item>
<property name="text">
<string>Replace the playlist</string>
</property>
</item>
<item>
<property name="text">
<string>Open in new playlist</string>
</property>
</item>
<item>
<property name="text">
<string>Add to the queue</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="combobox_doubleclickplaymode">
<property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>Never start playing</string>
</property>
</item>
<item>
<property name="text">
<string>Play if there is nothing already playing</string>
</property>
</item>
<item>
<property name="text">
<string>Always start playing</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_doubleclickplaylist">
<property name="title">
<string>Double clicking a song in the playlist will...</string>
</property>
<layout class="QVBoxLayout" name="layout_doubleclick_playlist">
<item>
<widget class="QComboBox" name="combobox_doubleclickplaylistaddmode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Change the currently playing song</string>
</property>
</item>
<item>
<property name="text">
<string>Add to the queue</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_seekstep">
<property name="title">

2
src/settings/playbacksettingspage.cpp
View File

@ -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());

10
src/settings/playbacksettingspage.ui
View File

@ -14,16 +14,6 @@
<string>Playback</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="checkbox_glowcurrenttrack">
<property name="text">
<string>Show a glowing animation on the current track</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_fading">
<property name="title">

34
src/settings/playlistsettingspage.cpp
View File

@ -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<int>(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();

173
src/settings/playlistsettingspage.ui
View File

@ -14,6 +14,16 @@
<string>Playlist</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="checkbox_glowcurrenttrack">
<property name="text">
<string>Show a glowing animation on the current track</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkbox_warncloseplaylist">
<property name="text">
@ -43,148 +53,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_1">
<property name="title">
<string>Using the menu to add a song will...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
<item>
<widget class="QComboBox" name="combobox_menuplaymode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Never start playing</string>
</property>
</item>
<item>
<property name="text">
<string>Play if there is nothing already playing</string>
</property>
</item>
<item>
<property name="text">
<string>Always start playing</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_previous">
<property name="title">
<string>Pressing &quot;Previous&quot; in player will...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
<item>
<widget class="QComboBox" name="combobox_previousmode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Jump to previous song right away</string>
</property>
</item>
<item>
<property name="text">
<string>Restart song, then jump to previous if pressed again</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_doubleclickaddmode">
<property name="title">
<string>Double clicking a song will...</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QComboBox" name="combobox_doubleclickaddmode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Append to the playlist</string>
</property>
</item>
<item>
<property name="text">
<string>Replace the playlist</string>
</property>
</item>
<item>
<property name="text">
<string>Open in new playlist</string>
</property>
</item>
<item>
<property name="text">
<string>Add to the queue</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="combobox_doubleclickplaymode">
<property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>Never start playing</string>
</property>
</item>
<item>
<property name="text">
<string>Play if there is nothing already playing</string>
</property>
</item>
<item>
<property name="text">
<string>Always start playing</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_doubleclickplaylist">
<property name="title">
<string>Double clicking a song in the playlist will...</string>
</property>
<layout class="QVBoxLayout" name="layout_doubleclick_playlist">
<item>
<widget class="QComboBox" name="combobox_doubleclickplaylistaddmode">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Change the currently playing song</string>
</property>
</item>
<item>
<property name="text">
<string>Add to the queue</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<widget class="QGroupBox" name="groupbox_paths">
<property name="title">
<string>When saving a playlist, file paths should be</string>
</property>
@ -220,27 +89,11 @@
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_1">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_editmetadatainline">
<widget class="QGroupBox" name="groupbox_metadata">
<property name="title">
<string>Metadata</string>
</property>
@ -269,7 +122,7 @@
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<spacer name="spacer_bottom">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>