Changeset 6370 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 17, 2008 4:40:09 PM (17 years ago)

Author:

vboxsync

Message:

2292: Remove license display from .deb:

Fixed the issue where "was no possibility to accept the license dialog" if there is enough space to feat whole the license text without scrollbars. For example, in case of maximization and running on high resolution displays with little system font.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (3 diffs)

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

@@ -564 +564 @@
 
         mLicenseText->setTextFormat (Qt::RichText);
-        mAgreeButton->setEnabled (false);
-        mDisagreeButton->setEnabled (false);
 
         connect (mLicenseText->verticalScrollBar(), SIGNAL (valueChanged (int)),
@@ -581 +579 @@
         buttonLayout->addWidget (mDisagreeButton);
 
+        mLicenseText->verticalScrollBar()->installEventFilter (this);
+
         resize (600, 450);
     }
@@ -607 +607 @@
     {
         if (aValue == mLicenseText->verticalScrollBar()->maxValue())
-        {
-            mAgreeButton->setEnabled (true);
-            mDisagreeButton->setEnabled (true);
-        }
+            unlockButtons();
+    }
+
+    void unlockButtons()
+    {
+        mAgreeButton->setEnabled (true);
+        mDisagreeButton->setEnabled (true);
     }
 
 private:
+
+    void showEvent (QShowEvent *aEvent)
+    {
+        QDialog::showEvent (aEvent);
+        bool isScrollBarHidden = mLicenseText->verticalScrollBar()->isHidden()
+                                 && !(windowState() & WindowMinimized);
+        mAgreeButton->setEnabled (isScrollBarHidden);
+        mDisagreeButton->setEnabled (isScrollBarHidden);
+    }
+
+    bool eventFilter (QObject *aObject, QEvent *aEvent)
+    {
+        switch (aEvent->type())
+        {
+            case QEvent::Hide:
+                if (aObject == mLicenseText->verticalScrollBar() &&
+                    (windowState() & WindowActive))
+                    unlockButtons();
+            default:
+                break;
+        }
+        return QDialog::eventFilter (aObject, aEvent);
+    }
 
     QString       mFilePath;