Website updated.

[irwi] / src / mainwidget.cpp

diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index 3c9207b..565a961 100644 (file)
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -1,5 +1,6 @@
 #include "mainwidget.h"
 #include "settingsdlg.h"
+#include "advsettingsdlg.h"
 
 #include <QInputDialog>
 #include <QPainter>
@@ -10,6 +11,9 @@
 MainWidget::MainWidget (QWidget *parent)
     : QWidget(parent)
 {
+    // reset settings to defaults
+    AdvSettingsDlg asd(this);
+
     layout = new QGridLayout(this);
 
     settings = new QSettings(this);
@@ -23,8 +27,7 @@ MainWidget::MainWidget (QWidget *parent)
         "/usr/share/icons/hicolor/48x48/hildon/statusarea_volume_mute.png"
     };
 
-    for (int i = 0; i < BUTTON_COUNT; ++i)
-    {
+    for (int i = 0; i < BUTTON_COUNT; ++i) {
         QToolButton *button = new QToolButton(this);
         button->setIcon(QIcon(QString(
             settings->value(QString("buttonIcon") + QString::number(i),
@@ -35,18 +38,19 @@ MainWidget::MainWidget (QWidget *parent)
         layout->addWidget(button, i%2, i/2);
     }
 
-    connect(buttons[0], SIGNAL(clicked()),
-            this, SLOT(sendCmdClicked(IRemote::VOLUMEUP)));
-   
-    this->setContentsMargins(0, 0, 0, 0);
+    connect(buttons[0], SIGNAL(clicked()), this, SLOT(sendCmdVolUp()));
+    connect(buttons[1], SIGNAL(clicked()), this, SLOT(sendCmdVolDown()));
+    connect(buttons[2], SIGNAL(clicked()), this, SLOT(sendCmdChUp()));
+    connect(buttons[3], SIGNAL(clicked()), this, SLOT(sendCmdChDown()));
+    connect(buttons[4], SIGNAL(clicked()), this, SLOT(sendCmdPower()));
+    connect(buttons[5], SIGNAL(clicked()), this, SLOT(sendCmdMute()));
+
+    setContentsMargins(0, 0, 0, 0);
     layout->setContentsMargins(0, 0, 0, 0);
-    this->setLayout(layout);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setAttribute(Qt::WA_OpaquePaintEvent);
+    setLayout(layout);
+    setAttribute(Qt::WA_TranslucentBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent);
     resize();
-
-
-    showSettingsDialog();
 }
 
 MainWidget::~MainWidget()
@@ -54,7 +58,37 @@ MainWidget::~MainWidget()
     delete settings;
 }
 
-void MainWidget::paintEvent(QPaintEvent*)
+void MainWidget::sendCmdVolUp()
+{
+    irCtrl.sendCmd(settings->value("cmd0", "VOLUP").toString());
+}
+
+void MainWidget::sendCmdVolDown()
+{
+    irCtrl.sendCmd(settings->value("cmd1", "VOLDOWN").toString());
+}
+
+void MainWidget::sendCmdChUp()
+{
+    irCtrl.sendCmd(settings->value("cmd2", "CHUP").toString());
+}
+
+void MainWidget::sendCmdChDown()
+{
+    irCtrl.sendCmd(settings->value("cmd3", "CHDOWN").toString());
+}
+
+void MainWidget::sendCmdPower()
+{
+    irCtrl.sendCmd(settings->value("cmd4", "POWER").toString());
+}
+
+void MainWidget::sendCmdMute()
+{
+    irCtrl.sendCmd(settings->value("cmd5", "MUTE").toString());
+}
+
+void MainWidget::paintEvent(QPaintEvent *)
 {
     int bgAlpha = settings->value("bgAlpha", "192").toInt();
     QPainter p(this);
@@ -64,7 +98,7 @@ void MainWidget::paintEvent(QPaintEvent*)
  
 void MainWidget::showSettingsDialog()
 {
-    SettingsDlg dlg(this);
+    SettingsDlg dlg;
     dlg.exec();
     update(); // Repaint required if bgAlpha value was changed
     resize();