bugfix 2649,2658

src/gui/AddressRangeDialog.cpp

@@ -55,8 +55,6 @@ AddressRangeDialog::AddressRangeDialog(ProjectPanel *project, QWidget *parent):
 {
     m_dialog = new Ui::AddressRangeDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
-
     obj=NULL;
 
 }

src/gui/AddressTableDialog.cpp

@@ -67,7 +67,6 @@ AddressTableDialog::AddressTableDialog(ProjectPanel *project, QWidget *parent) :
 {
     m_dialog = new Ui::AddressTableDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/CustomServiceDialog.cpp

@@ -55,7 +55,6 @@ CustomServiceDialog::CustomServiceDialog(ProjectPanel *project, QWidget *parent)
 {
     m_dialog = new Ui::CustomServiceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/DNSNameDialog.cpp

@@ -60,8 +60,6 @@ DNSNameDialog::DNSNameDialog(ProjectPanel *project, QWidget *parent) : QWidget(p
 {
     m_dialog = new Ui::DNSNameDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
-
     obj=NULL;
 }
 

src/gui/FWWindow.cpp

@@ -170,7 +170,6 @@ FWWindow::FWWindow(): m_space(0),
 
     m_mainWindow = new Ui::FWBMainWindow_q();
     m_mainWindow->setupUi(dynamic_cast<QMainWindow*>(this));
-    QApplication::setFont(st->getUiFont());
 
     m_space = new QMdiArea(this);
     setCentralWidget(m_space);
@@ -812,7 +811,6 @@ void FWWindow::editPrefs()
     PrefsDialog pd(this);
     if (QDialog::Accepted == pd.exec())
     {
-        QApplication::setFont(st->getUiFont());
         if (activeProject())
         activeProject()->prefsEdited();
     }

src/gui/FirewallDialog.cpp

@@ -74,7 +74,6 @@ FirewallDialog::FirewallDialog(ProjectPanel *project, QWidget *parent) : QWidget
     m_dialog = new Ui::FirewallDialog_q;
     m_dialog->setupUi(this);
     obj=NULL;
-    setFont(st->getUiFont());
 }
 
 void FirewallDialog::loadFWObject(FWObject *o)

src/gui/GroupObjectDialog.cpp

@@ -80,7 +80,6 @@ GroupObjectDialog::GroupObjectDialog(ProjectPanel *project, QWidget *parent) :
 {
     m_dialog = new Ui::GroupObjectDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 
     obj=NULL;
     selectedObject=NULL;

src/gui/HostDialog.cpp

@@ -57,7 +57,6 @@ HostDialog::HostDialog(ProjectPanel *project, QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::HostDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/ICMPServiceDialog.cpp

@@ -56,7 +56,6 @@ ICMPServiceDialog::ICMPServiceDialog(ProjectPanel *project, QWidget *parent) :
 {
     m_dialog = new Ui::ICMPServiceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/IPServiceDialog.cpp

@@ -56,7 +56,6 @@ IPServiceDialog::IPServiceDialog(ProjectPanel *project, QWidget *parent) : QWidg
 {
     m_dialog = new Ui::IPServiceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/IPv4Dialog.cpp

@@ -61,7 +61,7 @@ IPv4Dialog::IPv4Dialog(ProjectPanel *project, QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::IPv4Dialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
+
     obj=NULL;
 }
 

src/gui/IPv6Dialog.cpp

@@ -62,7 +62,6 @@ IPv6Dialog::IPv6Dialog(ProjectPanel *project, QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::IPv6Dialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/InterfaceDialog.cpp

@@ -64,7 +64,6 @@ InterfaceDialog::InterfaceDialog(ProjectPanel *project, QWidget *parent) :
 {
     m_dialog = new Ui::InterfaceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 /*
     seclevel->hide();    seclevelLabel->hide();
     netzone->hide();     netzoneLabel->hide();

src/gui/LibraryDialog.cpp

@@ -56,7 +56,6 @@ LibraryDialog::LibraryDialog(ProjectPanel *project, QWidget *parent) : QWidget(p
     m_dialog->setupUi(this);
 
     obj=NULL;
-    setFont(st->getUiFont());
     //layout()->setSizeConstraint(QLayout::SetFixedSize);
 
     Qt::WindowFlags flags = windowFlags();

src/gui/NATRuleOptionsDialog.cpp

@@ -59,7 +59,6 @@ NATRuleOptionsDialog::NATRuleOptionsDialog(ProjectPanel *project, QWidget *paren
 {
     m_dialog = new Ui::NATRuleOptionsDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 
     init=false;
 }

src/gui/NetworkDialog.cpp

@@ -55,7 +55,6 @@ NetworkDialog::NetworkDialog(ProjectPanel *project, QWidget *parent) : QWidget(p
 {
     m_dialog = new Ui::NetworkDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/NetworkDialogIPv6.cpp

@@ -55,7 +55,6 @@ NetworkDialogIPv6::NetworkDialogIPv6(ProjectPanel *project, QWidget *parent) : Q
 {
     m_dialog = new Ui::NetworkDialogIPv6_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/PhysicalAddressDialog.cpp

@@ -58,7 +58,6 @@ PhysicalAddressDialog::PhysicalAddressDialog(ProjectPanel *project, QWidget *par
 {
     m_dialog = new Ui::PhysAddressDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/ProjectPanel.cpp

@@ -222,7 +222,6 @@ void ProjectPanel::info(libfwbuilder::FWObject *obj, bool forced)
             m_panel->oi->setText(s);
         }
 
-        m_panel->oi->setFont(st->getUiFont());
         s=QString::fromUtf8(obj->getComment().c_str());
         m_panel->oi->append(s);
         m_panel->oi->moveCursor(QTextCursor::Start);
@@ -3583,7 +3582,6 @@ void ProjectPanel::showEvent( QShowEvent *ev)
         int wf = windowFlags();
         qDebug("windowFlags=%x", wf);
     }
-
     QWidget::showEvent(ev);
 }
 

src/gui/RoutingRuleOptionsDialog.cpp

@@ -64,7 +64,6 @@ RoutingRuleOptionsDialog::RoutingRuleOptionsDialog(ProjectPanel *project, QWidge
 {
     m_dialog = new Ui::RoutingRuleOptionsDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 }
 
 void RoutingRuleOptionsDialog::loadFWObject(FWObject *o)

src/gui/RuleOptionsDialog.cpp

@@ -67,7 +67,6 @@ RuleOptionsDialog::RuleOptionsDialog(ProjectPanel *project, QWidget *parent) : Q
 {
     m_dialog = new Ui::RuleOptionsDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 
     init=false;
 }

src/gui/RuleSetDialog.cpp

@@ -57,7 +57,6 @@ RuleSetDialog::RuleSetDialog(ProjectPanel *project, QWidget *parent) : QWidget(p
 {
     m_dialog = new Ui::RuleSetDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/RuleSetView.cpp

@@ -1333,7 +1333,6 @@ int RuleSetView::getColByType(REType type) const
     return -1;
 }
 
-
 QString RuleSetView::objectText(RuleElement *re,FWObject *obj)
 {
     if (re->isAny())

src/gui/TCPServiceDialog.cpp

@@ -55,7 +55,6 @@ TCPServiceDialog::TCPServiceDialog(ProjectPanel *project, QWidget *parent) : QWi
 {
     m_dialog = new Ui::TCPServiceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 
     obj=NULL;
 }

src/gui/TagServiceDialog.cpp

@@ -65,7 +65,6 @@ TagServiceDialog::TagServiceDialog(ProjectPanel *project, QWidget *parent) : QWi
 {
     m_dialog = new Ui::TagServiceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/TimeDialog.cpp

@@ -58,7 +58,6 @@ TimeDialog::TimeDialog(ProjectPanel *project, QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::TimeDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 
     obj=NULL;
 }

src/gui/UDPServiceDialog.cpp

@@ -54,7 +54,6 @@ UDPServiceDialog::UDPServiceDialog(ProjectPanel *project, QWidget *parent) : QWi
 {
     m_dialog = new Ui::UDPServiceDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
 
     obj=NULL;
 }

src/gui/UserDialog.cpp

@@ -55,7 +55,6 @@ UserDialog::UserDialog(ProjectPanel *project, QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::UserDialog_q;
     m_dialog->setupUi(this);
-    setFont(st->getUiFont());
     obj=NULL;
 }
 

src/gui/main.cpp

@@ -403,7 +403,6 @@ int main( int argc, char ** argv )
 
 /* initialize preferences */
         st->init();
-        QApplication::setFont(st->getUiFont());
 
         QString sshcmd=st->getSSHPath();
 
@@ -607,7 +606,6 @@ int main( int argc, char ** argv )
 
 /* initialize preferences */
         st->init();
-        QApplication::setFont(st->getUiFont());
         if (fwbdebug) qDebug("done");
 
         QPixmapCache::setCacheLimit(4096);

src/gui/timedialog_q.ui

@@ -670,5 +670,117 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>cbStart1_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>280</x>
+     <y>258</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>284</x>
+     <y>0</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cbStart2_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>314</x>
+     <y>256</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>343</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cbStart3_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>356</x>
+     <y>255</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>216</x>
+     <y>-9</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cbStart4_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>414</x>
+     <y>259</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>423</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cbStart5_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>477</x>
+     <y>259</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>486</x>
+     <y>-6</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cbStart6_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>505</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>568</x>
+     <y>0</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cbStart7_2</sender>
+   <signal>released()</signal>
+   <receiver>TimeDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>550</x>
+     <y>259</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>639</x>
+     <y>-5</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>