onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 00:19:55 +02:00
Code Issues Releases Wiki Activity

bugfix 2635,2609,2622,2624,2626,2628

Browse Source
This commit is contained in:
2008-06-03 15:30:02 +00:00
parent c40fdbceb1
commit acced349be
8 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/FWObjectPropertiesFactory.cpp
+1 -1
View File
@@ -571,7 +571,7 @@ QString FWObjectPropertiesFactory::getRuleActionProperties(PolicyRule *rule)
par = ropt->getStr("custom_str").c_str();
break;
case PolicyRule::Branch :
par = ropt->getStr("branch_name").c_str();
par = rule->getBranch()->getName().c_str();//ropt->getStr("branch_name").c_str();
break;
case PolicyRule::Classify :
if (platform=="ipfw")
src/gui/FindWhereUsedWidget.cpp
+3 -2
View File
@@ -40,6 +40,7 @@
#include "FWBSettings.h"
#include "ObjectTreeView.h"
#include "RuleSetView.h"
#include "ProjectPanel.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/FWReference.h"
@@ -253,10 +254,10 @@ void FindWhereUsedWidget::showObject(FWObject* o)
{
ref=findRef(object,o);
if (ref==NULL) return;
mw->activeProject()->openRuleSet(o->getParent()->getParent());
mw->clearManipulatorFocus();
mw->ensureObjectVisibleInRules( ref );
mw->selectRules();
// mw->selectRules();
if (mw->isEditorVisible())
{
mw->editObject( object );
src/gui/ObjectManipulator.cpp
+1 -1
View File
@@ -2321,7 +2321,7 @@ bool ObjectManipulator::switchObjectInEditor(FWObject *obj)
// qDebug("!2");
if (obj!=m_project->getCurrentRuleSet())
{
if (m_project->getCurrentRuleSet()!=NULL)
// if (m_project->getCurrentRuleSet()!=NULL)
m_project->openRuleSet(obj);
}
src/gui/ObjectTreeView.cpp
+1
View File
@@ -151,6 +151,7 @@ ObjectTreeView::ObjectTreeView(ProjectPanel* project, QWidget* parent, const cha
setAcceptDrops( true );
setDragDropMode( QAbstractItemView::DragDrop );
setRootIsDecorated( TRUE );
setSortingEnabled(false);
}
bool ObjectTreeView::event( QEvent *event )
src/gui/ProjectPanel.cpp
+2 -1
View File
@@ -3622,7 +3622,8 @@ void ProjectPanel::scheduleRuleSetRedraw()
if (!ruleSetRedrawPending)
{
ruleSetRedrawPending = true;
QTimer::singleShot( 0, this, SLOT(redrawRuleSets()) );
redrawRuleSets();
//QTimer::singleShot( 0, this, SLOT(redrawRuleSets()) );
}
}
src/gui/RuleSetView.cpp
+30 -24
View File
@@ -2165,6 +2165,12 @@ void RuleSetView::insertRule()
mw->updateLastModifiedTimestampForOneFirewall(getFirewall());
}
void RuleSetView::insertRuleAboveFirstGroup()
{
insertRule(0,NULL);
updateGroups();
}
FWObject* RuleSetView::getSelectedObject()
{
return selectedObject;
@@ -2705,42 +2711,42 @@ void RuleSetView::contextMenu(int row, int col, const QPoint &pos)
}
else
{
if (row==0)
popup->addAction( tr("Insert Rule Above"), this, SLOT( insertRuleAboveFirstGroup() ));
popup->addAction( tr("Rename group"), this, SLOT( renameGroup() ));
popup->addSeparator();
popup->addSeparator();
QMenu *subcolor = popup->addMenu( tr("Change color") );
QMenu *subcolor = popup->addMenu( tr("Change color") );
QPixmap pcolor(16,16);
pcolor.fill(QColor(255,255,255));
subcolor->addAction( QIcon(pcolor), tr("No color"), this, SLOT ( setColorEmpty() ));
QPixmap pcolor(16,16);
pcolor.fill(QColor(255,255,255));
subcolor->addAction( QIcon(pcolor), tr("No color"), this, SLOT ( setColorEmpty() ));
pcolor.fill(st->getLabelColor(FWBSettings::RED));
subcolor->addAction( QIcon(pcolor), tr("Red"), this, SLOT ( setColorRed() ));
pcolor.fill(st->getLabelColor(FWBSettings::RED));
subcolor->addAction( QIcon(pcolor), tr("Red"), this, SLOT ( setColorRed() ));
pcolor.fill(st->getLabelColor(FWBSettings::ORANGE));
subcolor->addAction( QIcon(pcolor), tr("Orange"), this, SLOT ( setColorOrange() ));
pcolor.fill(st->getLabelColor(FWBSettings::ORANGE));
subcolor->addAction( QIcon(pcolor), tr("Orange"), this, SLOT ( setColorOrange() ));
pcolor.fill(st->getLabelColor(FWBSettings::YELLOW));
subcolor->addAction( QIcon(pcolor), tr("Yellow"), this, SLOT ( setColorYellow() ));
pcolor.fill(st->getLabelColor(FWBSettings::YELLOW));
subcolor->addAction( QIcon(pcolor), tr("Yellow"), this, SLOT ( setColorYellow() ));
pcolor.fill(st->getLabelColor(FWBSettings::GREEN));
subcolor->addAction( QIcon(pcolor), tr("Green"), this, SLOT ( setColorGreen() ));
pcolor.fill(st->getLabelColor(FWBSettings::GREEN));
subcolor->addAction( QIcon(pcolor), tr("Green"), this, SLOT ( setColorGreen() ));
pcolor.fill(st->getLabelColor(FWBSettings::BLUE));
subcolor->addAction( QIcon(pcolor), tr("Blue"), this, SLOT ( setColorBlue() ));
pcolor.fill(st->getLabelColor(FWBSettings::BLUE));
subcolor->addAction( QIcon(pcolor), tr("Blue"), this, SLOT ( setColorBlue() ));
pcolor.fill(st->getLabelColor(FWBSettings::PURPLE));
subcolor->addAction( QIcon(pcolor), tr("Purple"), this, SLOT ( setColorPurple() ));
pcolor.fill(st->getLabelColor(FWBSettings::PURPLE));
subcolor->addAction( QIcon(pcolor), tr("Purple"), this, SLOT ( setColorPurple() ));
pcolor.fill(st->getLabelColor(FWBSettings::GRAY));
subcolor->addAction( QIcon(pcolor), tr("Gray"), this, SLOT ( setColorGray() ));
pcolor.fill(st->getLabelColor(FWBSettings::GRAY));
subcolor->addAction( QIcon(pcolor), tr("Gray"), this, SLOT ( setColorGray() ));
popup->exec( pos );
popup->exec( pos );
delete popup;
delete popup;
return ;
}
src/gui/RuleSetView.h
+1 -1
View File
@@ -162,7 +162,7 @@ class RuleSetView : public QTableView
void addToGroupAbove ();
void addToGroupBelow();
void removeFromGroup();
void insertRuleAboveFirstGroup();
void showHideRuleGroup (RuleGroupPanel * rgp);
void editSelected();
src/gui/UserDialog.cpp
+3 -3
View File
@@ -126,9 +126,9 @@ void UserDialog::applyChanges()
assert(s!=NULL);
s->dump(false,false);
string oldname=obj->getName();
obj->setName( string(m_dialog->obj_name->text().toUtf8().constData()) );
obj->setComment( string(m_dialog->comment->toPlainText().toUtf8().constData()) );
obj->setName( string(m_dialog->userid->text().toUtf8().constData()) );
s->setName( string(m_dialog->obj_name->text().toUtf8().constData()) );
s->setComment( string(m_dialog->comment->toPlainText().toUtf8().constData()) );
s->setUserId( string(m_dialog->userid->text().toUtf8().constData()) );
mw->updateObjName(obj,QString::fromUtf8(oldname.c_str()));