VirtualBox

Changeset 26800 in vbox for trunk/src


Ignore:
Timestamp:
Feb 25, 2010 2:38:22 PM (15 years ago)
Author:
vboxsync
Message:

FE/Qt4: New running VM core: Just a little patch to r58066.

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

Legend:

Unmodified
Added
Removed

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

    r26799 r26800  
    397397}
    398398
     399void UIMachineWindow::prepareMenuMachine()
     400{
     401    QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
     402
     403    menu->clear();
     404
     405    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Fullscreen));
     406    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Seamless));
     407    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize));
     408    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_AdjustWindow));
     409    menu->addSeparator();
     410    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_MouseIntegration));
     411    menu->addSeparator();
     412    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_TypeCAD));
     413#ifdef Q_WS_X11
     414    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_TypeCABS));
     415#endif
     416    menu->addSeparator();
     417    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_TakeSnapshot));
     418    menu->addSeparator();
     419    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_InformationDialog));
     420    menu->addSeparator();
     421    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Pause));
     422    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Reset));
     423    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Shutdown));
     424#ifndef Q_WS_MAC
     425    menu->addSeparator();
     426#endif /* Q_WS_MAC */
     427    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Close));
     428}
     429
     430void UIMachineWindow::prepareMenuDevices()
     431{
     432    QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
     433
     434    menu->clear();
     435
     436    /* Devices submenu */
     437    menu->addMenu(machineLogic()->actionsPool()->action(UIActionIndex_Menu_OpticalDevices)->menu());
     438    menu->addMenu(machineLogic()->actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->menu());
     439    menu->addMenu(machineLogic()->actionsPool()->action(UIActionIndex_Menu_USBDevices)->menu());
     440    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_NetworkAdaptersDialog));
     441    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_SharedFoldersDialog));
     442    menu->addSeparator();
     443    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_VRDP));
     444    menu->addSeparator();
     445    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_InstallGuestTools));
     446}
     447
     448#ifdef VBOX_WITH_DEBUGGER_GUI
     449void UIMachineWindow::prepareMenuDebug()
     450{
     451    QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Debug)->menu();
     452
     453    menu->clear();
     454
     455    /* Debug submenu */
     456    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Statistics));
     457    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_CommandLine));
     458    menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Logging));
     459}
     460#endif /* VBOX_WITH_DEBUGGER_GUI */
     461
    399462void UIMachineWindow::loadWindowSettings()
    400463{
    … …  
    439502}
    440503
    441 void UIMachineWindow::prepareMenuMachine()
    442 {
    443     QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
    444 
    445     menu->clear();
    446 
    447     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Fullscreen));
    448     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Seamless));
    449     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize));
    450     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_AdjustWindow));
    451     menu->addSeparator();
    452     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_MouseIntegration));
    453     menu->addSeparator();
    454     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_TypeCAD));
    455 #ifdef Q_WS_X11
    456     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_TypeCABS));
    457 #endif
    458     menu->addSeparator();
    459     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_TakeSnapshot));
    460     menu->addSeparator();
    461     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_InformationDialog));
    462     menu->addSeparator();
    463     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Pause));
    464     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Reset));
    465     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Shutdown));
    466 #ifndef Q_WS_MAC
    467     menu->addSeparator();
    468 #endif /* Q_WS_MAC */
    469     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Close));
    470 }
    471 
    472 void UIMachineWindow::prepareMenuDevices()
    473 {
    474     QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
    475 
    476     menu->clear();
    477 
    478     /* Devices submenu */
    479     menu->addMenu(machineLogic()->actionsPool()->action(UIActionIndex_Menu_OpticalDevices)->menu());
    480     menu->addMenu(machineLogic()->actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->menu());
    481     menu->addMenu(machineLogic()->actionsPool()->action(UIActionIndex_Menu_USBDevices)->menu());
    482     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_NetworkAdaptersDialog));
    483     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_SharedFoldersDialog));
    484     menu->addSeparator();
    485     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_VRDP));
    486     menu->addSeparator();
    487     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_InstallGuestTools));
    488 }
    489 
    490 #ifdef VBOX_WITH_DEBUGGER_GUI
    491 void UIMachineWindow::prepareMenuDebug()
    492 {
    493     QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Debug)->menu();
    494 
    495     menu->clear();
    496 
    497     /* Debug submenu */
    498     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_Statistics));
    499     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Simple_CommandLine));
    500     menu->addAction(machineLogic()->actionsPool()->action(UIActionIndex_Toggle_Logging));
    501 }
    502 #endif /* VBOX_WITH_DEBUGGER_GUI */
    503 

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

    r26799 r26800  
    7979
    8080    /* Cleanup helpers: */
    81     virtual void saveWindowSettings() {}
    82     virtual void cleanupConsoleConnections() {}
    83     virtual void cleanupWindowIcon() {}
     81    //virtual void saveWindowSettings() {}
     82#ifdef VBOX_WITH_DEBUGGER_GUI
     83    //virtual void prepareMenuDebug() {}
     84#endif
     85    //virtual void prepareMenuDevices() {}
     86    //virtual void prepareMenuMachine() {}
     87    //virtual void cleanupConsoleConnections() {}
     88    //virtual void cleanupWindowIcon() {}
    8489
    8590    /* Update routines: */

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

    r26799 r26800  
    343343    /* Machine submenu: */
    344344    QMenu *pMenuMachine = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
    345     UIMachineWindow::prepareMenuMachine();
     345    prepareMenuMachine();
    346346    menuBar()->addMenu(pMenuMachine);
    347347
    348348    /* Devices submenu: */
    349349    QMenu *pMenuDevices = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
    350     UIMachineWindow::prepareMenuDevices();
     350    prepareMenuDevices();
    351351    menuBar()->addMenu(pMenuDevices);
    352352
    … …  
    355355    {
    356356        QMenu *pMenuDebug = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Debug)->menu();
    357         UIMachineWindow::prepareMenuDebug();
     357        prepareMenuDebug();
    358358        menuBar()->addMenu(pMenuDebug);
    359359    }

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

    r26799 r26800  
    9595
    9696    /* Cleanup helpers: */
    97     void cleanupMachineView() {}
     97    //void cleanupMachineView() {}
    9898    void saveWindowSettings();
    99     void cleanupConnections() {}
     99    //void cleanupConnections() {}
    100100    void cleanupStatusBar();
    101     void cleanupMenu() {}
    102     void cleanupConsoleConnections() {}
     101    //void cleanupMenu() {}
     102    //void cleanupConsoleConnections() {}
    103103
    104104    /* Indicators pool: */
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