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

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index e006e8008dcc846469965aadf6fd58275f30533a..1e612dac22fc346c9607b560f54f057dbbdc4c74 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -221,15 +221,17 @@ void MainWindow::unsetConference()
 void MainWindow::setup()
 {
     SettingsDialog dialog;
 void MainWindow::setup()
 {
     SettingsDialog dialog;

-    dialog.exec();
-
-    QNetworkProxy proxy(
-            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
-            AppSettings::proxyAddress(),
-            AppSettings::proxyPort(),
-            PROXY_USERNAME,
-            PROXY_PASSWD);
-    QNetworkProxy::setApplicationProxy(proxy);
+    dialog.loadDialogData();
+    if (dialog.exec() == QDialog::Accepted) {
+        dialog.saveDialogData();
+        QNetworkProxy proxy(
+                AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+                AppSettings::proxyAddress(),
+                AppSettings::proxyPort(),
+                PROXY_USERNAME,
+                PROXY_PASSWD);
+        QNetworkProxy::setApplicationProxy(proxy);
+    }

 }
 
 /** Create and run ConferenceEditor dialog, making required connections for it.
 }
 
 /** Create and run ConferenceEditor dialog, making required connections for it.

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 36dbf4e1364cb17f7dadaf3d3ee3951cc401f3d8..82ba0d0bb5216f72b892b5a9115fa54ed449701c 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -26,23 +26,19 @@ SettingsDialog::SettingsDialog(QWidget *aParent)
     : QDialog(aParent)
 {
     setupUi(this);
     : QDialog(aParent)
 {
     setupUi(this);

+    connect(directConnection, SIGNAL(clicked(bool)), SLOT(connectionTypeChanged(bool)));
+}

 
 

+
+void SettingsDialog::loadDialogData()
+{

     // deserialize dialog data
     address->setText(AppSettings::proxyAddress());
     port->setValue(AppSettings::proxyPort());
     directConnection->setChecked(AppSettings::isDirectConnection());
     // deserialize dialog data
     address->setText(AppSettings::proxyAddress());
     port->setValue(AppSettings::proxyPort());
     directConnection->setChecked(AppSettings::isDirectConnection());

-
-    connect(buttonBox, SIGNAL(accepted()), SLOT(saveDialogData()));
-    connect(directConnection, SIGNAL(clicked(bool)), SLOT(connectionTypeChanged(bool)));
-
-    if(directConnection->isChecked())
-        proxyWidget->hide();
+    proxyWidget->setDisabled(directConnection->isChecked());

 }
 
 }
 

-void SettingsDialog::connectionTypeChanged(bool aState)
-{
-    aState ? proxyWidget->hide() : proxyWidget->show();
-}

 
 void SettingsDialog::saveDialogData()
 {
 
 void SettingsDialog::saveDialogData()
 {


@@ -50,7 +46,12 @@ void SettingsDialog::saveDialogData()
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
     AppSettings::setDirectConnection(directConnection->isChecked());
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
     AppSettings::setDirectConnection(directConnection->isChecked());

+}
+

 
 

-    close();
+void SettingsDialog::connectionTypeChanged(bool aState)
+{
+    proxyWidget->setDisabled(aState);

 }
 
 }
 

+

diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index 086347974ae9324c3729558fc7cb4c76e0d13652..4e4ba9db2a5ba437a1532f98206481a667c6d51e 100644 (file)
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -29,9 +29,10 @@ class SettingsDialog : public QDialog, Ui::SettingsDialog
 public:
     SettingsDialog(QWidget *aParent = NULL);
     ~SettingsDialog() {}
 public:
     SettingsDialog(QWidget *aParent = NULL);
     ~SettingsDialog() {}

+    void loadDialogData();
+    void saveDialogData();

 private slots:
     void connectionTypeChanged(bool aState);
 private slots:
     void connectionTypeChanged(bool aState);

-    void saveDialogData();

 };
 
 #endif /* PROXYSETTINGSDIALOG_H */  
 };
 
 #endif /* PROXYSETTINGSDIALOG_H */  

diff --git a/src/gui/settingsdialog.ui b/src/gui/settingsdialog.ui
index 940b03c4540c2b683b394b3a4aed81fc7e3badf7..05829f6e113f1cb5c5e93f04147021ed8a1263f4 100644 (file)
--- a/src/gui/settingsdialog.ui
+++ b/src/gui/settingsdialog.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog">
 <ui version="4.0">
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog">

+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>152</height>
+   </rect>
+  </property>

   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>


@@ -35,7 +43,7 @@
        </widget>
       </item>
       <item>
        </widget>
       </item>
       <item>

-       <widget class="QWidget" name="proxyWidget" native="true">
+       <widget class="QFrame" name="proxyWidget">

         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLabel" name="label">
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLabel" name="label">


@@ -83,5 +91,38 @@
   </layout>
  </widget>
  <resources/>
   </layout>
  </widget>
  <resources/>

- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>288</x>
+     <y>128</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>325</x>
+     <y>147</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>202</x>
+     <y>130</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>226</x>
+     <y>147</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>

 </ui>
 </ui>