Changeset 16913 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 18, 2009 3:40:21 PM (16 years ago)

Author:

vboxsync

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

43037

Message:

FE/Qt4: 3627: Shorten error dialogs - plus/minus (expand/collapse) button handlers added.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/QIMessageBox.h (modified) (2 diffs)
• src/QIMessageBox.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
 public:
 
+    enum ToggleType
+    {
+        Toggle = 0,
+        CollapsOnly,
+        ExpandOnly
+    };
+
     QIArrowSplitter (QWidget *aParent = 0);
 
@@ -63 +70 @@
 public slots:
 
-    void toggleWidget();
+    void toggleWidget (ToggleType aType = Toggle);
 
 private:
+
+    bool eventFilter (QObject *aObject, QEvent *aEvent);
 
     QVBoxLayout *mMainLayout;

trunk/src/VBox/Frontends/VirtualBox/src/QIMessageBox.cpp

@@ -46 +46 @@
 {
     VBoxGlobal::setLayoutMargin (mMainLayout, 0);
+    qApp->installEventFilter (this);
 }
 
@@ -74 +75 @@
 }
 
-void QIArrowSplitter::toggleWidget()
+void QIArrowSplitter::toggleWidget (ToggleType aType)
 {
     QToolButton *arrowButton = qobject_cast <QToolButton*> (sender());
@@ -85 +86 @@
             QWidget *relatedWidget = mWidgetsList [mButtonsList.indexOf (itemButton)];
             Assert (relatedWidget);
-            relatedWidget->setVisible (!relatedWidget->isVisible());
-            itemButton->setIcon (VBoxGlobal::iconSet (relatedWidget->isVisible() ?
-                                 ":/arrow_down_10px.png" : ":/arrow_right_10px.png"));
+            if ((relatedWidget->isVisible() && aType != ExpandOnly) ||
+                (!relatedWidget->isVisible() && aType != CollapsOnly))
+            {
+                relatedWidget->setVisible (!relatedWidget->isVisible());
+                itemButton->setIcon (VBoxGlobal::iconSet (relatedWidget->isVisible() ?
+                                     ":/arrow_down_10px.png" : ":/arrow_right_10px.png"));
+            }
         }
     }
@@ -113 +118 @@
     window()->setFixedSize (window()->minimumSizeHint());
 #endif
+}
+
+bool QIArrowSplitter::eventFilter (QObject *aObject, QEvent *aEvent)
+{
+    if (!aObject->isWidgetType())
+        return QWidget::eventFilter (aObject, aEvent);
+
+    QWidget *widget = qobject_cast <QWidget*> (aObject);
+    if (widget->window() != window())
+        return QWidget::eventFilter (aObject, aEvent);
+
+    /* Process some keyboard events */
+    if (aEvent->type() == QEvent::KeyPress)
+    {
+        QKeyEvent *kEvent = static_cast <QKeyEvent*> (aEvent);
+        QToolButton *arrowButton = qobject_cast <QToolButton*> (QApplication::focusWidget());
+        int slot = arrowButton ? mButtonsList.indexOf (arrowButton) : -1;
+        switch (kEvent->key())
+        {
+            case Qt::Key_Plus:
+            {
+                if (slot != -1 && !mWidgetsList [slot]->isVisible())
+                    arrowButton->animateClick();
+                else
+                    toggleWidget (ExpandOnly);
+                break;
+            }
+            case Qt::Key_Minus:
+            {
+                if (slot != -1 && mWidgetsList [slot]->isVisible())
+                    arrowButton->animateClick();
+                else
+                    toggleWidget (CollapsOnly);
+                break;
+            }
+        }
+    }
+
+    return QWidget::eventFilter (aObject, aEvent);
 }