Changeset 9245 in vbox for trunk/src/VBox

Timestamp:

May 30, 2008 11:57:42 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Created QIMainDialog which could be used as a QMainWindow, but has the
exec semantic of QDialog also. Additionally there is a new function
'setFileForProxyIcon' which enables the proxy icon usage on Mac OS X.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (2 diffs)
• include/QIMainDialog.h (added)
• include/VBoxDiskImageManagerDlg.h (modified) (7 diffs)
• include/VBoxUtils.h (modified) (1 diff)
• src/QIMainDialog.cpp (added)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (5 diffs)
• src/VBoxNewVMWzd.cpp (modified) (1 diff)
• src/VBoxVMFirstRunWzd.cpp (modified) (1 diff)
• src/darwin/VBoxUtils-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -444 +444 @@
         include/QIListView.h \
         include/QITreeWidget.h \
+        include/QIMainDialog.h \
         include/VBoxGlobalSettings.h \
         include/VBoxUtils.h \
@@ -528 +529 @@
         src/QIListView.cpp \
         src/QITreeWidget.cpp \
+        src/QIMainDialog.cpp \
         src/QILineEdit.cpp \
         src/VBoxDefs.cpp \

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

@@ -25 +25 @@
 
 #include "VBoxDiskImageManagerDlg.gen.h"
+#include "QIMainDialog.h"
 #include "QIWithRetranslateUI.h"
 #include "COMDefs.h"
@@ -30 +31 @@
 #include "VBoxMediaComboBox.h"
 
-/* Qt includes */
-#include <QPointer>
-
 class DiskImageItem;
 class VBoxToolBar;
 class InfoPaneLabel;
 
-class VBoxDiskImageManagerDlg : public QIWithRetranslateUI2<QMainWindow>,
+class VBoxDiskImageManagerDlg : public QIWithRetranslateUI2<QIMainDialog>,
                                 public Ui::VBoxDiskImageManagerDlg
 {
@@ -48 +46 @@
 public:
 
-    enum ResultCode { Rejected, 
-                      Accepted };
-
     VBoxDiskImageManagerDlg (QWidget *aParent = NULL, Qt::WindowFlags aFlags = Qt::Dialog);
 
@@ -56 +51 @@
 
     static void showModeless (bool aRefresh = true);
-    int exec();
-    int result() const;
 
     QUuid selectedUuid() const;
@@ -69 +62 @@
 
     void refreshAll();
-    virtual void setVisible (bool aVisible);
 
 protected:
@@ -101 +93 @@
     void processDoubleClick (QTreeWidgetItem *aItem, int aColumn);
     void processRightClick (const QPoint &aPos, QTreeWidgetItem *aItem, int aColumn);
-
-    void accept();
-    void reject();
-    void done (int aRescode);
-
-    void setResult (int aRescode);
 
 private:
@@ -152 +138 @@
     /* Window status */
     bool mDoSelect;
-    int mRescode;
     static VBoxDiskImageManagerDlg *mModelessDialog;
-    QPointer<QEventLoop> mEventLoop;
 
     /* Type if we are in the select modus */

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

@@ -269 +269 @@
 }
 
+/* Proxy icon creation */
+QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
+
 /* Special routines for the dock handling */
 CGImageRef darwinCreateDockBadge (const char *aSource);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -2533 +2533 @@
     dlg.setup (VBoxDefs::FD, true, &id);
 
