Changeset ad5c62f for src/gui/mainwindow.cpp

Timestamp:

04/13/10 16:20:00 (12 years ago)

Author:

kirilma <kirilma@…>

Branches:

master, qt5

Children:

47d0a31

Parents:

22232d9

Message:

move Settings and About to Window Menu

• remove Setting and About controls from widgets
• make instead a window menus with the corresponding actions
• rename "Proxy settings" to "Settings", placing the proxy button in a control group

File:

• src/gui/mainwindow.cpp (modified) (3 diffs)

src/gui/mainwindow.cpp

@@ -38 +38 @@
 #include "importschedulewidget.h"
 #include "mapwindow.h"
+#include "settingsdialog.h"
 
 #include <tabcontainer.h>
@@ -86 +87 @@
     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
 
-    connect(tabWidget, SIGNAL(infoIconClicked()), SLOT(aboutApp()));
+    connect(aboutAction, SIGNAL(triggered()), SLOT(aboutApp()));
+    connect(settingsAction, SIGNAL(triggered()), SLOT(setup()));
 
     selectConference->setDuplicatesEnabled(false);
@@ -232 +234 @@
 }
 
+void MainWindow::setup()
+{
+    SettingsDialog 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);
+}