VirtualBox

Ignore:
Timestamp:
Mar 22, 2019 1:22:06 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
129530
Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Restore lost sort item functionality.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h

    r77829 r77847  
    166166        /** Searches for a first machine child item. */
    167167        virtual UIChooserItem *firstMachineItem() = 0;
    168 
    169         /** Sorts children items. */
    170         virtual void sortItems() = 0;
    171168    /** @} */
    172169

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

    r77805 r77847  
    218218{
    219219    return 0;
    220 }
    221 
    222 void UIChooserItemGlobal::sortItems()
    223 {
    224     AssertMsgFailed(("Global graphics item do NOT support children!"));
    225220}
    226221

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.h

    r77805 r77847  
    112112        /** Searches for a first machine child item. */
    113113        virtual UIChooserItem *firstMachineItem() /* override */;
    114 
    115         /** Sorts children items. */
    116         virtual void sortItems() /* override */;
    117114    /** @} */
    118115

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

    r77829 r77847  
    539539}
    540540
    541 void UIChooserItemGroup::sortItems()
    542 {
    543     /// @todo implement manual sorting
    544 
    545 #if 0
    546     /* Sort group-items: */
    547     QMap<QString, UIChooserItem*> sorter;
    548     foreach (UIChooserItem *pItem, items(UIChooserItemType_Group))
    549         sorter.insert(pItem->name().toLower(), pItem);
    550     setItems(sorter.values(), UIChooserItemType_Group);
    551 
    552     /* Sort machine-items: */
    553     sorter.clear();
    554     foreach (UIChooserItem *pItem, items(UIChooserItemType_Machine))
    555         sorter.insert(pItem->name().toLower(), pItem);
    556     setItems(sorter.values(), UIChooserItemType_Machine);
    557 #endif
    558 
    559     /* Update model: */
    560     model()->updateNavigation();
    561     model()->updateLayout();
    562 }
    563 
    564541void UIChooserItemGroup::updateGeometry()
    565542{

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

    r77829 r77847  
    150150        /** Searches for a first machine child item. */
    151151        virtual UIChooserItem *firstMachineItem() /* override */;
    152 
    153         /** Sorts children items. */
    154         virtual void sortItems() /* override */;
    155152    /** @} */
    156153

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

    r77827 r77847  
    268268}
    269269
    270 void UIChooserItemMachine::sortItems()
    271 {
    272     AssertMsgFailed(("Machine graphics item do NOT support children!"));
    273 }
    274 
    275270void UIChooserItemMachine::updateLayout()
    276271{

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

    r77827 r77847  
    120120        /** Searches for a first machine child item. */
    121121        virtual UIChooserItem *firstMachineItem() /* override */;
    122 
    123         /** Sorts children items. */
    124         virtual void sortItems() /* override */;
    125122    /** @} */
    126123

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

    r77845 r77847  
    822822        return;
    823823
    824     /* Sorting group: */
    825     currentItem()->sortItems();
     824    /* Sort group-node: */
     825    sortNodes(currentItem()->node());
    826826}
    827827
    … …  
    10771077        return;
    10781078
    1079     /* Sorting parent group: */
    1080     currentItem()->parentItem()->sortItems();
     1079    /* Sort parent group-node: */
     1080    sortNodes(currentItem()->parentItem()->node());
    10811081}
    10821082
    … …  
    20902090}
    20912091
     2092void UIChooserModel::sortNodes(UIChooserNode *pNode)
     2093{
     2094    /* Sort nodes: */
     2095    pNode->sortNodes();
     2096
     2097    /* Rebuild tree for main root: */
     2098    buildTreeForMainRoot();
     2099    updateNavigation();
     2100    updateLayout();
     2101}
     2102
    20922103void UIChooserModel::saveGroupDefinitions()
    20932104{

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

    r77752 r77847  
    423423        /** Processes drag leave @a pEvent. */
    424424        bool processDragLeaveEvent(QGraphicsSceneDragDropEvent *pEvent);
     425
     426        /** Performs sorting for @a pNode. */
     427        void sortNodes(UIChooserNode *pNode);
    425428    /** @} */
    426429

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNode.h

    r77701 r77847  
    111111    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) = 0;
    112112
     113    /** Performs sorting of children nodes. */
     114    virtual void sortNodes() = 0;
     115
    113116    /** Returns if node is disabled. */
    114117    bool isDisabled() const;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGlobal.cpp

    r77701 r77847  
    138138}
    139139
     140void UIChooserNodeGlobal::sortNodes()
     141{
     142    AssertFailedReturnVoid();
     143}
     144
    140145void UIChooserNodeGlobal::retranslateUi()
    141146{

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGlobal.h

    r77683 r77847  
    8383    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) /* override */;
    8484
     85    /** Performs sorting of children nodes. */
     86    virtual void sortNodes() /* override */;
     87
    8588protected:
    8689

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGroup.cpp

    r77846 r77847  
    220220}
    221221
     222void UIChooserNodeGroup::sortNodes()
     223{
     224    QMap<QString, UIChooserNode*> mapGroup;
     225    foreach (UIChooserNode *pNode, m_nodesGroup)
     226        mapGroup[pNode->name()] = pNode;
     227    m_nodesGroup = mapGroup.values();
     228
     229    QMap<QString, UIChooserNode*> mapGlobal;
     230    foreach (UIChooserNode *pNode, m_nodesGlobal)
     231        mapGlobal[pNode->name()] = pNode;
     232    m_nodesGlobal = mapGlobal.values();
     233
     234    QMap<QString, UIChooserNode*> mapMachine;
     235    foreach (UIChooserNode *pNode, m_nodesMachine)
     236        mapMachine[pNode->name()] = pNode;
     237    m_nodesMachine = mapMachine.values();
     238}
     239
    222240void UIChooserNodeGroup::retranslateUi()
    223241{

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGroup.h

    r77846 r77847  
    9898    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) /* override */;
    9999
     100    /** Performs sorting of children nodes. */
     101    virtual void sortNodes() /* override */;
     102
    100103protected:
    101104

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.cpp

    r77846 r77847  
    153153}
    154154
     155void UIChooserNodeMachine::sortNodes()
     156{
     157    AssertFailedReturnVoid();
     158}
     159
    155160void UIChooserNodeMachine::retranslateUi()
    156161{

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.h

    r77686 r77847  
    8484    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) /* override */;
    8585
     86    /** Performs sorting of children nodes. */
     87    virtual void sortNodes() /* override */;
     88
    8689protected:
    8790
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette