onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 10:17:16 +01:00
Code Issues Releases Wiki Activity

bugfix 2402,2388,2403. part of bug 2422

Browse Source
This commit is contained in:
2008-04-20 14:14:59 +00:00
parent 1cafbf3e39
commit 30c5da8c8b
7 changed files with 903 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/FWWindow.cpp
View File

@ -309,9 +309,14 @@ void FWWindow::fileProp()
void FWWindow::fileNew()
{
ProjectPanel *proj = newProjectPanel();
if (proj->fileNew()){
if (proj->fileNew())
{
showSub(proj);
} // Memory leak ?
}
else
{
delete proj ;
}
}
void FWWindow::addToRCSActionSetEn(bool en)
@ -336,15 +341,12 @@ void FWWindow::fileSaveActionSetEn(bool en)
void FWWindow::fileOpen()
{
std::auto_ptr<ProjectPanel> proj(newProjectPanel());
if (proj->fileOpen())
{
if (activeProject()->getFileName()=="")
if (activeProject()->getRCS()==NULL)
{
//m_space->currentSubWindow()->
m_space->currentSubWindow()->hide();
//activeProject()->closeAuxiliaryPanel();
}
showSub(proj.release());
}

12
src/gui/ProjectPanel.cpp
View File

@ -1048,18 +1048,6 @@ QString ProjectPanel::chooseNewFileName(const QString &fname,
return "";
}
QString ProjectPanel::getFileName ()
{
if (rcs!=NULL)
{
return rcs->getFileName();
}
else
{
return QString ();
}
}
void ProjectPanel::setFileName(const QString &fname)
{
systemFile=false;

1
src/gui/ProjectPanel.h
View File

@ -261,7 +261,6 @@ public:
QString getDestDir(const QString &fname);
QString chooseNewFileName(const QString &fname, bool checkPresence,const QString &title);
void setFileName(const QString &fname);
QString getFileName ();
void check4Depends(libfwbuilder::FWObject *obj,
std::list<libfwbuilder::FWObject*> & objList,
libfwbuilder::FWObject *lib);

764
src/gui/RuleSetView.cpp
View File

@ -79,6 +79,9 @@
#include <qstyle.h>
#include <qtimer.h>
#include <qpixmapcache.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <qinputdialog.h>
#include "ProjectPanel.h"
using namespace libfwbuilder;
@ -145,7 +148,20 @@ QVariant RuleTableModel::headerData(int section, Qt::Orientation orientation, in
if (role == Qt::SizeHintRole)
return QSize(45, ruleSetView->getRowHeight(section));
if (role == Qt::DisplayRole)
return QString::number(section);
{
Rule * rule = Rule::cast (ruleSetView->ruleIndex[section]);
if (rule==NULL)
{
return QString ("");
}
int counter =0;
for (int i = section; i>=0; i--)
{
if (ruleSetView->ruleIndex[i]==NULL)
counter++;
}
return QString::number(section-counter);
}
if (role == Qt::FontRole)
{
//QFont f = QAbstractTableModel::headerData(section, orientation, role ).value<QFont>();
@ -723,6 +739,29 @@ void RuleSetView::fixRulePosition(Rule *rule, FWObject *parent, int pos)
rule->setPosition(pos);
}
RuleRowInfo* RuleSetView::getRuleRowInfoByGroupName (QString name)
{
if (name=="")
name="New Group";
for (int i = 0 ; i < rowsInfo.size(); i++)
{
if (rowsInfo[i]->groupName==name)
return rowsInfo[i];
}
return NULL;
}
int RuleSetView::getRuleRowInfoIndexByGroupName (QString name)
{
for (int i = 0 ; i < rowsInfo.size(); i++)
{
if (rowsInfo[i]->groupName==name)
return i;
}
return -1;
}
void RuleSetView::init()
{
QApplication::setOverrideCursor( QCursor( Qt::WaitCursor) );
@ -755,15 +794,150 @@ void RuleSetView::init()
colW[col]=br.width() + 10;
}
}
// QStringList groups ;
/*
for (FWObject::iterator i=ruleset->begin(); i!=ruleset->end(); i++)
{
Rule *r = Rule::cast(*i);
if (r->getRuleGroupName()=="")
{
r->setRuleGroupName("New group");
}
else
{
}
QString group = r->getRuleGroupName().c_str();
if (!groups.contains(group))
{
groups << group ;
RuleRowInfo * info = new RuleRowInfo;
info->groupName = group;
info->rules.push_back(r);
rowsInfo.push_back (info);
}
else
{
RuleRowInfo * info = getRuleRowInfoByGroupName(group);
info->rules.push_back(r);
}
}
for (int i = 0 ; i < rowsInfo.size(); i++)
{
RuleRowInfo * info = rowsInfo[i];
if (i==0)
{
info->row=0;
}
else
{
info->row=rowsInfo[i-1]->rules.size()+1;
}
}
*/
row=0;
/* for (int i = 0 ; i < rowsInfo.size(); i++)
{
RuleRowInfo * info = rowsInfo[i];
ruleIndex[row] = NULL;
//setSpan (row,0,0,8);
//QFrame * frame = new QFrame ();
//setIndexWidget (model()->index(row,0),new QPushButton(info->groupName));
row++;
for (int o = 0 ; o < info->rules.size(); o++)
{
ruleIndex[row] = info->rules[o];
setRuleNumber(row, Rule::cast( info->rules[o] ));
if (Rule::cast( info->rules[o] )->getPosition()!=row)
{
fixRulePosition(Rule::cast( info->rules[o] ), NULL, row);
}
// adjustRow(row);
int h=16;
for (int col=0; col<ncols; col++)
{
QRect cr = calculateCellSize(row,col);
h = QMAX(h, cr.height());
if (!userColWidth)
colW[col]=QMAX(colW[col],cr.width());
}
adjustRow_int(row,h);
row++;
}
}*/
QString memberRow ;
bool beginGroup = false ;
// rowsInfo.clear();
for (FWObject::iterator i=ruleset->begin(); i!=ruleset->end(); i++,row++)
{
ruleIndex[row] = *i;
Rule * r = Rule::cast( *i );
//setSpan (row,0,0,1);
/*
QString group = r->getRuleGroupName().c_str();
if (group!=memberRow)
{
// if (!beginGroup)
// {
ruleIndex[row] = NULL ;
beginGroup = true ;
memberRow = group;
rowsInfo.push_back (new RuleRowInfo(memberRow,true));
//QPanel * p = new QPanel(this);
addRuleGroupPanel(row);
deleteRuleGroupPanel(row);
addRuleGroupPanel(row);
deleteRuleGroupPanel(row);
addRuleGroupPanel(row);
deleteRuleGroupPanel(row);
addRuleGroupPanel(row);
deleteRuleGroupPanel(row);
addRuleGroupPanel(row);
deleteRuleGroupPanel(row);
// addRuleGroupPanel(row);
setRuleNumber(row, Rule::cast( *i ));
// row++;
}
else
{
ruleIndex[row] = NULL ;
beginGroup = false ;
setSpan (row,0,0,8);
setIndexWidget (model()->index(row,0),new QFrame());
memberRow = group;
rowsInfo.push_back (new RuleRowInfo(memberRow,false));
row++;
if (memberRow!="")
{
ruleIndex[row] = NULL ;
beginGroup = true ;
memberRow = group;
rowsInfo.push_back (new RuleRowInfo(memberRow,true));
setSpan (row,0,0,8);
setIndexWidget (model()->index(row,0),new QPushButton(memberRow));
row++;
}
}
}*/
ruleIndex[row] = *i;
rowsInfo.push_back (NULL);
setRuleNumber(row, r);
if (Rule::cast( *i )->getPosition()!=row)
{
fixRulePosition(Rule::cast( *i ), NULL, row);
fixRulePosition(r, NULL, row);
}
// adjustRow(row);
@ -785,11 +959,168 @@ void RuleSetView::init()
}
//updateContents();
updateGroups();
update();
QApplication::restoreOverrideCursor();
}
void RuleSetView::addRuleGroupPanel (int row)
{
RuleRowInfo * rri = rowsInfo[row];
if (rri==NULL)
return ;
setSpan (row,0,0,9);
// rri->index = &model()->index(row,0);
if (rri->isBeginRow)
{
bool hide = isRowHidden(row+1);
RuleGroupPanel * grouppanel = new RuleGroupPanel(NULL,this,row);
grouppanel->ruleGroupName->setText(rri->groupName);
if (!hide)
{
grouppanel->showHideRuleGroupButton->setText ("Collapse Group");
}
else
{
grouppanel->showHideRuleGroupButton->setText ("Expand Group");
}
setIndexWidget (model()->index(row,0),grouppanel);
}
else
{
setIndexWidget (model()->index(row,0),new QFrame());
}
}
void RuleSetView::refreshGroups ()
{
/* reset ();
for (int i = 0 ; i < rowsInfo.size(); i++)
{
Rule * r = Rule::cast(ruleIndex[i]);
bool hiden = this->isRowHidden(i);
QString group = r->getRuleGroupName().c_str();
if (group!=memberRow)
{
ruleModel->insertRow(i);
if (!beginGroup)
{
insertRuleIndex(i);
ruleIndex[i] = NULL ;
beginGroup = true ;
memberRow = group;
RuleRowInfo * rri = new RuleRowInfo(memberRow,true,hiden);
rowsInfo.insert (i,rri);
//QPanel * p = new QPanel(this);
addRuleGroupPanel(i);
}
else
{
insertRuleIndex(i);
ruleIndex[i] = NULL ;
beginGroup = false ;
//setSpan (row,0,0,8);
//setIndexWidget (model()->index(row,0),new QFrame());
rowsInfo.insert (i,new RuleRowInfo(memberRow,false,hiden));
memberRow = group;
addRuleGroupPanel(i);
}
i++;
}
}*/
}
void RuleSetView::updateGroups ()
{
reset ();
for (int i = 0 ; i < rowsInfo.size(); i++)
{
setSpan (i,0,0,1);
if (ruleIndex[i]==NULL)
{
removeRuleIndex(i);
rowsInfo.remove (i);
ruleModel->removeRows(i,i);
i--;
}
}
QString memberRow ;
bool beginGroup = false ;
for (int i = 0 ; i < rowsInfo.size(); i++)
{
Rule * r = Rule::cast(ruleIndex[i]);
bool hiden = this->isRowHidden(i);
QString group = r->getRuleGroupName().c_str();
if (group!=memberRow)
{
ruleModel->insertRow(i);
if (!beginGroup)
{
insertRuleIndex(i);
ruleIndex[i] = NULL ;
beginGroup = true ;
memberRow = group;
RuleRowInfo * rri = new RuleRowInfo(memberRow,true,false);
rowsInfo.insert (i,rri);
//QPanel * p = new QPanel(this);
addRuleGroupPanel(i);
}
else
{
insertRuleIndex(i);
ruleIndex[i] = NULL ;
beginGroup = false ;
//setSpan (row,0,0,8);
//setIndexWidget (model()->index(row,0),new QFrame());
rowsInfo.insert (i,new RuleRowInfo(memberRow,false,false));
memberRow = group;
addRuleGroupPanel(i);
}
i++;
}
}
/* removeRuleIndex(top);
rowsInfo.remove (top);
deleteRuleGroupPanel(top);
ruleModel->removeRows(top,top);
rowsInfo.insert (top,NULL);
ruleIndex[top]=r;
ruleModel->insertRow(top);
rowsInfo.insert (top+1,ru);
ruleIndex[top+1]=NULL;
ruleModel->insertRow(top+1);
addRuleGroupPanel(top+1);*/
// }
}
void RuleSetView::deleteRuleGroupPanel (int row)
{
// RuleRowInfo * rri = rowsInfo[row];
/*QWidget * w = indexWidget(*rri->index);
if (w!=NULL)
{
delete w ;
}*/
setIndexWidget (model()->index(row,0),NULL);
//setSpan (row,0,0,1);
//rowSpan(row,8);
}
QSize RuleSetView::getPMSize()
{
if (!st->getShowIconsInRules()){
@ -1580,7 +1911,15 @@ Rule* RuleSetView::insertRule(int pos, FWObject *r)
if (r!=NULL) copyRuleContent(newrule,Rule::cast(r));
for (int i=ruleIndex.size(); i>pos; --i) ruleIndex[i]=ruleIndex[i-1];
Rule * oldr = Rule::cast(ruleIndex[pos]);
for (int i=ruleIndex.size(); i>pos; --i)
ruleIndex[i]=ruleIndex[i-1];
//RuleRowInfo * info = getRuleRowInfoByGroupName(newrule->getRuleGroupName().c_str());
//if (info!=NULL)
//{
// info->rules.push_back (newrule);
//}
newrule->setRuleGroupName (oldr->getRuleGroupName());
ruleIndex[pos] = newrule;
if (fwbdebug && PolicyRule::cast(r)!=NULL)
@ -1817,6 +2156,53 @@ void RuleSetView::setSelectedObject(FWObject* obj)
openObjectInTree(selectedObject);
}
void RuleSetView::insertRuleIndex (int idx)
{
for ( int i=ruleIndex.size(); i>idx; --i)
{
ruleIndex[i]=ruleIndex[i-1];
}
}
void RuleSetView::removeRuleIndex (int idx)
{
for ( int i=idx; i<ruleIndex.size()-1; ++i)
{
ruleIndex[i]=ruleIndex[i+1];
}
// ruleIndex.remove (ruleIndex.size());
}
int RuleSetView::getUpNullRuleIndex (int idx)
{
for (int i=idx; i>=0; --i)
{
if (ruleIndex[i]==NULL)
{
return i;
}
}
return -1 ;
}
int RuleSetView::getDownNullRuleIndex (int idx)
{
for ( int i=idx; i<ruleIndex.size(); ++i)
{
if (ruleIndex[i]==NULL)
{
return i;
}
}
return -1;
}
void RuleSetView::openObjectInTree(FWObject *obj)
{
if (fwbdebug)
@ -1840,6 +2226,328 @@ void RuleSetView::openObjectInTree(FWObject *obj)
update();
}
void RuleSetView::newGroup()
{
bool ok = false ;
QString text = QInputDialog::getText(this, tr(""),
tr("Enter group name:"), QLineEdit::Normal,
"New Group", &ok);
if (ok && !text.isEmpty())
{
int row = firstSelectedRule;
int count = lastSelectedRule - firstSelectedRule +1;
createGroup(row,count,text);
}
// SimpleTextEditor * ste = new SimpleTextEditor(this, "New Group", false, "New Group2");
// ste->setModal (true);
// ste->show();
// QString text = ste->text();
}
void RuleSetView::addToUpGroup ()
{
int row = firstSelectedRule;
int count = lastSelectedRule - firstSelectedRule +1;
int top = getUpNullRuleIndex(row);
RuleRowInfo * ru = rowsInfo[top];
for (int i = 0; i< count ; i++)
{
Rule * r = Rule::cast(ruleIndex[row+i]);
r->setRuleGroupName (ru->groupName.toAscii().data());
ruleIndex[row+i] =r ;
}
updateGroups();
/*
int row = currentRow();
int top = getUpNullRuleIndex(row);
RuleRowInfo * ru = rowsInfo[top];
Rule * r = Rule::cast(ruleIndex[row]);
r->setRuleGroupName (ru->groupName.toAscii().data());
removeRuleIndex(row);
rowsInfo.remove (row);
ruleModel->removeRows(row,row);
removeRuleIndex(top);
rowsInfo.remove (top);
deleteRuleGroupPanel(top);
ruleModel->removeRows(top,top);
rowsInfo.insert (top,NULL);
ruleIndex[top]=r;
ruleModel->insertRow(top);
rowsInfo.insert (top+1,ru);
ruleIndex[top+1]=NULL;
ruleModel->insertRow(top+1);
addRuleGroupPanel(top+1);
reset();
/* insertRuleIndex(top-1);
removeRuleIndex(top);
rowsInfo.remove (top);
ruleModel->removeRows(top,top);
rowsInfo.insert (top,NULL);
ruleIndex[top]=ruleIndex[row-1];
ruleModel->insertRow(top);
*/
// ;
// removeRuleIndex(row+1);
// rowsInfo.remove (row+1);
// ruleModel->removeRows(row+1,row+1);
}
void RuleSetView::addToBottomGroup()
{
// int row = currentRow();
int row = firstSelectedRule;
int bottom = getDownNullRuleIndex(row);
RuleRowInfo * ru = rowsInfo[bottom];
int count = lastSelectedRule - firstSelectedRule +1;
for (int i = 0; i< count ; i++)
{
Rule * r = Rule::cast(ruleIndex[row+i]);
r->setRuleGroupName (ru->groupName.toAscii().data());
ruleIndex[row+i] =r ;
}
updateGroups();
/* Rule * r = Rule::cast(ruleIndex[row]);
r->setRuleGroupName (ru->groupName.toAscii().data());
// removeRuleIndex(bottom);
// rowsInfo.remove (bottom);
// deleteRuleGroupPanel(bottom);
// ruleModel->removeRows(bottom,bottom);
removeRuleIndex(row);
rowsInfo.remove (row);
ruleModel->removeRows(row,row);
rowsInfo.insert (row+1,NULL);
insertRuleIndex(row+1);
ruleIndex[row+1]=r;
ruleModel->insertRow(row+1);
init ();
//dataChanged();
//reset();
// rowsInfo.insert (row,ru);
// insertRuleIndex(row);
// ruleIndex[row]=NULL;
// ruleModel->insertRow(row);
// addRuleGroupPanel(row);
// update();
// QApplication::restoreOverrideCursor();
*/
}
RuleGroupPanel::RuleGroupPanel (QWidget * parent,RuleSetView * rsv, int row) : QFrame(parent)
{
this->row= row;
this->rsv = rsv;
this->setupUi(this);
setContentsMargins (0,0,0,0);
showHideRuleGroupButton->setText("Collapse Group");
connect (showHideRuleGroupButton, SIGNAL(pressed()),this,SLOT(showHideRuleGroup()));
}
void RuleGroupPanel::showHideRuleGroup()
{
rsv->showHideRuleGroup(this);
}
void RuleSetView::showHideRuleGroup(RuleGroupPanel * rgp)
{
QString act = rgp->showHideRuleGroupButton->text();
int row = rgp->row ;
RuleRowInfo * rrf = rowsInfo[row];
int bottom = getDownNullRuleIndex(row+1);
int count = bottom-row-1;
if (act=="Collapse Group")
{
for (int i = row+1; i< row+1+count;i++)
{
hideRow(i);
}
rrf->isHide=true;
//rgp->showHideRuleGroupButton->setText("Expand Group");
}
if (act=="Expand Group")
{
for (int i = row+1; i< row+1+count;i++)
{
showRow(i);
adjustRow(i);
//setRowHeight(i,rowHeights[i]);
dataChanged (model()->index(i,0),model()->index(i,8));
}
rrf->isHide=false;
//rgp->showHideRuleGroupButton->setText("Collapse Group");
}
// refreshGroups();
updateGroups();
}
void RuleSetView::removeFromGroup()
{
int row = lastSelectedRule;
int count = lastSelectedRule - firstSelectedRule+1;
removeFromGroup(row,count);
}
void RuleSetView::createGroup (int row, int count, QString groupName)
{
// insertRuleIndex(row);
// insertRuleIndex(row+count+1);
for (int i =0 ; i<count; i++)
Rule::cast(ruleIndex[row+i])->setRuleGroupName (groupName.toAscii().data());
//ruleIndex[row] = NULL ;
//ruleIndex[row+count+1] = NULL ;
//rowsInfo.insert(row,new RuleRowInfo(groupName,true));
//rowsInfo.insert(row+count+1,new RuleRowInfo(groupName,false));
//ruleModel->insertRow(row);
//ruleModel->insertRow(row+count+1);
//addRuleGroupPanel(row);
//addRuleGroupPanel(row+count+1);
updateGroups();
}
void RuleSetView::removeFromGroup (int row, int count)
{
for (int i = row ; i < row+count ; i++)
{
Rule * r = Rule::cast(ruleIndex[row]);
r->setRuleGroupName("");
ruleIndex[row]=r;
}
updateGroups();
/* int beginRow = getUpNullRuleIndex(row) ;
int endRow = getDownNullRuleIndex(row) ;
if (beginRow==endRow-2)
{
Rule * r = Rule::cast(ruleIndex[row]);
r->setRuleGroupName("");
ruleIndex[row]=r;
removeRuleIndex(endRow);
rowsInfo.remove(endRow);
deleteRuleGroupPanel(endRow);
ruleModel->removeRows(endRow,endRow);
removeRuleIndex(beginRow);
rowsInfo.remove(beginRow);
deleteRuleGroupPanel(beginRow);
ruleModel->removeRows(beginRow,beginRow);
reset ();
return ;
}
if (beginRow == row-1)
{
Rule * r = Rule::cast(ruleIndex[row]);
RuleRowInfo * ri = rowsInfo[beginRow];
removeRuleIndex(row);
rowsInfo.remove(row);
ruleModel->removeRows(row,row);
// removeRuleIndex(beginRow);
// rowsInfo.remove(beginRow);
// deleteRuleGroupPanel(beginRow);
// ruleModel->removeRows(beginRow,beginRow);
// insertRuleIndex(beginRow);
// ruleIndex[beginRow]=NULL;
// rowsInfo.insert(beginRow,ri);
// addRuleGroupPanel(beginRow);
// ruleModel->insertRow(beginRow);
insertRuleIndex(beginRow-1);
r->setRuleGroupName("");
ruleIndex[beginRow-1]=r;
rowsInfo.insert(beginRow-1,NULL);
ruleModel->insertRow(beginRow-1);
// dataChanged();
//reset ();
init() ;
return ;
}
if (endRow == row+1)
{
Rule * r = Rule::cast(ruleIndex[row]);
RuleRowInfo * ri = rowsInfo[endRow];
// removeRuleIndex(endRow);
// rowsInfo.remove(endRow);
// deleteRuleGroupPanel(endRow);
// ruleModel->removeRows(endRow,endRow);
removeRuleIndex(row);
rowsInfo.remove(row);
ruleModel->removeRows(row,row);
insertRuleIndex(row);
r->setRuleGroupName("");
ruleIndex[row]=r;
rowsInfo.insert(row,NULL);
ruleModel->insertRow(row);
// insertRuleIndex(row);
// ruleIndex[row]=NULL;
// rowsInfo.insert(row,ri);
// addRuleGroupPanel(row);
// ruleModel->insertRow(row);
reset ();
return ;
}
RuleRowInfo * begin = new RuleRowInfo("",false);
begin->operator =(*(rowsInfo[beginRow]));
RuleRowInfo * end = new RuleRowInfo("",false);
end->operator =(*(rowsInfo[endRow]));
Rule * r = Rule::cast(ruleIndex[row]);
r->setRuleGroupName ("");
insertRuleIndex(row+1);
ruleIndex[row+1]=NULL;
rowsInfo.insert(row+1,begin);
ruleModel->insertRow(row+1);
insertRuleIndex(row);
ruleIndex[row]=NULL;
rowsInfo.insert(row,end);
ruleModel->insertRow(row);
init ();
*/
}
void RuleSetView::addToUpGroup (int )
{
}
void RuleSetView::addToDownGroup (int )
{
}
void RuleSetView::contextMenu(int row, int col, const QPoint &pos)
{
if (fwbdebug)
@ -1897,6 +2605,42 @@ void RuleSetView::contextMenu(int row, int col, const QPoint &pos)
lastPopupMenuAction=None;
QMenu *popup=new QMenu(this);
Rule *r = Rule::cast(ruleIndex[row]);
if (r!=NULL)
{
if (r->getRuleGroupName()=="")
{
qDebug ((QString("").setNum(firstSelectedRule)).toAscii().data());
qDebug ((QString("").setNum(lastSelectedRule)).toAscii().data());
popup->addAction( tr("New group"), this, SLOT( newGroup() ));
int top = getUpNullRuleIndex(row);
if (top==row-1)
{
RuleRowInfo * ri= rowsInfo[top];
QString label = tr("Add to the group ");
label += ri->groupName;
popup->addAction( label, this, SLOT( addToUpGroup() ));
}
int bottom = getDownNullRuleIndex(row);
if (bottom==row+1)
{
RuleRowInfo * ri= rowsInfo[bottom];
QString label = tr("Add to the group ");
label += ri->groupName;
popup->addAction( label, this, SLOT( addToBottomGroup() ));
}
}
else
{
popup->addAction( tr("Remove from the group"), this, SLOT( removeFromGroup() ));
}
popup->addSeparator ();
}
switch (getColType(col))
{
@ -1905,7 +2649,7 @@ void RuleSetView::contextMenu(int row, int col, const QPoint &pos)
Firewall *f = getFirewall();
string platform=f->getStr("platform");
QString action_name;
if (Resources::isTargetActionSupported(platform,"Accept"))
{
action_name = getActionNameForPlatform(PolicyRule::Accept,
@ -2088,7 +2832,7 @@ void RuleSetView::contextMenu(int row, int col, const QPoint &pos)
Rule *rule = Rule::cast(ruleIndex[row]);
if (rule==NULL)
{
popup->addAction( tr("Insert Rule"), this, SLOT( insertRule() ) );
//popup->addAction( tr("Insert Rule"), this, SLOT( insertRule() ) );
} else
{
//int rn = rule->getPosition();
@ -3089,7 +3833,7 @@ void RuleSetView::removeRule()
mw->removePolicyBranchTab( subset );
int lastN=ruleIndex.size()-1;
ruleIndex.erase(rn);
ruleIndex.remove (rn);//erase(rn);
for (int i=rn; i<lastN; ++i) ruleIndex[i]=ruleIndex[i+1];
@ -3122,6 +3866,7 @@ void RuleSetView::addRuleAfterCurrent()
insertRule(lastSelectedRule+1,NULL);
changingRules = false;
m_project->updateLastModifiedTimestampForOneFirewall(getFirewall());
updateGroups();
}
void RuleSetView::moveRule()
@ -3329,6 +4074,7 @@ void RuleSetView::pasteRuleAbove()
changingRules = false;
m_project->updateLastModifiedTimestampForOneFirewall(getFirewall());
updateGroups();
}
@ -3372,7 +4118,7 @@ void RuleSetView::pasteRuleBelow()
changingRules = false;
m_project->updateLastModifiedTimestampForOneFirewall(getFirewall());
updateGroups();
// if (FWObjectClipboard::obj_clipboard->getObject()!=NULL)
// insertRule( rn+1, Rule::cast(FWObjectClipboard::obj_clipboard->getObject()) );
}

75
src/gui/RuleSetView.h
View File

@ -24,6 +24,7 @@
*/
#include "fwbuilder/Rule.h"
#include <ui_rulegrouppanel.h>
#include <vector>
#include <QPalette>
@ -106,6 +107,35 @@ private:
RuleSetView *ruleSetView;
};
class RuleRowInfo
{
public:
RuleRowInfo (RuleRowInfo & r)
{
this->operator =(r);
}
RuleRowInfo (QString groupName, bool begin,bool hide)
{
isBeginRow = begin ;
this->groupName=groupName;
index=NULL;
isHide = hide ;
}
QString groupName ;
bool isBeginRow;
bool isHide ;
QModelIndex * index ;
RuleRowInfo & operator = (RuleRowInfo & r)
{
this->isBeginRow = r.isBeginRow;
this->groupName = r.groupName;
this->index = r.index;
this->isHide = r.isHide ;
return *this;
}
};
class RuleTableModel : public QAbstractTableModel
{
friend class RuleSetView;
@ -137,6 +167,20 @@ protected:
RuleSetView *ruleSetView;
};
class RuleGroupPanel : public QFrame, public Ui_RuleGroupPanel
{
Q_OBJECT
public:
int row ;
RuleSetView * rsv ;
RuleGroupPanel (QWidget * parent,RuleSetView * rsv, int row) ;
public slots:
void showHideRuleGroup();
};
class RuleSetView : public QTableView
{
friend class headerMouseEventInterceptor;
@ -146,6 +190,7 @@ class RuleSetView : public QTableView
Q_OBJECT
public slots:
void selectionChanged(const QItemSelection&, const QItemSelection&);
void restoreSelection(bool same_widget);
void currentChanged( const QModelIndex &current );
@ -153,6 +198,13 @@ class RuleSetView : public QTableView
void itemDoubleClicked(const QModelIndex & index);
void contextMenu(int row, int col, const QPoint &pos);
void contextMenuRequested ( const QPoint &p );
void newGroup();
void addToUpGroup ();
void addToBottomGroup();
void removeFromGroup();
void showHideRuleGroup (RuleGroupPanel * rgp);
void editSelected();
void copySelectedObject();
@ -289,7 +341,28 @@ class RuleSetView : public QTableView
* adding and removal (because I need to manually shift elements in a
* loop).
*/
std::map<int,libfwbuilder::FWObject*> ruleIndex;
//std::map<int,libfwbuilder::FWObject*> ruleIndex;
QMap<int,libfwbuilder::FWObject*> ruleIndex;
void addRuleGroupPanel (int row);
void deleteRuleGroupPanel (int row);
void insertRuleIndex (int idx);
void removeRuleIndex (int idx);
void updateGroups ();
void refreshGroups ();
int getUpNullRuleIndex (int idx);
int getDownNullRuleIndex (int idx);
QVector <RuleRowInfo*> rowsInfo ;
RuleRowInfo* getRuleRowInfoByGroupName (QString name);
int getRuleRowInfoIndexByGroupName (QString name);
void createGroup (int row, int count, QString groupName);
void removeFromGroup (int row,int count);
void addToUpGroup (int row);
void addToDownGroup (int row);
int ncols;
//this bool var is needed for starting drag when user moves the mouse

1
src/gui/gui.pro
View File

@ -296,6 +296,7 @@ FORMS = FWBMainWindow_q.ui \
metriceditorpanel_q.ui \
findwhereusedwidget_q.ui \
confirmdeleteobjectdialog_q.ui\
rulegrouppanel.ui\
projectpanel_q.ui\
asklibforcopydialog_q.ui

65
src/gui/rulegrouppanel.ui Executable file
View File

@ -0,0 +1,65 @@
<ui version="4.0" >
<class>RuleGroupPanel</class>
<widget class="QWidget" name="RuleGroupPanel" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>447</width>
<height>61</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<widget class="QPushButton" name="showHideRuleGroupButton" >
<property name="text" >
<string>PushButton</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QLabel" name="ruleGroupName" >
<property name="text" >
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="6" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>