VirtualBox

Changeset 56869 in vbox


Ignore:
Timestamp:
Jul 8, 2015 3:05:04 PM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
101539
Message:

FE/Qt: Reverting r101520 since it causing conflicts with Win host.

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

Legend:

Unmodified
Added
Removed

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

    r56857 r56869  
    10531053#ifndef Q_WS_MAC
    10541054    connect(actionPool()->action(UIActionIndexRT_M_View_S_MinimizeWindow), SIGNAL(triggered()),
    1055             this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
     1055            this, SLOT(sltMinimizeActiveMachineWindow()));
    10561056#endif /* !Q_WS_MAC */
    10571057    connect(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow), SIGNAL(triggered()),
    … …  
    11121112    /* 'Window' action connections: */
    11131113    connect(actionPool()->action(UIActionIndex_M_Window_S_Minimize), SIGNAL(triggered()),
    1114             this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
     1114            this, SLOT(sltMinimizeActiveMachineWindow()));
    11151115#endif /* Q_WS_MAC */
    11161116}
    … …  
    15581558    /* Minimize active machine-window: */
    15591559    AssertPtrReturnVoid(activeMachineWindow());
    1560     activeMachineWindow()->showInMinimizedMode();
     1560    activeMachineWindow()->showMinimized();
    15611561}
    15621562

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

    r56857 r56869  
    105105    /* Show stuff: */
    106106    virtual void showInNecessaryMode() = 0;
    107     /** Shows window minimized. */
    108     virtual void showInMinimizedMode() { showMinimized(); }
    109107
    110108    /* Translate stuff: */

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

    r56857 r56869  
    247247                                              gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));
    248248    m_pMiniToolBar->addMenus(actionPool()->menus());
    249     connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), machineLogic(), SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
     249    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
    250250    connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    251251            actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));
    … …  
    444444}
    445445
    446 void UIMachineWindowFullscreen::showInMinimizedMode()
    447 {
    448 #ifndef Q_WS_MAC
    449     /* If there is mini-toolbar: */
    450     if (m_pMiniToolBar)
    451     {
    452         /* Minimize it first: */
    453         m_pMiniToolBar->showMinimized();
    454     }
    455 #endif /* !Q_WS_MAC */
    456 
    457     /* Call to base-class: */
    458     UIMachineWindow::showInMinimizedMode();
    459 }
    460 
    461446void UIMachineWindowFullscreen::adjustMachineViewSize()
    462447{

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

    r56857 r56869  
    9292    void placeOnScreen();
    9393    void showInNecessaryMode();
    94     /** Shows window minimized. */
    95     void showInMinimizedMode();
    9694
    9795    /** Adjusts machine-view size to correspond current machine-window size. */

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

    r56857 r56869  
    131131    m_pMiniToolBar->show();
    132132    m_pMiniToolBar->addMenus(actionPool()->menus());
    133     connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), machineLogic(), SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
     133    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
    134134    connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    135135            actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger()));
    … …  
    235235    /* Make sure machine-view have focus: */
    236236    m_pMachineView->setFocus();
    237 }
    238 
    239 void UIMachineWindowSeamless::showInMinimizedMode()
    240 {
    241 #ifndef Q_WS_MAC
    242     /* If there is mini-toolbar: */
    243     if (m_pMiniToolBar)
    244     {
    245         /* Minimize it first: */
    246         m_pMiniToolBar->showMinimized();
    247     }
    248 #endif /* !Q_WS_MAC */
    249 
    250     /* Call to base-class: */
    251     UIMachineWindow::showInMinimizedMode();
    252237}
    253238

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

    r56857 r56869  
    6464    void placeOnScreen();
    6565    void showInNecessaryMode();
    66     /** Shows window minimized. */
    67     void showInMinimizedMode();
    6866
    6967    /** Adjusts machine-view size to correspond current machine-window size. */
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