onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 19:27:13 +01:00
Code Issues Releases Wiki Activity

fixes #851

Browse Source
This commit is contained in:
Vadim Kurland 2009-12-12 05:21:58 +00:00
parent 48066e32e1
commit 908c3d38c1
2 changed files with 36 additions and 28 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 2100
#define BUILD_NUM 2101

62
src/gui/GroupObjectDialog.cpp
View File

@ -319,10 +319,11 @@ void GroupObjectDialog::getHelpName(QString *str)
void GroupObjectDialog::loadFWObject(FWObject *o)
{
obj=o;
obj = o;
Group *g = Group::cast(obj);
assert(g!=NULL);
// if (ServiceGroup::cast(obj)!=NULL)
// {
// m_dialog->icon->setPixmap(QIcon(":/Icons/ServiceGroup/icon").pixmap(
@ -381,8 +382,40 @@ void GroupObjectDialog::loadFWObject(FWObject *o)
// iconView->setEnabled(!o->isReadOnly());
setDisabledPalette(iconView);
init=false;
if (FWBTree().isSystem(g))
{
m_dialog->newButton->hide();
return;
}
if (new_object_menu)
{
new_object_menu->clear();
m_dialog->newButton->setMenu(NULL);
delete new_object_menu;
}
new_object_menu = new QMenu(this);
int add_to_group_id = g->getId();
list<string> types_list;
g->getAllowedTypesOfChildren(types_list);
foreach(string tn, types_list)
{
if (tn == FWObjectReference::TYPENAME ||
tn == FWServiceReference::TYPENAME ||
tn == FWIntervalReference::TYPENAME) continue;
if (fwbdebug)
qDebug() << "Adding type" << tn.c_str() << "to the new object menu";
m_project->m_panel->om->addNewObjectMenuItem(
new_object_menu, tn.c_str(), "", add_to_group_id);
}
m_dialog->newButton->setMenu( new_object_menu );
m_dialog->newButton->show();
}
void GroupObjectDialog::validate(bool *res)
@ -700,31 +733,6 @@ void GroupObjectDialog::selectObject(FWObject *o)
void GroupObjectDialog::newObject()
{
if (new_object_menu)
{
new_object_menu->clear();
m_dialog->newButton->setMenu(NULL);
delete new_object_menu;
}
new_object_menu = new QMenu(this);
Group *grp = Group::cast(obj);
list<string> types_list;
grp->getAllowedTypesOfChildren(types_list);
foreach(string tn, types_list)
{
if (tn == FWObjectReference::TYPENAME ||
tn == FWServiceReference::TYPENAME ||
tn == FWIntervalReference::TYPENAME) continue;
if (fwbdebug)
qDebug() << "Adding type" << tn.c_str() << "to the new object menu";
m_project->m_panel->om->addNewObjectMenuItem(new_object_menu, tn.c_str(),
"", grp->getId());
}
m_dialog->newButton->setMenu( new_object_menu );
m_dialog->newButton->showMenu();
}