Fixed mainwidget.cpp

[irwi] / src / settingsdlg.cpp

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 2efac90..dccbcfd 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -1,38 +1,60 @@
 #include "settingsdlg.h"
 #include "advsettingsdlg.h"
 #include "selectremotedlg.h"
+#include "aboutdlg.h"
 
 #include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <QWidget>
 #include <QDialog>
 #include <QPushButton>
 #include <QSettings>
+#include <QLabel>
 
 SettingsDlg::SettingsDlg(QWidget *parent)
     : QDialog(parent)
 {
-    layout = new QHBoxLayout(this);
+    layout = new QVBoxLayout(this);
+    btnLayout = new QHBoxLayout(this);
+    remoteNameLayout = new QHBoxLayout(this);
     
     QSettings settings(this);
-    advSettingsBtn = new QPushButton(tr("Advanced..."), this);
-    selectRemoteBtn = new QPushButton(
-            settings.value("remoteName", tr("Select remote")), this);
+    advSettingsBtn = new QPushButton(tr("Advanced"), this);
+    selectRemoteBtn = new QPushButton(tr("Select remote"), this);
+    aboutBtn = new QPushButton(tr("About"), this);
 
-    layout->addWidget(advSettingsBtn);
-    layout->addWidget(selectRemoteBtn);
+    btnLayout->addWidget(advSettingsBtn);
+    btnLayout->addWidget(selectRemoteBtn);
+    btnLayout->addWidget(aboutBtn);
 
     connect(advSettingsBtn, SIGNAL(clicked()),
             this, SLOT(showAdvSettingsDlg()));
     connect(selectRemoteBtn, SIGNAL(clicked()),
             this, SLOT(showSelectRemoteDlg()));
+    connect(aboutBtn, SIGNAL(clicked()),
+            this, SLOT(showAboutDlg()));
 
+    remoteNameLabel = new QLabel(
+                settings.value("remoteName", 
+                tr("<no remote selected>")).toString(), this);
+    remoteNameLayout->addWidget(new QLabel(tr("Remote name: "), this));
+    remoteNameLayout->addWidget(remoteNameLabel);
+
+    layout->addLayout(remoteNameLayout);
+    layout->addLayout(btnLayout);
     this->setLayout(layout);
+
+    updateRemoteName();
 }
 
 SettingsDlg::~SettingsDlg()
 {
     delete advSettingsBtn;
     delete selectRemoteBtn;
+    delete aboutBtn;
+    delete remoteNameLabel;
+    delete remoteNameLayout;
+    delete btnLayout;
     delete layout;
 }
 
@@ -45,6 +67,22 @@ void SettingsDlg::showAdvSettingsDlg()
 void SettingsDlg::showSelectRemoteDlg()
 {
     SelectRemoteDlg dlg(this);
+    connect(&dlg, SIGNAL(remoteDownloaded()), 
+            this, SLOT(updateRemoteName()));
+    dlg.exec();
+}
+
+void SettingsDlg::showAboutDlg()
+{
+    AboutDlg dlg(this);
     dlg.exec();
 }
 
+void SettingsDlg::updateRemoteName()
+{
+    QSettings settings(this);
+    remoteNameLabel->setText(settings.value("remoteName", 
+                tr("Select remote")).toString());
+}
+
+