SUMMARY It shall be possible to nest folders in packages STEPS TO REPRODUCE 1. Start Umbrello. 2. In the listview right click on Logical View and select New -> Package... 3. In Logical View right click on the new_package and select New. OBSERVED RESULT The items offered for creation inside Package do not include Folder. EXPECTED RESULT The items offered for creation inside Package shall include Folder. SOFTWARE/OS VERSIONS Umbrello: git master @ ea603204 Linux: openSuSE Tumbleweed 20201129 KDE Plasma Version: 5.20.3 KDE Frameworks Version: 5.76.0 Qt Version: 5.15.2
Git commit afe54199882d78ced2a04d520122a573b72151e9 by Oliver Kellogg. Committed on 19/12/2020 at 19:40. Pushed by okellogg into branch 'master'. Address 'It shall be possible to nest folders in packages' : umbrello/model_utils.cpp - In function typeIsAllowedInType case childType lvt_Logical_Folder, return true if parentType is lvt_Package. umbrello/menus/listpopupmenu.{h,cpp} - At functions - insertContainerItems(bool folderAndDiagrams, bool packages) - insertContainerItems(KMenu*, bool folderAndDiagrams, bool packages) split the single argument folderAndDiagrams into two separate arguments, `bool folders' and `bool diagrams'. umbrello/menus/listpopupmenu.cpp - In function insert(const MenuType, KMenu*) improve readability by - defining macro functions which factor the repeated code; - aligning the switch cases in quasi tabular form. umbrello/menus/umllistviewpopupmenu.cpp - In constructor with arguments QWidget*, UMLListViewItem*, in body of switch(type), - adjust code to changed signature of ListPopupMenu function insertContainerItems; - in case UMLListViewItem::lvt_Package call insertContainerItems with argument `folders' set to true. umbrello/umllistview.cpp - In function moveObject body of switch (srcType) handling of diagram types and lvt_Logical_Folder, admit case newParentType lvt_Package to execution of the move. M +147 -143 umbrello/menus/listpopupmenu.cpp M +2 -2 umbrello/menus/listpopupmenu.h M +5 -5 umbrello/menus/umllistviewpopupmenu.cpp M +3 -2 umbrello/model_utils.cpp M +2 -1 umbrello/umllistview.cpp https://invent.kde.org/sdk/umbrello/commit/afe54199882d78ced2a04d520122a573b72151e9