VirtualBox

Ignore:
Timestamp:
Feb 2, 2023 9:47:36 AM (2 years ago)
Author:
vboxsync
Message:

Merging r155526 from gui4 branch: FE/Qt: Runtime UI: Move initialization stuff from UISession to UIMachine.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3:79645-79692
        21 /branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513
         21/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526
        2222/trunk/src:92342,154921

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3/src/VBox:79645-79692
        21 /branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513
         21/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526

  • trunk/src/VBox/Frontends

    • Property svn:mergeinfo

      •  

        old new  
        1616/branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        1717/branches/dsen/gui3/src/VBox/Frontends:79645-79692
        18 /branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513
         18/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526

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

    r98422 r98423  
    803803UIMachine::UIMachine()
    804804    : QObject(0)
     805    , m_fInitialized(false)
    805806    , m_pSession(0)
    806807    , m_allowedVisualStates(UIVisualStateType_Invalid)
    … …  
    874875    updateStateAudioActions();
    875876    updateMouseState();
     877
     878    /* Warn listeners about we are initialized: */
     879    m_fInitialized = true;
     880    emit sigInitialized();
    876881
    877882    /* True by default: */

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

    r98422 r98423  
    6262
    6363signals:
     64
     65    /** Notifies listeners about machine initialized. */
     66    void sigInitialized();
    6467
    6568    /** Requests async visual-state change. */
    … …  
    154157    static UIMachine *instance() { return s_pInstance; }
    155158
     159    /** Returns whether machine is initialized. */
     160    bool isInitialized() const { return m_fInitialized; }
     161
    156162    /** Returns session UI instance. */
    157163    UISession *uisession() const { return m_pSession; }
    … …  
    541547    static UIMachine *s_pInstance;
    542548
     549    /** Holds whether machine is initialized. */
     550    bool  m_fInitialized;
     551
    543552    /** Holds the session UI instance. */
    544553    UISession *m_pSession;

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

    r98422 r98423  
    876876
    877877    /* We should watch for requested modes: */
    878     connect(uisession(), &UISession::sigInitialized, this, &UIMachineLogic::sltCheckForRequestedVisualStateType, Qt::QueuedConnection);
     878    connect(uimachine(), &UIMachine::sigInitialized, this, &UIMachineLogic::sltCheckForRequestedVisualStateType, Qt::QueuedConnection);
    879879    connect(uimachine(), &UIMachine::sigAdditionsStateChange, this, &UIMachineLogic::sltCheckForRequestedVisualStateType);
    880880
    … …  
    14201420
    14211421    /* We should stop watching for requested modes: */
    1422     disconnect(uisession(), &UISession::sigInitialized, this, &UIMachineLogic::sltCheckForRequestedVisualStateType);
     1422    disconnect(uimachine(), &UIMachine::sigInitialized, this, &UIMachineLogic::sltCheckForRequestedVisualStateType);
    14231423    disconnect(uimachine(), &UIMachine::sigAdditionsStateChange, this, &UIMachineLogic::sltCheckForRequestedVisualStateType);
    14241424

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

    r98422 r98423  
    176176#endif /* VBOX_GUI_WITH_PIDFILE */
    177177
    178     /* Warn listeners about we are initialized: */
    179     m_fInitialized = true;
    180     emit sigInitialized();
    181 
    182178    /* True by default: */
    183179    return true;
    … …  
    376372    , m_machineState(KMachineState_Null)
    377373    /* Common flags: */
    378     , m_fInitialized(false)
    379374    , m_fIsGuestResizeIgnored(false)
    380375    , m_fIsAutoCaptureDisabled(false)

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

    r98422 r98423  
    7777
    7878signals:
    79 
    80     /** Notifies listeners about session initialized. */
    81     void sigInitialized();
    8279
    8380    /** Notifies about additions state change. */
    … …  
    193190                                    machineStatePrevious() == KMachineState_TeleportingPausedVM; }
    194191
    195     bool isInitialized() const { return m_fInitialized; }
    196192    bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
    197193    bool isAutoCaptureDisabled() const { return m_fIsAutoCaptureDisabled; }
    … …  
    338334
    339335    /* Common flags: */
    340     bool m_fInitialized : 1;
    341336    bool m_fIsGuestResizeIgnored : 1;
    342337    bool m_fIsAutoCaptureDisabled : 1;

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

    r98419 r98423  
    288288        uimachine()->setRequestedVisualState(UIVisualStateType_Normal);
    289289
    290         /* If session already initialized => push mode-change directly: */
    291         if (uisession()->isInitialized())
     290        /* If machine UI already initialized => push mode-change directly: */
     291        if (uimachine()->isInitialized())
    292292            sltCheckForRequestedVisualStateType();
    293293    }

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

    r98386 r98423  
    273273            this, &UIMachineWindowNormal::sltCPUExecutionCapChange);
    274274
    275     /* Watch for UISession signals: */
    276     connect(machineLogic()->uisession(), &UISession::sigInitialized,
     275    /* Watch for UIMachine signals: */
     276    connect(machineLogic()->uimachine(), &UIMachine::sigInitialized,
    277277            this, &UIMachineWindowNormal::sltHandleSessionInitialized);
    278278}
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