[PC-BSD Commits] r13034 - pcbsd/current/src-qt4/pc-pfmanager

[svn at pcbsd.org]

Author: kris
Date: 2011-09-28 11:34:38 -0700 (Wed, 28 Sep 2011)
New Revision: 13034

Modified:
   pcbsd/current/src-qt4/pc-pfmanager/mainwindow.ui
   pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.cpp
   pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.hpp
Log:

Fixed a bug enabling / disabling firewall, and when user clicks "no" to disabling, make sure we re-check the box



Modified: pcbsd/current/src-qt4/pc-pfmanager/mainwindow.ui
===================================================================
--- pcbsd/current/src-qt4/pc-pfmanager/mainwindow.ui	2011-09-28 17:58:06 UTC (rev 13033)
+++ pcbsd/current/src-qt4/pc-pfmanager/mainwindow.ui	2011-09-28 18:34:38 UTC (rev 13034)
@@ -51,9 +51,6 @@
             <property name="text">
              <string>Restore default configuration</string>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
           <item row="0" column="0">
@@ -86,9 +83,6 @@
             <property name="text">
              <string>Start</string>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
           <item row="0" column="1">
@@ -96,9 +90,6 @@
             <property name="text">
              <string>Stop</string>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
           <item row="0" column="2">
@@ -106,9 +97,6 @@
             <property name="text">
              <string>Restart</string>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
           <item row="0" column="3">
@@ -136,16 +124,6 @@
           <string>General settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="cbEnable">
-            <property name="text">
-             <string>Enable Firewall on startup</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
-           </widget>
-          </item>
           <item row="0" column="1">
            <spacer name="spacer8">
             <property name="orientation">
@@ -162,6 +140,13 @@
             </property>
            </spacer>
           </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="cbEnable">
+            <property name="text">
+             <string>Enable Firewall on startup</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -245,21 +230,6 @@
          <attribute name="headerStretchLastSection">
           <bool>true</bool>
          </attribute>
-         <attribute name="headerCascadingSectionResizes">
-          <bool>false</bool>
-         </attribute>
-         <attribute name="headerDefaultSectionSize">
-          <number>65</number>
-         </attribute>
-         <attribute name="headerShowSortIndicator" stdset="0">
-          <bool>false</bool>
-         </attribute>
-         <attribute name="headerHighlightSections">
-          <bool>false</bool>
-         </attribute>
-         <attribute name="headerStretchLastSection">
-          <bool>true</bool>
-         </attribute>
          <column>
           <property name="text">
            <string>Service</string>

Modified: pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.cpp	2011-09-28 17:58:06 UTC (rev 13033)
+++ pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.cpp	2011-09-28 18:34:38 UTC (rev 13034)
@@ -36,7 +36,9 @@
                                        QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
             {
                 _firewall.disable();
-            }
+            } else {
+    		cbEnable->setChecked(true);
+	    }
         }
     }
 }

Modified: pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.hpp
===================================================================
--- pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.hpp	2011-09-28 17:58:06 UTC (rev 13033)
+++ pcbsd/current/src-qt4/pc-pfmanager/pfmanagerdlg.hpp	2011-09-28 18:34:38 UTC (rev 13034)
@@ -18,7 +18,7 @@
        setupUi(this);
     // Enabled
     connect(cbEnable, SIGNAL(clicked()),
-            this, SLOT(enableClicked()));
+           this, SLOT(enableClicked()));
     // Buttons
     QPushButton::connect(pbStart, SIGNAL(clicked()),
                         this, SLOT(startClicked()));