VirtualBox

Changeset 103552 in vbox for trunk


Ignore:
Timestamp:
Feb 23, 2024 4:31:29 PM (7 months ago)
Author:
vboxsync
Message:

FE/Qt: Rework UIActionPool to use global UIType instead of own cloned enum.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r103541 r103552  
    174174{
    175175    /* Only for manager's action-pool: */
    176     if (m_enmActionPoolType == UIActionPoolType_Manager)
     176    if (m_enmActionPoolType == UIType_ManagerUI)
    177177    {
    178178        /* If primary shortcut should be visible: */
     
    207207    {
    208208        /* Unchanged name for Manager UI: */
    209         case UIActionPoolType_Manager: return name();
     209        case UIType_ManagerUI: return name();
    210210        /* Filtered name for Runtime UI: */
    211         case UIActionPoolType_Runtime: return UITranslator::removeAccelMark(name());
     211        case UIType_RuntimeUI: return UITranslator::removeAccelMark(name());
    212212    }
    213213    /* Nothing by default: */
     
    237237            {
    238238                /* The same as menu name for Manager UI: */
    239                 case UIActionPoolType_Manager:
     239                case UIType_ManagerUI:
    240240                {
    241241                    setText(nameInMenu());
     
    243243                }
    244244                /* With shortcut appended for Runtime UI: */
    245                 case UIActionPoolType_Runtime:
     245                case UIType_RuntimeUI:
    246246                {
    247247                    if (m_fMachineMenuAction)
     
    519519
    520520    /** Returns default shortcut. */
    521     virtual QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const RT_OVERRIDE
    522     {
    523         switch (actionPoolType)
     521    virtual QKeySequence defaultShortcut(UIType enmActionPoolType) const RT_OVERRIDE
     522    {
     523        switch (enmActionPoolType)
    524524        {
    525             case UIActionPoolType_Manager: break;
    526             case UIActionPoolType_Runtime: return QKeySequence("Q");
     525            case UIType_ManagerUI: break;
     526            case UIType_RuntimeUI: return QKeySequence("Q");
    527527        }
    528528        return QKeySequence();
     
    698698
    699699    /** Returns default shortcut. */
    700     virtual QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const RT_OVERRIDE
    701     {
    702         switch (actionPoolType)
     700    virtual QKeySequence defaultShortcut(UIType enmActionPoolType) const RT_OVERRIDE
     701    {
     702        switch (enmActionPoolType)
    703703        {
    704             case UIActionPoolType_Manager: return QKeySequence(QKeySequence::HelpContents);
    705             case UIActionPoolType_Runtime: break;
     704            case UIType_ManagerUI: return QKeySequence(QKeySequence::HelpContents);
     705            case UIType_RuntimeUI: break;
    706706        }
    707707        return QKeySequence();
     
    11441144
    11451145    /** Returns default shortcut. */
    1146     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
    1147     {
    1148         switch (actionPool()->type())
     1146    virtual QKeySequence defaultShortcut(UIType enmActionPoolType) const RT_OVERRIDE
     1147    {
     1148        switch (enmActionPoolType)
    11491149        {
    1150             case UIActionPoolType_Manager: return QKeySequence("Ctrl+G");
    1151             case UIActionPoolType_Runtime: break;
     1150            case UIType_ManagerUI: return QKeySequence("Ctrl+G");
     1151            case UIType_RuntimeUI: break;
    11521152        }
    11531153        return QKeySequence();
     
    12161216
    12171217    /** Returns default shortcut. */
    1218     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1218    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    12191219    {
    12201220        return QKeySequence("Ctrl+Shift+F");
     
    12571257
    12581258    /** Returns default shortcut. */
    1259     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1259    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    12601260    {
    12611261        return QKeySequence("Ctrl+Shift+T");
     
    12981298
    12991299    /** Returns default shortcut. */
    1300     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1300    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    13011301    {
    13021302        return QKeySequence("Ctrl+Shift+D");
     
    13391339
    13401340    /** Returns default shortcut. */
    1341     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1341    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    13421342    {
    13431343        return QKeySequence("Ctrl+Shift+P");
     
    13801380
    13811381    /** Returns default shortcut. */
    1382     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1382    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    13831383    {
    13841384        return QKeySequence("Ctrl+Shift+R");
     
    13861386
    13871387    /** Returns standard shortcut. */
    1388     virtual QKeySequence standardShortcut(UIActionPoolType) const RT_OVERRIDE
     1388    virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE
    13891389    {
    13901390        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh);
     
    14271427
    14281428    /** Returns default shortcut. */
    1429     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1429    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    14301430    {
    14311431        return QKeySequence();
     
    14331433
    14341434    /** Returns standard shortcut. */
    1435     virtual QKeySequence standardShortcut(UIActionPoolType) const RT_OVERRIDE
     1435    virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE
    14361436    {
    14371437        return QKeySequence();
     
    14741474
    14751475    /** Returns default shortcut. */
    1476     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1476    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    14771477    {
    14781478        return QKeySequence("Ctrl+Shift+S");
     
    15911591
    15921592    /** Returns default shortcut. */
    1593     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1593    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    15941594    {
    15951595        return QKeySequence();
     
    16291629
    16301630    /** Returns default shortcut. */
    1631     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1631    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    16321632    {
    16331633        return QKeySequence();
     
    16701670
    16711671    /** Returns default shortcut. */
    1672     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1672    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    16731673    {
    16741674        return QKeySequence();
     
    17111711
    17121712    /** Returns default shortcut. */
    1713     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1713    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    17141714    {
    17151715        return QKeySequence();
     
    17521752
    17531753    /** Returns default shortcut. */
    1754     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1754    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    17551755    {
    17561756        return QKeySequence();
     
    17931793
    17941794    /** Returns default shortcut. */
    1795     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1795    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    17961796    {
    17971797        return QKeySequence();
     
    18321832
    18331833    /** Returns default shortcut. */
    1834     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1834    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    18351835    {
    18361836        return QKeySequence();
     
    18711871
    18721872    /** Returns default shortcut. */
    1873     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1873    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    18741874    {
    18751875        return QKeySequence();
     
    19101910
    19111911    /** Returns default shortcut. */
    1912     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1912    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    19131913    {
    19141914        return QKeySequence();
     
    19491949
    19501950    /** Returns default shortcut. */
    1951     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1951    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    19521952    {
    19531953        return QKeySequence();
     
    19881988
    19891989    /** Returns default shortcut. */
    1990     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1990    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    19911991    {
    19921992        return QKeySequence();
     
    20272027
    20282028    /** Returns default shortcut. */
    2029     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2029    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    20302030    {
    20312031        return QKeySequence();
     
    20652065
    20662066    /** Returns default shortcut. */
    2067     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2067    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    20682068    {
    20692069        return QKeySequence();
     
    21032103
    21042104    /** Returns default shortcut. */
    2105     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2105    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    21062106    {
    21072107        return QKeySequence();
     
    21412141
    21422142    /** Returns default shortcut. */
    2143     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2143    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    21442144    {
    21452145        return QKeySequence();
     
    21792179
    21802180    /** Returns default shortcut. */
    2181     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2181    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    21822182    {
    21832183        return QKeySequence();
     
    22172217
    22182218    /** Returns default shortcut. */
    2219     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2219    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    22202220    {
    22212221        return QKeySequence();
     
    22552255
    22562256    /** Returns default shortcut. */
    2257     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2257    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    22582258    {
    22592259        return QKeySequence();
     
    22932293
    22942294    /** Returns default shortcut. */
    2295     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2295    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    22962296    {
    22972297        return QKeySequence();
     
    23312331
    23322332    /** Returns default shortcut. */
    2333     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2333    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    23342334    {
    23352335        return QKeySequence();
     
    24012401
    24022402    /** Returns default shortcut. */
    2403     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2403    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    24042404    {
    24052405        return QKeySequence();
     
    27762776
    27772777    /** Returns default shortcut. */
    2778     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2778    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    27792779    {
    27802780        return QKeySequence();
     
    28152815
    28162816    /** Returns default shortcut. */
    2817     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2817    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    28182818    {
    28192819        return QKeySequence();
     
    28542854
    28552855    /** Returns default shortcut. */
    2856     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2856    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    28572857    {
    28582858        return QKeySequence();
     
    28932893
    28942894    /** Returns default shortcut. */
    2895     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2895    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    28962896    {
    28972897        return QKeySequence();
     
    32773277
    32783278/* static */
    3279 UIActionPool *UIActionPool::create(UIActionPoolType enmType)
     3279UIActionPool *UIActionPool::create(UIType enmType)
    32803280{
    32813281    UIActionPool *pActionPool = 0;
    32823282    switch (enmType)
    32833283    {
    3284         case UIActionPoolType_Manager: pActionPool = new UIActionPoolManager; break;
    3285         case UIActionPoolType_Runtime: pActionPool = new UIActionPoolRuntime; break;
     3284        case UIType_ManagerUI: pActionPool = new UIActionPoolManager; break;
     3285        case UIType_RuntimeUI: pActionPool = new UIActionPoolRuntime; break;
    32863286        default: AssertFailedReturn(0);
    32873287    }
     
    33003300
    33013301/* static */
    3302 void UIActionPool::createTemporary(UIActionPoolType enmType)
     3302void UIActionPool::createTemporary(UIType enmType)
    33033303{
    33043304    UIActionPool *pActionPool = 0;
    33053305    switch (enmType)
    33063306    {
    3307         case UIActionPoolType_Manager: pActionPool = new UIActionPoolManager(true); break;
    3308         case UIActionPoolType_Runtime: pActionPool = new UIActionPoolRuntime(true); break;
     3307        case UIType_ManagerUI: pActionPool = new UIActionPoolManager(true); break;
     3308        case UIType_RuntimeUI: pActionPool = new UIActionPoolRuntime(true); break;
    33093309        default: AssertFailedReturnVoid();
    33103310    }
     
    34653465#endif /* VBOX_WS_MAC */
    34663466
    3467 UIActionPool::UIActionPool(UIActionPoolType enmType, bool fTemporary /* = false */)
     3467UIActionPool::UIActionPool(UIType enmType, bool fTemporary /* = false */)
    34683468    : m_enmType(enmType)
    34693469    , m_fTemporary(fTemporary)
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r103058 r103552  
    3939/* GUI includes: */
    4040#include "QIWithRetranslateUI.h"
     41#include "UIDefs.h"
    4142#include "UIExtraDataDefs.h"
    4243#include "UILibraryDefs.h"
     
    4950class UIActionPoolManager;
    5051
    51 
    52 /** Action-pool types. */
    53 enum UIActionPoolType
    54 {
    55     UIActionPoolType_Manager,
    56     UIActionPoolType_Runtime
    57 };
    5852
    5953/** Action types. */
     
    300294    virtual QString shortcutExtraDataID() const { return QString(); }
    301295    /** Returns default keyboard shortcut for this action. */
    302     virtual QKeySequence defaultShortcut(UIActionPoolType) const { return QKeySequence(); }
     296    virtual QKeySequence defaultShortcut(UIType) const { return QKeySequence(); }
    303297    /** Returns standard keyboard shortcut for this action. */
    304     virtual QKeySequence standardShortcut(UIActionPoolType) const { return QKeySequence(); }
     298    virtual QKeySequence standardShortcut(UIType) const { return QKeySequence(); }
    305299
    306300    /** Retranslates action. */
     
    325319
    326320    /** Holds the reference to the action-pool this action belongs to. */
    327     UIActionPool           *m_pActionPool;
     321    UIActionPool *m_pActionPool;
    328322    /** Holds the type of the action-pool this action belongs to. */
    329     const UIActionPoolType  m_enmActionPoolType;
     323    const UIType  m_enmActionPoolType;
    330324
    331325    /** Holds the action type. */
     
    516510
    517511    /** Creates singleton instance. */
    518     static UIActionPool *create(UIActionPoolType enmType);
     512    static UIActionPool *create(UIType enmType);
    519513    /** Destroys singleton instance. */
    520514    static void destroy(UIActionPool *pActionPool);
     
    522516    /** Creates temporary singleton instance,
    523517      * used to initialize shortcuts-pool from action-pool of passed @a enmType. */
    524     static void createTemporary(UIActionPoolType enmType);
     518    static void createTemporary(UIType enmType);
    525519
    526520    /** Cast action-pool to Manager one. */
     
    530524
    531525    /** Returns action-pool type. */
    532     UIActionPoolType type() const { return m_enmType; }
     526    UIType type() const { return m_enmType; }
    533527    /** Returns whether this action-pool is temporary. */
    534528    bool isTemporary() const { return m_fTemporary; }
     
    594588
    595589    /** Constructs probably @a fTemporary action-pool of passed @a enmType. */
    596     UIActionPool(UIActionPoolType enmType, bool fTemporary = false);
     590    UIActionPool(UIType enmType, bool fTemporary = false);
    597591
    598592    /** Prepares pool. */
     
    680674
    681675    /** Holds the action-pool type. */
    682     const UIActionPoolType  m_enmType;
     676    const UIType  m_enmType;
    683677    /** Holds whether this action-pool is temporary. */
    684     const bool              m_fTemporary;
     678    const bool    m_fTemporary;
    685679};
    686680
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

    r102575 r103552  
    9898
    9999    /** Returns default shortcut. */
    100     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     100    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    101101    {
    102102        return QKeySequence("Ctrl+I");
     
    136136
    137137    /** Returns default shortcut. */
    138     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     138    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    139139    {
    140140        return QKeySequence("Ctrl+E");
     
    237237
    238238    /** Returns default shortcut. */
    239     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     239    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    240240    {
    241241        return QKeySequence("Ctrl+T");
     
    276276
    277277    /** Returns default shortcut. */
    278     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     278    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    279279    {
    280280        return QKeySequence("Ctrl+D");
     
    315315
    316316    /** Returns default shortcut. */
    317     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     317    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    318318    {
    319319        return QKeySequence("Ctrl+H");
     
    354354
    355355    /** Returns default shortcut. */
    356     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     356    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    357357    {
    358358        return QKeySequence("Ctrl+P");
     
    422422
    423423    /** Returns default shortcut. */
    424     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     424    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    425425    {
    426426        return QKeySequence("Ctrl+X");
     
    459459
    460460    /** Returns default shortcut. */
    461     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     461    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    462462    {
    463463        return QKeySequence("Ctrl+Q");
     
    517517
    518518    /** Returns default shortcut. */
    519     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     519    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    520520    {
    521521        return QKeySequence("Ctrl+N");
     
    556556
    557557    /** Returns default shortcut. */
    558     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     558    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    559559    {
    560560        return QKeySequence("Ctrl+A");
     
    701701
    702702    /** Returns default shortcut. */
    703     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     703    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    704704    {
    705705        return QKeySequence("Ctrl+N");
     
    738738
    739739    /** Returns default shortcut. */
    740     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     740    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    741741    {
    742742        return QKeySequence("Ctrl+A");
     
    803803
    804804    /** Returns default shortcut. */
    805     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     805    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    806806    {
    807807        return QKeySequence("Ctrl+S");
     
    838838
    839839    /** Returns default shortcut. */
    840     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     840    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    841841    {
    842842        return QKeySequence("Ctrl+O");
     
    13971397
    13981398    /** Returns default shortcut. */
    1399     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1399    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    14001400    {
    14011401        return QKeySequence("Ctrl+F");
     
    18701870
    18711871    /** Returns default shortcut. */
    1872     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1872    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    18731873    {
    18741874        return QKeySequence("Ctrl+L");
     
    20022002
    20032003    /** Returns default shortcut. */
    2004     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2004    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    20052005    {
    20062006        return QKeySequence("Ctrl+Shift+T");
     
    20432043
    20442044    /** Returns default shortcut. */
    2045     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2045    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    20462046    {
    20472047        return QKeySequence("Ctrl+Shift+D");
     
    20842084
    20852085    /** Returns default shortcut. */
    2086     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2086    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    20872087    {
    20882088        return QKeySequence("Ctrl+Shift+R");
     
    21262126
    21272127    /** Returns default shortcut. */
    2128     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2128    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    21292129    {
    21302130        return QKeySequence("Ctrl+Shift+P");
     
    21672167
    21682168    /** Returns default shortcut. */
    2169     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2169    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    21702170    {
    21712171        return QKeySequence("Ctrl+Shift+C");
     
    22362236
    22372237    /** Returns default shortcut. */
    2238     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2238    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    22392239    {
    22402240        return QKeySequence("Ctrl+Shift+I");
     
    22772277
    22782278    /** Returns default shortcut. */
    2279     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2279    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    22802280    {
    22812281        return QKeySequence("Ctrl+Shift+U");
     
    23502350
    23512351    /** Returns default shortcut. */
    2352     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2352    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    23532353    {
    23542354        return QKeySequence("Ctrl+Shift+A");
     
    23952395
    23962396    /** Returns default shortcut. */
    2397     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2397    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    23982398    {
    23992399        return QKeySequence("");
     
    24402440
    24412441    /** Returns default shortcut. */
    2442     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2442    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    24432443    {
    24442444        return QKeySequence("Ctrl+Shift+C");
     
    24852485
    24862486    /** Returns default shortcut. */
    2487     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2487    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    24882488    {
    24892489        return QKeySequence("Ctrl+Shift+M");
     
    25302530
    25312531    /** Returns default shortcut. */
    2532     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2532    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    25332533    {
    25342534        return QKeySequence("Ctrl+Shift+R");
     
    25752575
    25762576    /** Returns default shortcut. */
    2577     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2577    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    25782578    {
    25792579        return QKeySequence("Ctrl+Shift+L");
     
    26212621
    26222622    /** Returns default shortcut. */
    2623     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2623    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    26242624    {
    26252625        return QKeySequence("Ctrl+Shift+P");
     
    26672667
    26682668    /** Returns standard shortcut. */
    2669     virtual QKeySequence standardShortcut(UIActionPoolType) const RT_OVERRIDE
     2669    virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE
    26702670    {
    26712671        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Find);
     
    27082708
    27092709    /** Returns default shortcut. */
    2710     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2710    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    27112711    {
    27122712        return QKeySequence("Ctrl+Shift+F");
     
    27142714
    27152715    /** Returns standard shortcut. */
    2716     virtual QKeySequence standardShortcut(UIActionPoolType) const RT_OVERRIDE
     2716    virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE
    27172717    {
    27182718        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh);
     
    27572757
    27582758    /** Returns default shortcut. */
    2759     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2759    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    27602760    {
    27612761        return QKeySequence();
     
    28252825
    28262826    /** Returns default shortcut. */
    2827     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2827    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    28282828    {
    28292829        return QKeySequence("Ctrl+Shift+C");
     
    28662866
    28672867    /** Returns default shortcut. */
    2868     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2868    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    28692869    {
    28702870        return QKeySequence("Ctrl+Shift+R");
     
    29082908
    29092909    /** Returns default shortcut. */
    2910     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2910    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    29112911    {
    29122912        return QKeySequence("Ctrl+Shift+P");
     
    29492949
    29502950    /** Returns default shortcut. */
    2951     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     2951    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    29522952    {
    29532953        return QKeySequence("Ctrl+Shift+F");
     
    29552955
    29562956    /** Returns standard shortcut. */
    2957     virtual QKeySequence standardShortcut(UIActionPoolType) const RT_OVERRIDE
     2957    virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE
    29582958    {
    29592959        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh);
     
    30243024
    30253025    /** Returns default shortcut. */
    3026     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3026    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    30273027    {
    30283028        return QKeySequence("Ctrl+Shift+A");
     
    30663066
    30673067    /** Returns default shortcut. */
    3068     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3068    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    30693069    {
    30703070        return QKeySequence("Ctrl+Shift+I");
     
    31083108
    31093109    /** Returns default shortcut. */
    3110     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3110    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    31113111    {
    31123112        return QKeySequence("Ctrl+Shift+R");
     
    31513151
    31523152    /** Returns default shortcut. */
    3153     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3153    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    31543154    {
    31553155        return QKeySequence("Ctrl+Shift+P");
     
    31933193
    31943194    /** Returns default shortcut. */
    3195     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3195    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    31963196    {
    31973197        return QKeySequence("Ctrl+Shift+T");
     
    32353235
    32363236    /** Returns default shortcut. */
    3237     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3237    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    32383238    {
    32393239        return QKeySequence("Ctrl+Shift+H");
     
    32413241
    32423242    /** Returns standard shortcut. */
    3243     virtual QKeySequence standardShortcut(UIActionPoolType) const RT_OVERRIDE
     3243    virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE
    32443244    {
    32453245        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::HelpContents);
     
    34523452
    34533453    /** Returns default shortcut. */
    3454     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     3454    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    34553455    {
    34563456        return QKeySequence("Ctrl+Shift+P");
     
    35733573
    35743574UIActionPoolManager::UIActionPoolManager(bool fTemporary /* = false */)
    3575     : UIActionPool(UIActionPoolType_Manager, fTemporary)
     3575    : UIActionPool(UIType_ManagerUI, fTemporary)
    35763576{
    35773577}
     
    40114011    /* Create temporary Runtime UI pool to do the same: */
    40124012    if (!isTemporary())
    4013         UIActionPool::createTemporary(UIActionPoolType_Runtime);
     4013        UIActionPool::createTemporary(UIType_RuntimeUI);
    40144014}
    40154015
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

    r100634 r103552  
    124124
    125125    /** Returns default shortcut. */
    126     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     126    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    127127    {
    128128        return QKeySequence("S");
     
    174174
    175175    /** Returns default shortcut. */
    176     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     176    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    177177    {
    178178        return QKeySequence("T");
     
    224224
    225225    /** Returns default shortcut. */
    226     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     226    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    227227    {
    228228        return QKeySequence("N");
     
    274274
    275275    /** Returns default shortcut. */
    276     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     276    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    277277    {
    278278        return QKeySequence();
     
    327327
    328328    /** Returns default shortcut. */
    329     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     329    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    330330    {
    331331        return QKeySequence("P");
     
    377377
    378378    /** Returns default shortcut. */
    379     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     379    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    380380    {
    381381        return QKeySequence("R");
     
    515515
    516516    /** Returns default shortcut. */
    517     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     517    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    518518    {
    519519#ifdef VBOX_WS_MAC
     
    731731
    732732    /** Returns default shortcut. */
    733     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     733    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    734734    {
    735735        return QKeySequence("F");
     
    784784
    785785    /** Returns default shortcut. */
    786     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     786    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    787787    {
    788788        return QKeySequence("L");
     
    837837
    838838    /** Returns default shortcut. */
    839     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     839    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    840840    {
    841841        return QKeySequence("C");
     
    888888
    889889    /** Returns default shortcut. */
    890     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     890    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    891891    {
    892892        return QKeySequence("M");
     
    939939
    940940    /** Returns default shortcut. */
    941     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     941    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    942942    {
    943943        return QKeySequence("A");
     
    10361036
    10371037    /** Returns default shortcut. */
    1038     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1038    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    10391039    {
    10401040        return QKeySequence("E");
     
    16811681
    16821682    /** Returns default shortcut. */
    1683     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1683    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    16841684    {
    16851685        return QKeySequence("Del");
     
    17321732
    17331733    /** Returns default shortcut. */
    1734     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1734    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    17351735    {
    17361736        return QKeySequence("Backspace");
     
    19591959
    19601960    /** Returns default shortcut. */
    1961     virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
     1961    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
    19621962    {
    19631963#ifdef VBOX_WS_MAC
     
    31753175
    31763176UIActionPoolRuntime::UIActionPoolRuntime(bool fTemporary /* = false */)
    3177     : UIActionPool(UIActionPoolType_Runtime, fTemporary)
     3177    : UIActionPool(UIType_RuntimeUI, fTemporary)
    31783178    , m_cHostScreens(0)
    31793179    , m_cGuestScreens(0)
     
    36013601    /* Create temporary Manager UI pool to do the same: */
    36023602    if (!isTemporary())
    3603         UIActionPool::createTemporary(UIActionPoolType_Manager);
     3603        UIActionPool::createTemporary(UIType_ManagerUI);
    36043604}
    36053605
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r103549 r103552  
    24442444
    24452445    /* Create action-pool: */
    2446     m_pActionPool = UIActionPool::create(UIActionPoolType_Manager);
     2446    m_pActionPool = UIActionPool::create(UIType_ManagerUI);
    24472447
    24482448    /* Prepare menu update-handlers: */
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

    r103538 r103552  
    15981598{
    15991599    /* Create action-pool: */
    1600     m_pActionPool = UIActionPool::create(UIActionPoolType_Runtime);
     1600    m_pActionPool = UIActionPool::create(UIType_RuntimeUI);
    16011601    if (actionPool())
    16021602    {
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp

    r103551 r103552  
    243243    /** Constructs model passing @a pParent to the base-class.
    244244      * @param  enmType  Brings the action-pool type this model is related to. */
    245     UIShortcutConfigurationModel(QObject *pParent, UIActionPoolType enmType);
     245    UIShortcutConfigurationModel(QObject *pParent, UIType enmType);
    246246
    247247    /** Defines the parent @a pTable reference. */
     
    291291
    292292    /** Holds the action-pool type this model is related to. */
    293     UIActionPoolType  m_enmType;
     293    UIType  m_enmType;
    294294
    295295    /** Holds the parent table reference. */
     
    351351*********************************************************************************************************************************/
    352352
    353 UIShortcutConfigurationModel::UIShortcutConfigurationModel(QObject *pParent, UIActionPoolType enmType)
     353UIShortcutConfigurationModel::UIShortcutConfigurationModel(QObject *pParent, UIType enmType)
    354354    : QAbstractTableModel(pParent)
    355355    , m_enmType(enmType)
     
    383383    {
    384384        /* Filter out unnecessary items: */
    385         if (   (m_enmType == UIActionPoolType_Manager && item.key().startsWith(GUI_Input_MachineShortcuts))
    386             || (m_enmType == UIActionPoolType_Runtime && item.key().startsWith(GUI_Input_SelectorShortcuts)))
     385        if (   (m_enmType == UIType_ManagerUI && item.key().startsWith(GUI_Input_MachineShortcuts))
     386            || (m_enmType == UIType_RuntimeUI && item.key().startsWith(GUI_Input_SelectorShortcuts)))
    387387            continue;
    388388        /* Add suitable item to the model as a new shortcut: */
     
    538538                    QString strHotCombo = m_filteredShortcuts[iIndex].currentSequence();
    539539                    /* But if that is machine table and hot-combo is not empty: */
    540                     if (m_enmType == UIActionPoolType_Runtime && !strHotCombo.isEmpty())
     540                    if (m_enmType == UIType_RuntimeUI && !strHotCombo.isEmpty())
    541541                        /* We should prepend it with Host+ prefix: */
    542542                        strHotCombo.prepend(UIHostCombo::hostComboModifierName());
     
    557557                    return   m_filteredShortcuts[iIndex].key() == UIHostCombo::hostComboCacheKey()
    558558                           ? QVariant::fromValue(UIHostComboWrapper(m_filteredShortcuts[iIndex].currentSequence()))
    559                            : QVariant::fromValue(UIHotKey(  m_enmType == UIActionPoolType_Runtime
     559                           : QVariant::fromValue(UIHotKey(  m_enmType == UIType_RuntimeUI
    560560                                                          ? UIHotKeyType_Simple
    561561                                                          : UIHotKeyType_WithModifiers,
     
    927927
    928928            /* Prepare Manager UI model: */
    929             m_pModelManager = new UIShortcutConfigurationModel(this, UIActionPoolType_Manager);
     929            m_pModelManager = new UIShortcutConfigurationModel(this, UIType_ManagerUI);
    930930
    931931            /* Prepare Manager UI table: */
     
    964964
    965965            /* Prepare Runtime UI model: */
    966             m_pModelRuntime = new UIShortcutConfigurationModel(this, UIActionPoolType_Runtime);
     966            m_pModelRuntime = new UIShortcutConfigurationModel(this, UIType_RuntimeUI);
    967967
    968968            /* Create Runtime UI table: */
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

    r101717 r103552  
    358358{
    359359    /* Prepare action-pool: */
    360     m_pActionPool = UIActionPool::create(UIActionPoolType_Runtime);
     360    m_pActionPool = UIActionPool::create(UIType_RuntimeUI);
    361361
    362362    /* Prepare cache: */
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