dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-22 18:12:33 +02:00
parent dfcf715291
commit 8da2b9cd94
623 changed files with 9071 additions and 5126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/settings/behavioursettingspage.cpp
View File

@@ -39,6 +39,7 @@
#include <QGroupBox>
#include <QStandardPaths>
#include "constants/behavioursettings.h"
#include "core/iconloader.h"
#include "core/settings.h"
#include "settings/settingspage.h"
@@ -46,11 +47,10 @@
#include "ui_behavioursettingspage.h"
using namespace Qt::Literals::StringLiterals;
using namespace BehaviourSettings;
class SettingsDialog;
const char *BehaviourSettingsPage::kSettingsGroup = "Behaviour";
#ifdef HAVE_TRANSLATIONS
namespace {
bool LocaleAwareCompare(const QString &a, const QString &b) {
@@ -151,26 +151,26 @@ void BehaviourSettingsPage::Load() {
#ifdef Q_OS_MACOS
ui_->checkbox_keeprunning->setEnabled(true);
ui_->checkbox_keeprunning->setChecked(s.value("keeprunning", false).toBool());
ui_->checkbox_keeprunning->setChecked(s.value(kKeepRunning, false).toBool());
#else
const bool systemtray_available = QSystemTrayIcon::isSystemTrayAvailable();
ui_->checkbox_showtrayicon->setEnabled(systemtray_available);
ui_->checkbox_showtrayicon->setChecked(systemtray_available && s.value("showtrayicon", true).toBool());
ui_->checkbox_showtrayicon->setChecked(systemtray_available && s.value(kShowTrayIcon, true).toBool());
ui_->checkbox_keeprunning->setEnabled(systemtray_available && ui_->checkbox_showtrayicon->isChecked());
ui_->checkbox_keeprunning->setChecked(s.value("keeprunning", false).toBool());
ui_->checkbox_keeprunning->setChecked(s.value(kKeepRunning, false).toBool());
ui_->checkbox_trayicon_progress->setEnabled(systemtray_available && ui_->checkbox_showtrayicon->isChecked());
ui_->checkbox_trayicon_progress->setChecked(systemtray_available && ui_->checkbox_showtrayicon->isChecked() && s.value("trayicon_progress", false).toBool());
ui_->checkbox_trayicon_progress->setChecked(systemtray_available && ui_->checkbox_showtrayicon->isChecked() && s.value(kTrayIconProgress, false).toBool());
ui_->radiobutton_hide->setEnabled(systemtray_available && ui_->checkbox_showtrayicon->isChecked());
#ifdef HAVE_DBUS
ui_->checkbox_taskbar_progress->setChecked(s.value("taskbar_progress", true).toBool());
ui_->checkbox_taskbar_progress->setChecked(s.value(kTaskbarProgress, true).toBool());
#endif
#endif
ui_->checkbox_resumeplayback->setChecked(s.value("resumeplayback", false).toBool());
ui_->checkbox_playingwidget->setChecked(s.value("playing_widget", true).toBool());
ui_->checkbox_resumeplayback->setChecked(s.value(kResumePlayback, false).toBool());
ui_->checkbox_playingwidget->setChecked(s.value(kPlayingWidget, true).toBool());
#ifndef Q_OS_MACOS
const StartupBehaviour startup_behaviour = static_cast<StartupBehaviour>(s.value("startupbehaviour", static_cast<int>(StartupBehaviour::Remember)).toInt());
const StartupBehaviour startup_behaviour = static_cast<StartupBehaviour>(s.value(kStartupBehaviour, static_cast<int>(StartupBehaviour::Remember)).toInt());
switch (startup_behaviour) {
case StartupBehaviour::Show:
ui_->radiobutton_show->setChecked(true);
@@ -188,13 +188,13 @@ void BehaviourSettingsPage::Load() {
}
;
[[fallthrough]];
case BehaviourSettingsPage::StartupBehaviour::Remember:
case StartupBehaviour::Remember:
ui_->radiobutton_remember->setChecked(true);
break;
}
#endif
QString name = language_map_.key(s.value("language").toString());
QString name = language_map_.key(s.value(kLanguage).toString());
if (name.isEmpty()) {
ui_->combobox_language->setCurrentIndex(0);
}
@@ -202,19 +202,19 @@ void BehaviourSettingsPage::Load() {
ui_->combobox_language->setCurrentIndex(ui_->combobox_language->findText(name));
}
ui_->combobox_menuplaymode->setCurrentIndex(ui_->combobox_menuplaymode->findData(s.value("menu_playmode", static_cast<int>(PlayBehaviour::Never)).toInt()));
ui_->combobox_menuplaymode->setCurrentIndex(ui_->combobox_menuplaymode->findData(s.value(kMenuPlayMode, static_cast<int>(PlayBehaviour::Never)).toInt()));
ui_->combobox_previousmode->setCurrentIndex(ui_->combobox_previousmode->findData(s.value("menu_previousmode", static_cast<int>(PreviousBehaviour::DontRestart)).toInt()));
ui_->combobox_previousmode->setCurrentIndex(ui_->combobox_previousmode->findData(s.value(kMenuPreviousMode, static_cast<int>(PreviousBehaviour::DontRestart)).toInt()));
ui_->combobox_doubleclickaddmode->setCurrentIndex(ui_->combobox_doubleclickaddmode->findData(s.value("doubleclick_addmode", static_cast<int>(AddBehaviour::Append)).toInt()));
ui_->combobox_doubleclickaddmode->setCurrentIndex(ui_->combobox_doubleclickaddmode->findData(s.value(kDoubleClickAddMode, static_cast<int>(AddBehaviour::Append)).toInt()));
ui_->combobox_doubleclickplaymode->setCurrentIndex(ui_->combobox_doubleclickplaymode->findData(s.value("doubleclick_playmode", static_cast<int>(PlayBehaviour::Never)).toInt()));
ui_->combobox_doubleclickplaymode->setCurrentIndex(ui_->combobox_doubleclickplaymode->findData(s.value(kDoubleClickPlayMode, static_cast<int>(PlayBehaviour::Never)).toInt()));
ui_->combobox_doubleclickplaylistaddmode->setCurrentIndex(ui_->combobox_doubleclickplaylistaddmode->findData(s.value("doubleclick_playlist_addmode", static_cast<int>(PlaylistAddBehaviour::Play)).toInt()));
ui_->combobox_doubleclickplaylistaddmode->setCurrentIndex(ui_->combobox_doubleclickplaylistaddmode->findData(s.value(kDoubleClickPlaylistAddMode, static_cast<int>(PlaylistAddBehaviour::Play)).toInt()));
ui_->spinbox_seekstepsec->setValue(s.value("seek_step_sec", 10).toInt());
ui_->spinbox_seekstepsec->setValue(s.value(kSeekStepSec, 10).toInt());
ui_->spinbox_volumeincrement->setValue(s.value("volume_increment", 5).toInt());
ui_->spinbox_volumeincrement->setValue(s.value(kVolumeIncrement, 5).toInt());
s.endGroup();
@@ -229,14 +229,14 @@ void BehaviourSettingsPage::Save() {
Settings s;
s.beginGroup(kSettingsGroup);
s.setValue("showtrayicon", ui_->checkbox_showtrayicon->isChecked());
s.setValue("keeprunning", ui_->checkbox_keeprunning->isChecked());
s.setValue("trayicon_progress", ui_->checkbox_trayicon_progress->isChecked());
s.setValue(kShowTrayIcon, ui_->checkbox_showtrayicon->isChecked());
s.setValue(kKeepRunning, ui_->checkbox_keeprunning->isChecked());
s.setValue(kTrayIconProgress, ui_->checkbox_trayicon_progress->isChecked());
#if defined(HAVE_DBUS) && !defined(Q_OS_MACOS)
s.setValue("taskbar_progress", ui_->checkbox_taskbar_progress->isChecked());
s.setValue(kTaskbarProgress, ui_->checkbox_taskbar_progress->isChecked());
#endif
s.setValue("resumeplayback", ui_->checkbox_resumeplayback->isChecked());
s.setValue("playing_widget", ui_->checkbox_playingwidget->isChecked());
s.setValue(kResumePlayback, ui_->checkbox_resumeplayback->isChecked());
s.setValue(kPlayingWidget, ui_->checkbox_playingwidget->isChecked());
StartupBehaviour startup_behaviour = StartupBehaviour::Remember;
if (ui_->radiobutton_remember->isChecked()) startup_behaviour = StartupBehaviour::Remember;
@@ -244,9 +244,9 @@ void BehaviourSettingsPage::Save() {
if (ui_->radiobutton_hide->isChecked()) startup_behaviour = StartupBehaviour::Hide;
if (ui_->radiobutton_show_maximized->isChecked()) startup_behaviour = StartupBehaviour::ShowMaximized;
if (ui_->radiobutton_show_minimized->isChecked()) startup_behaviour = StartupBehaviour::ShowMinimized;
s.setValue("startupbehaviour", static_cast<int>(startup_behaviour));
s.setValue(kStartupBehaviour, static_cast<int>(startup_behaviour));
s.setValue("language", language_map_.contains(ui_->combobox_language->currentText()) ? language_map_[ui_->combobox_language->currentText()] : QString());
s.setValue(kLanguage, language_map_.contains(ui_->combobox_language->currentText()) ? language_map_[ui_->combobox_language->currentText()] : QString());
const PlayBehaviour menu_playmode = static_cast<PlayBehaviour>(ui_->combobox_menuplaymode->currentData().toInt());
@@ -257,15 +257,15 @@ void BehaviourSettingsPage::Save() {
const PlaylistAddBehaviour doubleclick_playlist_addmode = static_cast<PlaylistAddBehaviour>(ui_->combobox_doubleclickplaylistaddmode->currentData().toInt());
s.setValue("menu_playmode", static_cast<int>(menu_playmode));
s.setValue("menu_previousmode", static_cast<int>(menu_previousmode));
s.setValue("doubleclick_addmode", static_cast<int>(doubleclick_addmode));
s.setValue("doubleclick_playmode", static_cast<int>(doubleclick_playmode));
s.setValue("doubleclick_playlist_addmode", static_cast<int>(doubleclick_playlist_addmode));
s.setValue(kMenuPlayMode, static_cast<int>(menu_playmode));
s.setValue(kMenuPreviousMode, static_cast<int>(menu_previousmode));
s.setValue(kDoubleClickAddMode, static_cast<int>(doubleclick_addmode));
s.setValue(kDoubleClickPlayMode, static_cast<int>(doubleclick_playmode));
s.setValue(kDoubleClickPlaylistAddMode, static_cast<int>(doubleclick_playlist_addmode));
s.setValue("seek_step_sec", ui_->spinbox_seekstepsec->value());
s.setValue(kSeekStepSec, ui_->spinbox_seekstepsec->value());
s.setValue("volume_increment", ui_->spinbox_volumeincrement->value());
s.setValue(kVolumeIncrement, ui_->spinbox_volumeincrement->value());
s.endGroup();