Changeset 14478 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

Nov 21, 2008 5:44:17 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39756

Message:

FE/Qt4: SysTray: Reuse action data (icons, text) from the Selector. Also converted lots of member names to mMember format.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxConsoleWnd.h (modified) (1 diff)
• VBoxSelectorWnd.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

@@ -210 +210 @@
     QActionGroup *mRunningOrPausedActions;
 
-    // Machine actions
-    QAction *vmFullscreenAction;
-    QAction *vmSeamlessAction;
-    QAction *vmAutoresizeGuestAction;
-    QAction *vmAdjustWindowAction;
-    QAction *vmTypeCADAction;
+    /* Machine actions */
+    QAction *mVmFullscreenAction;
+    QAction *mVmSeamlessAction;
+    QAction *mVmAutoresizeGuestAction;
+    QAction *mVmAdjustWindowAction;
+    QAction *mVmTypeCADAction;
 #if defined(Q_WS_X11)
-    QAction *vmTypeCABSAction;
-#endif
-    QAction *vmResetAction;
-    QAction *vmPauseAction;
-    QAction *vmACPIShutdownAction;
-    QAction *vmCloseAction;
-    QAction *vmTakeSnapshotAction;
-    QAction *vmDisableMouseIntegrAction;
-    QAction *vmShowInformationDlgAction;
-
-    // Devices actions
-    QAction *devicesMountFloppyImageAction;
-    QAction *devicesUnmountFloppyAction;
-    QAction *devicesMountDVDImageAction;
-    QAction *devicesUnmountDVDAction;
-    QAction *devicesSwitchVrdpAction;
-    QAction *devicesSFDialogAction;
-    QAction *devicesInstallGuestToolsAction;
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    // Debugger actions
-    QAction *dbgStatisticsAction;
-    QAction *dbgCommandLineAction;
-    QAction *dbgLoggingAction;
-#endif
-
-    // Help actions
+    QAction *mVmTypeCABSAction;
+#endif
+    QAction *mVmResetAction;
+    QAction *mVmPauseAction;
+    QAction *mVmACPIShutdownAction;
+    QAction *mVmCloseAction;
+    QAction *mVmTakeSnapshotAction;
+    QAction *mVmDisableMouseIntegrAction;
+    QAction *mVmShowInformationDlgAction;
+
+    /* Devices actions */
+    QAction *mDevicesMountFloppyImageAction;
+    QAction *mDevicesUnmountFloppyAction;
+    QAction *mDevicesMountDVDImageAction;
+    QAction *mDevicesUnmountDVDAction;
+    QAction *mDevicesSwitchVrdpAction;
+    QAction *mDevicesSFDialogAction;
+    QAction *mDevicesInstallGuestToolsAction;
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    /* Debugger actions */
+    QAction *mDbgStatisticsAction;
+    QAction *mDbgCommandLineAction;
+    QAction *mDbgLoggingAction;
+#endif
+
+    /* Help actions */
     VBoxHelpActions mHelpActions;
 
-    // Machine popup menus
-    VBoxSwitchMenu *vmAutoresizeMenu;
-    VBoxSwitchMenu *vmDisMouseIntegrMenu;
-
-    // Devices popup menus
-    bool waitForStatusBarChange;
-    bool statusBarChangedInside;
+    /* Machine popup menus */
+    VBoxSwitchMenu *mVmAutoresizeMenu;
+    VBoxSwitchMenu *mVmDisMouseIntegrMenu;
+
+    /* Devices popup menus */
+    bool mWaitForStatusBarChange : 1;
+    bool mStatusBarChangedInside : 1;
 
     QAction *mDevicesUSBMenuSeparator;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -96 +96 @@
 #endif
 
+    const QAction *vmNewAction() const { return mVmNewAction; }
+    const QAction *vmConfigAction() const { return mVmConfigAction; }
+    const QAction *vmDeleteAction() const { return mVmDeleteAction; }
+    const QAction *vmStartAction() const { return mVmStartAction; }
+    const QAction *vmDiscardAction() const { return mVmDiscardAction; }
+    const QAction *vmPauseAction() const { return mVmPauseAction; }
+    const QAction *vmRefreshAction() const { return mVmRefreshAction; }
+    const QAction *vmShowLogsAction() const { return mVmShowLogsAction; }
+
 protected:
 
@@ -135 +144 @@
 
     /* Actions */
-    QAction *fileMediaMgrAction;
-    QAction *fileSettingsAction;
-    QAction *fileExitAction;
-    QAction *vmNewAction;
-    QAction *vmConfigAction;
-    QAction *vmDeleteAction;
-    QAction *vmStartAction;
-    QAction *vmDiscardAction;
-    QAction *vmPauseAction;
-    QAction *vmRefreshAction;
-    QAction *vmShowLogsAction;
+    QAction *mFileMediaMgrAction;
+    QAction *mFileSettingsAction;
+    QAction *mFileExitAction;
+    QAction *mVmNewAction;
+    QAction *mVmConfigAction;
+    QAction *mVmDeleteAction;
+    QAction *mVmStartAction;
+    QAction *mVmDiscardAction;
+    QAction *mVmPauseAction;
+    QAction *mVmRefreshAction;
+    QAction *mVmShowLogsAction;
 
     VBoxHelpActions mHelpActions;
@@ -159 +168 @@
 
     /* The right information widgets */
-    QTabWidget *vmTabWidget;
-    VBoxVMDetailsView *vmDetailsView;
-    VBoxSnapshotsWgt *vmSnapshotsWgt;
-    VBoxVMDescriptionPage *vmDescriptionPage;
-
-    QPoint normal_pos;
-    QSize normal_size;
-
-    bool doneInaccessibleWarningOnce : 1;
+    QTabWidget *mVmTabWidget;
+    VBoxVMDetailsView *mVmDetailsView;
+    VBoxSnapshotsWgt *mVmSnapshotsWgt;
+    VBoxVMDescriptionPage *mVmDescriptionPage;
+
+    QPoint mNormalPos;
+    QSize mNormalSize;
+
+    bool mDoneInaccessibleWarningOnce : 1;
 };