Fixed #1025, #1019

fwbuilder3.pro

@@ -18,4 +18,6 @@ tests.commands = for directory in `find . -name unit_tests`; \
                     cd $${DOLLAR}$${DOLLAR}home; \
                 done
 
+tests.depends = all
+
 QMAKE_EXTRA_TARGETS += tests

src/gui/newClusterDialog.cpp

@@ -101,7 +101,7 @@ void newClusterDialog::setFirewallList(std::vector<libfwbuilder::FWObject*> data
     useFirewallList = true;
 }
 
-void newClusterDialog::showPage(const int page)
+void newClusterDialog::showPage(const int page, bool blank)
 {
     FakeWizard::showPage(page);
 
@@ -115,6 +115,8 @@ void newClusterDialog::showPage(const int page)
     switch (p)
     {
     case FIREWALLS_PAGE:
+    {
+        if (blank)
         {
             m_dialog->firewallSelector->clear();
             if (useFirewallList)
@@ -127,13 +129,15 @@ void newClusterDialog::showPage(const int page)
                 mw->findAllFirewalls(fwlist);
                 m_dialog->firewallSelector->setFirewallList(fwlist);
             }
+        }
 
         setNextEnabled(FIREWALLS_PAGE, !this->m_dialog->obj_name->text().isEmpty());
         setFinishEnabled(FIREWALLS_PAGE, false);
-
         break;
     }
     case INTERFACES_PAGE:
+    {
+        if (blank)
         {
             m_dialog->interfaceSelector->clear();
             QList<Firewall*> firewalls;
@@ -141,12 +145,14 @@ void newClusterDialog::showPage(const int page)
             foreach ( fwpair fw, m_dialog->firewallSelector->getSelectedFirewalls() )
                 firewalls.append(fw.first);
             this->m_dialog->interfaceSelector->setFirewallList(firewalls);
-
+        }
         setNextEnabled(INTERFACES_PAGE, true);
         setFinishEnabled(INTERFACES_PAGE, false);
         break;
     }
     case INTERFACEEDITOR_PAGE:
+    {
+        if (blank)
         {
         if (this->m_dialog->interfaceSelector->getInterfaces().count() == 0)
             this->showPage(POLICY_PAGE);
@@ -172,13 +178,15 @@ void newClusterDialog::showPage(const int page)
         {
             this->m_dialog->interfaceEditor->addClusterInterface(iface);
         }
+        }
         setNextEnabled(INTERFACEEDITOR_PAGE, true);
         setFinishEnabled(INTERFACEEDITOR_PAGE, false);
         break;
     }
     case POLICY_PAGE:
     {
-
+        if (blank)
+        {
         foreach (QRadioButton *btn, copy_rules_from_buttons.keys())
         {
             btn->close();
@@ -192,6 +200,7 @@ void newClusterDialog::showPage(const int page)
             qFindChild<QVBoxLayout*>(this->m_dialog->page_4, "policyLayout")->addWidget(newbox);
             copy_rules_from_buttons[newbox] = fws.at(i).first;
         }
+        }
         setNextEnabled(POLICY_PAGE, true);
         setFinishEnabled(POLICY_PAGE, false);
         break;
@@ -325,7 +334,7 @@ void newClusterDialog::backClicked()
 {
     if (previousRelevant(currentPage()) > -1)
     {
-        showPage(previousRelevant(currentPage()));
+        showPage(previousRelevant(currentPage()), false);
     }
 }
 

src/gui/newClusterDialog.h

@@ -63,7 +63,7 @@ public:
 
     void setFirewallList(std::vector<libfwbuilder::FWObject*>);
 
-    void showPage(const int page);
+    void showPage(const int page, bool blank = true);
 
 protected:
     int previousRelevant(const int page) const;