Error fixes

[irwi] / src / advsettingsdlg.cpp

diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp
index b990f25..3549f74 100644 (file)
--- a/src/advsettingsdlg.cpp
+++ b/src/advsettingsdlg.cpp
@@ -3,6 +3,7 @@
 #include <QSettings>
 #include <QPushButton>
 #include <QMessageBox>
+#include <QFont>
 
 #include "advsettingsdlg.h"
 #include "settingstable.h"
@@ -20,13 +21,18 @@ AdvSettingsDlg::AdvSettingsDlg(QDialog *parent)
     setMinimumHeight(320);
 
     settings = new QSettings(this);
+
+    // Set default values on first startup
+    if (settings->allKeys().isEmpty())
+        setDefaults();
+
     resetBtn = new QPushButton(tr("Defaults"), this);
     saveBtn = new QPushButton(tr("Save"), this);
     table = new SettingsTable(this);
     layout = new QHBoxLayout(this);
     btnLayout = new QVBoxLayout();
 
-    connect(resetBtn, SIGNAL(clicked()), this, SLOT(resetToDefaults()));
+    connect(resetBtn, SIGNAL(clicked()), this, SLOT(showResetQuery()));
     connect(saveBtn, SIGNAL(clicked()), this, SLOT(save()));
 
     btnLayout->addWidget(resetBtn);
@@ -34,6 +40,10 @@ AdvSettingsDlg::AdvSettingsDlg(QDialog *parent)
     layout->addWidget(table, Qt::AlignLeft);
     layout->addLayout(btnLayout, 0);
 
+    QFont tableFont = table->font();
+    tableFont.setPointSize(20);
+    table->setFont(tableFont);
+
     refreshList();
 }
 
@@ -46,15 +56,6 @@ AdvSettingsDlg::~AdvSettingsDlg()
     delete table;
 }
 
-void AdvSettingsDlg::save()
-{
-    for (int i = 0; i < table->rowCount(); ++i)
-    {
-        settings->setValue(table->key(i), table->value(i));
-    }
-    done(0); // close dialog
-}
-
 void AdvSettingsDlg::refreshList()
 {
     table->removeAllRows();
@@ -63,31 +64,50 @@ void AdvSettingsDlg::refreshList()
     for (int i = 0; i < keys.size(); ++i)
     {
         table->appendRow(keys.at(i),
-                settings->value(keys.at(i), "n/a").toString());
+            settings->value(keys.at(i), "n/a").toString());
     }
 }
 
-void AdvSettingsDlg::resetToDefaults()
+void AdvSettingsDlg::setDefaults()
+{
+    settings->setValue("lircPort", 8765);
+    settings->setValue("remoteName", "No remote selected");
+    settings->setValue("lircConf", "/etc/lircd.conf");
+    settings->setValue("cmd0", "VOLUP");
+    settings->setValue("cmd1", "VOLDOWN");
+    settings->setValue("cmd2", "CHUP");
+    settings->setValue("cmd3", "CHDOWN");
+    settings->setValue("cmd4", "POWER");
+    settings->setValue("cmd5", "MUTE");
+    settings->setValue("remoteUrl",
+        "http://mercury.wipsl.com/irwi/remotes/");
+    settings->setValue("bgAlpha", 192);
+    settings->setValue("height", 147);
+    settings->setValue("width", 250);
+    settings->setValue("idleTimeout", 300);
+    settings->setValue("dbUrl", "http://mercury.wipsl.com/irwi/db/db.xml");
+}
+
+void AdvSettingsDlg::showResetQuery()
 {
     QMessageBox mbox(QMessageBox::Question, "",
-            tr("All settings will be reset to defaults"),
-            QMessageBox::Cancel | QMessageBox::Ok, this); 
-    if (mbox.exec() == QMessageBox::Ok)
+        tr("Reset all settings to defaults?"),
+        QMessageBox::Cancel | QMessageBox::Yes, this); 
+    if (mbox.exec() == QMessageBox::Yes)
     {
-        settings->setValue("lircPort", 8765);
-        settings->setValue("remoteName", "No remote selected");
-        settings->setValue("lircConf", "/etc/lircd.conf");
-        settings->setValue("cmd0", "VOL+");
-        settings->setValue("cmd1", "VOL-");
-        settings->setValue("cmd2", "P+");
-        settings->setValue("cmd3", "P-");
-        settings->setValue("cmd4", "ON/OFF");
-        settings->setValue("cmd5", "MUTE");
-        settings->setValue("remoteUrl",
-                "http://mercury.wipsl.com/irwi/remotes/");
-        settings->setValue("bgAlpha", 192);
-
+        setDefaults();
         refreshList();
     }
 }
 
+void AdvSettingsDlg::save()
+{
+    for (int i = 0; i < table->rowCount(); ++i)
+    {
+        settings->setValue(table->key(i), table->value(i));
+    }
+    done(0); // close dialog
+}
+
+
+