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

Timestamp:

Nov 10, 2008 10:40:32 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Tray Support: Styling; Reduced the number of VMs per menu to 10 and added numbering.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxDefs.h (modified) (3 diffs)
• VBoxSelectorWnd.h (modified) (6 diffs)

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

@@ -24 +24 @@
 #define __VBoxDefs_h__
 
+/* Qt includes */
 #include <qevent.h>
+#include <QUuid>
 
 #define LOG_GROUP LOG_GROUP_GUI
@@ -65 +67 @@
 #if defined (VBOX_GUI_DEBUG)
 
+#include <QThread>
+#include <QDateTime>
+
 #include <VBox/types.h> // for uint64_t type
-
-#include <qthread.h>
-#include <qdatetime.h>
 
 /**
@@ -104 +106 @@
 #endif // VBOX_GUI_DEBUG
 
-/* A common namespace for all enums */
+/** Null UUID constant to be used as a default value for reference parameters */
+extern const QUuid QUuid_null;
+
+/** Common namespace for all enums */
 struct VBoxDefs
 {

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

@@ -36 +36 @@
     #include <QSystemTrayIcon>
 #endif
-#include <QUuid>
 
 class VBoxSnapshotsWgt;
@@ -70 +69 @@
 
     void fileMediaMgr();
-    VBoxVMItem* getSelectedItem();
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    void iconActivated (QSystemTrayIcon::ActivationReason aReason);
-    void showWindow();
-#endif
     void fileSettings();
     void fileExit();
@@ -81 +75 @@
     void vmSettings (const QString &aCategory = QString::null,
                      const QString &aControl = QString::null,
-                     const QUuid &aMachineId = QUuid());
-    void vmDelete (const QUuid &aMachineId = QUuid());
-    void vmStart (const QUuid &aMachineId = QUuid());
-    void vmDiscard (const QUuid &aMachineId = QUuid());
-    void vmPause (bool, const QUuid &aMachineId = QUuid());
-    void vmRefresh (const QUuid &aMachineId = QUuid());
-    void vmShowLogs (const QUuid &aMachineId = QUuid());
+                     const QUuid & = QUuid_null);
+    void vmDelete (const QUuid & = QUuid_null);
+    void vmStart (const QUuid & = QUuid_null);
+    void vmDiscard (const QUuid & = QUuid_null);
+    void vmPause (bool, const QUuid & = QUuid_null);
+    void vmRefresh (const QUuid & = QUuid_null);
+    void vmShowLogs (const QUuid & = QUuid_null);
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    void refreshSysTray(bool a_bRetranslate = false);
+    void refreshSysTray (bool aRetranslate = false);
 #endif
+
     void refreshVMList();
     void refreshVMItem (const QUuid &aID, bool aDetails,
@@ -98 +93 @@
 
     void showContextMenu (const QPoint &aPoint);
+
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    void trayIconActivated (QSystemTrayIcon::ActivationReason aReason);
+    void showWindow();
+#endif
 
 protected:
@@ -142 +142 @@
     QAction *fileExitAction;
     QAction *vmNewAction;
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    QAction *trayShowWindowAction;
-    QAction *trayExitAction;
-#endif
     QAction *vmConfigAction;
     QAction *vmDeleteAction;
@@ -154 +150 @@
     QAction *vmShowLogsAction;
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    QAction *mTrayShowWindowAction;
+    QAction *mTrayExitAction;
+#endif
+
     VBoxHelpActions mHelpActions;
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
     /* The systray icon */
-    QSystemTrayIcon *trayIcon;
-    QMenu *trayIconMenu;
+    QSystemTrayIcon *mTrayIcon;
+    QMenu *mTrayIconMenu;
 #endif