Ignore:
Timestamp:
07/13/11 21:42:48 (11 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
268d58f
Parents:
6817002
Message:

The cancel button on the settings dialog works now (ticket #14) and the layout of the settings dialog is stable now (ticket #15).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/mainwindow.cpp

    r6817002 ra4ed73e  
    222222{
    223223    SettingsDialog dialog;
    224     dialog.exec();
    225 
    226     QNetworkProxy proxy(
    227             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
    228             AppSettings::proxyAddress(),
    229             AppSettings::proxyPort(),
    230             PROXY_USERNAME,
    231             PROXY_PASSWD);
    232     QNetworkProxy::setApplicationProxy(proxy);
     224    dialog.loadDialogData();
     225    if (dialog.exec() == QDialog::Accepted) {
     226        dialog.saveDialogData();
     227        QNetworkProxy proxy(
     228                AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
     229                AppSettings::proxyAddress(),
     230                AppSettings::proxyPort(),
     231                PROXY_USERNAME,
     232                PROXY_PASSWD);
     233        QNetworkProxy::setApplicationProxy(proxy);
     234    }
    233235}
    234236
Note: See TracChangeset for help on using the changeset viewer.