implemented 'proxy settings' dialog

 - user can secify proxy for network communication

diff --git a/src/app/app.pro b/src/app/app.pro
index ab788f79fdca9a4fca62943c7e3940f5828ba22b..10ef88b23283639c486ca70979b1b4d5dd648c57 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -16,7 +16,10 @@ maemo {
     TARGETDEPS += $$DESTDIR/libqalarm.a
 }
 
     TARGETDEPS += $$DESTDIR/libqalarm.a
 }
 

-SOURCES += main.cpp
+HEADERS += appsettings.h
+
+SOURCES += main.cpp \
+           appsettings.cpp

 
 RESOURCES += ../icons.qrc \
              ../maps.qrc
 
 RESOURCES += ../icons.qrc \
              ../maps.qrc

diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp
new file mode 100644 (file)
index 0000000..2d48066
--- /dev/null
+++ b/src/app/appsettings.cpp
@@ -0,0 +1,40 @@
+#include "appsettings.h"
+
+const QString PROXY_ADDRESS_SETTING ("proxyAddress"); 
+const QString PROXY_PORT_SETTING ("proxyPort"); 
+const QString PROXY_ISDIRECT_SETTING ("proxyIsDirectConnection"); 
+
+QSettings AppSettings::mSettings("Ixonos", "FOSDEM");
+
+
+
+QString AppSettings::proxyAddress()
+{
+    return mSettings.value(PROXY_ADDRESS_SETTING).toString();
+}
+
+quint16 AppSettings::proxyPort()
+{
+    return mSettings.value(PROXY_PORT_SETTING).toUInt();
+}
+
+bool AppSettings::isDirectConnection()
+{
+    return mSettings.value(PROXY_ISDIRECT_SETTING).toBool();
+}
+
+void AppSettings::setProxyAddress(const QString &aAddress)
+{
+    mSettings.setValue(PROXY_ADDRESS_SETTING, aAddress);
+}
+
+void AppSettings::setProxyPort(const quint16 aPort)
+{
+    mSettings.setValue(PROXY_PORT_SETTING, aPort);
+}
+
+void AppSettings::setDirectConnection(bool aDirectConnection)
+{
+    mSettings.setValue(PROXY_ISDIRECT_SETTING, aDirectConnection);
+}
+

diff --git a/src/app/appsettings.h b/src/app/appsettings.h
new file mode 100644 (file)
index 0000000..efae165
--- /dev/null
+++ b/src/app/appsettings.h
@@ -0,0 +1,25 @@
+
+#ifndef APPSETTINGS_H
+#define APPSETTINGS_H
+
+#include <QString>
+#include <QSettings>
+
+class AppSettings
+{
+    private:
+        AppSettings() {}
+        static QSettings mSettings;
+
+    public:
+        static QString proxyAddress();
+        static quint16 proxyPort();
+        static bool isDirectConnection();
+
+        static void setProxyAddress(const QString &aAddress);
+        static void setProxyPort(const quint16 aPort);
+        static void setDirectConnection(bool aDirectConnection);
+};
+
+#endif /* APPSETTINGS_H */
+

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 5d4cfc7d0bf06ba78cb13a4d971b13598159f66c..5ce8c0279d8a96aae77bfa0e5310e38c7eb2fb62 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -44,7 +44,8 @@ FORMS += searchhead.ui \
     eventdialog.ui \
     conflictsdialog.ui \
     tabcontainer.ui \
     eventdialog.ui \
     conflictsdialog.ui \
     tabcontainer.ui \

-    mapwindow.ui
+    mapwindow.ui \
+    proxysettingsdialog.ui

 
 HEADERS += roomstabcontainer.h \
     nowtabcontainer.h \
 
 HEADERS += roomstabcontainer.h \
     nowtabcontainer.h \


@@ -61,7 +62,8 @@ HEADERS += roomstabcontainer.h \
     eventdialog.h \
     tabwidget.h \
     tabcontainer.h \
     eventdialog.h \
     tabwidget.h \
     tabcontainer.h \

-    mapwindow.h
+    mapwindow.h \
+    proxysettingsdialog.h

 
 SOURCES += roomstabcontainer.cpp \
     nowtabcontainer.cpp \
 
 SOURCES += roomstabcontainer.cpp \
     nowtabcontainer.cpp \


@@ -78,7 +80,8 @@ SOURCES += roomstabcontainer.cpp \
     eventdialog.cpp \
     tabwidget.cpp \
     tabcontainer.cpp \
     eventdialog.cpp \
     tabwidget.cpp \
     tabcontainer.cpp \

