Changeset 9257 in vbox for trunk/src/VBox

Timestamp:

May 30, 2008 2:29:48 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Merged QIAbstractDialog into QIMainDialog. The log viewer & the
information dialog both using the new QIMainDialog. Additionally the log viewer
provides an proxy icon for the current selected log. Some small fixes in
QIMainDialog.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (2 diffs)
• include/QIAbstractDialog.h (deleted)
• include/QIMainDialog.h (modified) (4 diffs)
• include/VBoxDiskImageManagerDlg.h (modified) (1 diff)
• include/VBoxVMInformationDlg.h (modified) (2 diffs)
• src/QIAbstractDialog.cpp (deleted)
• src/QIMainDialog.cpp (modified) (3 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (1 diff)
• src/VBoxVMInformationDlg.cpp (modified) (5 diffs)
• ui/VBoxVMInformationDlg.ui (modified) (3 diffs)
• ui/VBoxVMLogViewer.ui (modified) (1 diff)

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

@@ -441 +441 @@
         include/QIRichLabel.h \
         include/QIAbstractWizard.h \
-        include/QIAbstractDialog.h \
         include/QIListView.h \
         include/QITreeWidget.h \
@@ -524 +523 @@
         src/QIRichLabel.cpp \
         src/QIAbstractWizard.cpp \
-        src/QIAbstractDialog.cpp \
         src/QIDialog.cpp \
         src/QIDialogButtonBox.cpp \

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

@@ -30 +30 @@
 
 class QEventLoop;
+class QSizeGrip;
 
 class QIMainDialog: public QMainWindow
@@ -45 +46 @@
     QString fileForProxyIcon () const;
 
+    void setSizeGripEnabled (bool aEnabled);
+    bool isSizeGripEnabled () const;
+
 public slots:
 
@@ -52 +56 @@
 
     virtual bool event (QEvent *aEvent);
+    virtual void resizeEvent (QResizeEvent *aEvent);
+    virtual void keyPressEvent (QKeyEvent *aEvent);
 
 protected slots:
@@ -70 +76 @@
 
     QString mFileForProxyIcon;
+
+    QPointer<QSizeGrip> mSizeGrip;
 };
 

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

@@ -67 +67 @@
     void retranslateUi();
     virtual void closeEvent (QCloseEvent *aEvent);
-    virtual void keyPressEvent (QKeyEvent *aEvent);
     virtual bool eventFilter (QObject *aObject, QEvent *aEvent);
     /* @todo: Currently not used (Ported from Qt3): */

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

@@ -25 +25 @@
 
 #include "VBoxVMInformationDlg.gen.h"
-#include "QIAbstractDialog.h"
+#include "QIMainDialog.h"
 #include "COMDefs.h"
 #include "QIWithRetranslateUI.h"
@@ -32 +32 @@
 class QTimer;
 
-class VBoxVMInformationDlg : public QIWithRetranslateUI2<QIAbstractDialog>,
+class VBoxVMInformationDlg : public QIWithRetranslateUI2<QIMainDialog>,
                              public Ui::VBoxVMInformationDlg
 {

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

@@ -34 +34 @@
 #include <QUrl>
 #include <QMenu>
+#include <QSizeGrip>
+#include <QPushButton>
 
 QIMainDialog::QIMainDialog (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = Qt::Dialog */)
@@ -82 +84 @@
 {
     return mFileForProxyIcon;
+}
+
+void QIMainDialog::setSizeGripEnabled (bool aEnabled)
+{
+    if (!mSizeGrip && aEnabled)
+    {
+        mSizeGrip = new QSizeGrip (this);
+        mSizeGrip->resize (mSizeGrip->sizeHint());
+        mSizeGrip->show();
+    }
+    else if (mSizeGrip && !aEnabled)
+        delete mSizeGrip;
+}
+
+bool QIMainDialog::isSizeGripEnabled () const
+{
+    return mSizeGrip;
 }
 
@@ -167 +186 @@
 }
 
