VirtualBox

Changeset 108147 in vbox for trunk/src


Ignore:
Timestamp:
Feb 10, 2025 5:54:21 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167452
Message:

FE/Qt: bugref:10814: VBox Manager / Chooser pane: Cleanup favourite item meaning; It was used with Global node/item type only which is obsolete now.

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

Legend:

Unmodified
Added
Removed

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

    r108138 r108147  
    587587    switch (enmType)
    588588    {
    589         /* Global nodes: */
    590         case UIChooserNodeDataOptionType_GlobalFavorite: return "f";
    591589        /* Group nodes: */
    592         case UIChooserNodeDataOptionType_GroupOpened:    return "o";
     590        case UIChooserNodeDataOptionType_GroupOpened: return "o";
    593591    }
    594592    return QString();
    … …  
    14711469            const QString strDescriptor = mt.captured(1);
    14721470            if (strDescriptor.contains(strNodeOptionOpened))
    1473                 return true;
    1474         }
    1475     }
    1476 
    1477     /* Return 'false' by default: */
    1478     return false;
    1479 }
    1480 
    1481 bool UIChooserAbstractModel::shouldGlobalNodeBeFavorite(UIChooserNode *pParentNode) const
    1482 {
    1483     /* Read group definitions: */
    1484     const QStringList definitions = gEDataManager->machineGroupDefinitions(pParentNode->fullName());
    1485     /* Return 'false' if no definitions found: */
    1486     if (definitions.isEmpty())
    1487         return false;
    1488 
    1489     /* Prepare required group definition reg-exp: */
    1490     const QString strNodePrefix = prefixToString(UIChooserNodeDataPrefixType_Global);
    1491     const QString strNodeOptionFavorite = optionToString(UIChooserNodeDataOptionType_GlobalFavorite);
    1492     const QString strNodeValueDefault = valueToString(UIChooserNodeDataValueType_GlobalDefault);
    1493     const QString strDefinitionTemplate = QString("%1(\\S)*=%2").arg(strNodePrefix, strNodeValueDefault);
    1494     const QRegularExpression re(strDefinitionTemplate);
    1495     /* For each the group definition: */
    1496     foreach (const QString &strDefinition, definitions)
    1497     {
    1498         /* Check if this is required definition: */
    1499         const QRegularExpressionMatch mt = re.match(strDefinition);
    1500         if (mt.capturedStart() == 0)
    1501         {
    1502             /* Get group descriptor: */
    1503             const QString strDescriptor = mt.captured(1);
    1504             if (strDescriptor.contains(strNodeOptionFavorite))
    15051471                return true;
    15061472        }

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

    r106061 r108147  
    313313                                     UIChooserNodeDataPrefixType enmDataType,
    314314                                     const QString &strName) const;
    315         /** Returns whether global node should be favorite,
    316           * searching starting from the passed @a pParentNode. */
    317         bool shouldGlobalNodeBeFavorite(UIChooserNode *pParentNode) const;
    318315
    319316        /** Wipes out empty groups starting from @a pParentItem. */

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

    r106061 r108147  
    7373enum UIChooserNodeDataOptionType
    7474{
    75     UIChooserNodeDataOptionType_GlobalFavorite,
    7675    UIChooserNodeDataOptionType_GroupOpened
    7776};

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

    r106061 r108147  
    9090                            pClickedItem = pGlobalItem;
    9191                    }
    92                     else
    93                     if (   pGlobalItem->isPinButtonArea(itemCursorPos)
    94                         && (   model()->firstSelectedItem() == pGlobalItem
    95                             || pGlobalItem->isHovered()))
    96                         model()->handlePinButtonClick(pGlobalItem);
    9792                    else
    9893                        pClickedItem = pGlobalItem;

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

    r106061 r108147  
    397397}
    398398
    399 bool UIChooserItem::isFavorite() const
    400 {
    401     return node()->isFavorite();
    402 }
    403 
    404 void UIChooserItem::setFavorite(bool fFavorite)
    405 {
    406     node()->setFavorite(fFavorite);
    407     if (m_pParent)
    408         m_pParent->toGroupItem()->updateFavorites();
    409 }
    410 
    411399int UIChooserItem::position() const
    412400{

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

    r106061 r108147  
    136136        QString definition() const;
    137137
    138         /** Returns whether item is favorite. */
    139         bool isFavorite() const;
    140         /** Defines whether item is @a fFavorite. */
    141         virtual void setFavorite(bool fFavorite);
    142 
    143138        /** Returns item position. */
    144139        int position() const;
    … …  
    174169        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const = 0;
    175170
    176         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */
    177         virtual void addItem(UIChooserItem *pItem, bool fFavorite, int iPosition) = 0;
     171        /** Adds a child @a pItem to certain @a iPosition. */
     172        virtual void addItem(UIChooserItem *pItem, int iPosition) = 0;
    178173        /** Removes child @a pItem. */
    179174        virtual void removeItem(UIChooserItem *pItem) = 0;

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

    r106061 r108147  
    8888}
    8989
    90 bool UIChooserItemGlobal::isPinButtonArea(const QPoint &position, int iMarginMultiplier /* = 1 */) const
    91 {
    92     const int iFullWidth = geometry().width();
    93     const int iFullHeight = geometry().height();
    94     const int iMarginHR = data(GlobalItemData_MarginHR).toInt();
    95     const int iSpacing = data(GlobalItemData_Spacing).toInt();
    96     const int iButtonMargin = data(GlobalItemData_ButtonMargin).toInt();
    97     const int iPinPixmapX = iFullWidth - iMarginHR - 1
    98                           - m_toolPixmap.width() / m_toolPixmap.devicePixelRatio()
    99                           - iSpacing
    100                           - m_pinPixmap.width() / m_pinPixmap.devicePixelRatio();
    101     const int iPinPixmapY = (iFullHeight - m_pinPixmap.height() / m_pinPixmap.devicePixelRatio()) / 2;
    102     QRect rect = QRect(iPinPixmapX,
    103                        iPinPixmapY,
    104                        m_pinPixmap.width() / m_pinPixmap.devicePixelRatio(),
    105                        m_pinPixmap.height() / m_pinPixmap.devicePixelRatio());
    106     rect.adjust(-iMarginMultiplier * iButtonMargin, -iMarginMultiplier * iButtonMargin,
    107                  iMarginMultiplier * iButtonMargin,  iMarginMultiplier * iButtonMargin);
    108     return rect.contains(position);
    109 }
    110 
    11190int UIChooserItemGlobal::heightHint() const
    11291{
    … …  
    174153}
    175154
    176 void UIChooserItemGlobal::setFavorite(bool fFavorite)
    177 {
    178     /* Call to base-class: */
    179     UIChooserItem::setFavorite(fFavorite);
    180 
    181     /* Update pin-pixmap: */
    182     updatePinPixmap();
    183 }
    184 
    185155void UIChooserItemGlobal::startEditing()
    186156{
    … …  
    212182}
    213183
    214 void UIChooserItemGlobal::addItem(UIChooserItem *, bool, int)
     184void UIChooserItemGlobal::addItem(UIChooserItem *, int)
    215185{
    216186    AssertMsgFailed(("Global graphics item do NOT support children!"));
    … …  
    259229                       m_iMinimumNameWidth +
    260230                       iSpacing +
    261                        m_toolPixmapSize.width() +
    262                        iSpacing +
    263                        m_pinPixmapSize.width());
     231                       m_toolPixmapSize.width());
    264232
    265233    /* Return result: */
    … …  
    278246    int iContentHeight = qMax(m_pixmapSize.height(), m_visibleNameSize.height());
    279247    iContentHeight = qMax(iContentHeight, m_toolPixmapSize.height());
    280     iContentHeight = qMax(iContentHeight, m_pinPixmapSize.height());
    281248
    282249    /* If we have height hint: */
    … …  
    371338    /* Add item to the parent: */
    372339    AssertPtrReturnVoid(parentItem());
    373     parentItem()->addItem(this, isFavorite(), position());
     340    parentItem()->addItem(this, position());
    374341
    375342    /* Configure connections: */
    … …  
    436403    /* Update tool-pixmap: */
    437404    updateToolPixmap();
    438     /* Update pin-pixmap: */
    439     updatePinPixmap();
    440405}
    441406
    … …  
    484449    {
    485450        m_toolPixmap = toolPixmap;
    486         update();
    487     }
    488 }
    489 
    490 void UIChooserItemGlobal::updatePinPixmap()
    491 {
    492     /* Determine icon metric: */
    493     const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize) * .75;
    494     /* Create new tool-pixmap and tool-pixmap size: */
    495     const QIcon pinIcon = UIIconPool::iconSet(isFavorite() ? ":/favorite_pressed_24px.png" : ":/favorite_24px.png");
    496     AssertReturnVoid(!pinIcon.isNull());
    497     const QSize pinPixmapSize = QSize(iIconMetric, iIconMetric);
    498     const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    499     const QPixmap pinPixmap = pinIcon.pixmap(pinPixmapSize, fDevicePixelRatio);
    500     /* Update linked values: */
    501     if (m_pinPixmapSize != pinPixmapSize)
    502     {
    503         m_pinPixmapSize = pinPixmapSize;
    504         updateGeometry();
    505     }
    506     if (m_pinPixmap.toImage() != pinPixmap.toImage())
    507     {
    508         m_pinPixmap = pinPixmap;
    509451        update();
    510452    }
    … …  
    813755                    m_toolPixmap);
    814756    }
    815 
    816     /* Calculate indents: */
    817     iRightColumnIndent = iRightColumnIndent - m_toolPixmap.width() / m_toolPixmap.devicePixelRatio() - iSpacing;
    818 
    819     /* Paint right column: */
    820     if (   model()->firstSelectedItem() == this
    821         || isHovered())
    822     {
    823         /* Prepare variables: */
    824         const int iPinPixmapX = iRightColumnIndent;
    825         const int iPinPixmapY = (iFullHeight - m_pinPixmap.height() / m_pinPixmap.devicePixelRatio()) / 2;
    826         QRect pinButtonRectangle = QRect(iPinPixmapX,
    827                                          iPinPixmapY,
    828                                          m_pinPixmap.width() / m_pinPixmap.devicePixelRatio(),
    829                                          m_pinPixmap.height() / m_pinPixmap.devicePixelRatio());
    830         pinButtonRectangle.adjust(- iButtonMargin, -iButtonMargin, iButtonMargin, iButtonMargin);
    831 
    832         /* Paint pin button: */
    833         if (   isHovered()
    834             && isPinButtonArea(itemCursorPosition, 4))
    835             paintFlatButton(/* Painter: */
    836                             pPainter,
    837                             /* Button rectangle: */
    838                             pinButtonRectangle,
    839                             /* Cursor position: */
    840                             itemCursorPosition);
    841 
    842         /* Paint pixmap: */
    843         paintPixmap(/* Painter: */
    844                     pPainter,
    845                     /* Point to paint in: */
    846                     QPoint(iPinPixmapX, iPinPixmapY),
    847                     /* Pixmap to paint: */
    848                     m_pinPixmap);
    849     }
    850 }
     757}

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

    r106061 r108147  
    6161        /** Returns whether passed @a position belongs to tool button area. */
    6262        bool isToolButtonArea(const QPoint &position, int iMarginMultiplier = 1) const;
    63         /** Returns whether passed @a position belongs to pin button area. */
    64         bool isPinButtonArea(const QPoint &position, int iMarginMultiplier = 1) const;
    6563    /** @} */
    6664
    … …  
    9593        virtual int type() const RT_OVERRIDE { return Type; }
    9694
    97         /** Defines whether item is @a fFavorite. */
    98         virtual void setFavorite(bool fFavorite) RT_OVERRIDE;
    99 
    10095        /** Starts item editing. */
    10196        virtual void startEditing() RT_OVERRIDE;
    … …  
    112107        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const RT_OVERRIDE;
    113108
    114         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */
    115         virtual void addItem(UIChooserItem *pItem, bool fFavorite, int iPosition) RT_OVERRIDE;
     109        /** Adds a child @a pItem to certain @a iPosition. */
     110        virtual void addItem(UIChooserItem *pItem, int iPosition) RT_OVERRIDE;
    116111        /** Removes child @a pItem. */
    117112        virtual void removeItem(UIChooserItem *pItem) RT_OVERRIDE;
    … …  
    210205        /** Updates tool pixmap. */
    211206        void updateToolPixmap();
    212         /** Updates pin pixmap. */
    213         void updatePinPixmap();
    214207        /** Updates minimum name width. */
    215208        void updateMinimumNameWidth();
    … …  
    249242        /** Holds item tool pixmap. */
    250243        QPixmap  m_toolPixmap;
    251         /** Holds item pin pixmap. */
    252         QPixmap  m_pinPixmap;
    253244
    254245        /** Holds item visible name. */
    … …  
    265256        /** Holds tool pixmap size. */
    266257        QSize  m_toolPixmapSize;
    267         /** Holds pin pixmap size. */
    268         QSize  m_pinPixmapSize;
    269258        /** Holds visible name size. */
    270259        QSize  m_visibleNameSize;

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

    r106061 r108147  
    7070    , m_pToggleButton(0)
    7171    , m_pNameEditorWidget(0)
    72     , m_pContainerFavorite(0)
    73     , m_pLayoutFavorite(0)
    7472    , m_pScrollArea(0)
    7573    , m_pContainer(0)
    … …  
    9492    , m_pToggleButton(0)
    9593    , m_pNameEditorWidget(0)
    96     , m_pContainerFavorite(0)
    97     , m_pLayoutFavorite(0)
    9894    , m_pScrollArea(0)
    9995    , m_pContainer(0)
    … …  
    147143    AssertMsg(!isRoot(), ("Can't open root-item!"));
    148144    m_pToggleButton->setToggled(true, fAnimated);
    149 }
    150 
    151 void UIChooserItemGroup::updateFavorites()
    152 {
    153     /* Global items only for now, move items to corresponding layout: */
    154     foreach (UIChooserItem *pItem, items(UIChooserNodeType_Global))
    155         if (pItem->isFavorite())
    156         {
    157             for (int iIndex = 0; iIndex < m_pLayoutGlobal->count(); ++iIndex)
    158                 if (m_pLayoutGlobal->itemAt(iIndex) == pItem)
    159                     m_pLayoutFavorite->addItem(pItem);
    160         }
    161         else
    162         {
    163             for (int iIndex = 0; iIndex < m_pLayoutFavorite->count(); ++iIndex)
    164                 if (m_pLayoutFavorite->itemAt(iIndex) == pItem)
    165                     m_pLayoutGlobal->addItem(pItem);
    166         }
    167 
    168     /* Update/activate children layout: */
    169     m_pLayout->updateGeometry();
    170     m_pLayout->activate();
    171 
    172     /* Relayout model: */
    173     model()->updateLayout();
    174145}
    175146
    … …  
    412383}
    413384
    414 void UIChooserItemGroup::addItem(UIChooserItem *pItem, bool fFavorite, int iPosition)
     385void UIChooserItemGroup::addItem(UIChooserItem *pItem, int iPosition)
    415386{
    416387    /* Check item type: */
    … …  
    422393            if (iPosition < 0 || iPosition >= m_globalItems.size())
    423394            {
    424                 if (fFavorite)
    425                     m_pLayoutFavorite->addItem(pItem);
    426                 else
    427                     m_pLayoutGlobal->addItem(pItem);
     395                m_pLayoutGlobal->addItem(pItem);
    428396                m_globalItems.append(pItem);
    429397            }
    430398            else
    431399            {
    432                 if (fFavorite)
    433                     m_pLayoutFavorite->insertItem(iPosition, pItem);
    434                 else
    435                     m_pLayoutGlobal->insertItem(iPosition, pItem);
     400                m_pLayoutGlobal->insertItem(iPosition, pItem);
    436401                m_globalItems.insert(iPosition, pItem);
    437402            }
    … …  
    491456            AssertMsg(m_globalItems.contains(pItem), ("Global-item was not found!"));
    492457            m_globalItems.removeAt(m_globalItems.indexOf(pItem));
    493             if (pItem->isFavorite())
    494                 m_pLayoutFavorite->removeItem(pItem);
    495             else
    496                 m_pLayoutGlobal->removeItem(pItem);
     458            m_pLayoutGlobal->removeItem(pItem);
    497459            break;
    498460        }
    … …  
    501463            AssertMsg(m_groupItems.contains(pItem), ("Group-item was not found!"));
    502464            m_groupItems.removeAt(m_groupItems.indexOf(pItem));
    503             if (pItem->isFavorite())
    504                 m_pLayoutFavorite->removeItem(pItem);
    505             else
    506                 m_pLayoutGroup->removeItem(pItem);
     465            m_pLayoutGroup->removeItem(pItem);
    507466            break;
    508467        }
    … …  
    511470            AssertMsg(m_machineItems.contains(pItem), ("Machine-item was not found!"));
    512471            m_machineItems.removeAt(m_machineItems.indexOf(pItem));
    513             if (pItem->isFavorite())
    514                 m_pLayoutFavorite->removeItem(pItem);
    515             else
    516                 m_pLayoutMachine->removeItem(pItem);
     472            m_pLayoutMachine->removeItem(pItem);
    517473            break;
    518474        }
    … …  
    641597        QSize viewSize = pView->size();
    642598        viewSize.setHeight(viewSize.height() - iPreviousVerticalIndent);
    643         /* Adjust favorite children container: */
    644         m_pContainerFavorite->resize(viewSize.width(), m_pContainerFavorite->minimumSizeHint().height());
    645         m_pContainerFavorite->setPos(0, iPreviousVerticalIndent);
    646         iPreviousVerticalIndent += m_pContainerFavorite->minimumSizeHint().height();
    647599        /* Adjust other children scroll-area: */
    648         m_pScrollArea->resize(viewSize.width(), viewSize.height() - m_pContainerFavorite->minimumSizeHint().height());
     600        m_pScrollArea->resize(viewSize.width(), viewSize.height());
    649601        m_pScrollArea->setPos(0, iPreviousVerticalIndent);
    650602    }
    … …  
    672624        QSize itemSize = size().toSize();
    673625        itemSize.setHeight(itemSize.height() - iPreviousVerticalIndent);
    674         /* Adjust favorite children container: */
    675         m_pContainerFavorite->resize(itemSize.width() - iParentIndent, m_pContainerFavorite->minimumSizeHint().height());
    676         m_pContainerFavorite->setPos(iParentIndent, iPreviousVerticalIndent);
    677         iPreviousVerticalIndent += m_pContainerFavorite->minimumSizeHint().height();
    678626        /* Adjust other children scroll-area: */
    679         m_pScrollArea->resize(itemSize.width() - iParentIndent, itemSize.height() - m_pContainerFavorite->minimumSizeHint().height());
     627        m_pScrollArea->resize(itemSize.width() - iParentIndent, itemSize.height());
    680628        m_pScrollArea->setPos(iParentIndent, iPreviousVerticalIndent);
    681629    }
    … …  
    684632    if (isClosed())
    685633    {
    686         m_pContainerFavorite->hide();
    687634        m_pScrollArea->hide();
    688635    }
    … …  
    690637    else
    691638    {
    692         m_pContainerFavorite->show();
    693639        m_pScrollArea->show();
    694640        foreach (UIChooserItem *pItem, items())
    … …  
    11071053    }
    11081054
    1109     /* Prepare favorite children container: */
    1110     m_pContainerFavorite = new QIGraphicsWidget(this);
    1111     if (m_pContainerFavorite)
    1112     {
    1113         /* Make it always above other children scroll-area: */
    1114         m_pContainerFavorite->setZValue(1);
    1115 
    1116         /* Prepare favorite children layout: */
    1117         m_pLayoutFavorite = new QGraphicsLinearLayout(Qt::Vertical, m_pContainerFavorite);
    1118         if (m_pLayoutFavorite)
    1119         {
    1120             m_pLayoutFavorite->setContentsMargins(0, 0, 0, 0);
    1121             m_pLayoutFavorite->setSpacing(0);
    1122         }
    1123     }
    1124 
    11251055    /* Prepare scroll-area: */
    11261056    m_pScrollArea = new UIGraphicsScrollArea(Qt::Vertical, this);
    … …  
    11771107     * it will be added to the scene indirectly: */
    11781108    else if (parentItem())
    1179         parentItem()->addItem(this, isFavorite(), position());
     1109        parentItem()->addItem(this, position());
    11801110    /* Otherwise sombody forgot to pass scene or parent. */
    11811111    else
    … …  
    14051335        {
    14061336            /* We have to take maximum children width into account: */
    1407             iProposedWidth = qMax(m_pContainerFavorite->minimumSizeHint().width(),
    1408                                   m_pContainer->minimumSizeHint().width());
     1337            iProposedWidth = m_pContainer->minimumSizeHint().width();
    14091338        }
    14101339    }
    … …  
    14231352        {
    14241353            /* We have to take maximum children width into account: */
    1425             iProposedWidth = qMax(m_pContainerFavorite->minimumSizeHint().width(),
    1426                                   m_pContainer->minimumSizeHint().width());
     1354            iProposedWidth = m_pContainer->minimumSizeHint().width();
    14271355        }
    14281356
    … …  
    14501378
    14511379            /* We have to take maximum children height into account: */
    1452             iProposedHeight += m_pContainerFavorite->minimumSizeHint().height();
    14531380            iProposedHeight += m_pContainer->minimumSizeHint().height();
    14541381            iProposedHeight += iSpacingV;
    … …  
    14701397        {
    14711398            /* We have to take maximum children height into account: */
    1472             iProposedHeight += m_pContainerFavorite->minimumSizeHint().height();
    14731399            iProposedHeight += m_pContainer->minimumSizeHint().height();
    14741400        }

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

    r106061 r108147  
    102102    /** @} */
    103103
    104     /** @name Children stuff.
    105       * @{ */
    106         /** Updates positions of favorite items. */
    107         void updateFavorites();
    108     /** @} */
    109 
    110104    /** @name Navigation stuff.
    111105      * @{ */
    … …  
    170164        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const RT_OVERRIDE;
    171165
    172         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */
    173         virtual void addItem(UIChooserItem *pItem, bool fFavorite, int iPosition) RT_OVERRIDE;
     166        /** Adds a child @a pItem to certain @a iPosition. */
     167        virtual void addItem(UIChooserItem *pItem, int iPosition) RT_OVERRIDE;
    174168        /** Removes child @a pItem. */
    175169        virtual void removeItem(UIChooserItem *pItem) RT_OVERRIDE;
    … …  
    370364    /** @name Children stuff.
    371365      * @{ */
    372         /** Holds the favorite children container instance. */
    373         QIGraphicsWidget      *m_pContainerFavorite;
    374         /** Holds the favorite children layout instance. */
    375         QGraphicsLinearLayout *m_pLayoutFavorite;
    376 
    377366        /** Holds the children scroll-area instance. */
    378         UIGraphicsScrollArea  *m_pScrollArea;
     367        UIGraphicsScrollArea *m_pScrollArea;
    379368        /** Holds the children container instance. */
    380         QIGraphicsWidget      *m_pContainer;
     369        QIGraphicsWidget     *m_pContainer;
    381370
    382371        /** Holds the main layout instance. */

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

    r106061 r108147  
    284284}
    285285
    286 void UIChooserItemMachine::addItem(UIChooserItem*, bool, int)
     286void UIChooserItemMachine::addItem(UIChooserItem*, int)
    287287{
    288288    AssertMsgFailed(("Machine graphics item do NOT support children!"));
    … …  
    597597    /* Add item to the parent: */
    598598    AssertPtrReturnVoid(parentItem());
    599     parentItem()->addItem(this, isFavorite(), position());
     599    parentItem()->addItem(this, position());
    600600
    601601    /* Configure connections: */

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

    r106061 r108147  
    130130        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const RT_OVERRIDE;
    131131
    132         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */
    133         virtual void addItem(UIChooserItem *pItem, bool fFavorite, int iPosition) RT_OVERRIDE;
     132        /** Adds a child @a pItem to certain @a iPosition. */
     133        virtual void addItem(UIChooserItem *pItem, int iPosition) RT_OVERRIDE;
    134134        /** Removes child @a pItem. */
    135135        virtual void removeItem(UIChooserItem *pItem) RT_OVERRIDE;

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

    r108138 r108147  
    127127    emit sigToolMenuRequested(pItem->mapToScene(QPointF(pItem->size().width(), 0)).toPoint(),
    128128                              pItem->type() == UIChooserNodeType_Machine ? pItem->toMachineItem()->cache() : 0);
    129 }
    130 
    131 void UIChooserModel::handlePinButtonClick(UIChooserItem *pItem)
    132 {
    133     switch (pItem->type())
    134     {
    135         case UIChooserNodeType_Global:
    136             pItem->setFavorite(!pItem->isFavorite());
    137             break;
    138         default:
    139             break;
    140     }
    141129}
    142130

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

    r106061 r108147  
    121121        /** Handles tool button click for certain @a pItem. */
    122122        void handleToolButtonClick(UIChooserItem *pItem);
    123         /** Handles pin button click for certain @a pItem. */
    124         void handlePinButtonClick(UIChooserItem *pItem);
    125123    /** @} */
    126124

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

    r106061 r108147  
    3636
    3737
    38 UIChooserNode::UIChooserNode(UIChooserNode *pParent /* = 0 */, bool fFavorite /* = false */)
     38UIChooserNode::UIChooserNode(UIChooserNode *pParent /* = 0 */)
    3939    : QObject(pParent)
    4040    , m_pParent(pParent)
    41     , m_fFavorite(fFavorite)
    4241    , m_pModel(0)
    4342    , m_fDisabled(false)

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

    r106061 r108147  
    5757public:
    5858
    59     /** Constructs chooser node passing @a pParent to the base-class.
    60       * @param  fFavorite  Brings whether the node is favorite. */
    61     UIChooserNode(UIChooserNode *pParent = 0, bool fFavorite = false);
     59    /** Constructs chooser node passing @a pParent to the base-class. */
     60    UIChooserNode(UIChooserNode *pParent = 0);
    6261    /** Destructs chooser node. */
    6362    virtual ~UIChooserNode() RT_OVERRIDE;
    … …  
    7978    /** Returns root node reference. */
    8079    UIChooserNode *rootNode() const;
    81 
    82     /** Returns whether the node is favorite. */
    83     bool isFavorite() const { return m_fFavorite; }
    84     /** Defines whether the node is @a fFavorite. */
    85     void setFavorite(bool fFavorite) { m_fFavorite = fFavorite; }
    8680
    8781    /** Defines the @a pModel reference. */
    … …  
    143137
    144138    /** Holds the parent node reference. */
    145     UIChooserNode  *m_pParent;
    146     /** Holds whether the node is favorite. */
    147     bool            m_fFavorite;
     139    UIChooserNode *m_pParent;
    148140
    149141    /** Holds the model reference. */
    … …  
    157149
    158150    /** Holds the flag to indicate whether the node is disabled or not. */
    159     bool m_fDisabled;
    160 
     151    bool  m_fDisabled;
    161152};
    162153

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

    r106061 r108147  
    3737UIChooserNodeGlobal::UIChooserNodeGlobal(UIChooserNode *pParent,
    3838                                         int iPosition,
    39                                          bool fFavorite,
    4039                                         const QString &)
    41     : UIChooserNode(pParent, fFavorite)
     40    : UIChooserNode(pParent)
    4241{
    4342    /* Add to parent: */
    … …  
    5453                                         int iPosition,
    5554                                         UIChooserNodeGlobal *pCopyFrom)
    56     : UIChooserNode(pParent, pCopyFrom->isFavorite())
     55    : UIChooserNode(pParent)
    5756{
    5857    /* Add to parent: */
    … …  
    9190}
    9291
    93 QString UIChooserNodeGlobal::definition(bool fFull /* = false */) const
     92QString UIChooserNodeGlobal::definition(bool) const
    9493{
    9594    const QString strNodePrefix = UIChooserAbstractModel::prefixToString(UIChooserNodeDataPrefixType_Global);
    96     const QString strNodeOptionFavorite = UIChooserAbstractModel::optionToString(UIChooserNodeDataOptionType_GlobalFavorite);
    9795    const QString strNodeValueDefault = UIChooserAbstractModel::valueToString(UIChooserNodeDataValueType_GlobalDefault);
    98     return   fFull
    99            ? QString("%1%2=%3").arg(strNodePrefix).arg(isFavorite() ? strNodeOptionFavorite : "").arg(strNodeValueDefault)
    100            : QString("%1=%2").arg(strNodePrefix).arg(strNodeValueDefault);
     96    return QString("%1=%2").arg(strNodePrefix).arg(strNodeValueDefault);
    10197}
    10298

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

    r106061 r108147  
    4545    /** Constructs chooser node passing @a pParent to the base-class.
    4646      * @param  iPosition  Brings the initial node position.
    47       * @param  fFavorite  Brings whether the node is favorite.
    4847      * @param  strTip     Brings the dummy tip. */
    4948    UIChooserNodeGlobal(UIChooserNode *pParent,
    5049                        int iPosition,
    51                         bool fFavorite,
    5250                        const QString &strTip);
    5351    /** Constructs chooser node passing @a pParent to the base-class.

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

    r108138 r108147  
    4343                                       UIChooserNodeGroupType enmGroupType,
    4444                                       bool fOpened)
    45     : UIChooserNode(pParent, false /* favorite */)
     45    : UIChooserNode(pParent)
    4646    , m_uId(uId)
    4747    , m_strName(strName)
    … …  
    6262                                       int iPosition,
    6363                                       UIChooserNodeGroup *pCopyFrom)
    64     : UIChooserNode(pParent, false /* favorite */)
     64    : UIChooserNode(pParent)
    6565    , m_uId(pCopyFrom->id())
    6666    , m_strName(pCopyFrom->name())

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

    r106061 r108147  
    4040                                           int iPosition,
    4141                                           const CMachine &comMachine)
    42     : UIChooserNode(pParent, false /* favorite */)
     42    : UIChooserNode(pParent)
    4343    , m_pCache(new UIVirtualMachineItemLocal(comMachine))
    4444{
    … …  
    5656                                           int iPosition,
    5757                                           const CCloudMachine &comCloudMachine)
    58     : UIChooserNode(pParent, false /* favorite */)
     58    : UIChooserNode(pParent)
    5959    , m_pCache(new UIVirtualMachineItemCloud(comCloudMachine))
    6060{
    … …  
    8080                                           int iPosition,
    8181                                           UIFakeCloudVirtualMachineItemState enmState)
    82     : UIChooserNode(pParent, false /* favorite */)
     82    : UIChooserNode(pParent)
    8383    , m_pCache(new UIVirtualMachineItemCloud(enmState))
    8484{
    … …  
    9696                                           int iPosition,
    9797                                           UIChooserNodeMachine *pCopyFrom)
    98     : UIChooserNode(pParent, pCopyFrom->isFavorite())
     98    : UIChooserNode(pParent)
    9999{
    100100    /* Prepare cache of corresponding type: */
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