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

Timestamp:

Nov 18, 2008 12:36:47 PM (16 years ago)

Author:

vboxsync

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

39479

Message:

Fe/Qt4: Systray: Restructured code.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxSelectorWnd.h (modified) (5 diffs)
• VBoxVMListView.h (modified) (4 diffs)

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

@@ -44 +44 @@
 class VBoxVMModel;
 class VBoxVMItem;
+class VBoxTrayIcon;
 
 class QTabWidget;
@@ -49 +50 @@
 class QEvent;
 
-class VBoxSelectorWnd: public QIWithRetranslateUI2 <QMainWindow>
+class VBoxSelectorWnd : public QIWithRetranslateUI2 <QMainWindow>
 {
     Q_OBJECT;
@@ -82 +83 @@
     void vmRefresh (const QUuid & = QUuid_null);
     void vmShowLogs (const QUuid & = QUuid_null);
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    void refreshSysTray (bool aRetranslate = false);
-#endif
 
     void refreshVMList();
@@ -159 +156 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
     /* The systray icon */
-    QSystemTrayIcon *mTrayIcon;
-    QMenu *mTrayIconMenu;
+    VBoxTrayIcon *mTrayIcon;
 #endif
 
@@ -179 +175 @@
 };
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+
+Q_DECLARE_METATYPE(QUuid);
+
+class VBoxTrayIcon : public QSystemTrayIcon
+{
+    Q_OBJECT;
+
+public:
+
+    VBoxTrayIcon (VBoxSelectorWnd* aParent, VBoxVMModel* aVMModel);
+    virtual ~VBoxTrayIcon ();
+
+    void refresh ();
+    void retranslateUi ();
+
+protected:
+
+    VBoxVMItem* GetItem (QObject* aObject);
+
+signals:
+
+public slots:
+
+
+private slots:
+
+    void showSubMenu();
+    void hideSubMenu ();
+
+    void vmSettings();
+    void vmDelete();
+    void vmStart();
+    void vmDiscard();
+    void vmPause(bool aPause);
+    void vmRefresh();
+    void vmShowLogs();
+
+private:
+
+    /* The vm list model */
+    VBoxVMModel *mVMModel;
+
+    VBoxSelectorWnd* mParent;
+    QMenu *mTrayIconMenu;
+    QAction *mVmConfigAction;
+    QAction *mVmDeleteAction;
+    QAction *mVmStartAction;
+    QAction *mVmDiscardAction;
+    QAction *mVmPauseAction;
+    QAction *mVmRefreshAction;
+    QAction *mVmShowLogsAction;
+};
+
+#endif // VBOX_GUI_WITH_SYSTRAY
+
 #endif // __VBoxSelectorWnd_h__

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

@@ -67 +67 @@
     ULONG snapshotCount() const { return mSnapshotCount; }
 
-    QAction* vmActionConfig() const { return vmConfigAction; }
-    QAction* vmActionDelete() const { return vmDeleteAction; }
-    QAction* vmActionStart() const { return vmStartAction; }
-    QAction* vmActionDiscard() const { return vmDiscardAction; }
-    QAction* vmActionPause() const { return vmPauseAction; }
-    QAction* vmActionRefresh() const { return vmRefreshAction; }
-    QAction* vmActionShowLogs() const { return vmShowLogsAction; }
-
     QString toolTipText() const;
 
@@ -88 +80 @@
     bool switchTo();
 
-    /* Updates all internal actions depending on the VM's state. */
-    void updateActions();
-    void retranslateUi();
-
 private:
 
@@ -97 +85 @@
     VBoxSelectorWnd *mParent;
     CMachine mMachine;
-
-    QAction *vmConfigAction;
-    QAction *vmDeleteAction;
-    QAction *vmStartAction;
-    QAction *vmDiscardAction;
-    QAction *vmPauseAction;
-    QAction *vmRefreshAction;
-    QAction *vmShowLogsAction;
 
     /* Cached machine data (to minimize server requests) */
@@ -122 +102 @@
 
     ULONG mPid;
-
-private slots:
-
-    void vmSettings();
-    void vmDelete();
-    void vmStart();
-    void vmDiscard();
-    void vmPause(bool aPause);
-    void vmRefresh();
-    void vmShowLogs();
 };