Changeset 70699 in vbox

Timestamp:

Jan 23, 2018 10:05:42 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9072 Logviewer MacOS fix part-1

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerSearchPanel.cpp (modified) (6 diffs)
• UIVMLogViewerSearchPanel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp

@@ -182 +182 @@
     if (!mainLayout())
         return;
-
+    
     /* Create search-editor: */
     m_pSearchEditor = new UISearchField(0 /* parent */);
@@ -192 +192 @@
         mainLayout()->addWidget(m_pSearchEditor);
     }
-
+    
     /* Create search-label: */
     m_pSearchLabel = new QLabel;
@@ -311 +311 @@
 void UIVMLogViewerSearchPanel::retranslateUi()
 {
-    m_pSearchLabel->setText(QString("%1 ").arg(UIVMLogViewerWidget::tr("&Find")));
-    m_pSearchEditor->setToolTip(UIVMLogViewerWidget::tr("Enter a search string here"));
-
-    m_pNextPrevButtons->setToolTip(0, UIVMLogViewerWidget::tr("Search for the previous occurrence of the string"));
-    m_pNextPrevButtons->setToolTip(1, UIVMLogViewerWidget::tr("Search for the next occurrence of the string"));
-
-    m_pCaseSensitiveCheckBox->setText(UIVMLogViewerWidget::tr("C&ase Sensitive"));
-    m_pCaseSensitiveCheckBox->setToolTip(UIVMLogViewerWidget::tr("Perform case sensitive search (when checked)"));
-
-    m_pMatchWholeWordCheckBox->setText(UIVMLogViewerWidget::tr("Ma&tch Whole Word"));
-    m_pMatchWholeWordCheckBox->setToolTip(UIVMLogViewerWidget::tr("Search matches only complete words when checked"));
-
-    m_pHighlightAllCheckBox->setText(UIVMLogViewerWidget::tr("&Highlight All"));
-    m_pHighlightAllCheckBox->setToolTip(UIVMLogViewerWidget::tr("All occurence of the search text are highlighted"));
-
+    if (m_pSearchLabel)
+        m_pSearchLabel->setText(QString("%1 ").arg(UIVMLogViewerWidget::tr("&Find")));
+
+    if (m_pSearchEditor)
+        m_pSearchEditor->setToolTip(UIVMLogViewerWidget::tr("Enter a search string here"));
+
+    if (m_pNextPrevButtons)
+    {
+        m_pNextPrevButtons->setToolTip(0, UIVMLogViewerWidget::tr("Search for the previous occurrence of the string"));
+        m_pNextPrevButtons->setToolTip(1, UIVMLogViewerWidget::tr("Search for the next occurrence of the string"));
+    }
+    
+    if (m_pCaseSensitiveCheckBox)
+    {
+        m_pCaseSensitiveCheckBox->setText(UIVMLogViewerWidget::tr("C&ase Sensitive"));
+        m_pCaseSensitiveCheckBox->setToolTip(UIVMLogViewerWidget::tr("Perform case sensitive search (when checked)"));
+    }
+    
+    if (m_pMatchWholeWordCheckBox)
+    {
+        m_pMatchWholeWordCheckBox->setText(UIVMLogViewerWidget::tr("Ma&tch Whole Word"));
+        m_pMatchWholeWordCheckBox->setToolTip(UIVMLogViewerWidget::tr("Search matches only complete words when checked"));
+    }
+    
+    if (m_pHighlightAllCheckBox)
+    {
+        m_pHighlightAllCheckBox->setText(UIVMLogViewerWidget::tr("&Highlight All"));
+        m_pHighlightAllCheckBox->setToolTip(UIVMLogViewerWidget::tr("All occurence of the search text are highlighted"));
+    }
+    
     if (m_iMatchCount == 0)
         m_pInfoLabel->setText(UIVMLogViewerWidget::tr("String not found"));
@@ -424 +439 @@
     /* Call to base-class: */
     UIVMLogViewerPanel::showEvent(pEvent);
-    /* Set focus on search-editor: */
-    m_pSearchEditor->setFocus();
-    /* Select all the text: */
-    m_pSearchEditor->selectAll();
+    if(m_pSearchEditor)
+    {
+        /* Set focus on search-editor: */
+        m_pSearchEditor->setFocus();
+        /* Select all the text: */
+        m_pSearchEditor->selectAll();
+    }
 }
 
@@ -438 +456 @@
     if (!pDocument)
         return;
-
+    if(!m_pSearchEditor)
+        return;
+    
     const QString &searchString = m_pSearchEditor->text();
     if (searchString.isEmpty())
@@ -558 +578 @@
 void UIVMLogViewerSearchPanel::configureInfoLabels()
 {
+    if (!m_pSearchEditor || !m_pWarningIcon || !m_pInfoLabel)
+        return;
+    
     /* If no match has been found, mark the search editor: */
     if (m_iMatchCount == 0)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.h

@@ -29 +29 @@
 class QHBoxLayout;
 class QLabel;
-class UIMiniCancelButton;
 class UIRoundRectSegmentedButton;
 class UISearchField;