Changeset 26799 in vbox

Timestamp:

Feb 25, 2010 2:26:23 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: don't recreated the menus all the time

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (3 diffs)
• UIMachineWindow.h (modified) (2 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (3 diffs)
• normal/UIMachineWindowNormal.h (modified) (1 diff)

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

@@ -439 +439 @@
 }
 
-void UIMachineWindow::sltPrepareMenuMachine()
+void UIMachineWindow::prepareMenuMachine()
 {
     QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
@@ -470 +470 @@
 }
 
-void UIMachineWindow::sltPrepareMenuDevices()
+void UIMachineWindow::prepareMenuDevices()
 {
     QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
@@ -489 +489 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
-void UIMachineWindow::sltPrepareMenuDebug()
+void UIMachineWindow::prepareMenuDebug()
 {
     QMenu *menu = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Debug)->menu();

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

@@ -71 +71 @@
     virtual void prepareWindowIcon();
     virtual void prepareConsoleConnections();
+    virtual void prepareMenuMachine();
+    virtual void prepareMenuDevices();
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    virtual void prepareMenuDebug();
+#endif
     virtual void loadWindowSettings();
 
@@ -83 +88 @@
     /* Protected slots: */
     void sltMachineStateChanged(KMachineState machineState);
-    void sltPrepareMenuMachine();
-    void sltPrepareMenuDevices();
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    void sltPrepareMenuDebug();
-#endif
 
     /* Protected variables: */

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

@@ -129 +129 @@
 }
 
-void UIMachineWindowNormal::sltPrepareMenuMachine()
-{
-    UIMachineWindow::sltPrepareMenuMachine();
-}
-
-void UIMachineWindowNormal::sltPrepareMenuDevices()
-{
-    UIMachineWindow::sltPrepareMenuDevices();
-}
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-void UIMachineWindowNormal::sltPrepareMenuDebug()
-{
-    UIMachineWindow::sltPrepareMenuDebug();
-}
-#endif
-
 void UIMachineWindowNormal::sltTryClose()
 {
@@ -360 +343 @@
     /* Machine submenu: */
     QMenu *pMenuMachine = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
+    UIMachineWindow::prepareMenuMachine();
     menuBar()->addMenu(pMenuMachine);
-    connect(pMenuMachine, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuMachine()));
 
     /* Devices submenu: */
     QMenu *pMenuDevices = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
+    UIMachineWindow::prepareMenuDevices();
     menuBar()->addMenu(pMenuDevices);
-    connect(pMenuDevices, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuDevices()));
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -372 +355 @@
     {
         QMenu *pMenuDebug = machineLogic()->actionsPool()->action(UIActionIndex_Menu_Debug)->menu();
+        UIMachineWindow::prepareMenuDebug();
         menuBar()->addMenu(pMenuDebug);
-        connect(pMenuDebug, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuDebug()));
     }
 #endif

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

@@ -60 +60 @@
     void sltSharedFolderChange();
 
-    /* Runtime menus: */
-    void sltPrepareMenuMachine();
-    void sltPrepareMenuDevices();
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    void sltPrepareMenuDebug();
-#endif
-
     /* LED connections: */
     void sltUpdateIndicators();