Changeset 70706 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 23, 2018 1:24:34 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9072 Logviewer MacOS fix part-2. Remove Cocoa native widgets.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/logviewer/UIVMLogViewerBookmarksPanel.cpp (modified) (8 diffs)
• src/logviewer/UIVMLogViewerBookmarksPanel.h (modified) (3 diffs)
• src/logviewer/UIVMLogViewerFilterPanel.cpp (modified) (1 diff)
• src/logviewer/UIVMLogViewerPanel.cpp (modified) (3 diffs)
• src/logviewer/UIVMLogViewerPanel.h (modified) (2 diffs)
• src/logviewer/UIVMLogViewerSearchPanel.cpp (modified) (12 diffs)
• src/logviewer/UIVMLogViewerSearchPanel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -551 +551 @@
         src/globals/UIThreadPool.cpp \
         src/logviewer/UIVMLogViewerFilterPanel.cpp \
+        src/logviewer/UIVMLogViewerSearchPanel.cpp \
         src/logviewer/UIVMLogViewerTextEdit.cpp \
         src/medium/UIMediumEnumerator.cpp \

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

@@ -22 +22 @@
 /* Qt includes: */
 # include <QComboBox>
+# include <QFrame>
 # include <QHBoxLayout>
 # if defined(RT_OS_SOLARIS)
@@ -31 +32 @@
 # include "QIToolButton.h"
 # include "UIIconPool.h"
-# include "UISpecialControls.h"
 # include "UIVMLogViewerBookmarksPanel.h"
 # include "UIVMLogViewerWidget.h"
@@ -45 +45 @@
     , m_pDeleteAllButton(0)
     , m_pDeleteCurrentButton(0)
-    , m_pNextPrevButtons(0)
+    , m_pNextButton(0)
+    , m_pPreviousButton(0)
+    , m_pNextPreviousButtonContainer(0)
 {
     prepare();
@@ -109 +111 @@
     }
 
+
     m_pGotoSelectedBookmark = new QIToolButton(this);
     if (m_pGotoSelectedBookmark)
@@ -116 +119 @@
     }
 
-    m_pNextPrevButtons = new UIRoundRectSegmentedButton(this, 2);
-    if (m_pNextPrevButtons)
-    {
-        m_pNextPrevButtons->setEnabled(0, false);
-        m_pNextPrevButtons->setEnabled(1, false);
-#ifndef VBOX_WS_MAC
-        /* No icons on the Mac: */
-        m_pNextPrevButtons->setIcon(0, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
-        m_pNextPrevButtons->setIcon(1, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
-#endif /* !VBOX_WS_MAC */
-        mainLayout()->addWidget(m_pNextPrevButtons);
-        m_pNextPrevButtons->setEnabled(0, true);
-        m_pNextPrevButtons->setEnabled(1, true);
+    m_pNextPreviousButtonContainer = new QFrame;
+    if (m_pNextPreviousButtonContainer)
+    {
+        mainLayout()->addWidget(m_pNextPreviousButtonContainer);
+        QHBoxLayout *pContainerLayout = new QHBoxLayout(m_pNextPreviousButtonContainer);
+        /* Configure layout: */
+#ifdef VBOX_WS_MAC
+            pContainerLayout->setContentsMargins(5, 0, 0, 5);
+            pContainerLayout->setSpacing(5);
+#else
+            pContainerLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 2, 0,
+                                                 qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) / 2, 0);
+            pContainerLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
+#endif
+       m_pPreviousButton = new QIToolButton;
+       if(m_pPreviousButton)
+       {
+           pContainerLayout->addWidget(m_pPreviousButton);
+           m_pPreviousButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
+       }
+
+       m_pNextButton = new QIToolButton;
+       if(m_pNextButton){
+           pContainerLayout->addWidget(m_pNextButton);
+           m_pNextButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
+       }
     }
 
@@ -153 +169 @@
 
     connect(m_pGotoSelectedBookmark, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoSelectedBookmark);
-    connect(m_pNextPrevButtons, &UIRoundRectSegmentedButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoNextPreviousBookmark);
+    connect(m_pNextButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoNextBookmark);
+    connect(m_pPreviousButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoPreviousBookmark);
 
     connect(m_pDeleteAllButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sigDeleteAllBookmarks);
@@ -171 +188 @@
     }
 
-    if (m_pNextPrevButtons)
-    {
-        m_pNextPrevButtons->setToolTip(0, UIVMLogViewerWidget::tr("Goto the previous bookmark"));
-        m_pNextPrevButtons->setToolTip(1, UIVMLogViewerWidget::tr("Goto the next bookmark"));
-    }
+    if (m_pNextButton)
+        m_pNextButton->setToolTip(UIVMLogViewerWidget::tr("Goto the next bookmark"));
+
+    if (m_pPreviousButton)
+        m_pPreviousButton->setToolTip(UIVMLogViewerWidget::tr("Goto the previous bookmark"));
 
     if (m_pGotoSelectedBookmark)
