Changeset 87697 in vbox

Timestamp:

Feb 10, 2021 5:20:34 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Some windows fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -3393 +3393 @@
 #if defined (VBOX_WITH_QHELP_VIEWER)
     showHelpBrowser(strLocation);
-    return;
-#endif
-
-#if defined (VBOX_WS_WIN)
-    HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
-#endif
-
-#if !defined(VBOX_OSE)
+#else
+ #if defined (VBOX_WS_WIN)
+        HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
+ #endif
+
+ #if !defined(VBOX_OSE)
     char szViewerPath[RTPATH_MAX];
     int rc;
@@ -3406 +3404 @@
     AssertRC(rc);
     QProcess::startDetached(QString(szViewerPath) + "/kchmviewer", QStringList(strLocation));
-# else /* #ifndef VBOX_OSE */
+ # else /* #ifndef VBOX_OSE */
     uiCommon().openURL("file://" + strLocation);
-# endif /* #ifdef VBOX_OSE */
-#if defined (VBOX_WS_MAC)
+ # endif /* #ifdef VBOX_OSE */
+ #if defined (VBOX_WS_MAC)
     uiCommon().openURL("file://" + strLocation);
+ #endif
 #endif
 }

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -342 +342 @@
     m_iFontPointSize = iFontPointSize;
     if (m_pValueLabel && m_iInitialFontPointSize != 0)
-    {
-        m_pValueLabel->setText(QString("%1\%").arg(QString::number(fontPercentage())));
-    }
+        m_pValueLabel->setText(QString("%1%2").arg(QString::number(fontPercentage())).arg("%"));
 }
 
@@ -372 +370 @@
                      m_pValueLabel);
 
-    m_pValueLabel->setText(QString("%1\%").arg(QString::number(fontPercentage())));
+    m_pValueLabel->setText(QString("%1%2").arg(QString::number(fontPercentage())).arg("%"));
 
     m_pMinusButton->setIcon(UIIconPool::iconSet(":/help_browser_minus_32px.png"));
@@ -1632 +1630 @@
 void UIHelpBrowserWidget::sltShowPrintDialog()
 {
-#ifndef VBOX_WS_MAC
+#ifdef VBOX_WS_X11
     if (!m_pTabManager)
         return;