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

Timestamp:

Nov 4, 2008 4:01:42 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Added first systray support (under development, compile with VBOX_GUI_WITH_SYSTRAY in VirtualBox4_DEFS).

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

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

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

@@ -33 +33 @@
 /* Qt includes */
 #include <QMainWindow>
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    #include <QSystemTrayIcon>
+#endif
+#include <QUuid>
 
 class VBoxSnapshotsWgt;
@@ -66 +70 @@
 
     void fileMediaMgr();
+    VBoxVMItem* getSelectedItem();
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    void iconActivated(QSystemTrayIcon::ActivationReason aReason);
+    void showWindow();
+#endif
     void fileSettings();
     void fileExit();
@@ -71 +80 @@
     void vmNew();
     void vmSettings (const QString &aCategory = QString::null,
-                     const QString &aControl = QString::null);
-    void vmDelete();
-    void vmStart();
-    void vmDiscard();
-    void vmPause (bool);
-    void vmRefresh();
-    void vmShowLogs();
+                     const QString &aControl = QString::null,
+                     const QUuid& = "");
+    void vmDelete(const QUuid& = "");
+    void vmStart (const QUuid& = "");
+    void vmDiscard(const QUuid& = "");
+    void vmPause (bool, const QUuid& = "");
+    void vmRefresh(const QUuid& = "");
+    void vmShowLogs(const QUuid& = "");
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    void refreshSysTray();
+#endif
     void refreshVMList();
     void refreshVMItem (const QUuid &aID, bool aDetails,
@@ -129 +142 @@
     QAction *fileExitAction;
     QAction *vmNewAction;
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    QAction *trayShowWindowAction;
+    QAction *trayExitAction;
+#endif
     QAction *vmConfigAction;
     QAction *vmDeleteAction;
@@ -138 +155 @@
 
     VBoxHelpActions mHelpActions;
+
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    /* The systray icon */
+    QSystemTrayIcon *trayIcon;
+    QMenu *trayIconMenu;
+#endif
 
     /* The vm list view/model */

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

@@ -31 +31 @@
 #include <QDateTime>
 
-class VBoxVMItem
-{
-public:
-    VBoxVMItem (const CMachine &aM);
+class VBoxVMItem : public QObject
+{
+    Q_OBJECT;
+
+public:
+
+    enum Action
+    {
+        Config = 0,
+        Delete,
+        Start,
+        Discard,
+        Pause,
+        Refresh,
+        ShowLogs
+    };
+
+public:
+
+    VBoxVMItem (const CMachine &aM, QObject* pParent);
     virtual ~VBoxVMItem();
 
@@ -42 +58 @@
     QIcon osIcon() const { return mAccessible ? vboxGlobal().vmGuestOSTypeIcon (mOSTypeId) :QPixmap (":/os_unknown.png"); }
     QUuid id() const { return mId; }
-    
+
     QString sessionStateName() const;
     QIcon sessionStateIcon() const { return mAccessible ? vboxGlobal().toIcon (mState) : QPixmap (":/state_aborted_16px.png"); }
@@ -49 +65 @@
     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;
 
     bool accessible() const { return mAccessible; }
+    bool running() const {  return (sessionState() != KSessionState_Closed); }
     const CVirtualBoxErrorInfo &accessError() const { return mAccessError; }
     KMachineState state() const { return mState; }
@@ -60 +85 @@
     bool canSwitchTo() const;
     bool switchTo();
+    
+    void updateActions();
 
 private:
 
     /* Private member vars */
+    QObject* mParent;
     CMachine mMachine;
+
+    QAction *vmConfigAction;
+    QAction *vmDeleteAction;
+    QAction *vmStartAction;
+    QAction *vmDiscardAction;
+    QAction *vmPauseAction;
+    QAction *vmRefreshAction;
+    QAction *vmShowLogsAction;
 
     /* Cached machine data (to minimize server requests) */
@@ -82 +118 @@
 
     ULONG mPid;
+
+private slots:
+
+    void vmSettings();
+    void vmDelete();
+    void vmStart();
+    void vmDiscard();
+    void vmPause(bool aPause);
+    void vmRefresh();
+    void vmShowLogs();
 };
 
@@ -111 +157 @@
 
     VBoxVMItem *itemById (const QUuid &aId) const;
+    VBoxVMItem *itemByRow (int aRow) const;
     QModelIndex indexById (const QUuid &aId) const;
 
@@ -163 +210 @@
     void mousePressEvent (QMouseEvent *aEvent);
     bool selectCurrent();
-}; 
+};
 
 class VBoxVMItemPainter: public QIItemDelegate
@@ -181 +228 @@
     inline QIcon::Mode iconMode (QStyle::State aState) const
     {
-        if (!(aState & QStyle::State_Enabled)) 
+        if (!(aState & QStyle::State_Enabled))
             return QIcon::Disabled;
-        if (aState & QStyle::State_Selected) 
+        if (aState & QStyle::State_Selected)
             return QIcon::Selected;
         return QIcon::Normal;