-    mapwindow.cpp
+    mapwindow.cpp \
+    proxysettingsdialog.cpp

 
 maemo { 
     FORMS += alarmdialog.ui
 
 maemo { 
     FORMS += alarmdialog.ui

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index 379aa673e8bb784d2ce2e2da6ffde7d46b7ca12f..32a9c30cd3de576d6e98c170b0f8bf2079b06c66 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -1,6 +1,7 @@
 #include "importschedulewidget.h"
 
 #include <schedulexmlparser.h>
 #include "importschedulewidget.h"
 
 #include <schedulexmlparser.h>

+#include "proxysettingsdialog.h"

 
 #include <QDir>
 #include <QFile>
 
 #include <QDir>
 #include <QFile>


@@ -9,9 +10,13 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QDebug>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QDebug>

+#include <appsettings.h>

 
 const QString SCHEDULE_URL = "http://fosdem.org/2010/schedule/xml";
 
 
 const QString SCHEDULE_URL = "http://fosdem.org/2010/schedule/xml";
 

+const QString PROXY_USERNAME;
+const QString PROXY_PASSWD;
+

 ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
     : QWidget(aParent)
 {
 ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
     : QWidget(aParent)
 {


@@ -28,6 +33,7 @@ ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
     importAction->hide();
     connect(online, SIGNAL(clicked()), SLOT(downloadSchedule()));
 
     importAction->hide();
     connect(online, SIGNAL(clicked()), SLOT(downloadSchedule()));
 

+    connect(proxySettings, SIGNAL(clicked()), SLOT(setupProxy()));

     mNetworkAccessManager = new QNetworkAccessManager(this);
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkQueryFinished(QNetworkReply*)));
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());
     mNetworkAccessManager = new QNetworkAccessManager(this);
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkQueryFinished(QNetworkReply*)));
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());


