main window and dialogs do not enforce font

doc/ChangeLog

@@ -1,3 +1,10 @@
+2008-08-29  Vadim Kurland  <vadim@vk.crocodile.org>
+
+	* making sure dialogs do not enforce font type and size if not
+	necessary. Main window and install dialog used to override system
+	font which led to problems with dialog layouts on some systems.
+
+
 2008-08-27  Vadim Kurland  <vadim@vk.crocodile.org>
 
 	* configure.in: Applied patch per bug #2079941: "Patch for

src/gui/FWBMainWindow_q.ui

@@ -24,13 +24,6 @@
     <height>0</height>
    </size>
   </property>
-  <property name="font" >
-   <font>
-    <family>Sans Serif</family>
-    <pointsize>11</pointsize>
-    <stylestrategy>PreferDefault</stylestrategy>
-   </font>
-  </property>
   <property name="windowTitle" >
    <string>Firewall Builder</string>
   </property>
@@ -83,7 +76,7 @@
      <x>0</x>
      <y>0</y>
      <width>741</width>
-     <height>28</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="editMenu" >

src/gui/PrefsDialog.cpp

@@ -480,6 +480,7 @@ void PrefsDialog::accept()
     mw->setupAutoSave();
     mw->showDeletedObjects(st->getBool("UI/ShowDeletedObjects"));
     mw->updateTreeFont();
+//    app->setFont(st->getTreeFont());
     QDialog::accept();
 }
 

src/gui/instdialog_q.ui

@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>564</width>
-    <height>663</height>
+    <width>854</width>
+    <height>621</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -74,7 +74,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex" >
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="page" >
       <property name="sizePolicy" >
@@ -259,6 +259,9 @@
             </property>
             <item>
              <widget class="QTableWidget" name="selectTable" >
+              <property name="alternatingRowColors" >
+               <bool>true</bool>
+              </property>
               <property name="selectionMode" >
                <enum>QAbstractItemView::NoSelection</enum>
               </property>

src/gui/instoptionsdialog_q.ui

@@ -21,9 +21,6 @@
     <height>32767</height>
    </size>
   </property>
-  <property name="font" >
-   <font/>
-  </property>
   <property name="focusPolicy" >
    <enum>Qt::StrongFocus</enum>
   </property>
@@ -548,7 +545,6 @@
   <tabstop>okButton</tabstop>
   <tabstop>cancelButton</tabstop>
  </tabstops>
- <includes/>
  <resources/>
  <connections>
   <connection>

src/gui/main.cpp

@@ -603,7 +603,6 @@ int main( int argc, char *argv[] )
         app->setOrganizationName(QLatin1String("NetCitadel LLC"));
         app->setApplicationName(QLatin1String("Firewall Builder"));
 
-
 /* need to initialize in order to be able to use FWBSettings */
         init(argv);
         init_platforms();
@@ -617,6 +616,8 @@ int main( int argc, char *argv[] )
 
         QPixmapCache::setCacheLimit(4096);
 
+//        app->setFont(st->getTreeFont());
+
 #ifdef ELC
         registered = init2(argv0,
                            "Firewall Builder",