[fwbuilder-commits] r2355 - branches/v3_1/src/gui
Brought to you by:
mikehorn
From: <a2...@in...> - 2010-01-16 18:13:20
|
Author: a2k Date: 2010-01-16 10:12:36 -0800 (Sat, 16 Jan 2010) New Revision: 2355 Modified: branches/v3_1/src/gui/FWWindow.cpp branches/v3_1/src/gui/instDialog.cpp branches/v3_1/src/gui/instDialog.h Log: fixed #1056 Modified: branches/v3_1/src/gui/FWWindow.cpp =================================================================== --- branches/v3_1/src/gui/FWWindow.cpp 2010-01-16 01:49:25 UTC (rev 2354) +++ branches/v3_1/src/gui/FWWindow.cpp 2010-01-16 18:12:36 UTC (rev 2355) @@ -757,7 +757,7 @@ { std::set<Firewall*> emp; - instd = new instDialog(this, BATCH_COMPILE, emp); + instd = new instDialog(this, false, emp); instd->show(); // id->exec(); @@ -770,7 +770,7 @@ qDebug("FWWindow::compile preselected %d firewalls", int(vf.size())); - instDialog *id = new instDialog(this, BATCH_COMPILE, vf); + instDialog *id = new instDialog(this, false, vf); instd = id; instd->show(); @@ -780,7 +780,7 @@ void FWWindow::install(set<Firewall*> vf) { - instDialog *id = new instDialog(this, BATCH_INSTALL, vf); + instDialog *id = new instDialog(this, true, vf); instd = id; instd->show(); @@ -792,7 +792,7 @@ void FWWindow::install() { std::set<Firewall*> emp; - instd = new instDialog(this, BATCH_INSTALL, emp); + instd = new instDialog(this, true, emp); instd->show(); // id->exec(); Modified: branches/v3_1/src/gui/instDialog.cpp =================================================================== --- branches/v3_1/src/gui/instDialog.cpp 2010-01-16 01:49:25 UTC (rev 2354) +++ branches/v3_1/src/gui/instDialog.cpp 2010-01-16 18:12:36 UTC (rev 2355) @@ -84,11 +84,47 @@ using namespace fwcompiler; -instDialog::instDialog(QWidget* p, - BatchOperation op, - set<Firewall*> reqFirewalls_) : QDialog(p) +instDialog::instDialog(QWidget *p, bool install, set<Firewall*> fws) : QDialog(p) { + init(p); + reqFirewalls = fws; + + findFirewalls(); + if (firewalls.size()==0) + { + setTitle( pageCount()-1, tr("There are no firewalls to process.") ); + for (int i=0;i<pageCount()-1;i++) + { + setAppropriate(i,false); + } + showPage(pageCount()-1); + return; + } + if (firewalls.size()==1) m_dialog->batchInstall->setEnabled(false); + + creatingTable = false; + + m_dialog->selectTable->setFocus(); + + + m_dialog->selectInfoLabel->setText(tr("<p align=\"center\"><b><font size=\"+2\">Select firewalls to compile.</font></b></p>")); + if (!install) + { + m_dialog->batchInstFlagFrame->hide(); + setAppropriate(2,false); + m_dialog->selectTable->hideColumn(INSTALL_CHECKBOX_COLUMN); + } + showPage(0); + + if (fws.size() == 1) + showPage(1); + + m_dialog->detailMCframe->show(); +} + +void instDialog::init(QWidget* p) +{ connect(this, SIGNAL(activateRule(ProjectPanel*, QString, QString, int)), p, SLOT(activateRule(ProjectPanel*, QString, QString, int))); @@ -174,61 +210,6 @@ setFinishEnabled(page, false); lastPage=-1; - reqFirewalls = reqFirewalls_; - - findFirewalls(); - if (firewalls.size()==0) - { - setTitle( pageCount()-1, tr("There are no firewalls to process.") ); - for (int i=0;i<pageCount()-1;i++) - { - setAppropriate(i,false); - } - showPage(pageCount()-1); - return; - } - if (firewalls.size()==1) m_dialog->batchInstall->setEnabled(false); - // setup wizard appropriate pages - operation = op; - - creatingTable = false; - - m_dialog->selectTable->setFocus(); - - showPage(0); - - if (reqFirewalls_.size() == 1) - showPage(1); - - switch(op) - { - case BATCH_COMPILE: - { // only compilation's requested - m_dialog->selectInfoLabel->setText( - tr("<p align=\"center\"><b><font size=\"+2\">Select firewalls to compile.</font></b></p>")); - m_dialog->batchInstFlagFrame->hide(); - setAppropriate(2,false); - m_dialog->selectTable->hideColumn(INSTALL_CHECKBOX_COLUMN); - break; - } - - case BATCH_INSTALL: - { // full cycle's requested - break; - } - - default : - { - setTitle( pageCount()-1, tr("Unknown operation.") ); - for (int i=0;i<pageCount()-1;i++) - { - setAppropriate(i,false); - } - showPage(pageCount()-1); - } - } - - m_dialog->detailMCframe->show(); } instDialog::~instDialog() Modified: branches/v3_1/src/gui/instDialog.h =================================================================== --- branches/v3_1/src/gui/instDialog.h 2010-01-16 01:49:25 UTC (rev 2354) +++ branches/v3_1/src/gui/instDialog.h 2010-01-16 18:12:36 UTC (rev 2355) @@ -90,6 +90,8 @@ Q_OBJECT; + void init(QWidget*); + Ui::instDialog_q *m_dialog; instConf cnf; Page1Operation page_1_op; @@ -176,8 +178,7 @@ public: - instDialog(QWidget* p, BatchOperation op, - std::set<libfwbuilder::Firewall*> reqFirewalls_); + instDialog(QWidget *p, bool install, std::set<libfwbuilder::Firewall*> fws); virtual ~instDialog(); void summary(); |