@@ -201 +218 @@
 }
 
-void UIVMLogViewerBookmarksPanel::sltGotoNextPreviousBookmark(int buttonIndex)
+
+void UIVMLogViewerBookmarksPanel::sltGotoNextBookmark()
+{
+    /* go to next bookmark or wrap around to the beginning of the list: */
+    if (m_pBookmarksComboBox->currentIndex() == m_pBookmarksComboBox->count()-1)
+        m_pBookmarksComboBox->setCurrentIndex(1);
+    else
+        m_pBookmarksComboBox->setCurrentIndex(m_pBookmarksComboBox->currentIndex() + 1);
+}
+
+
+void UIVMLogViewerBookmarksPanel::sltGotoPreviousBookmark()
+{
+    /* go to previous bookmark or wrap around to the end of the list: */
+    if (m_pBookmarksComboBox->currentIndex() <= 1)
+        m_pBookmarksComboBox->setCurrentIndex(m_pBookmarksComboBox->count() - 1);
+    else
+        m_pBookmarksComboBox->setCurrentIndex(m_pBookmarksComboBox->currentIndex() - 1);
+}
+
+void UIVMLogViewerBookmarksPanel::sltGotoSelectedBookmark()
 {
     if (!m_pBookmarksComboBox || m_pBookmarksComboBox->count() <= 1)
         return;
-
-    /* go to previous bookmark or wrap around to the end of the list: */
-    if (buttonIndex == 0)
-    {
-        if (m_pBookmarksComboBox->currentIndex() <= 1)
-            m_pBookmarksComboBox->setCurrentIndex(m_pBookmarksComboBox->count() - 1);
-        else
-            m_pBookmarksComboBox->setCurrentIndex(m_pBookmarksComboBox->currentIndex() - 1);
-    }
-    /* go to next bookmark or wrap around to the beginning of the list: */
-    else if (buttonIndex == 1)
-    {
-        if (m_pBookmarksComboBox->currentIndex() == m_pBookmarksComboBox->count()-1)
-            m_pBookmarksComboBox->setCurrentIndex(1);
-        else
-            m_pBookmarksComboBox->setCurrentIndex(m_pBookmarksComboBox->currentIndex() + 1);
-    }
-}
-
-void UIVMLogViewerBookmarksPanel::sltGotoSelectedBookmark()
-{
-    if (!m_pBookmarksComboBox || m_pBookmarksComboBox->count() <= 1)
-        return;
     emit sigBookmarkSelected(m_pBookmarksComboBox->currentIndex() - 1);
 }

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

@@ -24 +24 @@
 /* Forward declarations: */
 class QComboBox;
+class QFrame;
 class QIToolButton;
 class UIRoundRectSegmentedButton;
@@ -65 +66 @@
     void sltDeleteCurrentBookmark();
     void sltBookmarkSelected(int index);
-    void sltGotoNextPreviousBookmark(int buttonIndex);
+    void sltGotoNextBookmark();
+    void sltGotoPreviousBookmark();
     void sltGotoSelectedBookmark();
 
@@ -78 +80 @@
     QIToolButton *m_pDeleteAllButton;
     QIToolButton *m_pDeleteCurrentButton;
-    UIRoundRectSegmentedButton *m_pNextPrevButtons;
+    QIToolButton *m_pNextButton;
+    QIToolButton *m_pPreviousButton;
+    QFrame       *m_pNextPreviousButtonContainer;
 };
 

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

@@ -39 +39 @@
 # include "QIToolButton.h"
 # include "UIIconPool.h"
-# include "UISpecialControls.h"
 # include "UIVMLogPage.h"
 # include "UIVMLogViewerFilterPanel.h"

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

@@ -29 +29 @@
 
 /* GUI includes: */
+# include "QIToolButton.h"
 # include "UIIconPool.h"
-# include "UISpecialControls.h"
 # include "UIVMLogPage.h"
 # include "UIVMLogViewerPanel.h"
@@ -79 +79 @@
         m_pMainLayout->setSpacing(2);
     }
-    m_pCloseButton = new UIMiniCancelButton;
+    m_pCloseButton = new QIToolButton;
     if (m_pCloseButton)
     {
+        m_pCloseButton->setIcon(m_pCloseButton->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
         m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft);
     }
@@ -89 +90 @@
 {
     if (m_pCloseButton)
-        connect(m_pCloseButton, &UIMiniCancelButton::clicked, this, &UIVMLogViewerPanel::hide);
-
+        connect(m_pCloseButton, &QIToolButton::clicked, this, &QIToolButton::hide);
 }
