onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 11:47:24 +01:00
Code Issues Releases Wiki Activity

fixes #804

Browse Source
This commit is contained in:
Vadim Kurland 2009-12-07 21:35:14 +00:00
parent 5001ba1d92
commit 87b2655ecf
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2045
#define BUILD_NUM 2046

30
src/gui/ObjectManipulator.cpp
View File

@ -339,8 +339,11 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos)
popup_menu->clear();
QAction *edtID = popup_menu->addAction(
tr("Edit"), this, SLOT( editSelectedObject()));
QAction *edtID =
popup_menu->addAction(tr("Edit"), this, SLOT( editSelectedObject()));
if (RuleSet::cast(currentObj))
popup_menu->addAction(tr("Open"), this, SLOT( openSelectedRuleSet()));
QMenu *duptargets = NULL;
QAction *dupID = NULL;
@ -955,11 +958,25 @@ void ObjectManipulator::editSelectedObject()
FWObject *obj = getCurrentObjectTree()->getSelectedObjects().front();
if (obj==NULL) return;
// obj->dump(false,false);
if (RuleSet::cast(obj)!=NULL && m_project->getCurrentRuleSet()!=obj)
m_project->openRuleSet(obj);
editObject(obj);
if (RuleSet::cast(obj)!=NULL && m_project->getCurrentRuleSet()!=obj)
QCoreApplication::postEvent(
m_project, new openRulesetEvent(m_project->getFileName(), obj->getId()));
QCoreApplication::postEvent(
mw, new openObjectInEditorEvent(m_project->getFileName(), obj->getId()));
}
void ObjectManipulator::openSelectedRuleSet()
{
if (getCurrentObjectTree()->getNumSelected()==0) return;
FWObject *obj = getCurrentObjectTree()->getSelectedObjects().front();
if (obj==NULL) return;
if (RuleSet::cast(obj)!=NULL && m_project->getCurrentRuleSet()!=obj)
QCoreApplication::postEvent(
m_project, new openRulesetEvent(m_project->getFileName(), obj->getId()));
}
bool ObjectManipulator::editObject(FWObject *obj)
@ -1001,7 +1018,6 @@ bool ObjectManipulator::switchObjectInEditor(FWObject *obj)
mw->openEditor(obj); // opens object in the editor
//currentObj = obj;
active = true;
//openObject(obj); // position the tree so that obj is visible
if (fwbdebug) qDebug("ObjectManipulator::switchObjectInEditor done");

3
src/gui/ObjectManipulator.h
View File

@ -172,7 +172,8 @@ public slots:
void closeObject();
void editSelectedObject();
void openSelectedRuleSet();
void contextMenuRequested(const QPoint &pos);
/*