-    if (dlg.exec() == VBoxDiskImageManagerDlg::Accepted)
+    if (dlg.exec() == QDialog::Accepted)
     {
         CFloppyDrive drv = csession.GetMachine().GetFloppyDrive();
@@ -2577 +2577 @@
     dlg.setup (VBoxDefs::CD, true, &id);
 
-    if (dlg.exec() == VBoxDiskImageManagerDlg::Accepted)
+    if (dlg.exec() == QDialog::Accepted)
     {
         CDVDDrive drv = csession.GetMachine().GetDVDDrive();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -209 +209 @@
 
 VBoxDiskImageManagerDlg::VBoxDiskImageManagerDlg (QWidget *aParent /* = NULL */,  Qt::WindowFlags aFlags /* = 0 */)
-    : QIWithRetranslateUI2<QMainWindow> (aParent, aFlags)
-    , mRescode (Rejected)
+    : QIWithRetranslateUI2<QIMainDialog> (aParent, aFlags)
     , mType (VBoxDefs::InvalidType)
 {
@@ -523 +522 @@
 }
 
-int VBoxDiskImageManagerDlg::exec()
-{
-    AssertMsg (!mEventLoop, ("exec is called recursively!\n"));
-
-    /* Reset the result code */
-    setResult (Rejected);
-    bool deleteOnClose = testAttribute(Qt::WA_DeleteOnClose);
-    setAttribute(Qt::WA_DeleteOnClose, false);
-    /* Create a local event loop */
-    mEventLoop = new QEventLoop();
-    /* Show the window */
-    show();
-    /* A guard to ourself for the case we destroy ourself. */
-    QPointer<VBoxDiskImageManagerDlg> guard = this;
-    /* Start the event loop. This blocks. */
-    mEventLoop->exec();
-    /* Delete the event loop */
-    delete mEventLoop;
-    /* Are we valid anymore? */
-    if (guard.isNull())
-        return Rejected;
-     int res = result();
-     if (deleteOnClose)
-         delete this;
-    /* Return the final result */
-    return res;
-}
-
 QUuid VBoxDiskImageManagerDlg::selectedUuid() const
 {
@@ -796 +767 @@
     /* Start enumerating media */
     vboxGlobal().startEnumeratingMedia();
-}
-
-void VBoxDiskImageManagerDlg::setVisible (bool aVisible)
-{
-    QMainWindow::setVisible (aVisible);
-    /* Exit from the event loop if there is any and we are changing our state
-     * from visible to invisible. */
-    if(mEventLoop && !aVisible)
-        mEventLoop->exit();
 }
 
@@ -1407 +1369 @@
 }
 
-void VBoxDiskImageManagerDlg::accept() 
-{ 
-    done (Accepted); 
-}
-
-void VBoxDiskImageManagerDlg::reject() 
-{ 
-    done (Rejected); 
-}
-
-void VBoxDiskImageManagerDlg::done (int aResult)
-{
-    /* Set the final result */
-    setResult (aResult);
-    /* Hide this window */
-    hide();
-    /* And close the window */
-    close();
-}
-
-int VBoxDiskImageManagerDlg::result() const 
-{ 
-    return mRescode; 
-}
-
-void VBoxDiskImageManagerDlg::setResult (int aRescode) 
-{ 
-    mRescode = aRescode; 
-}
-
 QTreeWidget* VBoxDiskImageManagerDlg::treeWidget (VBoxDefs::DiskType aType) const
 {
@@ -1552 +1484 @@
         return;
     }
+
+    /* Set the file for the proxy icon */ 
+    setFileForProxyIcon (item->path());
 
     /* Ensures current item visible every time we are switching page */

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxNewVMWzd.cpp

@@ -197 +197 @@
     VBoxDiskImageManagerDlg dlg (this);
     dlg.setup (VBoxDefs::HD, true);
-    QUuid newId = dlg.exec() == VBoxDiskImageManagerDlg::Accepted ?
+    QUuid newId = dlg.exec() == QDialog::Accepted ?
         dlg.selectedUuid() : mMediaCombo->getId();
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMFirstRunWzd.cpp

@@ -246 +246 @@
         mRbFdType->isChecked() ? VBoxDefs::FD : VBoxDefs::InvalidType;
     vdm.setup (type, true, &machineId);
-    if (vdm.exec() == VBoxDiskImageManagerDlg::Accepted)
+    if (vdm.exec() == QDialog::Accepted)
     {
         mCbImage->setCurrentItem (vdm.selectedUuid());

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp

@@ -32 +32 @@
 #include <QPixmap>
 #include <QPainter>
+#include <QApplication>
 
 /**
@@ -95 +96 @@
     Assert (!qpm.isNull());
     return ::darwinToCGImageRef (&qpm);
+}
+
+/* Proxy icon creation */
+QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText)
+{
+    QFontMetrics fm (qApp->font());
+    QRect tbRect = fm.boundingRect (aText);
+    const int h = qMax (aPixmap.height(), tbRect.height());
+    const int m = 2;
+    QPixmap dragPixmap (aPixmap.width() + tbRect.width() + m, h);
+    dragPixmap.fill (Qt::transparent);
+    QPainter painter (&dragPixmap);
+    painter.drawPixmap (0, qAbs (h - aPixmap.height()) / 2.0, aPixmap);
+    painter.drawText (aPixmap.width() + m, qAbs (h - aPixmap.height()) / 2.0 + aPixmap.height(), aText);
+    painter.end();
+    return dragPixmap;
 }