Changeset 37615 in vbox for trunk

Timestamp:

Jun 23, 2011 2:37:32 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5748: Another Qt + KDE related issue fixed: Disappearing of settings dialog title and settings page headline.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (1 diff)
• UISettingsDialogSpecific.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -268 +268 @@
         m_pWarningPane->setWarningText(m_strWarningHint);
 
+#ifndef VBOX_GUI_WITH_TOOLBAR_SETTINGS
+    /* Retranslate current page headline: */
+    m_pLbTitle->setText(m_pSelector->itemText(m_pSelector->currentId()));
+#endif /* VBOX_GUI_WITH_TOOLBAR_SETTINGS */
+
     /* Get the list of validators: */
     QList<QIWidgetValidator*> validatorsList = findChildren<QIWidgetValidator*>();

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -470 +470 @@
 void UISettingsDialogGlobal::retranslateUi()
 {
+    /* Base-class UI translation: */
+    UISettingsDialog::retranslateUi();
+
     /* Set dialog's name: */
     setWindowTitle(title());
@@ -499 +502 @@
     /* Translate the selector: */
     m_pSelector->polish();
-
-    /* Base-class UI translation: */
-    UISettingsDialog::retranslateUi();
 }
 
@@ -562 +562 @@
     connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)), this, SLOT(sltAllowResetFirstRunFlag()));
 
-    /* Get corresponding machine (required to determine dialog type): */
+    /* Get corresponding machine (required to determine dialog type and page availability): */
     m_machine = vboxGlobal().virtualBox().FindMachine(m_strMachineId);
     AssertMsg(!m_machine.isNull(), ("Can't find corresponding machine!\n"));
@@ -854 +854 @@
 void UISettingsDialogMachine::retranslateUi()
 {
+    /* We have to make sure that the Network, Serial & Parallel pages are retranslated
+     * before they are revalidated. Cause: They do string comparing within
+     * vboxGlobal which is retranslated at that point already: */
+    QEvent event(QEvent::LanguageChange);
+    if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Network))
+        qApp->sendEvent(pPage, &event);
+    if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Serial))
+        qApp->sendEvent(pPage, &event);
+    if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Parallel))
+        qApp->sendEvent(pPage, &event);
+
+    /* Base-class UI translation: */
+    UISettingsDialog::retranslateUi();
+
     /* Set dialog's name: */
     setWindowTitle(title());
 
-    /* We have to make sure that the Serial & Network subpages are retranslated
-     * before they are revalidated. Cause: They do string comparing within
-     * vboxGlobal which is retranslated at that point already. */
-    QEvent event(QEvent::LanguageChange);
-
     /* General page: */
     m_pSelector->setItemText(VMSettingsPage_General, tr("General"));
@@ -879 +888 @@
     /* Network page: */
     m_pSelector->setItemText(VMSettingsPage_Network, tr("Network"));
-    if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Network))
-        qApp->sendEvent(pPage, &event);
 
     /* Ports page: */
@@ -887 +894 @@
     /* Serial page: */
     m_pSelector->setItemText(VMSettingsPage_Serial, tr("Serial Ports"));
-    if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Serial))
-        qApp->sendEvent(pPage, &event);
 
     /* Parallel page: */
     m_pSelector->setItemText(VMSettingsPage_Parallel, tr("Parallel Ports"));
-    if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Parallel))
-        qApp->sendEvent(pPage, &event);
 
     /* USB page: */
@@ -903 +906 @@
     /* Translate the selector: */
     m_pSelector->polish();
-
-    /* Base-class UI translation: */
-    UISettingsDialog::retranslateUi();
-
-    /* Revalidate all pages to retranslate the warning messages also: */
-    QList<QIWidgetValidator*> validators = findChildren<QIWidgetValidator*>();
-    for (int i = 0; i < validators.size(); ++i)
-    {
-        QIWidgetValidator *pValidator = validators[i];
-        if (!pValidator->isValid())
-            sltRevalidate(pValidator);
-    }
 }
 
@@ -920 +911 @@
 {
     QString strDialogTitle;
-    if (!m_machine.isNull())
-        strDialogTitle = tr("%1 - %2").arg(m_machine.GetName()).arg(titleExtension());
+    /* Get corresponding machine (required to compose dialog title): */
+    const CMachine &machine = vboxGlobal().virtualBox().FindMachine(m_strMachineId);
+    if (!machine.isNull())
+        strDialogTitle = tr("%1 - %2").arg(machine.GetName()).arg(titleExtension());
     return strDialogTitle;
 }