-
 
 void UIVMLogViewerPanel::retranslateUi()

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

@@ -29 +29 @@
 class QPlainTextEdit;
 class QTextDocument;
-class UIMiniCancelButton;
+class QIToolButton;
 class UIVMLogViewerWidget;
 
@@ -75 +75 @@
     QHBoxLayout         *m_pMainLayout;
     /** Holds the instance of close-button we create. */
-    UIMiniCancelButton  *m_pCloseButton;
+    QIToolButton        *m_pCloseButton;
 };
 

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

@@ -29 +29 @@
 # include <QHBoxLayout>
 # include <QLabel>
+# include <QLineEdit>
 # include <QPlainTextEdit>
 # include <QTextBlock>
@@ -43 +44 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+class UIVMLogViewerSearchField: public QLineEdit
+{
+    Q_OBJECT;
+
+public:
+
+    UIVMLogViewerSearchField(QWidget *pParent)
+        : QLineEdit(pParent)
+    {
+        m_baseBrush = palette().base();
+    }
+
+    void markError()
+    {
+        QPalette pal = palette();
+        QColor c(Qt::red);
+        c.setAlphaF(0.3);
+        pal.setBrush(QPalette::Base, c);
+        setPalette(pal);
+    }
+
+    void unmarkError()
+    {
+        QPalette pal = palette();
+        pal.setBrush(QPalette::Base, m_baseBrush);
+        setPalette(pal);
+    }
+
+private:
+    /* Private member vars */
+    QBrush m_baseBrush;
+};
 
 UIVMLogViewerSearchPanel::UIVMLogViewerSearchPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
@@ -182 +216 @@
     if (!mainLayout())
         return;
-    
+
     /* Create search-editor: */
-    m_pSearchEditor = new UISearchField(0 /* parent */);
+    m_pSearchEditor = new UIVMLogViewerSearchField(0 /* parent */);
     if (m_pSearchEditor)
     {
@@ -192 +226 @@
         mainLayout()->addWidget(m_pSearchEditor);
     }
-    
+
     /* Create search-label: */
     m_pSearchLabel = new QLabel;
@@ -299 +333 @@
 void UIVMLogViewerSearchPanel::prepareConnections()
 {
-    connect(m_pSearchEditor, &UISearchField::textChanged, this, &UIVMLogViewerSearchPanel::sltSearchTextChanged);
+    connect(m_pSearchEditor, &UIVMLogViewerSearchField::textChanged, this, &UIVMLogViewerSearchPanel::sltSearchTextChanged);
     connect(m_pNextPrevButtons, &UIRoundRectSegmentedButton::clicked, this, &UIVMLogViewerSearchPanel::find);
     connect(m_pHighlightAllCheckBox, &QCheckBox::stateChanged,
@@ -322 +356 @@
         m_pNextPrevButtons->setToolTip(1, UIVMLogViewerWidget::tr("Search for the next occurrence of the string"));
     }
-    
+
     if (m_pCaseSensitiveCheckBox)
     {
@@ -328 +362 @@
         m_pCaseSensitiveCheckBox->setToolTip(UIVMLogViewerWidget::tr("Perform case sensitive search (when checked)"));
     }
-    
+
     if (m_pMatchWholeWordCheckBox)
     {
@@ -334 +368 @@
         m_pMatchWholeWordCheckBox->setToolTip(UIVMLogViewerWidget::tr("Search matches only complete words when checked"));
     }
-    
+
     if (m_pHighlightAllCheckBox)
     {
@@ -340 +374 @@
         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"));
@@ -458 +492 @@
     if(!m_pSearchEditor)
         return;
-    
+
     const QString &searchString = m_pSearchEditor->text();
     if (searchString.isEmpty())
@@ -580 +614 @@
     if (!m_pSearchEditor || !m_pWarningIcon || !m_pInfoLabel)
         return;
-    
+
     /* If no match has been found, mark the search editor: */
     if (m_iMatchCount == 0)
@@ -615 +649 @@
    return findFlags;
 }
+
+#include "UIVMLogViewerSearchPanel.moc"

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

@@ -31 +31 @@
 class UIRoundRectSegmentedButton;
 class UISearchField;
+class UIVMLogViewerSearchField;
 class UIVMLogViewerWidget;
 
@@ -104 +105 @@
     QLabel *m_pSearchLabel;
     /** Holds the instance of search-editor we create. */
-    UISearchField *m_pSearchEditor;
+    UIVMLogViewerSearchField *m_pSearchEditor;
     /** Holds the instance of next/back button-box we create. */
     UIRoundRectSegmentedButton *m_pNextPrevButtons;