VirtualBox

Changeset 54160 in vbox


Ignore:
Timestamp:
Feb 11, 2015 8:50:39 PM (10 years ago)
Author:
vboxsync
Message:

FE/Qt: 7677: Check for the requested visual-state on each GA state-change even if no GA state was changed; Additional release logging.

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

Legend:

Unmodified
Added
Removed

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

    r54151 r54160  
    847847
    848848    /* Guest additions state-change updater: */
    849     connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltAdditionsStateChanged()));
     849    connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
    850850
    851851    /* Mouse capability state-change updater: */

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

    r54151 r54160  
    907907        m_fIsGuestSupportsSeamless = fIsGuestSupportsSeamless;
    908908
    909         /* Notify listeners about guest additions state changed: */
    910         emit sigAdditionsStateChange();
    911     }
     909        /* Notify listeners about guest additions state really changed: */
     910        emit sigAdditionsStateActualChange();
     911    }
     912
     913    /* Notify listeners about guest additions state event came: */
     914    emit sigAdditionsStateChange();
    912915}
    913916

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

    r53954 r54160  
    267267    void sigMachineStateChange();
    268268    void sigAdditionsStateChange();
     269    void sigAdditionsStateActualChange();
    269270    void sigNetworkAdapterChange(const CNetworkAdapter &networkAdapter);
    270271    void sigMediumChange(const CMediumAttachment &mediumAttachment);

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

    r53954 r54160  
    335335void UIMachineLogicFullscreen::sltCheckForRequestedVisualStateType()
    336336{
     337    LogRel(("UIMachineLogicFullscreen::sltCheckForRequestedVisualStateType: Requested-state=%d, Machine-state=%d\n",
     338            uisession()->requestedVisualState(), uisession()->machineState()));
     339
    337340    /* Do not try to change visual-state type if machine was not started yet: */
    338341    if (!uisession()->isRunning() && !uisession()->isPaused())

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

    r53912 r54160  
    129129
    130130    /* Guest additions state-change updater: */
    131     connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltAdditionsStateChanged()));
     131    connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
    132132}
    133133

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

    r53065 r54160  
    6565void UIMachineLogicNormal::sltCheckForRequestedVisualStateType()
    6666{
     67    LogRel(("UIMachineLogicNormal::sltCheckForRequestedVisualStateType: Requested-state=%d, Machine-state=%d\n",
     68            uisession()->requestedVisualState(), uisession()->machineState()));
     69
    6770    /* Do not try to change visual-state type if machine was not started yet: */
    6871    if (!uisession()->isRunning() && !uisession()->isPaused())
    … …  
    8386                uisession()->changeVisualState(UIVisualStateType_Seamless);
    8487            }
     88            else
     89                LogRel(("UIMachineLogicNormal::sltCheckForRequestedVisualStateType: "
     90                        "Rejecting 'seamless' as is it not yet supported...\n"));
    8591            break;
    8692        }

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

    r53912 r54160  
    124124
    125125    /* Guest additions state-change updater: */
    126     connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltAdditionsStateChanged()));
     126    connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
    127127}
    128128

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

    r53954 r54160  
    125125void UIMachineLogicSeamless::sltCheckForRequestedVisualStateType()
    126126{
     127    LogRel(("UIMachineLogicSeamless::sltCheckForRequestedVisualStateType: Requested-state=%d, Machine-state=%d\n",
     128            uisession()->requestedVisualState(), uisession()->machineState()));
     129
    127130    /* Do not try to change visual-state type if machine was not started yet: */
    128131    if (!uisession()->isRunning() && !uisession()->isPaused())

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

    r54100 r54160  
    144144
    145145    /* Guest additions state-change updater: */
    146     connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltAdditionsStateChanged()));
     146    connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
    147147}
    148148
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