VirtualBox

Changeset 90878 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 25, 2021 12:05:26 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10067: Runtime UI: Move manual override mode stuff to the place where it belongs (UISession).

Location:
trunk/src/VBox/Frontends/VirtualBox/src/runtime
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r90856 r90878  
    390390    /* Enable 'manual-override',
    391391     * preventing automatic Runtime UI closing: */
    392     setManualOverrideMode(true);
     392    uisession()->setManualOverrideMode(true);
    393393
    394394    /* Was the step successful? */
    … …  
    416416        /* Enable 'manual-override',
    417417         * preventing automatic Runtime UI closing: */
    418         setManualOverrideMode(true);
     418        uisession()->setManualOverrideMode(true);
    419419
    420420        /* Saving VM state: */
    … …  
    441441    /* Enable 'manual-override',
    442442     * preventing automatic Runtime UI closing: */
    443     setManualOverrideMode(true);
     443    uisession()->setManualOverrideMode(true);
    444444
    445445    /* Was the step successful? */
    … …  
    451451
    452452    /* Disable 'manual-override' finally: */
    453     setManualOverrideMode(false);
     453    uisession()->setManualOverrideMode(false);
    454454
    455455    /* Manually close Runtime UI: */
    … …  
    619619        {
    620620            /* If not in 'manual-override' mode: */
    621             if (!isManualOverrideMode())
     621            if (!uisession()->isManualOverrideMode())
    622622            {
    623623                /* VM has been powered off, saved, teleported or aborted.
    … …  
    856856    , m_pDragAndDropActions(0)
    857857    , m_fIsWindowsCreated(false)
    858     , m_fIsManualOverride(false)
    859858#ifdef VBOX_WITH_DEBUGGER_GUI
    860859    , m_pDbgGui(0)
    … …  
    19441943{
    19451944    /* Disable 'manual-override' finally: */
    1946     setManualOverrideMode(false);
     1945    uisession()->setManualOverrideMode(false);
    19471946
    19481947    /* Close Runtime UI if state was saved: */
    … …  
    19851984
    19861985    /* Do not close machine-window in 'manual-override' mode: */
    1987     if (isManualOverrideMode())
     1986    if (uisession()->isManualOverrideMode())
    19881987        return;
    19891988

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

    r90856 r90878  
    126126    UIMachineWindow* mainMachineWindow() const;
    127127    UIMachineWindow* activeMachineWindow() const;
    128 
    129     /** Returns whether VM is in 'manual-override' mode.
    130       * @note S.a. #m_fIsManualOverride description for more information. */
    131     bool isManualOverrideMode() const { return m_fIsManualOverride; }
    132     /** Defines whether VM is in 'manual-override' mode.
    133       * @note S.a. #m_fIsManualOverride description for more information. */
    134     void setManualOverrideMode(bool fIsManualOverride) { m_fIsManualOverride = fIsManualOverride; }
    135128
    136129    /** Adjusts machine-window(s) geometry if necessary. */
    … …  
    428421    bool m_fIsWindowsCreated : 1;
    429422
    430     /** Holds whether VM is in 'manual-override' mode
    431       * which means there will be no automatic UI shutdowns,
    432       * visual representation mode changes and other similar routines. */
    433     bool m_fIsManualOverride : 1;
    434 
    435423#ifdef VBOX_WITH_DEBUGGER_GUI
    436424    /* Debugger functionality: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r90856 r90878  
    288288     * preventing automatic Runtime UI closing
    289289     * and visual representation mode changes: */
    290     if (machineLogic())
    291         machineLogic()->setManualOverrideMode(true);
     290    setManualOverrideMode(true);
    292291
    293292    /* Show "Starting/Restoring" progress dialog: */
    … …  
    315314
    316315    /* Disable 'manual-override' finally: */
    317     if (machineLogic())
    318         machineLogic()->setManualOverrideMode(false);
     316    setManualOverrideMode(false);
    319317
    320318    /* True by default: */
    … …  
    838836    , m_fIsGuestResizeIgnored(false)
    839837    , m_fIsAutoCaptureDisabled(false)
     838    , m_fIsManualOverride(false)
    840839    /* Guest additions flags: */
    841840    , m_ulGuestAdditionsRunLevel(0)
    … …  
    18971896            /* Enable 'manual-override',
    18981897             * preventing automatic Runtime UI closing: */
    1899             if (machineLogic())
    1900                 machineLogic()->setManualOverrideMode(true);
     1898            setManualOverrideMode(true);
    19011899            /* Power off VM: */
    19021900            bool fServerCrashed = false;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

    r90856 r90878  
    173173    bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
    174174    bool isAutoCaptureDisabled() const { return m_fIsAutoCaptureDisabled; }
     175
     176    /** Returns whether VM is in 'manual-override' mode.
     177      * @note S.a. #m_fIsManualOverride description for more information. */
     178    bool isManualOverrideMode() const { return m_fIsManualOverride; }
     179    /** Defines whether VM is in 'manual-override' mode.
     180      * @note S.a. #m_fIsManualOverride description for more information. */
     181    void setManualOverrideMode(bool fIsManualOverride) { m_fIsManualOverride = fIsManualOverride; }
    175182
    176183    /* Guest additions state getters: */
    … …  
    538545    bool m_fIsGuestResizeIgnored : 1;
    539546    bool m_fIsAutoCaptureDisabled : 1;
     547    /** Holds whether VM is in 'manual-override' mode
     548      * which means there will be no automatic UI shutdowns,
     549      * visual representation mode changes and other stuff. */
     550    bool m_fIsManualOverride : 1;
    540551
    541552    /* Guest additions flags: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

    r82968 r90878  
    338338
    339339    /* Do not try to change visual-state type in 'manual override' mode: */
    340     if (isManualOverrideMode())
     340    if (uisession()->isManualOverrideMode())
    341341        return;
    342342

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r88247 r90878  
    6969
    7070    /* Do not try to change visual-state type in 'manual override' mode: */
    71     if (isManualOverrideMode())
     71    if (uisession()->isManualOverrideMode())
    7272        return;
    7373

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

    r82968 r90878  
    127127
    128128    /* Do not try to change visual-state type in 'manual override' mode: */
    129     if (isManualOverrideMode())
     129    if (uisession()->isManualOverrideMode())
    130130        return;
    131131
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