Pulls more things from settings

diff --git a/src/irctrl.cpp b/src/irctrl.cpp
index 8a201e8..15ccc48 100644 (file)
--- a/src/irctrl.cpp
+++ b/src/irctrl.cpp
@@ -21,46 +21,47 @@ IrCtrl::~IrCtrl()
 
 void IrCtrl::genericSendCmd(const QString &commandName)
 {
+    QSettings settings(this);
     QTcpSocket sock(this);
 //    sock.setSocketOption(QAbstractSocket::LowDelayOption, 1);
-    sock.connectToHost(QHostAddress::LocalHost, LIRC_PORT,
+    sock.connectToHost(QHostAddress::LocalHost, 
+            settings.value("lircPort", LIRC_PORT).toInt(),
             QIODevice::WriteOnly|QIODevice::Unbuffered);
-    sock.waitForConnected(-1);
-    QSettings settings(this);
-    QString remoteName = settings.value("remoteName", "Zyxel_DMA-1000").toString();
+    sock.waitForConnected();
+    QString remoteName = settings.value("remoteName", "REMOTE_NAME_MISSING").toString();
     QString cmd = "SEND_ONCE " + remoteName + " " + commandName + "\n";
     sock.write(cmd.toAscii());
-    sock.waitForBytesWritten(-1);
+    sock.waitForBytesWritten();
     sock.close();
 }
 
 void IrCtrl::sendCmd0(bool)
 {
-    genericSendCmd("VOL+");
+    genericSendCmd(settings.value("cmd0", "VOL+").toString());
 }
 
 void IrCtrl::sendCmd1(bool)
 {
-    genericSendCmd("VOL-");
+    genericSendCmd(settings.value("cmd1", "VOL-"));
 }
 
 void IrCtrl::sendCmd2(bool)
 {
-    genericSendCmd("P+");
+    genericSendCmd(settings.value("cmd2", "P+"));
 }
 
 void IrCtrl::sendCmd3(bool)
 {
-    genericSendCmd("P-");
+    genericSendCmd(settings.value("cmd3", "P-"));
 }
 
 void IrCtrl::sendCmd4(bool)
 {
-    genericSendCmd("ON/OFF");
+    genericSendCmd(settings.value("cmd4", "ON/OFF"));
 }
 
 void IrCtrl::sendCmd5(bool)
 {
-    genericSendCmd("MUTE");
+    genericSendCmd(settings.value("cmd5", "MUTE"));
 }
 

diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index a3d8151..a5c9c07 100644 (file)
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -12,6 +12,8 @@ MainWidget::MainWidget (QWidget *parent)
 {
     layout = new QGridLayout(this);
 
+    QSettings settings(this);
+
     char *iconNames[] = {
         "/usr/share/icons/hicolor/48x48/hildon/statusarea_volumelevel4.png",
         "/usr/share/icons/hicolor/48x48/hildon/statusarea_volumelevel1.png",
@@ -24,7 +26,9 @@ MainWidget::MainWidget (QWidget *parent)
     for (int i = 0; i < BUTTON_COUNT; ++i)
     {
         QToolButton *button = new QToolButton(this);
-        button->setIcon(QIcon(QString(iconNames[i]))); 
+        button->setIcon(QIcon(QString(
+            settings.value(QString("buttonIcon") + QString::number(i),
+                iconNames[i])))); 
         buttons[i] = button;
         button->setPalette(QPalette(QColor(0, 0, 0, 192)));
         layout->addWidget(button, i%2, i/2);

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 6dc5287..8ee261f 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -161,7 +161,7 @@ void SettingsDlg::modelItemChanged(QListWidgetItem *current, QListWidgetItem *pr
 void SettingsDlg::remoteDownloadFinished(QNetworkReply *reply)
 {
     if (reply->error() == QNetworkReply::NoError) {
-        QFile file("/etc/lircd.conf");
+        QFile file(settings->value("lircConf", "/etc/lircd.conf"));
         if(file.open(QIODevice::WriteOnly))
         {
             file.write(reply->readAll());