Changeset 548 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Feb 2, 2007 1:57:12 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Latest fixes to VDM and media enumeration process (better cooperation between media cobmoboxes, modal and modeless VDMs during the enumeration).

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxGlobal.h (modified) (4 diffs)
• VBoxMediaComboBox.h (modified) (3 diffs)
• VBoxSelectorWnd.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -245 +245 @@
         return toString (aHD.GetType());
     }
-    
+
     QString toString (CEnums::DiskControllerType t, LONG d) const;
 
@@ -321 +321 @@
 
     void startEnumeratingMedia();
-    bool isInEnumeratingProcess() { return media_enum_thread ? true : false; }
-
-    /** Returns a list of all currently enumerated media (it is empty if the
-     *  enumeration has been finished or never been started). */
-    VBoxMediaList currentMediaList() const { return media_list; }
+
+    /**
+     *  Returns a list of all currently registered media. This list is used
+     *  to globally track the accessiblity state of all media on a dedicated
+     *  thread. This the list is initially empty (before the first enumeration
+     *  process is started using #startEnumeratingMedia()).
+     */
+    const VBoxMediaList &currentMediaList() const { return media_list; }
+
+    /** Returns true if the media enumeration is in progress. */
+    bool isMediaEnumerationStarted() const { return media_enum_thread != NULL; }
+
+    void addMedia (const VBoxMedia &);
+    void updateMedia (const VBoxMedia &);
+    void removeMedia (VBoxDefs::DiskType, const QUuid &);
 
     /* various helpers */
@@ -360 +370 @@
 
     /**
-     *  Emitted during the enumeration process started
-     *  by #startEnumeratingMedia(). */
-    void mediaEnumerated (const VBoxMedia &media);
+     *  Emitted at the beginning of the enumeration process started
+     *  by #startEnumeratingMedia().
+     */
+    void mediaEnumStarted();
+
+    /**
+     *  Emitted when a new media item from the list has updated
+     *  its accessibility state.
+     */
+    void mediaEnumerated (const VBoxMedia &aMedia, int aIndex);
 
     /**
@@ -368 +385 @@
      *  by #startEnumeratingMedia().
      *  @note #currentMediaList() will return an empty list
-     *  when this signal is emitted, use the argument instead. */
-    void mediaEnumerated (const VBoxMediaList &list);
+     *  when this signal is emitted, use the argument instead.
+     */
+    void mediaEnumFinished (const VBoxMediaList &aList);
+
+    /** Emitted when a new media is added using #addMedia(). */
+    void mediaAdded (const VBoxMedia &);
+
+    /** Emitted when the media is updated using #updateMedia(). */
+    void mediaUpdated (const VBoxMedia &);
+
+    /** Emitted when the media is removed using #removeMedia(). */
+    void mediaRemoved (VBoxDefs::DiskType, const QUuid &);
 
     /* signals emitted when the VirtualBox callback is called by the server

trunk/src/VBox/Frontends/VirtualBox/include/VBoxMediaComboBox.h

@@ -27 +27 @@
 
 #include <qcombobox.h>
-#include <quuid.h>
 
 class QListBoxItem;
@@ -37 +36 @@
 public:
 
-    VBoxMediaComboBox (QWidget *aParent = 0,
-                       const char *aName = 0, int aType = 0);
+    VBoxMediaComboBox (QWidget *aParent = 0, const char *aName = 0,
+                       int aType = 0, bool aUseEmptyItem = false);
     ~VBoxMediaComboBox() {}
 
     void  refresh();
-    void  appendItem (const QString &, const QUuid &, const QString &);
-    void  replaceItem (int, const QString &, const QString &);
-    void  removeLastItem();
-    void  setReadyForRefresh();
-    void  setRequiredItem (const QUuid &);
     void  setUseEmptyItem (bool);
     void  setBelongsTo (const QUuid &);
     QUuid getId();
     QUuid getBelongsTo();
-    void setCurrentItem (int);
+    void  setCurrentItem (const QUuid &);
 
 protected slots:
 
-    void mediaEnumerated (const VBoxMedia &);
-    void listEnumerated (const VBoxMediaList &);
+    void mediaEnumStarted();
+    void mediaEnumerated (const VBoxMedia &, int);
+    void mediaEnumFinished (const VBoxMediaList &);
+    void mediaAdded (const VBoxMedia &);
+    void mediaUpdated (const VBoxMedia &);
+    void mediaRemoved (VBoxDefs::DiskType, const QUuid &);
     void processOnItem (QListBoxItem *);
-    void updateToolTip (int);
+    void processActivated (int);
 
 protected:
 
-    void loadCleanContent();
-    int updateMedia (const QString &, const QUuid &, const QString &,
-                     VBoxMedia::Status);
+    void updateToolTip (int);
+    void setCurrentItem (int);
+    void processMedia (const VBoxMedia &);
+    void processHdMedia (const VBoxMedia &);
+    void processCdMedia (const VBoxMedia &);
+    void processFdMedia (const VBoxMedia &);
+    void appendItem (const QString &, const QUuid &,
+                     const QString &, QPixmap *);
+    void replaceItem (int, const QString &,
+                      const QString &, QPixmap *);
+    void updateShortcut (const QString &, const QUuid &, const QString &,
+                          VBoxMedia::Status);
 
     int         mType;
@@ -72 +79 @@
     QUuid       mRequiredId;
     bool        mUseEmptyItem;
-    bool        mToBeRefreshed;
+    QPixmap     mPmInacc;
+    QPixmap     mPmError;
 };
 

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

@@ -91 +91 @@
     void vmListBoxCurrentChanged (bool aRefreshDetails = true,
                                   bool aRefreshSnapshots = true);
-    void mediaEnumerated (const VBoxMediaList &list);
+    void mediaEnumFinished (const VBoxMediaList &);
 
     /* VirtualBox callback events we're interested in */