onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-02 23:27:30 +02:00
Code Issues Releases Wiki Activity

Revert "set detailed folder name"

Browse Source 
This reverts commit d6e48b3313dc1bef95f6545b83d38d249f57232e.
This commit is contained in:
Sirius Bakke 2019-06-10 19:40:03 +02:00
parent 03ed123626
commit 780ef56f3f
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libgui/ObjectManipulator.h
View File

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

22
src/libgui/ObjectManipulator_tree_ops.cpp
View File

@ -553,7 +553,7 @@ void ObjectManipulator::clearObjects()
libs_model->removeRows(0, libs_model->rowCount()); libs_model->removeRows(0, libs_model->rowCount());
libs_model->addStaticItems(); libs_model->addStaticItems();
current_tree_view = nullptr; current_tree_view = nullptr;
if (fwbdebug) qDebug("ObjectManipulator::clearObjects done"); if (fwbdebug) qDebug("ObjectManipulator::clearObjects done");
@ -814,12 +814,9 @@ void ObjectManipulator::addUserFolderToTree(FWObject *obj,
FWObject* newFolder = obj->getRoot()->create(ObjectGroup::TYPENAME); FWObject* newFolder = obj->getRoot()->create(ObjectGroup::TYPENAME);
newFolder->setParent(obj); newFolder->setParent(obj);
newFolder->setName(folder.toUtf8().constData()
);
sub->setFWObject(newFolder); sub->setFWObject(newFolder);
allItems[newFolder] = sub; allItems[newFolder] = sub;
obj->setStr("folder", folder.toUtf8().constData()); obj->setStr("folder", folder.toUtf8().constData());
newFolder->setStr("folder", getFolderNameString(newFolder));
sub->setUserFolderParent(obj); sub->setUserFolderParent(obj);
sub->setUserFolderName(folder); sub->setUserFolderName(folder);
@ -829,21 +826,6 @@ void ObjectManipulator::addUserFolderToTree(FWObject *obj,
} }
std::string ObjectManipulator::getFolderNameString(libfwbuilder::FWObject *obj) {
std::string result = "";
FWObject *parent = obj->getParent();
while(parent != nullptr) {
result = parent->getName() + "/" + result;
parent = parent->getParent();
}
result = result + obj->getName();
return result;
}
void ObjectManipulator::removeUserFolderFromTree(FWObject *obj, void ObjectManipulator::removeUserFolderFromTree(FWObject *obj,
const QString &folder) const QString &folder)
{ {
@ -892,4 +874,4 @@ void ObjectManipulator::moveToFromUserFolderInTree(FWObject *obj,
refreshSubtree(newItem, nullptr); refreshSubtree(newItem, nullptr);
} }