rgscan: some improvements

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

3 files changed, 24 insertions, 7 deletions

diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp
index 46f36a39a..383bc687e 100644
--- a/src/plugins/General/rgscan/rgscandialog.cpp
+++ b/src/plugins/General/rgscan/rgscandialog.cpp
@@ -21,6 +21,7 @@
 #include <QSettings>
 #include <QProgressBar>
 #include <QThreadPool>
+#include <QSettings>
 #include <qmmpui/playlisttrack.h>
 #include <qmmpui/metadataformatter.h>
 #include <qmmpui/filedialog.h>
@@ -49,11 +50,14 @@ RGScanDialog::RGScanDialog(QList <PlayListTrack *> tracks,  QWidget *parent) : Q
         m_ui.tableWidget->setItem(m_ui.tableWidget->rowCount() - 1, 0, item);
         QProgressBar *progressBar = new QProgressBar(this);
         progressBar->setRange(0, 100);
-        //progressBar->setValue(50);
         m_ui.tableWidget->setCellWidget(m_ui.tableWidget->rowCount() - 1, 1, progressBar);
     }
 
     m_ui.tableWidget->resizeColumnsToContents();
+    m_ui.writeButton->setEnabled(false);
+
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    restoreGeometry(settings.value("RGScaner/geometry").toByteArray());
 }
 
 RGScanDialog::~RGScanDialog()
@@ -82,7 +86,7 @@ void RGScanDialog::onScanFinished(QString url)
     {
         if(url != m_ui.tableWidget->item(i, 0)->data(Qt::UserRole).toString())
             continue;
-        m_ui.tableWidget->setItem(i, 2, new QTableWidgetItem(QString::number(m_scaners.at(i)->gain())));
+        m_ui.tableWidget->setItem(i, 2, new QTableWidgetItem(tr("%1 dB").arg(m_scaners.at(i)->gain())));
         m_ui.tableWidget->setItem(i, 4, new QTableWidgetItem(QString::number(m_scaners.at(i)->peak())));
     }
 
@@ -114,25 +118,31 @@ void RGScanDialog::onScanFinished(QString url)
 
         for(int i = 0; i < m_ui.tableWidget->rowCount(); ++i)
         {
-            m_ui.tableWidget->setItem(i, 3, new QTableWidgetItem(QString::number(album_gain)));
+            m_ui.tableWidget->setItem(i, 3, new QTableWidgetItem(tr("%1 dB").arg(album_gain)));
             m_ui.tableWidget->setItem(i, 5, new QTableWidgetItem(QString::number(album_peak)));
         }
 
         qDeleteAll(m_scaners);
         m_scaners.clear();
+
+        m_ui.writeButton->setEnabled(true);
     }
 }
 
+void RGScanDialog::reject()
+{
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    settings.setValue("RGScaner/geometry", saveGeometry());
+    QDialog::reject();
+}
+
 void RGScanDialog::stop()
 {
     if(m_scaners.isEmpty())
         return;
     foreach (RGScaner *scaner, m_scaners)
-    {
         scaner->stop();
-    }
     QThreadPool::globalInstance()->waitForDone();
-
     qDeleteAll(m_scaners);
     m_scaners.clear();
 }
diff --git a/src/plugins/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h
index b2e88dd94..55279e59b 100644
--- a/src/plugins/General/rgscan/rgscandialog.h
+++ b/src/plugins/General/rgscan/rgscandialog.h
@@ -43,6 +43,7 @@ public:
 private slots:
     void on_calculateButton_clicked();
     void onScanFinished(QString url);
+    void reject();
 
 private:
     void stop();
diff --git a/src/plugins/General/rgscan/rgscandialog.ui b/src/plugins/General/rgscan/rgscandialog.ui
index 9bec40c92..76c172a5f 100644
--- a/src/plugins/General/rgscan/rgscandialog.ui
+++ b/src/plugins/General/rgscan/rgscandialog.ui
@@ -25,6 +25,12 @@
    </property>
    <item row="0" column="0" colspan="3">
     <widget class="QTableWidget" name="tableWidget">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -71,7 +77,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QPushButton" name="pushButton_2">
+    <widget class="QPushButton" name="writeButton">
      <property name="text">
       <string>Write Tags</string>
      </property>