onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-06-24 01:49:36 +02:00
Code Issues Releases Wiki Activity

set detailed folder name

Browse Source 
Signed-off-by: Sirius Bakke <sirius.bakke@uninett.no>
This commit is contained in:
pudelwudel
2015-01-14 09:06:32 +01:00
committed by Sirius Bakke
parent 7642f391af
commit d6e48b3313
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libgui/ObjectManipulator.h
View File

@@ -324,6 +324,8 @@ public:
const std::string &namesuffix);
void autorenameVlans(std::list<libfwbuilder::FWObject*> &obj_list);
std::string getFolderNameString(libfwbuilder::FWObject *obj);
void reload();
void loadObjects();
@@ -493,6 +495,8 @@ public:
void addSubfolderActions(QList<QAction*> &AddObjectActions, libfwbuilder::FWObject *currentObj, ObjectTreeViewItem *item, bool &addSubfolder);
signals:
void libraryAccessChanged(bool writable);
};
#endif

20
src/libgui/ObjectManipulator_tree_ops.cpp
View File

@@ -809,11 +809,14 @@ void ObjectManipulator::addUserFolderToTree(FWObject *obj,
ObjectTreeViewItem *sub = new ObjectTreeViewItem(item);
FWObject* newFolder = obj->getRoot()->create("ObjectGroup");
FWObject* newFolder = obj->getRoot()->create(ObjectGroup::TYPENAME);
newFolder->setParent(obj);
newFolder->setName(folder.toUtf8().constData()
);
sub->setFWObject(newFolder);
allItems[newFolder] = sub;
obj->setStr("folder", folder.toUtf8().constData());
newFolder->setStr("folder", getFolderNameString(newFolder));
sub->setUserFolderParent(obj);
sub->setUserFolderName(folder);
@@ -823,6 +826,21 @@ void ObjectManipulator::addUserFolderToTree(FWObject *obj,
}
std::string ObjectManipulator::getFolderNameString(libfwbuilder::FWObject *obj) {
std::string result = "";
FWObject *parent = obj->getParent();
while(parent != NULL) {
result = parent->getName() + "/" + result;
parent = parent->getParent();
}
result = result + obj->getName();
return result;
}
void ObjectManipulator::removeUserFolderFromTree(FWObject *obj,
const QString &folder)
{