[PC-BSD Commits] r381 - pcbsd/trunk/kcmPFManager

svn at pcbsd.org svn at pcbsd.org
Wed Jun 27 12:36:38 PDT 2007


Author: kris
Date: 2007-06-27 20:36:37 +0100 (Wed, 27 Jun 2007)
New Revision: 381

Removed:
   pcbsd/trunk/kcmPFManager/Makefile
Modified:
   pcbsd/trunk/kcmPFManager/adddlg.ui
   pcbsd/trunk/kcmPFManager/kcm_pfmanager.desktop
   pcbsd/trunk/kcmPFManager/kcm_pfmanager.la
   pcbsd/trunk/kcmPFManager/pfmanager.pro
Log:

Modified the FW manager, now it creates in right location and has layout on
the popup. 



Deleted: pcbsd/trunk/kcmPFManager/Makefile

Modified: pcbsd/trunk/kcmPFManager/adddlg.ui
===================================================================
--- pcbsd/trunk/kcmPFManager/adddlg.ui	2007-06-27 19:24:56 UTC (rev 380)
+++ pcbsd/trunk/kcmPFManager/adddlg.ui	2007-06-27 19:36:37 UTC (rev 381)
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>252</width>
-            <height>263</height>
+            <width>246</width>
+            <height>312</height>
         </rect>
     </property>
     <property name="caption">
@@ -26,208 +26,115 @@
             <property name="name">
                 <cstring>bgInfo</cstring>
             </property>
+            <property name="frameShape">
+                <enum>GroupBoxPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
             <property name="title">
                 <string>Add</string>
             </property>
-            <widget class="QLabel">
+            <grid>
                 <property name="name">
-                    <cstring>lbService</cstring>
+                    <cstring>unnamed</cstring>
                 </property>
-                <property name="geometry">
-                    <rect>
-                        <x>11</x>
-                        <y>20</y>
-                        <width>53</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Service:</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>lbPolicy</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>11</x>
-                        <y>74</y>
-                        <width>53</width>
-                        <height>19</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Policy:</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>txDirection</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>11</x>
-                        <y>124</y>
-                        <width>53</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Direction:</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>txProtocol</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>11</x>
-                        <y>151</y>
-                        <width>53</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Protocol:</string>
-                </property>
-            </widget>
-            <widget class="QRadioButton">
-                <property name="name">
-                    <cstring>rbBlock</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>70</x>
-                        <y>99</y>
-                        <width>149</width>
-                        <height>19</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Block</string>
-                </property>
-            </widget>
-            <widget class="QRadioButton">
-                <property name="name">
-                    <cstring>rbAllow</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>70</x>
-                        <y>74</y>
-                        <width>149</width>
-                        <height>19</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Allow</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>lbInterface</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>9</x>
-                        <y>179</y>
-                        <width>61</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Interface:</string>
-                </property>
-            </widget>
-            <widget class="QComboBox">
-                <property name="name">
-                    <cstring>cbProtocol</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>70</x>
-                        <y>151</y>
-                        <width>149</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="QComboBox">
-                <property name="name">
-                    <cstring>cbDirection</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>70</x>
-                        <y>124</y>
-                        <width>149</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>lbPort</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>11</x>
-                        <y>47</y>
-                        <width>53</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Port:</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>txPort</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>70</x>
-                        <y>47</y>
-                        <width>149</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="QComboBox">
-                <property name="name">
-                    <cstring>cbServices</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>70</x>
-                        <y>20</y>
-                        <width>149</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="editable">
-                    <bool>true</bool>
-                </property>
-                <property name="autoCompletion">
-                    <bool>true</bool>
-                </property>
-            </widget>
-            <widget class="QComboBox">
-                <property name="name">
-                    <cstring>cbInterfaces</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>69</x>
-                        <y>179</y>
-                        <width>151</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
+                <widget class="QLabel" row="0" column="0">
+                    <property name="name">
+                        <cstring>lbService</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Service:</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="2" column="0">
+                    <property name="name">
+                        <cstring>lbPolicy</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Policy:</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="5" column="0" rowspan="2" colspan="1">
+                    <property name="name">
+                        <cstring>txProtocol</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Protocol:</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton" row="3" column="1" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>rbBlock</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Block</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton" row="2" column="1" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>rbAllow</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Allow</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="7" column="0">
+                    <property name="name">
+                        <cstring>lbInterface</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Interface:</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="1" column="0">
+                    <property name="name">
+                        <cstring>lbPort</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Port:</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>txPort</cstring>
+                    </property>
+                </widget>
+                <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>cbServices</cstring>
+                    </property>
+                    <property name="editable">
+                        <bool>true</bool>
+                    </property>
+                    <property name="autoCompletion">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QComboBox" row="4" column="2">
+                    <property name="name">
+                        <cstring>cbDirection</cstring>
+                    </property>
+                </widget>
+                <widget class="QComboBox" row="5" column="2">
+                    <property name="name">
+                        <cstring>cbProtocol</cstring>
+                    </property>
+                </widget>
+                <widget class="QComboBox" row="6" column="2" rowspan="2" colspan="1">
+                    <property name="name">
+                        <cstring>cbInterfaces</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>txDirection</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Direction:</string>
+                    </property>
+                </widget>
+            </grid>
         </widget>
         <widget class="QPushButton" row="1" column="1">
             <property name="name">

Modified: pcbsd/trunk/kcmPFManager/kcm_pfmanager.desktop
===================================================================
--- pcbsd/trunk/kcmPFManager/kcm_pfmanager.desktop	2007-06-27 19:24:56 UTC (rev 380)
+++ pcbsd/trunk/kcmPFManager/kcm_pfmanager.desktop	2007-06-27 19:36:37 UTC (rev 381)
@@ -3,7 +3,7 @@
 Exec=kcmshell kcm_pfmanager
 Icon=firewall.png
 Type=Application
-Name=PC-BSD Firewall Manager
+Name=Firewall Manager
 
 X-KDE-ModuleType=Library
 X-KDE-SubstituteUID=true

Modified: pcbsd/trunk/kcmPFManager/kcm_pfmanager.la
===================================================================
--- pcbsd/trunk/kcmPFManager/kcm_pfmanager.la	2007-06-27 19:24:56 UTC (rev 380)
+++ pcbsd/trunk/kcmPFManager/kcm_pfmanager.la	2007-06-27 19:36:37 UTC (rev 381)
@@ -1,3 +1,3 @@
 
-dlname='kcm_pfmanager.so'
-library_names='kcm_pfmanager.so'
+dlname='lakcm_pfmanager.so'
+library_names='lakcm_pfmanager.so'

Modified: pcbsd/trunk/kcmPFManager/pfmanager.pro
===================================================================
--- pcbsd/trunk/kcmPFManager/pfmanager.pro	2007-06-27 19:24:56 UTC (rev 380)
+++ pcbsd/trunk/kcmPFManager/pfmanager.pro	2007-06-27 19:36:37 UTC (rev 381)
@@ -5,7 +5,7 @@
 CONFIG += dll
 #CONFIG += release
 #CONFIG += debug
-TARGET = kcm_pfmanager
+TARGET = /usr/local/lib/kde3/kcm_pfmanager
 TEMPLATE = lib
 #TEMPLATE = app 
 DEPENDPATH += config



More information about the Commits mailing list