Changeset 84610 in vbox
- Timestamp:
- May 29, 2020 2:10:06 PM (5 years ago)
- svn:sync-xref-src-repo-rev:
- 138344
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/manager
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp
r84217 r84610 35 35 36 36 37 UIVirtualMachineItemCloud::UIVirtualMachineItemCloud( )37 UIVirtualMachineItemCloud::UIVirtualMachineItemCloud(UIFakeCloudVirtualMachineItemState enmState) 38 38 : UIVirtualMachineItem(UIVirtualMachineItemType_CloudFake) 39 39 , m_enmMachineState(KCloudMachineState_Invalid) 40 , m_enmFakeCloudItemState( UIFakeCloudVirtualMachineItemState_Loading)40 , m_enmFakeCloudItemState(enmState) 41 41 , m_pTask(0) 42 42 { -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h
r84196 r84610 44 44 public: 45 45 46 /** Constructs fake cloud VM item . */47 UIVirtualMachineItemCloud( );46 /** Constructs fake cloud VM item of certain @a enmState. */ 47 UIVirtualMachineItemCloud(UIFakeCloudVirtualMachineItemState enmState); 48 48 /** Constructs real cloud VM item on the basis of taken @a comCloudMachine. */ 49 49 UIVirtualMachineItemCloud(const CCloudMachine &comCloudMachine); -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp
r84598 r84610 365 365 /* Create invisible root group node: */ 366 366 m_pInvisibleRootNode = new UIChooserNodeGroup(0 /* parent */, 367 false /* favorite */,368 367 0 /* position */, 368 true /* opened */, 369 369 QString() /* name */, 370 UIChooserNodeGroupType_Local, 371 true /* opened */); 370 UIChooserNodeGroupType_Local); 372 371 if (invisibleRoot()) 373 372 { … … 377 376 /* Create global node: */ 378 377 new UIChooserNodeGlobal(invisibleRoot() /* parent */, 378 0 /* position */, 379 379 shouldGlobalNodeBeFavorite(invisibleRoot()), 380 0 /* position */,381 380 QString() /* tip */); 382 381 … … 446 445 UIChooserNodeGroup *pProviderNode = 447 446 new UIChooserNodeGroup(invisibleRoot() /* parent */, 448 false /* favorite */,449 447 getDesiredNodePosition(invisibleRoot(), 450 448 UIChooserNodeDataPrefixType_Provider, 451 449 strProviderShortName), 452 strProviderShortName,453 UIChooserNodeGroupType_Provider,454 450 shouldGroupNodeBeOpened(invisibleRoot(), 455 451 UIChooserNodeDataPrefixType_Provider, 456 strProviderShortName)); 452 strProviderShortName), 453 strProviderShortName, 454 UIChooserNodeGroupType_Provider); 457 455 458 456 /* Iterate through provider's profiles: */ … … 471 469 UIChooserNodeGroup *pProfileNode = 472 470 new UIChooserNodeGroup(pProviderNode /* parent */, 473 false /* favorite */,474 471 getDesiredNodePosition(pProviderNode, 475 472 UIChooserNodeDataPrefixType_Profile, 476 473 strProfileName), 477 strProfileName,478 UIChooserNodeGroupType_Profile,479 474 shouldGroupNodeBeOpened(pProviderNode, 480 475 UIChooserNodeDataPrefixType_Profile, 481 strProfileName)); 476 strProfileName), 477 strProfileName, 478 UIChooserNodeGroupType_Profile); 482 479 483 480 /* Add fake cloud VM item: */ 484 481 new UIChooserNodeMachine(pProfileNode /* parent */, 485 false /* favorite*/,486 0 /* position */);482 0 /* position */, 483 UIFakeCloudVirtualMachineItemState_Loading); 487 484 488 485 /* Create list cloud machines task: */ … … 770 767 { 771 768 /* Add fake cloud VM item: */ 772 UIChooserNodeMachine *pFakeNode = new UIChooserNodeMachine(pProfileNode /* parent */, 773 false /* favorite */, 774 0 /* position */); 775 AssertPtrReturnVoid(pFakeNode); 776 AssertReturnVoid(pFakeNode->cacheType() == UIVirtualMachineItemType_CloudFake); 777 pFakeNode->cache()->toCloud()->setFakeCloudItemState(UIFakeCloudVirtualMachineItemState_Done); 769 new UIChooserNodeMachine(pProfileNode /* parent */, 770 0 /* position */, 771 UIFakeCloudVirtualMachineItemState_Done); 778 772 } 779 773 } … … 1028 1022 UIChooserNodeGroup *pNewGroupNode = 1029 1023 new UIChooserNodeGroup(pParentNode, 1030 false /* favorite */,1031 1024 getDesiredNodePosition(pParentNode, 1032 1025 UIChooserNodeDataPrefixType_Local, 1033 1026 strSecondSubName), 1034 strSecondSubName,1035 UIChooserNodeGroupType_Local,1036 1027 fAllGroupsOpened || shouldGroupNodeBeOpened(pParentNode, 1037 1028 UIChooserNodeDataPrefixType_Local, 1038 strSecondSubName)); 1029 strSecondSubName), 1030 strSecondSubName, 1031 UIChooserNodeGroupType_Local); 1039 1032 return strSecondSuffix.isEmpty() ? pNewGroupNode : getLocalGroupNode(strFirstSuffix, pNewGroupNode, fAllGroupsOpened); 1040 1033 } … … 1300 1293 { 1301 1294 new UIChooserNodeMachine(pParentNode, 1302 false /* favorite */,1303 1295 getDesiredNodePosition(pParentNode, 1304 1296 UIChooserNodeDataPrefixType_Machine, … … 1310 1302 { 1311 1303 UIChooserNodeMachine *pNode = new UIChooserNodeMachine(pParentNode, 1312 false /* favorite */,1313 1304 getDesiredNodePosition(pParentNode, 1314 1305 UIChooserNodeDataPrefixType_Machine, -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp
r84439 r84610 369 369 case UIChooserNodeType_Group: 370 370 { 371 UIChooserNodeGroup *pNewNode = new UIChooserNodeGroup(pParentNode, pCurrentNode->toGroupNode(), iNewCurrentNodePosition);371 UIChooserNodeGroup *pNewNode = new UIChooserNodeGroup(pParentNode, iNewCurrentNodePosition, pCurrentNode->toGroupNode()); 372 372 pShiftedItem = new UIChooserItemGroup(pParentNode->item(), pNewNode); 373 373 break; … … 375 375 case UIChooserNodeType_Machine: 376 376 { 377 UIChooserNodeMachine *pNewNode = new UIChooserNodeMachine(pParentNode, pCurrentNode->toMachineNode(), iNewCurrentNodePosition);377 UIChooserNodeMachine *pNewNode = new UIChooserNodeMachine(pParentNode, iNewCurrentNodePosition, pCurrentNode->toMachineNode()); 378 378 pShiftedItem = new UIChooserItemMachine(pParentNode->item(), pNewNode); 379 379 break; -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
r84578 r84610 823 823 824 824 /* Copy passed group-item into this group: */ 825 UIChooserNodeGroup *pNewGroupNode = new UIChooserNodeGroup(node(), pNode->toGroupNode(), iPosition);825 UIChooserNodeGroup *pNewGroupNode = new UIChooserNodeGroup(node(), iPosition, pNode->toGroupNode()); 826 826 UIChooserItemGroup *pNewGroupItem = new UIChooserItemGroup(this, pNewGroupNode); 827 827 if (isClosed()) … … 877 877 878 878 /* Copy passed machine-item into this group: */ 879 UIChooserNodeMachine *pNewMachineNode = new UIChooserNodeMachine(node(), pNode->toMachineNode(), iPosition);879 UIChooserNodeMachine *pNewMachineNode = new UIChooserNodeMachine(node(), iPosition, pNode->toMachineNode()); 880 880 UIChooserItemMachine *pNewMachineItem = new UIChooserItemMachine(this, pNewMachineNode); 881 881 if (isClosed()) -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
r84420 r84610 466 466 /* Group passed item with current-item into the new group: */ 467 467 UIChooserNodeGroup *pNewGroupNode = new UIChooserNodeGroup(parentItem()->node(), 468 false /* favorite */,469 468 parentItem()->node()->nodes().size(), 469 true /* opened */, 470 470 UIChooserModel::uniqueGroupName(parentItem()->node()), 471 parentItem()->node()->toGroupNode()->groupType(), 472 true /* true */); 471 parentItem()->node()->toGroupNode()->groupType()); 473 472 UIChooserItemGroup *pNewGroupItem = new UIChooserItemGroup(parentItem(), pNewGroupNode); 474 473 UIChooserNodeMachine *pNewMachineNode1 = new UIChooserNodeMachine(pNewGroupNode, 475 nodeToMachineType(),476 pNewGroupNode->nodes().size());474 pNewGroupNode->nodes().size(), 475 nodeToMachineType()); 477 476 new UIChooserItemMachine(pNewGroupItem, pNewMachineNode1); 478 477 UIChooserNodeMachine *pNewMachineNode2 = new UIChooserNodeMachine(pNewGroupNode, 479 pN ode->toMachineNode(),480 pN ewGroupNode->nodes().size());478 pNewGroupNode->nodes().size(), 479 pNode->toMachineNode()); 481 480 new UIChooserItemMachine(pNewGroupItem, pNewMachineNode2); 482 481 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp
r84591 r84610 652 652 { 653 653 UIChooserNodeGroup *pGroupNode = new UIChooserNodeGroup(pParentNode, 654 p Node->toGroupNode(),655 p ParentNode->nodes().size());654 pParentNode->nodes().size(), 655 pNode->toGroupNode()); 656 656 UIChooserItemGroup *pGroupItem = new UIChooserItemGroup(pParentItem, pGroupNode); 657 657 if (childrenToBeRenamed.contains(pNode)) … … 663 663 { 664 664 UIChooserNodeMachine *pMachineNode = new UIChooserNodeMachine(pParentNode, 665 p Node->toMachineNode(),666 p ParentNode->nodes().size());665 pParentNode->nodes().size(), 666 pNode->toMachineNode()); 667 667 UIChooserItemMachine *pMachineItem = new UIChooserItemMachine(pParentItem, pMachineNode); 668 668 ungroupedItems << pMachineItem; … … 775 775 /* Create new group node in the current root: */ 776 776 pTargetGroupNode = new UIChooserNodeGroup(invisibleRoot(), 777 false /* favorite */,778 777 invisibleRoot()->nodes().size() /* position */, 778 true /* opened */, 779 779 uniqueGroupName(invisibleRoot()), 780 UIChooserNodeGroupType_Local, 781 true /* opened */); 780 UIChooserNodeGroupType_Local); 782 781 pTargetGroupItem = new UIChooserItemGroup(root(), pTargetGroupNode); 783 782 } … … 815 814 /* Copy or move group-item: */ 816 815 UIChooserNodeGroup *pNewGroupSubNode = new UIChooserNodeGroup(pTargetGroupNode, 817 p Item->node()->toGroupNode(),818 p TargetGroupNode->nodes().size());816 pTargetGroupNode->nodes().size(), 817 pItem->node()->toGroupNode()); 819 818 copiedItems << new UIChooserItemGroup(pTargetGroupItem, pNewGroupSubNode); 820 819 delete pItem->node(); … … 830 829 /* Copy or move machine-item: */ 831 830 UIChooserNodeMachine *pNewMachineSubNode = new UIChooserNodeMachine(pTargetGroupNode, 832 p Item->node()->toMachineNode(),833 p TargetGroupNode->nodes().size());831 pTargetGroupNode->nodes().size(), 832 pItem->node()->toMachineNode()); 834 833 copiedItems << new UIChooserItemMachine(pTargetGroupItem, pNewMachineSubNode); 835 834 delete pItem->node(); -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGlobal.cpp
r84412 r84610 25 25 26 26 UIChooserNodeGlobal::UIChooserNodeGlobal(UIChooserNode *pParent, 27 int iPosition, 27 28 bool fFavorite, 28 int iPosition,29 29 const QString &) 30 30 : UIChooserNode(pParent, fFavorite) … … 39 39 40 40 UIChooserNodeGlobal::UIChooserNodeGlobal(UIChooserNode *pParent, 41 UIChooserNodeGlobal *pCopyFrom,42 int iPosition)41 int iPosition, 42 UIChooserNodeGlobal *pCopyFrom) 43 43 : UIChooserNode(pParent, pCopyFrom->isFavorite()) 44 44 { -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGlobal.h
r84373 r84610 34 34 35 35 /** Constructs chooser node passing @a pParent to the base-class. 36 * @param iPosition Brings the initial node position. 36 37 * @param fFavorite Brings whether the node is favorite. 37 * @param iPosition Brings the initial node position.38 38 * @param strTip Brings the dummy tip. */ 39 39 UIChooserNodeGlobal(UIChooserNode *pParent, 40 int iPosition, 40 41 bool fFavorite, 41 int iPosition,42 42 const QString &strTip); 43 43 /** Constructs chooser node passing @a pParent to the base-class. 44 * @param pCopyFrom Brings the node to copy data from.45 * @param iPosition Brings the initial node position. */44 * @param iPosition Brings the initial node position. 45 * @param pCopyFrom Brings the node to copy data from. */ 46 46 UIChooserNodeGlobal(UIChooserNode *pParent, 47 UIChooserNodeGlobal *pCopyFrom,48 int iPosition);47 int iPosition, 48 UIChooserNodeGlobal *pCopyFrom); 49 49 /** Destructs chooser node. */ 50 50 virtual ~UIChooserNodeGlobal() /* override */; -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGroup.cpp
r84412 r84610 27 27 28 28 UIChooserNodeGroup::UIChooserNodeGroup(UIChooserNode *pParent, 29 bool fFavorite,30 29 int iPosition, 30 bool fOpened, 31 31 const QString &strName, 32 UIChooserNodeGroupType enmGroupType ,33 bool fOpened)34 : UIChooserNode(pParent, fFavorite)32 UIChooserNodeGroupType enmGroupType) 33 : UIChooserNode(pParent, false /* favorite */) 34 , m_fOpened(fOpened) 35 35 , m_strName(strName) 36 36 , m_enmGroupType(enmGroupType) 37 , m_fOpened(fOpened)38 37 { 39 38 /* Add to parent: */ … … 46 45 47 46 UIChooserNodeGroup::UIChooserNodeGroup(UIChooserNode *pParent, 48 UIChooserNodeGroup *pCopyFrom,49 int iPosition)50 : UIChooserNode(pParent, pCopyFrom->isFavorite())47 int iPosition, 48 UIChooserNodeGroup *pCopyFrom) 49 : UIChooserNode(pParent, false /* favorite */) 51 50 , m_strName(pCopyFrom->name()) 52 51 , m_enmGroupType(pCopyFrom->groupType()) … … 301 300 { 302 301 foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Group)) 303 new UIChooserNodeGroup(this, pNode->toGroupNode(), m_nodesGroup.size());302 new UIChooserNodeGroup(this, m_nodesGroup.size(), pNode->toGroupNode()); 304 303 foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Global)) 305 new UIChooserNodeGlobal(this, pNode->toGlobalNode(), m_nodesGlobal.size());304 new UIChooserNodeGlobal(this, m_nodesGlobal.size(), pNode->toGlobalNode()); 306 305 foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Machine)) 307 new UIChooserNodeMachine(this, pNode->toMachineNode(), m_nodesMachine.size());308 } 306 new UIChooserNodeMachine(this, m_nodesMachine.size(), pNode->toMachineNode()); 307 } -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGroup.h
r84373 r84610 34 34 35 35 /** Constructs chooser node passing @a pParent to the base-class. 36 * @param fFavorite Brings whether the node is favorite.37 * @param iPosition Brings the initial node position.36 * @param iPosition Brings the initial node position 37 * @param fOpened Brings whether this group node is opened.. 38 38 * @param strName Brings current node name. 39 * @param enmGroupType Brings group node type. 40 * @param fOpened Brings whether this group node is opened. */ 39 * @param enmGroupType Brings group node type. */ 41 40 UIChooserNodeGroup(UIChooserNode *pParent, 42 bool fFavorite,43 41 int iPosition, 42 bool fOpened, 44 43 const QString &strName, 45 UIChooserNodeGroupType enmGroupType, 46 bool fOpened); 44 UIChooserNodeGroupType enmGroupType); 47 45 /** Constructs chooser node passing @a pParent to the base-class. 48 * @param pCopyFrom Brings the node to copy data from.49 * @param iPosition Brings the initial node position. */46 * @param iPosition Brings the initial node position. 47 * @param pCopyFrom Brings the node to copy data from. */ 50 48 UIChooserNodeGroup(UIChooserNode *pParent, 51 UIChooserNodeGroup *pCopyFrom,52 int iPosition);49 int iPosition, 50 UIChooserNodeGroup *pCopyFrom); 53 51 /** Destructs chooser node removing it's children. */ 54 52 virtual ~UIChooserNodeGroup() /* override */; … … 120 118 void copyContents(UIChooserNodeGroup *pCopyFrom); 121 119 120 /** Holds whether node is opened. */ 121 bool m_fOpened; 122 122 /** Holds the node name. */ 123 123 QString m_strName; 124 124 /** Holds the group node type. */ 125 125 UIChooserNodeGroupType m_enmGroupType; 126 /** Holds whether node is opened. */127 bool m_fOpened;128 126 129 127 /** Holds group children. */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.cpp
r84412 r84610 24 24 25 25 UIChooserNodeMachine::UIChooserNodeMachine(UIChooserNode *pParent, 26 bool fFavorite, 27 int iPosition, 26 int iPosition, 28 27 const CMachine &comMachine) 29 : UIChooserNode(pParent, f Favorite)28 : UIChooserNode(pParent, false /* favorite */) 30 29 , m_pCache(new UIVirtualMachineItemLocal(comMachine)) 31 30 { … … 39 38 40 39 UIChooserNodeMachine::UIChooserNodeMachine(UIChooserNode *pParent, 41 bool fFavorite,42 40 int iPosition, 43 41 const CCloudMachine &comCloudMachine) 44 : UIChooserNode(pParent, f Favorite)42 : UIChooserNode(pParent, false /* favorite */) 45 43 , m_pCache(new UIVirtualMachineItemCloud(comCloudMachine)) 46 44 { … … 60 58 61 59 UIChooserNodeMachine::UIChooserNodeMachine(UIChooserNode *pParent, 62 bool fFavorite,63 int iPosition)64 : UIChooserNode(pParent, f Favorite)65 , m_pCache(new UIVirtualMachineItemCloud )66 { 67 /* Add to parent: */ 68 if (parentNode()) 69 parentNode()->addNode(this, iPosition); 70 71 /* Apply language settings: */ 72 retranslateUi(); 73 } 74 75 UIChooserNodeMachine::UIChooserNodeMachine(UIChooserNode *pParent, 76 UIChooserNodeMachine *pCopyFrom,77 int iPosition)60 int iPosition, 61 UIFakeCloudVirtualMachineItemState enmState) 62 : UIChooserNode(pParent, false /* favorite */) 63 , m_pCache(new UIVirtualMachineItemCloud(enmState)) 64 { 65 /* Add to parent: */ 66 if (parentNode()) 67 parentNode()->addNode(this, iPosition); 68 69 /* Apply language settings: */ 70 retranslateUi(); 71 } 72 73 UIChooserNodeMachine::UIChooserNodeMachine(UIChooserNode *pParent, 74 int iPosition, 75 UIChooserNodeMachine *pCopyFrom) 78 76 : UIChooserNode(pParent, pCopyFrom->isFavorite()) 79 77 { … … 85 83 break; 86 84 case UIVirtualMachineItemType_CloudFake: 87 m_pCache = new UIVirtualMachineItemCloud ;85 m_pCache = new UIVirtualMachineItemCloud(pCopyFrom->cache()->toCloud()->fakeCloudItemState()); 88 86 break; 89 87 case UIVirtualMachineItemType_CloudReal: -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.h
r84373 r84610 40 40 41 41 /** Constructs chooser node for local VM passing @a pParent to the base-class. 42 * @param fFavorite Brings whether the node is favorite.43 42 * @param iPosition Brings initial node position. 44 43 * @param comMachine Brings COM machine object. */ 45 44 UIChooserNodeMachine(UIChooserNode *pParent, 46 bool fFavorite,47 45 int iPosition, 48 46 const CMachine &comMachine); 49 47 /** Constructs chooser node for real cloud VM passing @a pParent to the base-class. 50 * @param fFavorite Brings whether the node is favorite.51 48 * @param iPosition Brings initial node position. 52 49 * @param comCloudMachine Brings COM cloud machine object. */ 53 50 UIChooserNodeMachine(UIChooserNode *pParent, 54 bool fFavorite,55 51 int iPosition, 56 52 const CCloudMachine &comCloudMachine); 57 53 /** Constructs chooser node for fake cloud VM passing @a pParent to the base-class. 58 * @param fFavorite Brings whether the node is favorite.59 * @param iPosition Brings the initial node position. */54 * @param iPosition Brings the initial node position. 55 * @param enmState Brings fake item type. */ 60 56 UIChooserNodeMachine(UIChooserNode *pParent, 61 bool fFavorite,62 int iPosition);57 int iPosition, 58 UIFakeCloudVirtualMachineItemState enmState); 63 59 /** Constructs chooser node passing @a pParent to the base-class. 64 * @param pCopyFrom Brings the node to copy data from.65 * @param iPosition Brings the initial node position. */60 * @param iPosition Brings the initial node position. 61 * @param pCopyFrom Brings the node to copy data from. */ 66 62 UIChooserNodeMachine(UIChooserNode *pParent, 67 UIChooserNodeMachine *pCopyFrom,68 int iPosition);63 int iPosition, 64 UIChooserNodeMachine *pCopyFrom); 69 65 /** Destructs chooser node. */ 70 66 virtual ~UIChooserNodeMachine() /* override */;
Note:
See TracChangeset
for help on using the changeset viewer.