X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcoreconnectionsettingspage.cpp;h=aeb732e50c97cb70cecd2d67ede567bdeb8804cb;hp=c3b78059d4fe347e6fa9df091e6670f98a61bf58;hb=bd2fb9596ddd44d486a3ff4914bcac045210c498;hpb=b099603e2e1297ec41a354dc949729e4f77d7bbd

diff --git a/src/qtui/settingspages/coreconnectionsettingspage.cpp b/src/qtui/settingspages/coreconnectionsettingspage.cpp
index c3b78059..aeb732e5 100644
--- a/src/qtui/settingspages/coreconnectionsettingspage.cpp
+++ b/src/qtui/settingspages/coreconnectionsettingspage.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,80 +15,99 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreconnectionsettingspage.h"
 
 CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Remote Cores"), tr("Connection"), parent) {
-  ui.setupUi(this);
-#ifndef HAVE_KDE
-  ui.useSolid->hide();
+    : SettingsPage(tr("Remote Cores"), tr("Connection"), parent)
+{
+    ui.setupUi(this);
+#ifndef HAVE_KDE4
+    ui.useSolid->hide();
 #endif
 
-  initAutoWidgets();
+    initAutoWidgets();
 
-  connect(ui.useSolid, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
-  connect(ui.usePingTimeout, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
-  connect(ui.useNoTimeout, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+    connect(ui.useSolid, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+    connect(ui.useQNetworkConfigurationManager, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+    connect(ui.usePingTimeout, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+    connect(ui.useNoTimeout, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
 }
 
-void CoreConnectionSettingsPage::widgetHasChanged() {
-  bool hasChanged = false;
-  CoreConnectionSettings::NetworkDetectionMode mode = modeFromRadioButtons();
-  if(mode != _detectionMode)
-    hasChanged = true;
 
-  setChangedState(hasChanged);
+void CoreConnectionSettingsPage::widgetHasChanged()
+{
+    bool hasChanged = false;
+    CoreConnectionSettings::NetworkDetectionMode mode = modeFromRadioButtons();
+    if (mode != _detectionMode)
+        hasChanged = true;
+
+    setChangedState(hasChanged);
 }
 
-void CoreConnectionSettingsPage::defaults() {
-#ifdef HAVE_KDE
-  setRadioButtons(CoreConnectionSettings::UseSolid);
+
+void CoreConnectionSettingsPage::defaults()
+{
+#ifdef HAVE_KDE4
+    setRadioButtons(CoreConnectionSettings::UseSolid);
 #else
-  setRadioButtons(CoreConnectionSettings::UsePingTimeout);
+    setRadioButtons(CoreConnectionSettings::UseQNetworkConfigurationManager);
 #endif
 
-  SettingsPage::defaults();
+    SettingsPage::defaults();
 }
 
-void CoreConnectionSettingsPage::load() {
-  CoreConnectionSettings s;
-  _detectionMode = s.networkDetectionMode();
-  setRadioButtons(_detectionMode);
-  SettingsPage::load();
+
+void CoreConnectionSettingsPage::load()
+{
+    CoreConnectionSettings s;
+    _detectionMode = s.networkDetectionMode();
+    setRadioButtons(_detectionMode);
+    SettingsPage::load();
 }
 
-void CoreConnectionSettingsPage::save() {
-  _detectionMode = modeFromRadioButtons();
-  CoreConnectionSettings s;
-  s.setNetworkDetectionMode(_detectionMode);
-  SettingsPage::save();
+
+void CoreConnectionSettingsPage::save()
+{
+    _detectionMode = modeFromRadioButtons();
+    CoreConnectionSettings s;
+    s.setNetworkDetectionMode(_detectionMode);
+    SettingsPage::save();
 }
 
-void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode) {
-  switch(mode) {
-#ifdef HAVE_KDE
-  case CoreConnectionSettings::UseSolid:
-    ui.useSolid->setChecked(true);
-    break;
+
+void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode)
+{
+    switch (mode) {
+#ifdef HAVE_KDE4
+    case CoreConnectionSettings::UseSolid:
+        ui.useSolid->setChecked(true);
+        break;
 #endif
-  case CoreConnectionSettings::UsePingTimeout:
-    ui.usePingTimeout->setChecked(true);
-    break;
-  default:
-    ui.useNoTimeout->setChecked(true);
-  }
+    case CoreConnectionSettings::UseQNetworkConfigurationManager:
+        ui.useQNetworkConfigurationManager->setChecked(true);
+        break;
+    case CoreConnectionSettings::UsePingTimeout:
+        ui.usePingTimeout->setChecked(true);
+        break;
+    default:
+        ui.useNoTimeout->setChecked(true);
+    }
 }
 
-CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const {
-#ifdef HAVE_KDE
-  if(ui.useSolid->isChecked())
-    return CoreConnectionSettings::UseSolid;
+
+CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const
+{
+#ifdef HAVE_KDE4
+    if (ui.useSolid->isChecked())
+        return CoreConnectionSettings::UseSolid;
 #endif
-  if(ui.usePingTimeout->isChecked())
-    return CoreConnectionSettings::UsePingTimeout;
+    if (ui.useQNetworkConfigurationManager->isChecked())
+        return CoreConnectionSettings::UseQNetworkConfigurationManager;
+    if (ui.usePingTimeout->isChecked())
+        return CoreConnectionSettings::UsePingTimeout;
 
-  return CoreConnectionSettings::NoActiveDetection;
+    return CoreConnectionSettings::NoActiveDetection;
 }