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

Timestamp:

Jun 26, 2009 3:05:25 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Show mostly "Whats this" messages as tooltip.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialog.cpp (modified) (6 diffs)

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

@@ -225 +225 @@
 
     if (!mErrorString.isEmpty())
-    {
-#ifndef Q_WS_MAC
         mLbWhatsThis->setText (mErrorString);
-#else /* Q_WS_MAC */
-        mIconLabel->setToolTip (mErrorString);
-#endif /* Q_WS_MAC */
-    }
     else
         updateWhatsThis (true);
@@ -247 +241 @@
 
     if (!mWarnString.isEmpty())
-    {
-#ifndef Q_WS_MAC
         mLbWhatsThis->setText (mWarnString);
-#else /* Q_WS_MAC */
-        mIconLabel->setToolTip (mWarnString);
-#endif /* Q_WS_MAC */
-    }
     else
         updateWhatsThis (true);
@@ -310 +298 @@
         mIconLabel->setWarningPixmap (mErrorIcon);
         mIconLabel->setWarningText (mErrorHint);
-        mIconLabel->setToolTip ("");
+#ifdef Q_WS_MAC
+        mIconLabel->setToolTip (mErrorString);
+#endif /* Q_WS_MAC */
         mIconLabel->setVisible (!mValid);
         mButtonBox->button (QDialogButtonBox::Ok)->setEnabled (mValid);
@@ -343 +333 @@
         mIconLabel->setWarningPixmap (mWarnIcon);
         mIconLabel->setWarningText (mWarnHint);
-        mIconLabel->setToolTip ("");
+#ifdef Q_WS_MAC
+        mIconLabel->setToolTip (mWarnString);
+#endif /* Q_WS_MAC */
         mIconLabel->setVisible (!mSilent);
     }
@@ -372 +364 @@
     }
 
+#ifndef Q_WS_MAC
     if (text.isEmpty() && !mErrorString.isEmpty())
         text = mErrorString;
@@ -380 +373 @@
 
     mLbWhatsThis->setText (text);
+#else /* Q_WS_MAC */
+    if (widget && !text.isEmpty())
+        widget->setToolTip (QString("<qt>%1</qt>").arg(text));
+#endif /* Q_WS_MAC */
 }