VirtualBox

Changeset 44825 in vbox


Ignore:
Timestamp:
Feb 26, 2013 11:19:59 AM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
83962
Message:

FE/Qt: Runtime cleanup: Fullscreen/Seamless logic stuff.

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

Legend:

Unmodified
Added
Removed

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

    r41689 r44825  
    77
    88/*
    9  * Copyright (C) 2010-2012 Oracle Corporation
     9 * Copyright (C) 2010-2013 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    101101}
    102102
    103 int UIMachineLogicFullscreen::hostScreenForGuestScreen(int screenId) const
    104 {
    105     return m_pScreenLayout->hostScreenForGuestScreen(screenId);
    106 }
    107 
    108 #ifdef Q_WS_MAC
    109 void UIMachineLogicFullscreen::prepareFullscreenConnections()
    110 {
    111     /* Presentation mode connection: */
    112     connect(gEDataEvents, SIGNAL(sigPresentationModeChange(bool)),
    113             this, SLOT(sltChangePresentationMode(bool)));
     103int UIMachineLogicFullscreen::hostScreenForGuestScreen(int iScreenId) const
     104{
     105    return m_pScreenLayout->hostScreenForGuestScreen(iScreenId);
     106}
     107
     108#ifdef Q_WS_MAC
     109void UIMachineLogicFullscreen::sltChangePresentationMode(bool /* fEnabled */)
     110{
     111    setPresentationModeEnabled(true);
     112}
     113
     114void UIMachineLogicFullscreen::sltScreenLayoutChanged()
     115{
     116    setPresentationModeEnabled(true);
    114117}
    115118#endif /* Q_WS_MAC */
    … …  
    166169}
    167170
     171#ifdef Q_WS_MAC
     172void UIMachineLogicFullscreen::prepareFullscreenConnections()
     173{
     174    /* Presentation mode connection: */
     175    connect(gEDataEvents, SIGNAL(sigPresentationModeChange(bool)),
     176            this, SLOT(sltChangePresentationMode(bool)));
     177}
     178#endif /* Q_WS_MAC */
     179
    168180void UIMachineLogicFullscreen::cleanupMachineWindows()
    169181{
    … …  
    191203
    192204#ifdef Q_WS_MAC
    193 void UIMachineLogicFullscreen::sltChangePresentationMode(bool /* fEnabled */)
    194 {
    195     setPresentationModeEnabled(true);
    196 }
    197 
    198 void UIMachineLogicFullscreen::sltScreenLayoutChanged()
    199 {
    200     setPresentationModeEnabled(true);
    201 }
    202 
    203205void UIMachineLogicFullscreen::setPresentationModeEnabled(bool fEnabled)
    204206{

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

    r41064 r44825  
    66
    77/*
    8  * Copyright (C) 2010-2012 Oracle Corporation
     8 * Copyright (C) 2010-2013 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3535    /* Constructor/destructor: */
    3636    UIMachineLogicFullscreen(QObject *pParent, UISession *pSession);
    37     virtual ~UIMachineLogicFullscreen();
     37    ~UIMachineLogicFullscreen();
    3838
    3939    /* Check if this logic is available: */
    … …  
    4343    void prepare();
    4444
    45     int hostScreenForGuestScreen(int screenId) const;
     45    /* Multi-screen stuff: */
     46    int hostScreenForGuestScreen(int iScreenId) const;
    4647
    4748private slots:
    4849
    49 #ifdef RT_OS_DARWIN
     50#ifdef Q_WS_MAC
    5051    void sltChangePresentationMode(bool fEnabled);
    5152    void sltScreenLayoutChanged();
    52 #endif /* RT_OS_DARWIN */
     53#endif /* Q_WS_MAC */
    5354
    5455private:
    … …  
    6263
    6364    /* Cleanup helpers: */
    64     void cleanupMachineWindows();
    65     void cleanupActionGroups();
    6665#ifdef Q_WS_MAC
    6766    //void cleanupCommonConnections() {}
    6867#endif /* Q_WS_MAC */
     68    void cleanupMachineWindows();
     69    void cleanupActionGroups();
    6970
    7071#ifdef Q_WS_MAC
    … …  
    7273#endif /* Q_WS_MAC */
    7374
     75    /* Variables: */
    7476    UIMultiScreenLayout *m_pScreenLayout;
    7577

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

    r41587 r44825  
    77
    88/*
    9  * Copyright (C) 2010-2012 Oracle Corporation
     9 * Copyright (C) 2010-2013 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    8787}
    8888
    89 int UIMachineLogicSeamless::hostScreenForGuestScreen(int screenId) const
     89int UIMachineLogicSeamless::hostScreenForGuestScreen(int iScreenId) const
    9090{
    91     return m_pScreenLayout->hostScreenForGuestScreen(screenId);
     91    return m_pScreenLayout->hostScreenForGuestScreen(iScreenId);
    9292}
    9393

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

    r41064 r44825  
    66
    77/*
    8  * Copyright (C) 2010-2012 Oracle Corporation
     8 * Copyright (C) 2010-2013 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3535    /* Constructor/destructor: */
    3636    UIMachineLogicSeamless(QObject *pParent, UISession *pSession);
    37     virtual ~UIMachineLogicSeamless();
     37    ~UIMachineLogicSeamless();
    3838
    3939    /* Check if this logic is available: */
    4040    bool checkAvailability();
    4141
    42     int hostScreenForGuestScreen(int screenId) const;
     42    /* Multi-screen stuff: */
     43    int hostScreenForGuestScreen(int iScreenId) const;
    4344
    4445private:
    … …  
    5253    void cleanupActionGroups();
    5354
     55    /* Variables: */
    5456    UIMultiScreenLayout *m_pScreenLayout;
    5557
Note: See TracChangeset for help on using the changeset viewer.

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