VirtualBox

Changeset 84439 in vbox


Ignore:
Timestamp:
May 21, 2020 6:09:40 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
138144
Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane cleanup: Move group rename action trigger handling to proper place in UIVirtualBoxManager class.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/manager
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r84437 r84439  
    600600}
    601601
     602void UIVirtualBoxManager::sltOpenGroupNameEditor()
     603{
     604    m_pWidget->openGroupNameEditor();
     605}
     606
    602607void UIVirtualBoxManager::sltOpenMachineSettingsDialog(QString strCategory /* = QString() */,
    603608                                                       QString strControl /* = QString() */,
    … …  
    15031508    connect(actionPool()->action(UIActionIndexST_M_Group_S_Add), &UIAction::triggered,
    15041509            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
     1510    connect(actionPool()->action(UIActionIndexST_M_Group_S_Rename), &UIAction::triggered,
     1511            this, &UIVirtualBoxManager::sltOpenGroupNameEditor);
    15051512    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow), &UIAction::triggered,
    15061513            this, &UIVirtualBoxManager::sltPerformStartOrShowMachine);

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

    r83855 r84439  
    187187        /** Handles call to open add machine dialog. */
    188188        void sltOpenAddMachineDialog();
     189
     190        /** Handles call to open group name editor. */
     191        void sltOpenGroupNameEditor();
    189192
    190193        /** Handles call to open Machine Settings dialog.

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r84438 r84439  
    109109{
    110110    return m_pPaneChooser->isGroupSavingInProgress();
     111}
     112
     113void UIVirtualBoxManagerWidget::openGroupNameEditor()
     114{
     115    m_pPaneChooser->openGroupNameEditor();
    111116}
    112117

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

    r84438 r84439  
    134134        /** Returns whether group saving is in progress. */
    135135        bool isGroupSavingInProgress() const;
     136
     137        /** Opens group name editor. */
     138        void openGroupNameEditor();
    136139    /** @} */
    137140

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

    r84437 r84439  
    105105    AssertPtrReturn(model(), false);
    106106    return model()->isGroupSavingInProgress();
     107}
     108
     109void UIChooser::openGroupNameEditor()
     110{
     111    AssertPtrReturnVoid(model());
     112    model()->startEditingSelectedGroupItemName();
    107113}
    108114

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

    r84438 r84439  
    127127    /** @} */
    128128
     129    /** @name Action handling stuff.
     130      * @{ */
     131        /** Opens group name editor. */
     132        void openGroupNameEditor();
     133    /** @} */
     134
    129135public slots:
    130136

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

    r84437 r84439  
    253253            if (model()->currentItem()->type() == UIChooserNodeType_Group)
    254254            {
    255                 /* Start embedded editing of current-item: */
    256                 model()->startEditingGroupItemName();
     255                /* Start editing selected group item name: */
     256                model()->startEditingSelectedGroupItemName();
    257257                /* Filter that event out: */
    258258                return true;

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

    r84437 r84439  
    555555}
    556556
    557 void UIChooserModel::startEditingGroupItemName()
    558 {
    559     sltEditGroupName();
     557void UIChooserModel::startEditingSelectedGroupItemName()
     558{
     559    /* Only for single selected group: */
     560    if (!isSingleGroupSelected())
     561        return;
     562
     563    /* Start editing first selected item name: */
     564    firstSelectedItem()->startEditing();
    560565}
    561566
    … …  
    789794{
    790795    AssertMsgFailed(("Current-item destroyed!"));
    791 }
    792 
    793 void UIChooserModel::sltEditGroupName()
    794 {
    795     /* Check if action is enabled: */
    796     if (!actionPool()->action(UIActionIndexST_M_Group_S_Rename)->isEnabled())
    797         return;
    798     /* Only for single selected group: */
    799     if (!isSingleGroupSelected())
    800         return;
    801 
    802     /* Start editing group name: */
    803     firstSelectedItem()->startEditing();
    804796}
    805797
    … …  
    13891381    connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::triggered,
    13901382            this, &UIChooserModel::sltCreateNewMachine);
    1391     connect(actionPool()->action(UIActionIndexST_M_Group_S_Rename), &UIAction::triggered,
    1392             this, &UIChooserModel::sltEditGroupName);
    13931383    connect(actionPool()->action(UIActionIndexST_M_Group_S_Remove), &UIAction::triggered,
    13941384            this, &UIChooserModel::sltUngroupSelectedGroup);

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

    r84437 r84439  
    213213        UIChooserItem *root() const;
    214214
    215         /** Starts editing group name. */
    216         void startEditingGroupItemName();
     215        /** Starts editing selected group item name. */
     216        void startEditingSelectedGroupItemName();
    217217
    218218        /** Starts or shows selected items. */
    … …  
    289289    /** @name Children stuff.
    290290      * @{ */
    291         /** Handles group rename request. */
    292         void sltEditGroupName();
    293291        /** Handles group sort request. */
    294292        void sltSortGroup();
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