Some fixes and dialog for advanced settings.

diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp
new file mode 100644 (file)
index 0000000..ae29f6c
--- /dev/null
+++ b/src/advsettingsdlg.cpp
@@ -0,0 +1,24 @@
+#include <QGridLayout>
+#include <QSettings>
+
+#include "advsettingsdlg.h"
+
+AdvSettingsDlg::AdvSettingsDlg(QDialog *parent)
+    : QDialog(parent)
+{
+    layout = new QGridLayout(this);
+    settings = new QSettings(this);
+
+    setWindowTitle(tr("Advanced settings"));
+    setLayout(layout);
+}
+
+AdvSettingsDlg::~AdvSettingsDlg()
+{
+    delete layout;
+    layout = NULL;
+    delete settings;
+    settings = NULL;
+}
+
+

diff --git a/src/advsettingsdlg.h b/src/advsettingsdlg.h
new file mode 100644 (file)
index 0000000..0ac14ee
--- /dev/null
+++ b/src/advsettingsdlg.h
@@ -0,0 +1,24 @@
+#ifndef _ADVSETTINGSDLG_H_
+#define _ADVSETTINGSDLG_H_
+
+#include <QDialog>
+
+class QGridLayout;
+class QSettings;
+
+class AdvSettingsDlg : public QDialog
+{
+public:
+    AdvSettingsDlg(QDialog *parent = 0);
+    ~AdvSettingsDlg();
+
+private:
+    AdvSettingsDlg(const AdvSettingsDlg &);
+
+private:
+    QGridLayout *layout;
+    QSettings *settings;
+};
+
+#endif // _ADVSETTINGSDLG_H_
+

diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index cf39d7b..c8b7305 100644 (file)
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -15,6 +15,7 @@
 #include <QByteArray>
 #include <QFile>
 #include <QMap>
+#include <QMessageBox>
 
 SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     : QDialog(parent)
@@ -182,7 +183,8 @@ void SelectRemoteDlg::remoteDownloadFinished(QNetworkReply *reply)
 
     std::system("lircctl restart");
 
-    QMessageBox mbox(NULL, tr("Success"), tr("Remote downloaded"), QMessageBox::Ok, this, Qt:Popup);
+    QMessageBox mbox(QMessageBox::Information, tr("Success"),
+            tr("Remote downloaded"), QMessageBox::Ok, this, Qt::Popup);
     mbox.exec();
     this->close();
 }

diff --git a/src/selectremotedlg.h b/src/selectremotedlg.h
index d525648..2119d45 100644 (file)
--- a/src/selectremotedlg.h
+++ b/src/selectremotedlg.h
@@ -18,7 +18,7 @@ class SelectRemoteDlg : public QDialog
     Q_OBJECT
 public:
     SelectRemoteDlg(QWidget *parent = 0);
-    ~SelectRemoteDlgDlg();
+    ~SelectRemoteDlg();
 
 private slots:
     void alphabetItemChanged(QListWidgetItem *current, QListWidgetItem *previous);

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 2efac90..d4949aa 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -16,7 +16,7 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     QSettings settings(this);
     advSettingsBtn = new QPushButton(tr("Advanced..."), this);
     selectRemoteBtn = new QPushButton(
-            settings.value("remoteName", tr("Select remote")), this);
+            settings.value("remoteName", tr("Select remote")).toString(), this);
 
     layout->addWidget(advSettingsBtn);
     layout->addWidget(selectRemoteBtn);

diff --git a/src/src.pro b/src/src.pro
index 252f1b2..0255df4 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,11 +6,15 @@ SOURCES += mainwidget.cpp
 SOURCES += irctrl.cpp
 SOURCES += irctrl_p.cpp
 SOURCES += settingsdlg.cpp
+SOURCES += selectremotedlg.cpp
+SOURCES += advsettingsdlg.cpp
 
 HEADERS += mainwidget.h
 HEADERS += irctrl.h
 HEADERS += irctrl_p.h
 HEADERS += settingsdlg.h
+HEADERS += selectremotedlg.h
+HEADERS += advsettingsdlg.h
 
 include(qmaemo5homescreenadaptor/qmaemo5homescreenadaptor.pri)