Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/mainwindow.cpp

    r22232d9 rad5c62f  
    3838#include "importschedulewidget.h"
    3939#include "mapwindow.h"
     40#include "settingsdialog.h"
    4041
    4142#include <tabcontainer.h>
     
    8687    connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
    8788
    88     connect(tabWidget, SIGNAL(infoIconClicked()), SLOT(aboutApp()));
     89    connect(aboutAction, SIGNAL(triggered()), SLOT(aboutApp()));
     90    connect(settingsAction, SIGNAL(triggered()), SLOT(setup()));
    8991
    9092    selectConference->setDuplicatesEnabled(false);
     
    232234}
    233235
     236void MainWindow::setup()
     237{
     238    SettingsDialog dialog;
     239    dialog.exec();
     240
     241    qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
     242    QNetworkProxy proxy(
     243            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
     244            AppSettings::proxyAddress(),
     245            AppSettings::proxyPort(),
     246            PROXY_USERNAME,
     247            PROXY_PASSWD);
     248    QNetworkProxy::setApplicationProxy(proxy);
     249}
Note: See TracChangeset for help on using the changeset viewer.