VirtualBox

Changeset 75209 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Oct 31, 2018 4:41:46 PM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9241: Rename UIActionPoolSelector => UIActionPoolManager.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
17 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r75155 r75209  
    790790        src/extradata/UIExtraDataManager.h \
    791791        src/globals/UIActionPool.h \
     792        src/globals/UIActionPoolManager.h \
    792793        src/globals/UIActionPoolRuntime.h \
    793         src/globals/UIActionPoolSelector.h \
    794794        src/globals/UIAnimationFramework.h \
    795795        src/globals/UIDesktopWidgetWatchdog.h \
    … …  
    10691069        src/extradata/UIExtraDataManager.h \
    10701070        src/globals/UIActionPool.h \
     1071        src/globals/UIActionPoolManager.h \
    10711072        src/globals/UIActionPoolRuntime.h \
    1072         src/globals/UIActionPoolSelector.h \
    10731073        src/globals/UIAnimationFramework.h \
    10741074        src/globals/UIDesktopWidgetWatchdog.h \
    … …  
    12011201        src/extradata/UIExtraDataManager.cpp \
    12021202        src/globals/UIActionPool.cpp \
     1203        src/globals/UIActionPoolManager.cpp \
    12031204        src/globals/UIActionPoolRuntime.cpp \
    1204         src/globals/UIActionPoolSelector.cpp \
    12051205        src/globals/UIMainEventListener.cpp \
    12061206        src/globals/UIThreadPool.cpp \
    … …  
    12821282        src/extradata/UIExtraDataManager.cpp \
    12831283        src/globals/UIActionPool.cpp \
     1284        src/globals/UIActionPoolManager.cpp \
    12841285        src/globals/UIActionPoolRuntime.cpp \
    1285         src/globals/UIActionPoolSelector.cpp \
    12861286        src/globals/UIMainEventListener.cpp \
    12871287        src/globals/UIThreadPool.cpp \
    … …  
    14821482        src/globals/COMDefs.cpp \
    14831483        src/globals/UIActionPool.cpp \
     1484        src/globals/UIActionPoolManager.cpp \
    14841485        src/globals/UIActionPoolRuntime.cpp \
    1485         src/globals/UIActionPoolSelector.cpp \
    14861486        src/globals/UIAnimationFramework.cpp \
    14871487        src/globals/UIDefs.cpp \
    … …  
    18131813        src/globals/COMDefs.cpp \
    18141814        src/globals/UIActionPool.cpp \
     1815        src/globals/UIActionPoolManager.cpp \
    18151816        src/globals/UIActionPoolRuntime.cpp \
    1816         src/globals/UIActionPoolSelector.cpp \
    18171817        src/globals/UIAnimationFramework.cpp \
    18181818        src/globals/UIDefs.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp

    r75161 r75209  
    3030# include "QITreeWidget.h"
    3131# include "VBoxGlobal.h"
    32 # include "UIActionPoolSelector.h"
     32# include "UIActionPoolManager.h"
    3333# include "UIExtraDataManager.h"
    3434# include "UIIconPool.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r75207 r75209  
    2727# include "VBoxGlobal.h"
    2828# include "UIActionPool.h"
    29 # include "UIActionPoolSelector.h"
     29# include "UIActionPoolManager.h"
    3030# include "UIActionPoolRuntime.h"
    3131# include "UIConverter.h"
    … …  
    158158void UIAction::setShortcut(const QKeySequence &shortcut)
    159159{
    160     /* Only for selector's action-pool: */
    161     if (m_enmActionPoolType == UIActionPoolType_Selector)
     160    /* Only for manager's action-pool: */
     161    if (m_enmActionPoolType == UIActionPoolType_Manager)
    162162    {
    163163        /* If shortcut is visible: */
    … …  
    191191    switch (m_enmActionPoolType)
    192192    {
    193         /* Unchanged name for Selector UI: */
    194         case UIActionPoolType_Selector: return name();
     193        /* Unchanged name for Manager UI: */
     194        case UIActionPoolType_Manager: return name();
    195195        /* Filtered name for Runtime UI: */
    196196        case UIActionPoolType_Runtime: return VBoxGlobal::removeAccelMark(name());
    … …  
    210210    switch (m_enmActionPoolType)
    211211    {
    212         /* The same as menu name for Selector UI: */
    213         case UIActionPoolType_Selector:
     212        /* The same as menu name for Manager UI: */
     213        case UIActionPoolType_Manager:
    214214        {
    215215            setText(nameInMenu());
    … …  
    533533        switch (actionPoolType)
    534534        {
    535             case UIActionPoolType_Selector: break;
     535            case UIActionPoolType_Manager: break;
    536536            case UIActionPoolType_Runtime: return QKeySequence("Q");
    537537        }
    … …  
    715715        switch (actionPoolType)
    716716        {
    717             case UIActionPoolType_Selector: return QKeySequence(QKeySequence::HelpContents);
     717            case UIActionPoolType_Manager: return QKeySequence(QKeySequence::HelpContents);
    718718            case UIActionPoolType_Runtime: break;
    719719        }
    … …  
    11681168        switch (actionPool()->type())
    11691169        {
    1170             case UIActionPoolType_Selector: return QKeySequence("Ctrl+G");
     1170            case UIActionPoolType_Manager: return QKeySequence("Ctrl+G");
    11711171            case UIActionPoolType_Runtime: break;
    11721172        }
    … …  
    20812081    switch (enmType)
    20822082    {
    2083         case UIActionPoolType_Selector: pActionPool = new UIActionPoolSelector; break;
     2083        case UIActionPoolType_Manager: pActionPool = new UIActionPoolManager; break;
    20842084        case UIActionPoolType_Runtime: pActionPool = new UIActionPoolRuntime; break;
    20852085        default: AssertFailedReturn(0);
    … …  
    21042104    switch (enmType)
    21052105    {
    2106         case UIActionPoolType_Selector: pActionPool = new UIActionPoolSelector(true); break;
     2106        case UIActionPoolType_Manager: pActionPool = new UIActionPoolManager(true); break;
    21072107        case UIActionPoolType_Runtime: pActionPool = new UIActionPoolRuntime(true); break;
    21082108        default: AssertFailedReturnVoid();
    … …  
    21252125}
    21262126
    2127 UIActionPoolSelector *UIActionPool::toSelector()
    2128 {
    2129     return qobject_cast<UIActionPoolSelector*>(this);
     2127UIActionPoolManager *UIActionPool::toManager()
     2128{
     2129    return qobject_cast<UIActionPoolManager*>(this);
    21302130}
    21312131
    … …  
    24312431{
    24322432    /* Make sure index belongs to this class: */
    2433     if (iIndex > UIActionIndex_Max)
    2434         return;
     2433    AssertReturnVoid(iIndex < UIActionIndex_Max);
    24352434
    24362435    /* If menu with such index is invalidated

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r75207 r75209  
    3535class UIActionPool;
    3636class UIActionPoolRuntime;
    37 class UIActionPoolSelector;
     37class UIActionPoolManager;
    3838
    3939
    … …  
    4141enum UIActionPoolType
    4242{
    43     UIActionPoolType_Selector,
     43    UIActionPoolType_Manager,
    4444    UIActionPoolType_Runtime
    4545};
    … …  
    474474    /** Pointer to menu update-handler for this class. */
    475475    typedef void (UIActionPool::*PTFActionPool)();
    476     /** Pointer to menu update-handler for Selector sub-class. */
    477     typedef void (UIActionPoolSelector::*PTFActionPoolSelector)();
     476    /** Pointer to menu update-handler for Manager sub-class. */
     477    typedef void (UIActionPoolManager::*PTFActionPoolManager)();
    478478    /** Pointer to menu update-handler for Runtime sub-class. */
    479479    typedef void (UIActionPoolRuntime::*PTFActionPoolRuntime)();
    … …  
    482482    {
    483483        PTFActionPool ptf;
    484         PTFActionPoolSelector ptfs;
     484        PTFActionPoolManager ptfm;
    485485        PTFActionPoolRuntime ptfr;
    486486    };
    … …  
    509509    /** Cast action-pool to Runtime one. */
    510510    UIActionPoolRuntime *toRuntime();
    511     /** Cast action-pool to Selector one. */
    512     UIActionPoolSelector *toSelector();
     511    /** Cast action-pool to Manager one. */
     512    UIActionPoolManager *toManager();
    513513
    514514    /** Returns action-pool type. */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

    r75208 r75209  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIActionPoolSelector class implementation.
     3 * VBox Qt GUI - UIActionPoolManager class implementation.
    44 */
    55
    … …  
    2222/* GUI includes: */
    2323# include "VBoxGlobal.h"
    24 # include "UIActionPoolSelector.h"
     24# include "UIActionPoolManager.h"
    2525# include "UIExtraDataManager.h"
    2626# include "UIIconPool.h"
    … …  
    24952495
    24962496/*********************************************************************************************************************************
    2497 *   Class UIActionPoolSelector implementation.                                                                                   *
     2497*   Class UIActionPoolManager implementation.                                                                                    *
    24982498*********************************************************************************************************************************/
    24992499
    2500 UIActionPoolSelector::UIActionPoolSelector(bool fTemporary /* = false */)
    2501     : UIActionPool(UIActionPoolType_Selector, fTemporary)
     2500UIActionPoolManager::UIActionPoolManager(bool fTemporary /* = false */)
     2501    : UIActionPool(UIActionPoolType_Manager, fTemporary)
    25022502{
    25032503}
    25042504
    2505 void UIActionPoolSelector::preparePool()
     2505void UIActionPoolManager::preparePool()
    25062506{
    25072507    /* 'File' actions: */
    … …  
    26222622
    26232623    /* Prepare update-handlers for known menus: */
    2624     m_menuUpdateHandlers[UIActionIndexST_M_File].ptfs =                  &UIActionPoolSelector::updateMenuFile;
    2625     m_menuUpdateHandlers[UIActionIndexST_M_Welcome].ptfs =               &UIActionPoolSelector::updateMenuWelcome;
    2626     m_menuUpdateHandlers[UIActionIndexST_M_Group].ptfs =                 &UIActionPoolSelector::updateMenuGroup;
    2627     m_menuUpdateHandlers[UIActionIndexST_M_Machine].ptfs =               &UIActionPoolSelector::updateMenuMachine;
    2628     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_StartOrShow].ptfs =   &UIActionPoolSelector::updateMenuGroupStartOrShow;
    2629     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_StartOrShow].ptfs = &UIActionPoolSelector::updateMenuMachineStartOrShow;
    2630     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close].ptfs =         &UIActionPoolSelector::updateMenuGroupClose;
    2631     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Close].ptfs =       &UIActionPoolSelector::updateMenuMachineClose;
    2632     m_menuUpdateHandlers[UIActionIndexST_M_MediumWindow].ptfs =          &UIActionPoolSelector::updateMenuMediumWindow;
    2633     m_menuUpdateHandlers[UIActionIndexST_M_Medium].ptfs =                &UIActionPoolSelector::updateMenuMedium;
    2634     m_menuUpdateHandlers[UIActionIndexST_M_NetworkWindow].ptfs =         &UIActionPoolSelector::updateMenuNetworkWindow;
    2635     m_menuUpdateHandlers[UIActionIndexST_M_Network].ptfs =               &UIActionPoolSelector::updateMenuNetwork;
    2636     m_menuUpdateHandlers[UIActionIndexST_M_CloudWindow].ptfs =           &UIActionPoolSelector::updateMenuCloudWindow;
    2637     m_menuUpdateHandlers[UIActionIndexST_M_Cloud].ptfs =                 &UIActionPoolSelector::updateMenuCloud;
    2638     m_menuUpdateHandlers[UIActionIndexST_M_Snapshot].ptfs =              &UIActionPoolSelector::updateMenuSnapshot;
     2624    m_menuUpdateHandlers[UIActionIndexST_M_File].ptfm =                  &UIActionPoolManager::updateMenuFile;
     2625    m_menuUpdateHandlers[UIActionIndexST_M_Welcome].ptfm =               &UIActionPoolManager::updateMenuWelcome;
     2626    m_menuUpdateHandlers[UIActionIndexST_M_Group].ptfm =                 &UIActionPoolManager::updateMenuGroup;
     2627    m_menuUpdateHandlers[UIActionIndexST_M_Machine].ptfm =               &UIActionPoolManager::updateMenuMachine;
     2628    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_StartOrShow].ptfm =   &UIActionPoolManager::updateMenuGroupStartOrShow;
     2629    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_StartOrShow].ptfm = &UIActionPoolManager::updateMenuMachineStartOrShow;
     2630    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close].ptfm =         &UIActionPoolManager::updateMenuGroupClose;
     2631    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Close].ptfm =       &UIActionPoolManager::updateMenuMachineClose;
     2632    m_menuUpdateHandlers[UIActionIndexST_M_MediumWindow].ptfm =          &UIActionPoolManager::updateMenuMediumWindow;
     2633    m_menuUpdateHandlers[UIActionIndexST_M_Medium].ptfm =                &UIActionPoolManager::updateMenuMedium;
     2634    m_menuUpdateHandlers[UIActionIndexST_M_NetworkWindow].ptfm =         &UIActionPoolManager::updateMenuNetworkWindow;
     2635    m_menuUpdateHandlers[UIActionIndexST_M_Network].ptfm =               &UIActionPoolManager::updateMenuNetwork;
     2636    m_menuUpdateHandlers[UIActionIndexST_M_CloudWindow].ptfm =           &UIActionPoolManager::updateMenuCloudWindow;
     2637    m_menuUpdateHandlers[UIActionIndexST_M_Cloud].ptfm =                 &UIActionPoolManager::updateMenuCloud;
     2638    m_menuUpdateHandlers[UIActionIndexST_M_Snapshot].ptfm =              &UIActionPoolManager::updateMenuSnapshot;
    26392639
    26402640    /* Call to base-class: */
    … …  
    26422642}
    26432643
    2644 void UIActionPoolSelector::prepareConnections()
     2644void UIActionPoolManager::prepareConnections()
    26452645{
    26462646    /* Prepare connections: */
    … …  
    26522652}
    26532653
    2654 void UIActionPoolSelector::updateMenu(int iIndex)
     2654void UIActionPoolManager::updateMenu(int iIndex)
    26552655{
    26562656    /* If index belongs to base-class => delegate to base-class: */
    … …  
    26632663             && m_invalidations.contains(iIndex)
    26642664             && m_menuUpdateHandlers.contains(iIndex))
    2665              (this->*(m_menuUpdateHandlers.value(iIndex).ptfs))();
     2665             (this->*(m_menuUpdateHandlers.value(iIndex).ptfm))();
    26662666}
    26672667
    2668 void UIActionPoolSelector::updateMenus()
     2668void UIActionPoolManager::updateMenus()
    26692669{
    26702670    /* Clear menu list: */
    … …  
    27202720}
    27212721
    2722 void UIActionPoolSelector::updateMenuFile()
     2722void UIActionPoolManager::updateMenuFile()
    27232723{
    27242724    /* Get corresponding menu: */
    … …  
    28132813}
    28142814
    2815 void UIActionPoolSelector::updateMenuWelcome()
     2815void UIActionPoolManager::updateMenuWelcome()
    28162816{
    28172817    /* Get corresponding menu: */
    … …  
    28292829}
    28302830
    2831 void UIActionPoolSelector::updateMenuGroup()
     2831void UIActionPoolManager::updateMenuGroup()
    28322832{
    28332833    /* Get corresponding menu: */
    … …  
    28622862}
    28632863
    2864 void UIActionPoolSelector::updateMenuMachine()
     2864void UIActionPoolManager::updateMenuMachine()
    28652865{
    28662866    /* Get corresponding menu: */
    … …  
    28982898}
    28992899
    2900 void UIActionPoolSelector::updateMenuGroupStartOrShow()
     2900void UIActionPoolManager::updateMenuGroupStartOrShow()
    29012901{
    29022902    /* Get corresponding menu: */
    … …  
    29152915}
    29162916
    2917 void UIActionPoolSelector::updateMenuMachineStartOrShow()
     2917void UIActionPoolManager::updateMenuMachineStartOrShow()
    29182918{
    29192919    /* Get corresponding menu: */
    … …  
    29322932}
    29332933
    2934 void UIActionPoolSelector::updateMenuGroupClose()
     2934void UIActionPoolManager::updateMenuGroupClose()
    29352935{
    29362936    /* Get corresponding menu: */
    … …  
    29502950}
    29512951
    2952 void UIActionPoolSelector::updateMenuMachineClose()
     2952void UIActionPoolManager::updateMenuMachineClose()
    29532953{
    29542954    /* Get corresponding menu: */
    … …  
    29682968}
    29692969
    2970 void UIActionPoolSelector::updateMenuMediumWindow()
     2970void UIActionPoolManager::updateMenuMediumWindow()
    29712971{
    29722972    /* Update corresponding menu: */
    … …  
    29772977}
    29782978
    2979 void UIActionPoolSelector::updateMenuMedium()
     2979void UIActionPoolManager::updateMenuMedium()
    29802980{
    29812981    /* Update corresponding menu: */
    … …  
    29862986}
    29872987
    2988 void UIActionPoolSelector::updateMenuMediumWrapper(UIMenu *pMenu)
     2988void UIActionPoolManager::updateMenuMediumWrapper(UIMenu *pMenu)
    29892989{
    29902990    /* Clear contents: */
    … …  
    30263026}
    30273027
    3028 void UIActionPoolSelector::updateMenuNetworkWindow()
     3028void UIActionPoolManager::updateMenuNetworkWindow()
    30293029{
    30303030    /* Update corresponding menu: */
    … …  
    30353035}
    30363036
    3037 void UIActionPoolSelector::updateMenuNetwork()
     3037void UIActionPoolManager::updateMenuNetwork()
    30383038{
    30393039    /* Update corresponding menu: */
    … …  
    30443044}
    30453045
    3046 void UIActionPoolSelector::updateMenuNetworkWrapper(UIMenu *pMenu)
     3046void UIActionPoolManager::updateMenuNetworkWrapper(UIMenu *pMenu)
    30473047{
    30483048    /* Clear contents: */
    … …  
    30783078}
    30793079
    3080 void UIActionPoolSelector::updateMenuCloudWindow()
     3080void UIActionPoolManager::updateMenuCloudWindow()
    30813081{
    30823082    /* Update corresponding menu: */
    … …  
    30873087}
    30883088
    3089 void UIActionPoolSelector::updateMenuCloud()
     3089void UIActionPoolManager::updateMenuCloud()
    30903090{
    30913091    /* Update corresponding menu: */
    … …  
    30963096}
    30973097
    3098 void UIActionPoolSelector::updateMenuCloudWrapper(UIMenu *pMenu)
     3098void UIActionPoolManager::updateMenuCloudWrapper(UIMenu *pMenu)
    30993099{
    31003100    /* Clear contents: */
    … …  
    31323132}
    31333133
    3134 void UIActionPoolSelector::updateMenuSnapshot()
     3134void UIActionPoolManager::updateMenuSnapshot()
    31353135{
    31363136    /* Get corresponding menu: */
    … …  
    31513151}
    31523152
    3153 void UIActionPoolSelector::updateShortcuts()
     3153void UIActionPoolManager::updateShortcuts()
    31543154{
    31553155    /* Call to base-class: */
    … …  
    31603160}
    31613161
    3162 void UIActionPoolSelector::setShortcutsVisible(int iIndex, bool fVisible)
     3162void UIActionPoolManager::setShortcutsVisible(int iIndex, bool fVisible)
    31633163{
    31643164    /* Prepare a list of actions: */
    … …  
    32353235}
    32363236
    3237 QString UIActionPoolSelector::shortcutsExtraDataID() const
     3237QString UIActionPoolManager::shortcutsExtraDataID() const
    32383238{
    32393239    return GUI_Input_SelectorShortcuts;
    … …  
    32413241
    32423242
    3243 #include "UIActionPoolSelector.moc"
     3243#include "UIActionPoolManager.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

    r75208 r75209  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIActionPoolSelector class declaration.
     3 * VBox Qt GUI - UIActionPoolManager class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIActionPoolSelector_h___
    19 #define ___UIActionPoolSelector_h___
     18#ifndef ___UIActionPoolManager_h___
     19#define ___UIActionPoolManager_h___
    2020
    2121/* Qt includes: */
    … …  
    158158
    159159/** UIActionPool extension
    160   * representing action-pool singleton for Selector UI. */
    161 class SHARED_LIBRARY_STUFF UIActionPoolSelector : public UIActionPool
     160  * representing action-pool singleton for Manager UI. */
     161class SHARED_LIBRARY_STUFF UIActionPoolManager : public UIActionPool
    162162{
    163163    Q_OBJECT;
    … …  
    168168      * @param  fTemporary  Brings whether this action-pool is temporary,
    169169      *                     used to (re-)initialize shortcuts-pool. */
    170     UIActionPoolSelector(bool fTemporary = false);
     170    UIActionPoolManager(bool fTemporary = false);
    171171
    172172    /** Prepares pool. */
    … …  
    237237
    238238
    239 #endif /* !___UIActionPoolSelector_h___ */
    240 
     239#endif /* !___UIActionPoolManager_h___ */
     240

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

    r75191 r75209  
    42944294    /* Call to base-class: */
    42954295    UIActionPool::updateShortcuts();
    4296     /* Create temporary Selector UI pool to do the same: */
     4296    /* Create temporary Manager UI pool to do the same: */
    42974297    if (!m_fTemporary)
    4298         UIActionPool::createTemporary(UIActionPoolType_Selector);
     4298        UIActionPool::createTemporary(UIActionPoolType_Manager);
    42994299}
    43004300

  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

    r75161 r75209  
    2929# include "QIDialogButtonBox.h"
    3030# include "QITreeWidget.h"
    31 # include "UIActionPoolSelector.h"
     31# include "UIActionPoolManager.h"
    3232# include "UIExtraDataManager.h"
    3333# include "UIIconPool.h"

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

    r75054 r75209  
    2828
    2929/* GUI includes */
    30 # include "UIActionPoolSelector.h"
     30# include "UIActionPoolManager.h"
    3131# include "UICloudProfileManager.h"
    3232# include "UIHostNetworkManager.h"

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

    r75144 r75209  
    2828
    2929/* GUI includes */
    30 # include "UIActionPoolSelector.h"
     30# include "UIActionPoolManager.h"
    3131# include "UIErrorPane.h"
    3232# include "UIDetails.h"

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

    r75207 r75209  
    2929/* GUI includes: */
    3030# include "QIFileDialog.h"
    31 # include "UIActionPoolSelector.h"
     31# include "UIActionPoolManager.h"
    3232# include "UICloudProfileManager.h"
    3333# include "UIDesktopServices.h"
    … …  
    12721272
    12731273    /* Create action-pool: */
    1274     m_pActionPool = UIActionPool::create(UIActionPoolType_Selector);
     1274    m_pActionPool = UIActionPool::create(UIActionPoolType_Manager);
    12751275
    12761276    /* Build menu-bar: */

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

    r75093 r75209  
    2828/* GUI includes: */
    2929# include "QISplitter.h"
    30 # include "UIActionPoolSelector.h"
     30# include "UIActionPoolManager.h"
    3131# include "UIErrorString.h"
    3232# include "UIExtraDataManager.h"

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

    r75204 r75209  
    3333# include "UIChooserItemMachine.h"
    3434# include "UIChooserModel.h"
    35 # include "UIActionPoolSelector.h"
     35# include "UIActionPoolManager.h"
    3636# include "UIIconPool.h"
    3737# include "UIImageTools.h"

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

    r75102 r75209  
    3434# include "QIMessageBox.h"
    3535# include "VBoxGlobal.h"
    36 # include "UIActionPoolSelector.h"
     36# include "UIActionPoolManager.h"
    3737# include "UIChooser.h"
    3838# include "UIChooserHandlerMouse.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

    r75102 r75209  
    3333# include "QIMessageBox.h"
    3434# include "VBoxGlobal.h"
    35 # include "UIActionPoolSelector.h"
     35# include "UIActionPoolManager.h"
    3636# include "UIIconPool.h"
    3737# include "UITools.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

    r75161 r75209  
    3636# include "QITabWidget.h"
    3737# include "VBoxGlobal.h"
    38 # include "UIActionPoolSelector.h"
     38# include "UIActionPoolManager.h"
    3939# include "UIExtraDataManager.h"
    4040# include "UIMediumDetailsWidget.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r73349 r75209  
    422422#include "UIActionPool.h"
    423423#include "UIActionPoolRuntime.h"
    424 #include "UIActionPoolSelector.h"
     424#include "UIActionPoolManager.h"
    425425#include "UIAnimationFramework.h"
    426426#include "UIApplianceEditorWidget.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

    r73859 r75209  
    482482    {
    483483        /* Filter out unnecessary shortcuts: */
    484         if ((m_type == UIActionPoolType_Selector && item.key().startsWith(GUI_Input_MachineShortcuts)) ||
     484        if ((m_type == UIActionPoolType_Manager && item.key().startsWith(GUI_Input_MachineShortcuts)) ||
    485485            (m_type == UIActionPoolType_Runtime && item.key().startsWith(GUI_Input_SelectorShortcuts)))
    486486            continue;
    … …  
    10891089
    10901090            /* Create Selector UI model: */
    1091             m_pSelectorModel = new UIHotKeyTableModel(this, UIActionPoolType_Selector);
     1091            m_pSelectorModel = new UIHotKeyTableModel(this, UIActionPoolType_Manager);
    10921092
    10931093            /* Create Selector UI table: */

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

    r75161 r75209  
    3737# include "QIMessageBox.h"
    3838# include "QITreeWidget.h"
    39 # include "UIActionPoolSelector.h"
     39# include "UIActionPoolManager.h"
    4040# include "UIConverter.h"
    4141# include "UIExtraDataManager.h"
Note: See TracChangeset for help on using the changeset viewer.

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