analyzer: added option 'cells size'

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2888 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 27 insertions, 25 deletions

diff --git a/src/plugins/Visual/analyzer/settingsdialog.cpp b/src/plugins/Visual/analyzer/settingsdialog.cpp
index fc1df9b2e..444a303dd 100644
--- a/src/plugins/Visual/analyzer/settingsdialog.cpp
+++ b/src/plugins/Visual/analyzer/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007 by Ilya Kotov                                      *
+ *   Copyright (C) 2007-2012 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,28 +19,28 @@
  ***************************************************************************/
 
 #include <QSettings>
-
+#include <QSize>
 #include <qmmp/qmmp.h>
-
 #include "settingsdialog.h"
 
-SettingsDialog::SettingsDialog(QWidget *parent)
- : QDialog(parent)
+SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
 {
-    ui.setupUi(this);
+    m_ui.setupUi(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    ui.analyzerComboBox->setCurrentIndex(settings.value("Analyzer/analyzer_falloff", 3).toInt()-1);
-    ui.peaksCheckBox->setChecked(settings.value("Analyzer/show_peaks", true).toBool());
-    ui.peaksComboBox->setCurrentIndex(settings.value("Analyzer/peaks_falloff", 3).toInt()-1);
-    ui.fpsComboBox->setCurrentIndex(settings.value("Analyzer/refresh_rate", 2).toInt()-1);
-    ui.colorWidget1->setColor(settings.value("Analyzer/color1", "Green").toString());
-    ui.colorWidget2->setColor(settings.value("Analyzer/color2", "Yellow").toString());
-    ui.colorWidget3->setColor(settings.value("Analyzer/color3", "Red").toString());
-    ui.bgColorWidget->setColor(settings.value("Analyzer/bg_color", "Black").toString());
-    ui.peakColorWidget->setColor(settings.value("Analyzer/peak_color", "Cyan").toString());
+    m_ui.analyzerComboBox->setCurrentIndex(settings.value("Analyzer/analyzer_falloff", 3).toInt()-1);
+    m_ui.peaksCheckBox->setChecked(settings.value("Analyzer/show_peaks", true).toBool());
+    m_ui.peaksComboBox->setCurrentIndex(settings.value("Analyzer/peaks_falloff", 3).toInt()-1);
+    m_ui.fpsComboBox->setCurrentIndex(settings.value("Analyzer/refresh_rate", 2).toInt()-1);
+    m_ui.colorWidget1->setColor(settings.value("Analyzer/color1", "Green").toString());
+    m_ui.colorWidget2->setColor(settings.value("Analyzer/color2", "Yellow").toString());
+    m_ui.colorWidget3->setColor(settings.value("Analyzer/color3", "Red").toString());
+    m_ui.bgColorWidget->setColor(settings.value("Analyzer/bg_color", "Black").toString());
+    m_ui.peakColorWidget->setColor(settings.value("Analyzer/peak_color", "Cyan").toString());
+    QSize cells_size = settings.value("Analyzer/cells_size", QSize(15, 6)).toSize();
+    m_ui.cellWidthSpinBox->setValue(cells_size.width());
+    m_ui.cellHeightSpinBox->setValue(cells_size.height());
 }
 
-
 SettingsDialog::~SettingsDialog()
 {
 }
@@ -48,14 +48,16 @@ SettingsDialog::~SettingsDialog()
 void SettingsDialog::accept()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    settings.setValue("Analyzer/analyzer_falloff", ui.analyzerComboBox->currentIndex() + 1);
-    settings.setValue("Analyzer/peaks_falloff", ui.peaksComboBox->currentIndex() + 1);
-    settings.setValue("Analyzer/refresh_rate", ui.fpsComboBox->currentIndex() + 1);
-    settings.setValue("Analyzer/show_peaks", ui.peaksCheckBox->isChecked());
-    settings.setValue("Analyzer/color1", ui.colorWidget1->colorName());
-    settings.setValue("Analyzer/color2", ui.colorWidget2->colorName());
-    settings.setValue("Analyzer/color3", ui.colorWidget3->colorName());
-    settings.setValue("Analyzer/bg_color", ui.bgColorWidget->colorName());
-    settings.setValue("Analyzer/peak_color", ui.peakColorWidget->colorName());
+    settings.setValue("Analyzer/analyzer_falloff", m_ui.analyzerComboBox->currentIndex() + 1);
+    settings.setValue("Analyzer/peaks_falloff", m_ui.peaksComboBox->currentIndex() + 1);
+    settings.setValue("Analyzer/refresh_rate", m_ui.fpsComboBox->currentIndex() + 1);
+    settings.setValue("Analyzer/show_peaks", m_ui.peaksCheckBox->isChecked());
+    settings.setValue("Analyzer/color1", m_ui.colorWidget1->colorName());
+    settings.setValue("Analyzer/color2", m_ui.colorWidget2->colorName());
+    settings.setValue("Analyzer/color3", m_ui.colorWidget3->colorName());
+    settings.setValue("Analyzer/bg_color", m_ui.bgColorWidget->colorName());
+    settings.setValue("Analyzer/peak_color", m_ui.peakColorWidget->colorName());
+    settings.setValue("Analyzer/cells_size", QSize(m_ui.cellWidthSpinBox->value(),
+                                                   m_ui.cellHeightSpinBox->value()));
     QDialog::accept();
 }