From edd08955c3b91a8cd8382abf4789d59f679d89b8 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Sun, 3 Aug 2008 23:40:43 +0000
Subject: [PATCH] bug 2036963

---
 build_num                  |  2 +-
 doc/ChangeLog              |  4 ++++
 qmake.inc                  | 22 +++++++++++-----------
 src/gui/newhostdialog_q.ui |  8 ++++----
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/build_num b/build_num
index ba77ae295..5ef33162a 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 445
+#define BUILD_NUM 447
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b82a35e78..32383ccbb 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,9 @@
 2008-08-03  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* newhostdialog_q.ui: fixed bug # 2036963 "Add new Host Object on
+	MacOSX". The "new host" dialog was too big and did not fit on low
+	resolution screen
+
 	* res.pro: Now installing fwbuilder.desktop file on Linux and
 	application icons under $DATADIR/icons/hicolor/ (sizes 128x128
 	16x16 24x24 256x256 32x32 48x48 512x512 72x72)
diff --git a/qmake.inc b/qmake.inc
index 246ae900e..a6121cd74 100644
--- a/qmake.inc
+++ b/qmake.inc
@@ -11,8 +11,8 @@ SO_VERSION    = @LIBFWBUILDER_SOLIB_VERSION@
 DEFINES      += $$(DEFINES)
 LANGUAGE      = C++
 UI_DIR        = ui
-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
+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
@@ -30,10 +30,10 @@ unix {
 	MOC_DIR = .moc
 	OBJECTS_DIR = .obj
 
-	PREFIX                  = /home/vadim/src/fwb3-branch-v3/install_root/
+	PREFIX                  = /home/vadim/src/fwb3-branch-v3/install_root
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
-	ICONSDIR                = /home/vadim/src/fwb3-branch-v3/install_root//share//icons/hicolor/
+	ICONSDIR                = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/
 
     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
 
@@ -43,19 +43,19 @@ unix {
 	target.path             = $$PREFIX/bin
 	dtd.path                = @TEMPLATE_DIR@/
 	migration.path          = @TEMPLATE_DIR@/migration
-	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root//share/doc/fwbuilder-3.0.0
-	datadir.path		    = /home/vadim/src/fwb3-branch-v3/install_root//share/
+	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+	datadir.path		    = /home/vadim/src/fwb3-branch-v3/install_root/share/
 
 
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/
 
-	res.path			= /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0
-	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0/os/
-	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0/platform/
-	res_help.path 	    = /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0/help/
-	res_desktop.path	= /home/vadim/src/fwb3-branch-v3/install_root//share//applications/
+	res.path			= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0
+	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/
+	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/
+	res_help.path 	    = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/
+	res_desktop.path	= /home/vadim/src/fwb3-branch-v3/install_root/share//applications/
 
     INSTALLS		   += res 
     INSTALLS		   += res_os
diff --git a/src/gui/newhostdialog_q.ui b/src/gui/newhostdialog_q.ui
index 87c0111dd..a906a31bb 100644
--- a/src/gui/newhostdialog_q.ui
+++ b/src/gui/newhostdialog_q.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>488</width>
-    <height>701</height>
+    <width>486</width>
+    <height>585</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
@@ -201,7 +201,7 @@
          </layout>
         </widget>
        </item>
-       <item row="5" column="1" >
+       <item row="5" column="0" colspan="2" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -212,7 +212,7 @@
          <property name="sizeHint" >
           <size>
            <width>144</width>
-           <height>341</height>
+           <height>161</height>
           </size>
          </property>
         </spacer>