@@ -80,8 +86,6 @@ void ImportScheduleWidget::browseSchedule()
 
 void ImportScheduleWidget::networkQueryFinished(QNetworkReply *aReply)
 {
 
 void ImportScheduleWidget::networkQueryFinished(QNetworkReply *aReply)
 {

-    qDebug() << "ImportScheduleWidget::networkQueryFinished()";
-

     if ( aReply->error() != QNetworkReply::NoError )
     {
         qDebug() << "Error occured during download: " << aReply->errorString();
     if ( aReply->error() != QNetworkReply::NoError )
     {
         qDebug() << "Error occured during download: " << aReply->errorString();


@@ -94,8 +98,6 @@ void ImportScheduleWidget::networkQueryFinished(QNetworkReply *aReply)
 
 void ImportScheduleWidget::downloadSchedule()
 {
 
 void ImportScheduleWidget::downloadSchedule()
 {

-    qDebug() << "downloading schedule";
-

     QNetworkRequest request;
     request.setUrl(QUrl(SCHEDULE_URL));
     mNetworkAccessManager->get(request);
     QNetworkRequest request;
     request.setUrl(QUrl(SCHEDULE_URL));
     mNetworkAccessManager->get(request);


@@ -106,14 +108,33 @@ void ImportScheduleWidget::importData(const QByteArray &aData)
     browse->hide();
     online->hide();
     progressBar->show();
     browse->hide();
     online->hide();
     progressBar->show();

+    proxySettings->hide();

 
     int confId = mXmlParser->parseData(aData);
 
     progressBar->hide();
     browse->show();
     online->show();
 
     int confId = mXmlParser->parseData(aData);
 
     progressBar->hide();
     browse->show();
     online->show();

+    proxySettings->show();

     importScheduleLabel->setText("Import schedule: ");
 
     emit(scheduleImported(confId));
 }
 
     importScheduleLabel->setText("Import schedule: ");
 
     emit(scheduleImported(confId));
 }
 

+void ImportScheduleWidget::setupProxy()
+{
+    ProxySettingsDialog dialog;
+    dialog.exec();
+
+    qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
+    QNetworkProxy proxy(
+            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+            AppSettings::proxyAddress(),
+            AppSettings::proxyPort(),
+            PROXY_USERNAME,
+            PROXY_PASSWD);
+    QNetworkProxy::setApplicationProxy(proxy);
+
+    mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());
+}
+

diff --git a/src/gui/importschedulewidget.h b/src/gui/importschedulewidget.h
index 302dc066152d56b30e0dd5ab670c559f09c52400..e337b9d552803725dd81ddc96e7d393085b14637 100644 (file)
--- a/src/gui/importschedulewidget.h
+++ b/src/gui/importschedulewidget.h
@@ -20,6 +20,7 @@ class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
         void showParsingProgress(int progress);
         void networkQueryFinished(QNetworkReply *aReply);
         void downloadSchedule();
         void showParsingProgress(int progress);
         void networkQueryFinished(QNetworkReply *aReply);
         void downloadSchedule();

+        void setupProxy();

     signals:
         void scheduleImported(int confId);
     private:
     signals:
         void scheduleImported(int confId);
     private:

diff --git a/src/gui/importschedulewidget.ui b/src/gui/importschedulewidget.ui
index c2ee410fcaf9d8e7c6522b9f9b0b2fdc79def6c7..a961055238a7e573d626a2cc5e1439b69c314330 100644 (file)
--- a/src/gui/importschedulewidget.ui
+++ b/src/gui/importschedulewidget.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>634</width>
+    <width>662</width>

     <height>66</height>
    </rect>
   </property>
     <height>66</height>
    </rect>
   </property>


@@ -67,6 +67,16 @@
        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>

+     <item>
+      <widget class="QToolButton" name="proxySettings" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+       <property name="autoRaise" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>

      <item>
       <widget class="QPushButton" name="browse" >
        <property name="sizePolicy" >
      <item>
       <widget class="QPushButton" name="browse" >
        <property name="sizePolicy" >

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 71440dbe77453570ff80ae7e98f2991db5985525..15f507148a7e5a152f8bcf3fb3ad09d43b17fe87 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -21,21 +21,23 @@
 #include "mapwindow.h"
 
 #include <tabcontainer.h>
 #include "mapwindow.h"
 
 #include <tabcontainer.h>

+#include <appsettings.h>

 
 

-const QString PROXY_URL("192.168.0.252");
-const quint16 PROXY_PORT = 4040;

 const QString PROXY_USERNAME;
 const QString PROXY_PASSWD;
 const QString PROXY_USERNAME;
 const QString PROXY_PASSWD;

-const bool DIRECT_CONNECTION = false;

 
 MainWindow::MainWindow(int aEventId, QWidget *aParent)
     : QMainWindow(aParent)
 {
     setupUi(this);
 
 
 MainWindow::MainWindow(int aEventId, QWidget *aParent)
     : QMainWindow(aParent)
 {
     setupUi(this);
 

-    qDebug() << "Setting-up proxy: " << PROXY_URL << ":" << PROXY_PORT;
-    QNetworkProxy proxy(DIRECT_CONNECTION ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
-            PROXY_URL, PROXY_PORT, PROXY_USERNAME, PROXY_PASSWD);
+    qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
+    QNetworkProxy proxy(
+            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+            AppSettings::proxyAddress(),
+            AppSettings::proxyPort(),
+            PROXY_USERNAME,
+            PROXY_PASSWD);

     QNetworkProxy::setApplicationProxy(proxy);
 
     int confId = Conference::activeConference();
     QNetworkProxy::setApplicationProxy(proxy);
 
     int confId = Conference::activeConference();

diff --git a/src/gui/proxysettingsdialog.cpp b/src/gui/proxysettingsdialog.cpp
new file mode 100644 (file)
index 0000000..54c5c29
--- /dev/null
+++ b/src/gui/proxysettingsdialog.cpp
@@ -0,0 +1,37 @@
+#include "proxysettingsdialog.h"
+
+#include <appsettings.h>
+#include <QDebug>
+
+ProxySettingsDialog::ProxySettingsDialog(QWidget *aParent)
+    : QDialog(aParent)
+{
+    setupUi(this);
+
+    // deserialize dialog data
+    address->setText(AppSettings::proxyAddress());
+    port->setValue(AppSettings::proxyPort());
+    directConnection->setChecked(AppSettings::isDirectConnection());
+
+    connect(okButton, SIGNAL(clicked()), SLOT(saveDialogData()));
+    connect(directConnection, SIGNAL(clicked(bool)), SLOT(connectionTypeChanged(bool)));
+
+    if(directConnection->isChecked())
+        proxyWidget->hide();
+}
+
+void ProxySettingsDialog::connectionTypeChanged(bool aState)
+{
+    aState ? proxyWidget->hide() : proxyWidget->show();
+}
+
+void ProxySettingsDialog::saveDialogData()
+{
+    // serialize dialog data
+    AppSettings::setProxyAddress(address->text());
+    AppSettings::setProxyPort(port->value());
+    AppSettings::setDirectConnection(directConnection->isChecked());
+
+    close();
+}
+

diff --git a/src/gui/proxysettingsdialog.h b/src/gui/proxysettingsdialog.h
new file mode 100644 (file)
index 0000000..59bc57c
--- /dev/null
+++ b/src/gui/proxysettingsdialog.h
@@ -0,0 +1,19 @@
+#ifndef PROXYSETTINGSDIALOG_H
+#define PROXYSETTINGSDIALOG_H
+
+#include <QDialog>
+#include "ui_proxysettingsdialog.h"
+
+class ProxySettingsDialog : public QDialog, Ui::ProxySettingsDialog
+{
+    Q_OBJECT
+public:
+    ProxySettingsDialog(QWidget *aParent = NULL);
+    ~ProxySettingsDialog() {}
+private slots:
+    void connectionTypeChanged(bool aState);
+    void saveDialogData();
+};
+
+#endif /* PROXYSETTINGSDIALOG_H */  
+

diff --git a/src/gui/proxysettingsdialog.ui b/src/gui/proxysettingsdialog.ui
new file mode 100644 (file)
index 0000000..2b85c58
--- /dev/null
+++ b/src/gui/proxysettingsdialog.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>ProxySettingsDialog</class>
+ <widget class="QDialog" name="ProxySettingsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>469</width>
+    <height>146</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Proxy settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <widget class="QCheckBox" name="directConnection" >
+     <property name="text" >
+      <string>Direct connection</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" native="1" name="proxyWidget" >
+     <layout class="QHBoxLayout" name="horizontalLayout_3" >
+      <item>
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Address: </string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="address" />
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Port:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="port" >
+        <property name="maximum" >
+         <number>9999</number>
+        </property>
+        <property name="value" >
+         <number>8080</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>