VirtualBox

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

Merging r155512 and r155513 from gui4 branch: FE/Qt: Runtime UI: Redirecting machine name stuff from UISession to UIMachine; Small cleanup for UISession getters.

Location:
trunk
Files:
11 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-155511
         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
        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-155511
         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

  • 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-155511
         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

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

    r98420 r98422  
    225225{
    226226    return m_enmRequestedVisualState;
     227}
     228
     229QString UIMachine::machineName() const
     230{
     231    return uisession()->machineName();
    227232}
    228233

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

    r98404 r98422  
    172172    UIVisualStateType requestedVisualState() const;
    173173
     174    /** @name General stuff.
     175     ** @{ */
     176        /** Returns the machine name. */
     177        QString machineName() const;
     178    /** @} */
     179
    174180    /** @name Branding stuff.
    175181     ** @{ */

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

    r98421 r98422  
    321321}
    322322
    323 const QString& UIMachineLogic::machineName() const
    324 {
    325     return uisession()->machineName();
     323QString UIMachineLogic::machineName() const
     324{
     325    return uimachine()->machineName();
    326326}
    327327

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

    r98400 r98422  
    138138
    139139    /** Returns the machine name. */
    140     const QString& machineName() const;
     140    QString machineName() const;
    141141    const QList<UIMachineWindow*>& machineWindows() const { return m_machineWindowsList; }
    142142    UIKeyboardHandler* keyboardHandler() const { return m_pKeyboardHandler; }

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

    r98419 r98422  
    237237}
    238238
    239 const QString& UIMachineWindow::machineName() const
    240 {
    241     return uisession()->machineName();
     239QString UIMachineWindow::machineName() const
     240{
     241    return uimachine()->machineName();
    242242}
    243243

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

    r98376 r98422  
    102102
    103103    /** Returns the machine name. */
    104     const QString& machineName() const;
     104    QString machineName() const;
    105105
    106106    /** Returns whether the machine-window should resize to fit to the guest display.

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

    r98420 r98422  
    248248}
    249249
    250 UIMachineLogic* UISession::machineLogic() const
    251 {
    252     return uimachine() ? uimachine()->machineLogic() : 0;
    253 }
    254 
    255 QWidget* UISession::mainMachineWindow() const
    256 {
    257     return machineLogic() ? machineLogic()->mainMachineWindow() : 0;
    258 }
    259 
    260250WId UISession::mainMachineWindowId() const
    261251{
    262     return mainMachineWindow()->winId();
    263 }
    264 
    265 UIMachineWindow *UISession::activeMachineWindow() const
    266 {
    267     return machineLogic() ? machineLogic()->activeMachineWindow() : 0;
     252    return mainMachineWindow() ? mainMachineWindow()->winId() : 0;
    268253}
    269254
    … …  
    411396}
    412397
     398UIMachineLogic *UISession::machineLogic() const
     399{
     400    return uimachine() ? uimachine()->machineLogic() : 0;
     401}
     402
     403UIMachineWindow *UISession::activeMachineWindow() const
     404{
     405    return machineLogic() ? machineLogic()->activeMachineWindow() : 0;
     406}
     407
     408QWidget *UISession::mainMachineWindow() const
     409{
     410    return machineLogic() ? machineLogic()->mainMachineWindow() : 0;
     411}
     412
    413413bool UISession::prepare()
    414414{
    … …  
    416416    if (!prepareSession())
    417417        return false;
     418
     419    /* Prepare GUI stuff: */
    418420    prepareNotificationCenter();
    419421    prepareConsoleEventHandlers();
    420422    prepareFramebuffers();
    421 
    422     /* Prepare GUI stuff: */
    423423    prepareConnections();
    424424    prepareSignalHandling();

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

    r98420 r98422  
    150150
    151151    /** Returns the session instance. */
    152     CSession& session() { return m_session; }
     152    CSession &session() { return m_session; }
    153153    /** Returns the session's machine instance. */
    154     CMachine& machine() { return m_machine; }
     154    CMachine &machine() { return m_machine; }
    155155    /** Returns the session's console instance. */
    156     CConsole& console() { return m_console; }
     156    CConsole &console() { return m_console; }
    157157    /** Returns the console's display instance. */
    158     CDisplay& display() { return m_display; }
     158    CDisplay &display() { return m_display; }
    159159    /** Returns the console's guest instance. */
    160     CGuest& guest() { return m_guest; }
     160    CGuest &guest() { return m_guest; }
    161161    /** Returns the console's mouse instance. */
    162     CMouse& mouse() { return m_mouse; }
     162    CMouse &mouse() { return m_mouse; }
    163163    /** Returns the console's keyboard instance. */
    164     CKeyboard& keyboard() { return m_keyboard; }
     164    CKeyboard &keyboard() { return m_keyboard; }
    165165    /** Returns the console's debugger instance. */
    166     CMachineDebugger& debugger() { return m_debugger; }
     166    CMachineDebugger &debugger() { return m_debugger; }
    167167
    168168    /** Returns the machine name. */
    169     const QString& machineName() const { return m_strMachineName; }
     169    QString machineName() const { return m_strMachineName; }
     170
     171    /** Returns previous machine state. */
    170172    KMachineState machineStatePrevious() const { return m_machineStatePrevious; }
     173    /** Returns machine state. */
    171174    KMachineState machineState() const { return m_machineState; }
    172175
    173     UIMachineLogic* machineLogic() const;
    174     QWidget* mainMachineWindow() const;
     176    /** Returns main machine-widget id. */
    175177    WId mainMachineWindowId() const;
    176     UIMachineWindow *activeMachineWindow() const;
    177178
    178179    bool isSaved() const { return machineState() == KMachineState_Saved ||
    … …  
    191192    bool wasPaused() const { return machineStatePrevious() == KMachineState_Paused ||
    192193                                    machineStatePrevious() == KMachineState_TeleportingPausedVM; }
     194
    193195    bool isInitialized() const { return m_fInitialized; }
    194196    bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
    … …  
    272274    ~UISession();
    273275
    274     /* Private getters: */
    275     UIMachine* uimachine() const { return m_pMachine; }
     276    /** Returns machine UI reference. */
     277    UIMachine *uimachine() const { return m_pMachine; }
     278    /** Returns machine-logic reference. */
     279    UIMachineLogic *machineLogic() const;
     280    /** Returns main machine-window reference. */
     281    UIMachineWindow *activeMachineWindow() const;
     282    /** Returns main machine-widget reference. */
     283    QWidget *mainMachineWindow() const;
    276284
    277285    /* Prepare helpers: */
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