VirtualBox

Changeset 42323 in vbox


Ignore:
Timestamp:
Jul 23, 2012 12:33:32 PM (12 years ago)
Author:
vboxsync
Message:

FE/Qt: get rid of a bit of duplication in the MachineView code.

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

Legend:

Unmodified
Added
Removed

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

    r42318 r42323  
    151151            break;
    152152    }
     153    pMachineView->sltMachineStateChanged();
     154    /** @todo Can we move the call to sltAdditionsStateChanged() from the
     155     * subclass constructors here too?  It is called for Normal and Seamless,
     156     * but not for Fullscreen and Scale.  However for Scale it is a no op.,
     157     * so it would not hurt.  Would it hurt for Fullscreen? */
    153158    return pMachineView;
    154159}
    … …  
    262267#endif /* VBOX_WITH_VIDEOHWACCEL */
    263268{
     269    /* Load machine view settings: */
     270    loadMachineViewSettings();
     271
     272    /* Prepare viewport: */
     273    prepareViewport();
     274
     275    /* Prepare frame buffer: */
     276    prepareFrameBuffer();
     277
     278    /* Prepare common things: */
     279    prepareCommon();
     280
     281    /* Prepare event-filters: */
     282    prepareFilters();
     283
     284    /* Prepare connections: */
     285    prepareConnections();
     286
     287    /* Prepare console connections: */
     288    prepareConsoleConnections();
    264289}
    265290

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

    r42318 r42323  
    5353    , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked())
    5454{
    55     /* Load machine view settings: */
    56     loadMachineViewSettings();
    57 
    58     /* Prepare viewport: */
    59     prepareViewport();
    60 
    61     /* Prepare frame buffer: */
    62     prepareFrameBuffer();
    63 
    64     /* Prepare common things: */
    65     prepareCommon();
    66 
    67     /* Prepare event-filters: */
    68     prepareFilters();
    69 
    70     /* Prepare connections: */
    71     prepareConnections();
    72 
    73     /* Prepare console connections: */
    74     prepareConsoleConnections();
    75 
    76     /* Initialization: */
    77     sltMachineStateChanged();
    7855}
    7956

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

    r42318 r42323  
    4949    , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked())
    5050{
    51     /* Load machine view settings: */
    52     loadMachineViewSettings();
    53 
    54     /* Prepare viewport: */
    55     prepareViewport();
    56 
    57     /* Prepare frame buffer: */
    58     prepareFrameBuffer();
    59 
    60     /* Prepare common things: */
    61     prepareCommon();
    62 
    63     /* Prepare event-filters: */
    64     prepareFilters();
    65 
    66     /* Prepare connections: */
    67     prepareConnections();
    68 
    69     /* Prepare console connections: */
    70     prepareConsoleConnections();
    7151
    7252    /* Initialization: */
    73     sltMachineStateChanged();
    7453    sltAdditionsStateChanged();
    7554}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

    r42318 r42323  
    5353    , m_pPauseImage(0)
    5454{
    55     /* Load machine view settings: */
    56     loadMachineViewSettings();
    57 
    58     /* Prepare viewport: */
    59     prepareViewport();
    60 
    61     /* Prepare frame buffer: */
    62     prepareFrameBuffer();
    63 
    64     /* Prepare common things: */
    65     prepareCommon();
    66 
    67     /* Prepare event-filters: */
    68     prepareFilters();
    69 
    70     /* Prepare connections: */
    71     prepareConnections();
    72 
    73     /* Prepare console connections: */
    74     prepareConsoleConnections();
    75 
    76     /* Initialization: */
    77     sltMachineStateChanged();
    7855}
    7956

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

    r42318 r42323  
    5757                    )
    5858{
    59     /* Load machine view settings: */
    60     loadMachineViewSettings();
    61 
    62     /* Prepare viewport: */
    63     prepareViewport();
    64 
    65     /* Prepare frame buffer: */
    66     prepareFrameBuffer();
    67 
    68     /* Prepare common things: */
    69     prepareCommon();
    70 
    71     /* Prepare event-filters: */
    72     prepareFilters();
    73 
    74     /* Prepare connections: */
    75     prepareConnections();
    76 
    77     /* Prepare console connections: */
    78     prepareConsoleConnections();
    79 
    8059    /* Prepare seamless view: */
    8160    prepareSeamless();
    8261
    8362    /* Initialization: */
    84     sltMachineStateChanged();
    8563    sltAdditionsStateChanged();
    8664}
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