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. BUG: 430593
parent
72fdab6a
Please register or sign in to comment