[PC-BSD Commits] r8088 - pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin

[svn at pcbsd.org]

Author: kris
Date: 2010-11-30 08:47:47 -0800 (Tue, 30 Nov 2010)
New Revision: 8088

Modified:
   pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.cpp
   pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.ui
Log:

MFC option to enable / disable the lagg interface in the NetworkManagerAdmin tool



Modified: pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.cpp
===================================================================
--- pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.cpp	2010-11-30 15:47:59 UTC (rev 8087)
+++ pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.cpp	2010-11-30 16:47:47 UTC (rev 8088)
@@ -18,6 +18,7 @@
 #include <qstring.h>
 #include <qfile.h>
 #include <qmessagebox.h>
+#include <QSettings>
 
 using namespace std;
 
@@ -288,6 +289,9 @@
     lineIPv6Gateway->setText(getValue("/etc/rc.conf", "ipv6_defaultrouter=", 1) );
     
     
+    // Check if we want to use the lagg interface
+    QSettings settings("PCBSD");
+    checkLagg->setChecked(settings.value("/pc-netmanager/useLagg", false).toBool());
     
     // Load the PPPOE Configuration
 
@@ -376,6 +380,9 @@
      saveValue("/etc/resolv.conf", "search", "search " + lineSearchDomain->text(), 1);
    }
 
+   // Save the lagg preference
+   QSettings settings("PCBSD");
+   settings.setValue("/pc-netmanager/useLagg", checkLagg->isChecked());
    
    if (checkPPPOE->isChecked())
    {

Modified: pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.ui
===================================================================
--- pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.ui	2010-11-30 15:47:59 UTC (rev 8087)
+++ pcbsd/stable/pcbsd-netmanager/src/NetworkManagerAdmin/netmanadmin.ui	2010-11-30 16:47:47 UTC (rev 8088)
@@ -334,7 +334,7 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="7" column="0">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -347,7 +347,7 @@
      </property>
     </spacer>
    </item>
-   <item row="7" column="0">
+   <item row="8" column="0">
     <widget class="QLabel" name="textGlobalError">
      <property name="text">
       <string/>
@@ -357,7 +357,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="9" column="0">
     <spacer name="verticalSpacer_3">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -373,7 +373,7 @@
      </property>
     </spacer>
    </item>
-   <item row="9" column="0">
+   <item row="10" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer">
@@ -500,6 +500,22 @@
      </property>
     </widget>
    </item>
+   <item row="6" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Misc</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="checkLagg">
+        <property name="text">
+         <string>Enable Lagg wired / wireless failover</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>