1 files changed, 52 insertions, 28 deletions

diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index d0b616037..89fba0d22 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -41,10 +41,6 @@ SkinnedSettings::SkinnedSettings(QWidget *parent) : QWidget(parent)
     loadSkins();
     loadFonts();
     createActions();
-    //setup icons
-    m_ui.skinInstallButton->setIcon(QIcon::fromTheme("list-add"));
-    m_ui.skinReloadButton->setIcon(QIcon::fromTheme("view-refresh"));
-    m_ui.popupTemplateButton->setIcon(QIcon::fromTheme("configure"));
 }
 
 SkinnedSettings::~SkinnedSettings()
@@ -262,35 +258,63 @@ void SkinnedSettings::readSettings()
     m_ui.hiddenCheckBox->setChecked(settings.value("start_hidden", false).toBool());
     m_ui.hideOnCloseCheckBox->setChecked(settings.value("hide_on_close", false).toBool());
     m_ui.windowTitleLineEdit->setText(settings.value("window_title_format","%if(%p,%p - %t,%t)").toString());
+    //playlist colors
+    m_ui.plSkinColorsCheckBox->setChecked(settings.value("pl_use_skin_colors", true).toBool());
+    m_ui.plBg1Color->setColor(settings.value("pl_bg1_color", "#0d0d0d").toString());
+    m_ui.plBg2Color->setColor(settings.value("pl_bg2_color", "#0d0d0d").toString());
+    m_ui.plHlColor->setColor(settings.value("pl_highlight_color", "#2a2a2a").toString());
+    m_ui.plTextNormalColor->setColor(settings.value("pl_normal_text_color", "#5a5a5a").toString());
+    m_ui.plTextCurrentColor->setColor(settings.value("pl_current_text_color", "#407dec").toString());
+    m_ui.plTextHlCurrentColor->setColor(settings.value("pl_hl_text_color", "#5a5a5a").toString());
+    m_ui.plGrBgColor->setColor(settings.value("pl_group_bg", "#0d0d0d").toString());
+    m_ui.plSplitterColor->setColor(settings.value("pl_splitter_color", "#5a5a5a").toString());
+    m_ui.plGrTextColor->setColor(settings.value("pl_group_text", "#5a5a5a").toString());
+    m_ui.plCurrentTrackBgColor->setColor(settings.value("pl_current_bg_color", "#0d0d0d").toString());
+    m_ui.plOverrideGroupBgCheckBox->setChecked(settings.value("pl_override_group_bg", false).toBool());
+    m_ui.plOverrideCurrentBgCheckBox->setChecked(settings.value("pl_override_current_bg", false).toBool());
     settings.endGroup();
 }
 
 void SkinnedSettings::writeSettings()
 {
-    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Skinned");
-    settings.setValue ("pl_show_protocol", m_ui.protocolCheckBox->isChecked());
-    settings.setValue ("pl_show_numbers", m_ui.numbersCheckBox->isChecked());
-    settings.setValue ("pl_show_lengths", m_ui.lengthsCheckBox->isChecked());
-    settings.setValue ("pl_align_numbers", m_ui.alignCheckBox->isChecked());
-    settings.setValue ("pl_show_anchor", m_ui.anchorCheckBox->isChecked());
-    settings.setValue ("pl_show_plalists", m_ui.playlistsCheckBox->isChecked());
-    settings.setValue ("pl_show_splitters", m_ui.showSplittersCheckBox->isChecked());
-    settings.setValue ("pl_alt_splitter_color", m_ui.alternateSplitterColorCheckBox->isChecked());
-    settings.setValue ("pl_show_popup", m_ui.popupCheckBox->isChecked());
-    settings.setValue ("pl_separator", m_ui.plSeplineEdit->text());
-    settings.setValue ("pl_show_create_button", m_ui.showNewPLCheckBox->isChecked());
-    settings.setValue ("mw_opacity", 1.0 -  (double)m_ui.mwTransparencySlider->value()/100);
-    settings.setValue ("eq_opacity", 1.0 -  (double)m_ui.eqTransparencySlider->value()/100);
-    settings.setValue ("pl_opacity", 1.0 -  (double)m_ui.plTransparencySlider->value()/100);
-    settings.setValue ("bitmap_font", m_ui.useBitmapCheckBox->isChecked());
-    settings.setValue ("skin_cursors", m_ui.skinCursorsCheckBox->isChecked());
-    settings.setValue ("skin_name", m_currentSkinName);
-    settings.setValue ("start_hidden", m_ui.hiddenCheckBox->isChecked());
-    settings.setValue ("hide_on_close", m_ui.hideOnCloseCheckBox->isChecked());
-    settings.setValue ("window_title_format", m_ui.windowTitleLineEdit->text());
-    settings.setValue ("mw_font", m_ui.mainFontLabel->font().toString());
-    settings.setValue ("pl_font", m_ui.plFontLabel->font().toString());
-    settings.setValue ("pl_header_font", m_ui.headerFontLabel->font().toString());
+    settings.setValue("pl_show_protocol", m_ui.protocolCheckBox->isChecked());
+    settings.setValue("pl_show_numbers", m_ui.numbersCheckBox->isChecked());
+    settings.setValue("pl_show_lengths", m_ui.lengthsCheckBox->isChecked());
+    settings.setValue("pl_align_numbers", m_ui.alignCheckBox->isChecked());
+    settings.setValue("pl_show_anchor", m_ui.anchorCheckBox->isChecked());
+    settings.setValue("pl_show_plalists", m_ui.playlistsCheckBox->isChecked());
+    settings.setValue("pl_show_splitters", m_ui.showSplittersCheckBox->isChecked());
+    settings.setValue("pl_alt_splitter_color", m_ui.alternateSplitterColorCheckBox->isChecked());
+    settings.setValue("pl_show_popup", m_ui.popupCheckBox->isChecked());
+    settings.setValue("pl_separator", m_ui.plSeplineEdit->text());
+    settings.setValue("pl_show_create_button", m_ui.showNewPLCheckBox->isChecked());
+    settings.setValue("mw_opacity", 1.0 - (double)m_ui.mwTransparencySlider->value()/100);
+    settings.setValue("eq_opacity", 1.0 - (double)m_ui.eqTransparencySlider->value()/100);
+    settings.setValue("pl_opacity", 1.0 - (double)m_ui.plTransparencySlider->value()/100);
+    settings.setValue("bitmap_font", m_ui.useBitmapCheckBox->isChecked());
+    settings.setValue("skin_cursors", m_ui.skinCursorsCheckBox->isChecked());
+    settings.setValue("skin_name", m_currentSkinName);
+    settings.setValue("start_hidden", m_ui.hiddenCheckBox->isChecked());
+    settings.setValue("hide_on_close", m_ui.hideOnCloseCheckBox->isChecked());
+    settings.setValue("window_title_format", m_ui.windowTitleLineEdit->text());
+    settings.setValue("mw_font", m_ui.mainFontLabel->font().toString());
+    settings.setValue("pl_font", m_ui.plFontLabel->font().toString());
+    settings.setValue("pl_header_font", m_ui.headerFontLabel->font().toString());
+    //playlist colors
+    settings.setValue("pl_use_skin_colors", m_ui.plSkinColorsCheckBox->isChecked());
+    settings.setValue("pl_bg1_color", m_ui.plBg1Color->colorName());
+    settings.setValue("pl_bg2_color", m_ui.plBg2Color->colorName());
+    settings.setValue("pl_highlight_color", m_ui.plHlColor->colorName());
+    settings.setValue("pl_normal_text_color", m_ui.plTextNormalColor->colorName());
+    settings.setValue("pl_current_text_color", m_ui.plTextCurrentColor->colorName());
+    settings.setValue("pl_hl_text_color", m_ui.plTextHlCurrentColor->colorName());
+    settings.setValue("pl_group_bg", m_ui.plGrBgColor->colorName());
+    settings.setValue("pl_splitter_color", m_ui.plSplitterColor->colorName());
+    settings.setValue("pl_group_text", m_ui.plGrTextColor->colorName());
+    settings.setValue("pl_current_bg_color", m_ui.plCurrentTrackBgColor->colorName());
+    settings.setValue("pl_override_group_bg", m_ui.plOverrideGroupBgCheckBox->isChecked());
+    settings.setValue("pl_override_current_bg", m_ui.plOverrideCurrentBgCheckBox->isChecked());
     settings.endGroup();
 }