+void QIMainDialog::resizeEvent (QResizeEvent *aEvent)
+{
+    QMainWindow::resizeEvent (aEvent);
+
+    /* Adjust the size-grip location for the current resize event */
+    if (mSizeGrip) 
+    {
+        if (isRightToLeft())
+            mSizeGrip->move (rect().bottomLeft() - mSizeGrip->rect().bottomLeft());
+        else
+            mSizeGrip->move (rect().bottomRight() - mSizeGrip->rect().bottomRight());
+        aEvent->accept();
+    }
+}
+
+void QIMainDialog::keyPressEvent (QKeyEvent *aEvent)
+{
+#ifdef Q_WS_MAC
+    if (aEvent->modifiers() == Qt::ControlModifier && 
+        aEvent->key() == Qt::Key_Period) 
+        reject();
+    else
+#endif
+    if (aEvent->modifiers() == Qt::NoModifier ||
+        (aEvent->modifiers() & Qt::KeypadModifier && aEvent->key() == Qt::Key_Enter))
+    {
+        switch (aEvent->key())
+        {
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
+                {
+                    QList<QPushButton*> list = qFindChildren<QPushButton*> (this);
+                    for (int i=0; i < list.size(); ++i)
+                    {
+                        QPushButton *pb = list.at (i);
+                        if (pb->isDefault() && pb->isVisible()) 
+                        {
+                            if (pb->isEnabled())
+                                pb->click();
+                            return;
+                        }
+                    }
+                    break;
+                }
+            case Qt::Key_Escape:
+                {
+                    reject();
+                    break;
+                }
+        }
+    }
+    else
+        aEvent->ignore();
+}
+
 void QIMainDialog::accept() 
 { 

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

@@ -817 +817 @@
     mModelessDialog = NULL;
     aEvent->accept();
-}
-
-void VBoxDiskImageManagerDlg::keyPressEvent (QKeyEvent *aEvent)
-{
-    if (aEvent->modifiers() == Qt::NoModifier ||
-        (aEvent->modifiers() != Qt::NoModifier && aEvent->key() == Qt::Key_Enter))
-    {
-        switch (aEvent->key())
-        {
-            case Qt::Key_Enter:
-            case Qt::Key_Return:
-                {
-                    accept();
-                    break;
-                }
-            case Qt::Key_Escape:
-                {
-                    reject();
-                    break;
-                }
-        }
-    }
-    else
-        aEvent->ignore();
 }
 

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

@@ -52 +52 @@
                                             const CSession &aSession,
                                             Qt::WindowFlags aFlags)
-    : QIWithRetranslateUI2<QIAbstractDialog> (aConsole, aFlags)
+    : QIWithRetranslateUI2<QIMainDialog> (aConsole, aFlags)
     , mIsPolished (false)
     , mConsole (aConsole)
@@ -61 +61 @@
     Ui::VBoxVMInformationDlg::setupUi (this);
 
-    /* Initialize parent defaults */
-    initializeDialog();
+#ifdef Q_WS_MAC
+    /* No icon for this window on the mac, cause this would act as proxy icon
+     * which isn't necessary here. */
+    setWindowIcon (QIcon());
+#endif
+
+    /* Enable size grip without using a status bar. */
+    setSizeGripEnabled (true);
 
     /* Setup focus-proxy for pages */
@@ -250 +256 @@
 bool VBoxVMInformationDlg::event (QEvent *aEvent)
 {
-    bool result = QIAbstractDialog::event (aEvent);
+    bool result = QIMainDialog::event (aEvent);
     switch (aEvent->type())
     {
@@ -269 +275 @@
 void VBoxVMInformationDlg::resizeEvent (QResizeEvent *aEvent)
 {
-    QIAbstractDialog::resizeEvent (aEvent);
+    QIMainDialog::resizeEvent (aEvent);
 
     /* Store dialog size for this vm */
@@ -281 +287 @@
 void VBoxVMInformationDlg::showEvent (QShowEvent *aEvent)
 {
-    QIAbstractDialog::showEvent (aEvent);
+    QIMainDialog::showEvent (aEvent);
 
     /* One may think that QWidget::polish() is the right place to do things

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMInformationDlg.ui

@@ -1 +1 @@
 <ui version="4.0" >
- <class>VBoxVMInformationDlg</class>
  <comment>
  VBox frontends: Qt4 GUI ("VirtualBox"):
@@ -18 +17 @@
  additional information or have any questions.
  </comment>
+ <class>VBoxVMInformationDlg</class>
  <widget class="QMainWindow" name="VBoxVMInformationDlg" >
   <property name="geometry" >
@@ -121 +121 @@
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusbar" />
  </widget>
  <customwidgets>

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMLogViewer.ui

@@ -54 +54 @@
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusbar" />
  </widget>
  <customwidgets>