From 921acce2669257de0148dfc98fb8f37f9044687d Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Mon, 21 Jul 2008 00:34:15 +0000
Subject: [PATCH] widened "address" field of ipv6 and networkipv6 dialogs

---
 build_num                      |  2 +-
 qmake.inc                      | 26 +++++++++++++-------------
 src/gui/ipv6dialog_q.ui        |  6 +++---
 src/gui/networkdialogipv6_q.ui | 10 +++++-----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/build_num b/build_num
index 3461d1d46..a21af1aa4 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 395
+#define BUILD_NUM 396
diff --git a/qmake.inc b/qmake.inc
index dacae5284..235850e66 100644
--- a/qmake.inc
+++ b/qmake.inc
@@ -11,15 +11,15 @@ SO_VERSION    = @LIBFWBUILDER_SOLIB_VERSION@
 DEFINES      += $$(DEFINES)
 LANGUAGE      = C++
 UI_DIR        = ui
-MANDIR        = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/
-DOCDIR        = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+MANDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
+DOCDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
 
 HAVE_ANTLR_RUNTIME = 1
 HAVE_EXTERNAL_ANTLR = 0
 
 unix {
-    ANTLR_INCLUDEPATH =  /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
-    ANTLR_LIBS =  /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
+    ANTLR_INCLUDEPATH =  /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
+    ANTLR_LIBS =  /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
     FWBPARSER_LIB = ../parsers/libfwbparser.a
 }
 
@@ -30,36 +30,36 @@ unix {
 	MOC_DIR = .moc
 	OBJECTS_DIR = .obj
 
-	PREFIX                  = /Users/vadim/src/fwb3-branch-v3/install_root
+	PREFIX                  = /home/vadim/src/fwb3-branch-v3/install_root
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
 
-    INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
+    INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
 
-    LIBS_FWCOMPILER         = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
-    LIBS_FWBUILDER          = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
+    LIBS_FWCOMPILER         = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
+    LIBS_FWBUILDER          = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
 
 	target.path             = $$PREFIX/bin
 	dtd.path                = @TEMPLATE_DIR@/
 	migration.path          = @TEMPLATE_DIR@/migration
-	doc.path                = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
 
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/
 
 	res.files           = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml
-	res.path			= ../Resources
+	res.path			= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0
 	res_os.files        = src/res/os/*.xml
-	res_os.path 		= ../Resources/os/
+	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/
 	res_platform.files  = src/res/platform/*.xml
-	res_platform.path 	= ../Resources/platform/
+	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/
 
     INSTALLS		   += res 
     INSTALLS		   += res_os
     INSTALLS		   += res_platform
 #        INSTALLS   += icns
-	LIBS                   += $$LIBS_FWBUILDER  -L/sw/lib -lpoll
+	LIBS                   += $$LIBS_FWBUILDER -lutil 
 
 	PKGLOCALEDIR			= $$res.path/locale
 
diff --git a/src/gui/ipv6dialog_q.ui b/src/gui/ipv6dialog_q.ui
index fd4c9b9de..e43dfa03e 100644
--- a/src/gui/ipv6dialog_q.ui
+++ b/src/gui/ipv6dialog_q.ui
@@ -245,7 +245,7 @@
          <widget class="QFrame" name="frame14" >
           <property name="minimumSize" >
            <size>
-            <width>16</width>
+            <width>300</width>
             <height>16</height>
            </size>
           </property>
@@ -288,7 +288,7 @@
              </property>
              <property name="minimumSize" >
               <size>
-               <width>200</width>
+               <width>250</width>
                <height>25</height>
               </size>
              </property>
@@ -326,7 +326,7 @@
              </property>
              <property name="minimumSize" >
               <size>
-               <width>0</width>
+               <width>250</width>
                <height>25</height>
               </size>
              </property>
diff --git a/src/gui/networkdialogipv6_q.ui b/src/gui/networkdialogipv6_q.ui
index c9fcf6d68..dee296cd5 100644
--- a/src/gui/networkdialogipv6_q.ui
+++ b/src/gui/networkdialogipv6_q.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>604</width>
-    <height>198</height>
+    <width>732</width>
+    <height>205</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -295,7 +295,7 @@
          <widget class="QFrame" name="frame50" >
           <property name="minimumSize" >
            <size>
-            <width>250</width>
+            <width>300</width>
             <height>16</height>
            </size>
           </property>
@@ -326,7 +326,7 @@
              </property>
              <property name="minimumSize" >
               <size>
-               <width>200</width>
+               <width>250</width>
                <height>0</height>
               </size>
              </property>
@@ -352,7 +352,7 @@
              </property>
              <property name="minimumSize" >
               <size>
-               <width>0</width>
+               <width>250</width>
                <height>0</height>
               </size>
              </property>