Changeset 70487 in vbox

Timestamp:

Jan 8, 2018 8:04:54 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072 The first attempt on logviewer's bookmark panel

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/logviewer/UIVMLogViewerBookmarksPanel.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp ) (9 diffs)
• src/logviewer/UIVMLogViewerBookmarksPanel.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h ) (6 diffs)
• src/logviewer/UIVMLogViewerFilterPanel.cpp (modified) (1 diff)
• src/logviewer/UIVMLogViewerWidget.cpp (modified) (28 diffs)
• src/logviewer/UIVMLogViewerWidget.h (modified) (6 diffs)
• src/medium/UIMediumManager.cpp (modified) (1 diff)

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

@@ -335 +335 @@
         src/hostnetwork/UIHostNetworkDetailsWidget.h \
         src/hostnetwork/UIHostNetworkManager.h \
+        src/logviewer/UIVMLogViewerBookmarksPanel.h \
         src/logviewer/UIVMLogViewerDialog.h \
         src/logviewer/UIVMLogViewerFilterPanel.h \
@@ -651 +652 @@
         src/hostnetwork/UIHostNetworkManager.cpp \
         src/hostnetwork/UIHostNetworkUtils.cpp \
+        src/logviewer/UIVMLogViewerBookmarksPanel.cpp \
         src/logviewer/UIVMLogViewerDialog.cpp \
         src/logviewer/UIVMLogViewerFilterPanel.cpp \

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

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QButtonGroup>
 # include <QComboBox>
-# include <QFrame>
 # include <QHBoxLayout>
 # if defined(RT_OS_SOLARIS)
@@ -34 +32 @@
 # include <QTextCursor>
 # include <QToolButton>
-# include <QRadioButton>
 # include <QScrollArea>
 
@@ -40 +37 @@
 # include "UIIconPool.h"
 # include "UISpecialControls.h"
-# include "UIVMLogViewerFilterPanel.h"
+# include "UIVMLogViewerBookmarksPanel.h"
 # include "UIVMLogViewerWidget.h"
 # ifdef VBOX_WS_MAC
@@ -47 +44 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* UIVMFilterLineEdit class is used to display and modify the list of filter terms.
-   the terms are displayed as words with spaces in between and it is possible to
-   remove these terms one by one by selecting them or completely by the clearAll button
-   located on the right side of the line edit: */
-class UIVMFilterLineEdit : public QLineEdit
-{
-    Q_OBJECT;
 
-signals:
-
-    void sigFilterTermRemoved(QString removedString);
-    void sigClearAll();
-
-public:
-
-    UIVMFilterLineEdit(QWidget *parent = 0)
-        :QLineEdit(parent)
-        , m_pRemoveTermButton(0)
-    {
-        setReadOnly(true);
-        home(false);
-        createButtons();
-    }
-
-    void addFilterTerm(const QString& filterTermString)
-    {
-        if (text().isEmpty())
-            insert(filterTermString);
-        else
-        {
-            QString newString(filterTermString);
-            insert(newString.prepend(' '));
-        }
-    }
-
-    void clearAll()
-    {
-        if (text().isEmpty())
-            return;
-        sltClearAll();
-    }
-
-protected:
-
-    /* Overload the mouseXXXEvent to control how selection is done: */
-    virtual void        mouseDoubleClickEvent(QMouseEvent *){}
-    virtual void        mouseMoveEvent(QMouseEvent *){}
-    virtual void        mousePressEvent(QMouseEvent * event)
-    {
-        /* Simulate double mouse click to select a word with a single click: */
-        QLineEdit::mouseDoubleClickEvent(event);
-    }
-
-    virtual void        mouseReleaseEvent(QMouseEvent *){}
-    virtual void paintEvent(QPaintEvent *event)
-    {
-        QLineEdit::paintEvent(event);
-        int clearButtonSize = height();
-        m_pClearAllButton->setGeometry(width() - clearButtonSize, 0, clearButtonSize, clearButtonSize);
-        /* If we have a selected term move the m_pRemoveTermButton to the end of the
-           or start of the word (depending on the location of the word within line edit itself: */
-        if (hasSelectedText())
-        {
-            m_pRemoveTermButton->show();
-            int buttonY = 0.5 * (height() - 16);
-            int buttonSize = 16;
-            int charWidth = fontMetrics().width('x');
-            int buttonLeft = cursorRect().right() - 0.5 * charWidth;
-            /* If buttonLeft is in far left of the line edit, move the
-               button to left side of the selected word: */
-            if (buttonLeft + buttonSize  >=  width() - clearButtonSize)
-            {
-                int selectionWidth = charWidth * selectedText().length();
-                buttonLeft -= (selectionWidth + buttonSize);
-            }
-            m_pRemoveTermButton->setGeometry(buttonLeft, buttonY, buttonSize, buttonSize);
-        }
-        else
-            m_pRemoveTermButton->hide();
-    }
-
-private slots:
-
-    /* Nofifies the listeners that selected word (filter term) has been removed: */
-    void sltRemoveFilterTerm()
-    {
-        if (!hasSelectedText())
-            return;
-        emit sigFilterTermRemoved(selectedText());
-        /* Remove the string from text() including the trailing space: */
-        setText(text().remove(selectionStart(), selectedText().length()+1));
-    }
-
-    /* The whole content is removed. Listeners are notified: */
-    void sltClearAll()
-    {
-        /* Check if we have some text to avoid recursive calls: */
-        if (text().isEmpty())
-            return;
-
-        clear();
-        emit sigClearAll();
-    }
-
-private:
-
-    void createButtons()
-    {
-        m_pRemoveTermButton = new QToolButton(this);
-        AssertReturnVoid(m_pRemoveTermButton);
-        m_pRemoveTermButton->setIcon(m_pRemoveTermButton->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
-        m_pRemoveTermButton->hide();
-
-        m_pClearAllButton = new QToolButton(this);
-        AssertReturnVoid(m_pClearAllButton);
-        m_pClearAllButton->setIcon(m_pRemoveTermButton->style()->standardIcon(QStyle::SP_LineEditClearButton));
-
-        connect(m_pRemoveTermButton, &QToolButton::clicked, this, &UIVMFilterLineEdit::sltRemoveFilterTerm);
-        connect(m_pClearAllButton, &QToolButton::clicked, this, &UIVMFilterLineEdit::sltClearAll);
-    }
-
-    QToolButton *m_pRemoveTermButton;
-    QToolButton *m_pClearAllButton;
-};
-
-UIVMLogViewerFilterPanel::UIVMLogViewerFilterPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+UIVMLogViewerBookmarksPanel::UIVMLogViewerBookmarksPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_iMaxBookmarkTextLength(60)
     , m_pViewer(pViewer)
     , m_pMainLayout(0)
     , m_pCloseButton(0)
-    , m_pFilterLabel(0)
-    , m_pFilterComboBox(0)
-    , m_pButtonGroup(0)
-    , m_pAndRadioButton(0)
-    , m_pOrRadioButton(0)
-    , m_pRadioButtonContainer(0)
-    , m_pAddFilterTermButton(0)
-    , m_eFilterOperatorButton(AndButton)
-    , m_pFilterTermsLineEdit(0)
-    , m_pResultLabel(0)
-    , m_iUnfilteredLineCount(0)
-    , m_iFilteredLineCount(0)
+    , m_pBookmarksComboBox(0)
 {
     prepare();
 }
 
-void UIVMLogViewerFilterPanel::applyFilter(const int iCurrentIndex /* = 0 */)
+void UIVMLogViewerBookmarksPanel::update()
 {
-    Q_UNUSED(iCurrentIndex);
-    filter();
-    retranslateUi();
+    if(!m_pBookmarksComboBox)
+        return;
+    const QVector<QPair<int, QString> > *bookmarkVector = m_pViewer->currentBookmarkVector();
+    if(!bookmarkVector)
+        return;
+
+    m_pBookmarksComboBox->clear();
+    QStringList bList;
+    for(int i = 0; i < bookmarkVector->size(); ++i)
+    {
+        QString strItem = QString("BookMark %1 at Line %2: %3").arg(QString::number(i)).
+            arg(QString::number(bookmarkVector->at(i).first)).arg(bookmarkVector->at(i).second);
+
+        if(strItem.length() > m_iMaxBookmarkTextLength)
+        {
+            strItem.resize(m_iMaxBookmarkTextLength);
+            strItem.replace(m_iMaxBookmarkTextLength, 3, QString("..."));
+        }
+        bList << strItem;
+    }
+    m_pBookmarksComboBox->addItems(bList);
 }
 
-void UIVMLogViewerFilterPanel::filter()
+void UIVMLogViewerBookmarksPanel::setBookmarkIndex(int index)
 {
-    QPlainTextEdit *pCurrentPage = m_pViewer->currentLogPage();
-    AssertReturnVoid(pCurrentPage);
-    const QString& strInputText = m_pViewer->currentLog();
-    m_iUnfilteredLineCount = 0;
-    m_iFilteredLineCount = 0;
-    if (strInputText.isNull())
+    if (!m_pBookmarksComboBox)
         return;
-    QTextDocument *document = pCurrentPage->document();
-    if (!document)
+    if (index >= m_pBookmarksComboBox->count())
         return;
-    QStringList stringLines = strInputText.split("\n");
-    m_iUnfilteredLineCount = stringLines.size();
-    if (m_filterTermList.empty())
-    {
-        document->setPlainText(strInputText);
-        emit sigFilterApplied();
-        m_iFilteredLineCount = document->lineCount();
-        return;
-    }
-
-    /* Prepare filter-data: */
-    QString strFilteredText;
-    int count = 0;
-    for (int lineIdx = 0; lineIdx < stringLines.size(); ++lineIdx)
-    {
-        const QString& currentLineString = stringLines[lineIdx];
-        if (currentLineString.isEmpty())
-            continue;
-        if (applyFilterTermsToString(currentLineString))
-        {
-            strFilteredText.append(currentLineString).append("\n");
-            ++count;
-        }
-    }
-
-    document->setPlainText(strFilteredText);
-    m_iFilteredLineCount = document->lineCount();
-
-    /* Move the cursor position to end: */
-    QTextCursor cursor = pCurrentPage->textCursor();
-    cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
-    pCurrentPage->setTextCursor(cursor);
-
-    emit sigFilterApplied();
+    m_pBookmarksComboBox->setCurrentIndex(index);
 }
 
-
-bool UIVMLogViewerFilterPanel::applyFilterTermsToString(const QString& string)
-{
-    /* Number of the filter terms contained with the @p string: */
-    int hitCount = 0;
-    for (int i = 0; i < m_filterTermList.size(); ++i)
-    {
-        const QRegExp rxFilterExp(m_filterTermList.at(i), Qt::CaseInsensitive);
-        /* Disregard empty and invalid filter terms: */
-        if (rxFilterExp.isEmpty() || !rxFilterExp.isValid())
-            continue;
-
-        if (string.contains(rxFilterExp))
-        {
-            ++hitCount;
-            /* Early return */
-            if (m_eFilterOperatorButton == OrButton)
-                return true;
-        }
-
-        /* Early return */
-        if (!string.contains(rxFilterExp) && m_eFilterOperatorButton == AndButton )
-            return false;
-    }
-    /* All the terms are found within the @p string. To catch AND case: */
-    if (hitCount == m_filterTermList.size())
-        return true;
-    return false;
-}
-
-
-void UIVMLogViewerFilterPanel::sltAddFilterTerm()
-{
-    if (!m_pFilterComboBox)
-        return;
-    if (m_pFilterComboBox->currentText().isEmpty())
-        return;
-
-    /* Continue only if the term is new. */
-    if (m_filterTermList.contains(m_pFilterComboBox->currentText()))
-        return;
-    m_filterTermList.push_back(m_pFilterComboBox->currentText());
-
-    /* Add the new filter term to line edit: */
-    if (m_pFilterTermsLineEdit)
-        m_pFilterTermsLineEdit->addFilterTerm(m_pFilterComboBox->currentText());
-
-    /* Clear the content of the combo box: */
-    m_pFilterComboBox->setCurrentText(QString());
-    applyFilter();
-}
-
-void UIVMLogViewerFilterPanel::sltClearFilterTerms()
-{
-    if (m_filterTermList.empty())
-        return;
-    m_filterTermList.clear();
-    applyFilter();
-    if (m_pFilterTermsLineEdit)
-        m_pFilterTermsLineEdit->clearAll();
-}
-
-void UIVMLogViewerFilterPanel::sltOperatorButtonChanged(int buttonId)
-{
-    if (buttonId < 0 || buttonId >= ButtonEnd)
-        return;
-    m_eFilterOperatorButton = static_cast<FilterOperatorButton>(buttonId);
-    applyFilter();
-}
-
-void UIVMLogViewerFilterPanel::sltRemoveFilterTerm(const QString &termString)
-{
-    QStringList newList;
-    for (QStringList::iterator iterator = m_filterTermList.begin();
-        iterator != m_filterTermList.end(); ++iterator)
-    {
-        if ((*iterator) != termString)
-            newList.push_back(*iterator);
-    }
-    m_filterTermList = newList;
-    applyFilter();
-}
-
-void UIVMLogViewerFilterPanel::prepare()
+void UIVMLogViewerBookmarksPanel::prepare()
 {
     prepareWidgets();
@@ -338 +97 @@
 }
 
-void UIVMLogViewerFilterPanel::prepareWidgets()
+void UIVMLogViewerBookmarksPanel::prepareWidgets()
 {
     m_pMainLayout = new QHBoxLayout(this);
@@ -347 +106 @@
     m_pCloseButton = new UIMiniCancelButton(this);
     AssertPtrReturnVoid(m_pCloseButton);
-    m_pMainLayout->addWidget(m_pCloseButton);
+    m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft);
 
-    prepareRadioButtonGroup();
+    m_pBookmarksComboBox = new QComboBox(this);
+    QFontMetrics fontMetrics = m_pBookmarksComboBox->fontMetrics();
+    AssertPtrReturnVoid(m_pBookmarksComboBox);
+    m_pBookmarksComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    m_pBookmarksComboBox->setMaximumWidth(fontMetrics.width('a') * (m_iMaxBookmarkTextLength + 2));
+    printf("max max %d\n", fontMetrics.width('a') * (m_iMaxBookmarkTextLength + 2));
+    m_pMainLayout->addWidget(m_pBookmarksComboBox, 2, Qt::AlignLeft);
 
-    m_pFilterComboBox = new QComboBox(this);
-    AssertPtrReturnVoid(m_pFilterComboBox);
-    {
-        m_pFilterComboBox->setEditable(true);
-        QStringList strFilterPresets;
-        strFilterPresets << "" << "GUI" << "NAT" << "AHCI" << "VD" << "Audio" << "VUSB" << "SUP" << "PGM" << "HDA"
-                         << "HM" << "VMM" << "GIM" << "CPUM";
-        strFilterPresets.sort();
-        m_pFilterComboBox->addItems(strFilterPresets);
-        m_pMainLayout->addWidget(m_pFilterComboBox,1);
-    }
-
-    m_pAddFilterTermButton = new QPushButton(this);
-    AssertPtrReturnVoid(m_pAddFilterTermButton);
-    {
-        m_pAddFilterTermButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
-        m_pMainLayout->addWidget(m_pAddFilterTermButton,0);
-    }
-
-    m_pFilterTermsLineEdit = new UIVMFilterLineEdit(this);
-    AssertPtrReturnVoid(m_pFilterTermsLineEdit);
-    {
-        m_pMainLayout->addWidget(m_pFilterTermsLineEdit, 4);
-        m_pFilterTermsLineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum /*vertical */);
-    }
-
-    m_pResultLabel = new QLabel(this);
-    AssertPtrReturnVoid(m_pResultLabel);
-    {
-        m_pMainLayout->addWidget(m_pResultLabel,0);
-    }
-        /* Create filter-label: */
-//         m_pFilterLabel = new QLabel(this);
-//         AssertPtrReturnVoid(m_pFilterLabel);
-//         {
-//             /* Configure filter-label: */
-//             m_pFilterLabel->setBuddy(m_pFilterComboBox);
-// #ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
-//             QFont font = m_pFilterLabel->font();
-//             font.setPointSize(::darwinSmallFontSize());
-//             m_pFilterLabel->setFont(font);
-// #endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
-//             /* Add filter-label to main-layout: */
-//             m_pMainLayout->addWidget(m_pFilterLabel);
-//         }
 }
 
-void UIVMLogViewerFilterPanel::prepareRadioButtonGroup()
+void UIVMLogViewerBookmarksPanel::prepareConnections()
 {
-    m_pButtonGroup = new QButtonGroup(this);
-    AssertPtrReturnVoid(m_pButtonGroup);
+    connect(m_pCloseButton, &UIMiniCancelButton::clicked, this, &UIVMLogViewerBookmarksPanel::hide);
 
-    m_pRadioButtonContainer = new QFrame(this);
-    m_pRadioButtonContainer->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
-    AssertPtrReturnVoid(m_pRadioButtonContainer);
-
-    QHBoxLayout* containerLayout = (new QHBoxLayout(m_pRadioButtonContainer));
-    AssertPtrReturnVoid(containerLayout);
-    containerLayout->setContentsMargins(0, 0, 0, 0);
-    containerLayout->setSpacing(0);
-
-    m_pAndRadioButton = new QRadioButton(this);
-    m_pOrRadioButton =  new QRadioButton(this);
-    AssertPtrReturnVoid(m_pAndRadioButton);
-    AssertPtrReturnVoid(m_pOrRadioButton);
-
-    m_pButtonGroup->addButton(m_pAndRadioButton, static_cast<int>(AndButton));
-    m_pButtonGroup->addButton(m_pOrRadioButton, static_cast<int>(OrButton));
-    m_pOrRadioButton->setText("Or");
-    m_pAndRadioButton->setText("And");
-    m_pOrRadioButton->setChecked(true);
-    m_eFilterOperatorButton = OrButton;
-
-    containerLayout->addWidget(m_pOrRadioButton);
-    containerLayout->addWidget(m_pAndRadioButton);
-    m_pMainLayout->addWidget(m_pRadioButtonContainer);
-}
-
-void UIVMLogViewerFilterPanel::prepareConnections()
-{
-    connect(m_pCloseButton, &UIMiniCancelButton::clicked, this, &UIVMLogViewerFilterPanel::hide);
-    connect(m_pAddFilterTermButton, &QPushButton::clicked, this,  &UIVMLogViewerFilterPanel::sltAddFilterTerm);
-    connect(m_pButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
-            this, &UIVMLogViewerFilterPanel::sltOperatorButtonChanged);
-    connect(m_pFilterComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this, &UIVMLogViewerFilterPanel::sltAddFilterTerm);
-    connect(m_pFilterTermsLineEdit, &UIVMFilterLineEdit::sigFilterTermRemoved,
-            this, &UIVMLogViewerFilterPanel::sltRemoveFilterTerm);
-    connect(m_pFilterTermsLineEdit, &UIVMFilterLineEdit::sigClearAll,
-            this, &UIVMLogViewerFilterPanel::sltClearFilterTerms);
 }
 
 
-void UIVMLogViewerFilterPanel::retranslateUi()
+void UIVMLogViewerBookmarksPanel::retranslateUi()
 {
     m_pCloseButton->setToolTip(UIVMLogViewerWidget::tr("Close the search panel."));
-    m_pFilterComboBox->setToolTip(UIVMLogViewerWidget::tr("Enter filtering string here."));
-    m_pAddFilterTermButton->setToolTip(UIVMLogViewerWidget::tr("Add filter term."));
-    m_pResultLabel->setText(UIVMLogViewerWidget::tr("Showing %1/%2").arg(m_iFilteredLineCount).arg(m_iUnfilteredLineCount));
-    m_pFilterTermsLineEdit->setToolTip(UIVMLogViewerWidget::tr("The filter terms list. Select one to remove or click the button on the right side to remove them all."));
-    m_pRadioButtonContainer->setToolTip(UIVMLogViewerWidget::tr("The type of boolean operator for filter operation."));
 }
 
-bool UIVMLogViewerFilterPanel::eventFilter(QObject *pObject, QEvent *pEvent)
+bool UIVMLogViewerBookmarksPanel::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     /* Depending on event-type: */
@@ -462 +138 @@
     case QEvent::KeyPress:
         {
-            /* Cast to corresponding key press event: */
-            QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
-
-            /* Handle Ctrl+T key combination as a shortcut to focus search field: */
-            if (pKeyEvent->QInputEvent::modifiers() == Qt::ControlModifier &&
-                pKeyEvent->key() == Qt::Key_T)
-            {
-                if (m_pViewer->currentLogPage())
-                {
-                    if (isHidden())
-                        show();
-                    m_pFilterComboBox->setFocus();
-                    return true;
-                }
-            }
-            else if (pKeyEvent->key() == Qt::Key_Return && m_pFilterComboBox && m_pFilterComboBox->hasFocus())
-                sltAddFilterTerm();
-
             break;
         }
@@ -490 +148 @@
 
 /** Handles the Qt show @a pEvent. */
-void UIVMLogViewerFilterPanel::showEvent(QShowEvent *pEvent)
+void UIVMLogViewerBookmarksPanel::showEvent(QShowEvent *pEvent)
 {
     /* Call to base-class: */
     QWidget::showEvent(pEvent);
-    /* Set focus to combo-box: */
-    m_pFilterComboBox->setFocus();
 }
 
 /** Handles the Qt hide @a pEvent. */
-void UIVMLogViewerFilterPanel::hideEvent(QHideEvent *pEvent)
+void UIVMLogViewerBookmarksPanel::hideEvent(QHideEvent *pEvent)
 {
     /* Get focused widget: */
@@ -510 +166 @@
     QWidget::hideEvent(pEvent);
 }
-
-#include "UIVMLogViewerFilterPanel.moc"

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

@@ -16 +16 @@
  */
 
-#ifndef ___UIVMLogViewerFilterPanel_h___
-#define ___UIVMLogViewerFilterPanel_h___
+#ifndef ___UIVMLogViewerBookmarksPanel_h___
+#define ___UIVMLogViewerBookmarksPanel_h___
 
 /* Qt includes: */
@@ -26 +26 @@
 
 /* Forward declarations: */
-class QButtonGroup;
 class QComboBox;
-class QFrame;
 class QHBoxLayout;
 class QLabel;
 class QLineEdit;
 class QPushButton;
-class QRadioButton;
 class UIVMFilterLineEdit;
 class UIMiniCancelButton;
@@ -40 +37 @@
 
 /** QWidget extension
-  * providing GUI for filter panel in VM Log Viewer. */
-class UIVMLogViewerFilterPanel : public QIWithRetranslateUI<QWidget>
+  * providing GUI for bookmark management. Show a list of bookmarks currently set
+  for displayed log page. It has controls to navigate and clear bookmarks. */
+class UIVMLogViewerBookmarksPanel : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -47 +45 @@
 signals:
 
-    /* Notifies listeners that the filter has been applied. */
-    void sigFilterApplied();
-
 public:
 
-    /** Constructs the filter-panel by passing @a pParent to the QWidget base-class constructor.
-      * @param  pViewer  Specifies reference to the VM Log-Viewer this filter-panel belongs to. */
-    UIVMLogViewerFilterPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerBookmarksPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+
+    /* Adds a single bookmark to an existing list of bookmarks. Possibly called
+       by UIVMLogViewerWidget when user adds a bookmark thru context menu etc. */
+    void addBookmark(const QPair<int, QString> &newBookmark);
+    /* Clear the bookmark list and show this list instead. Probably done after
+       user switches to another log page tab etc. */
+    void setBookmarksList(const QVector<QPair<int, QString> > &bookmarkList);
+    void update();
+    /* @a index is the index of the curent bookmark. */
+    void setBookmarkIndex(int index);
 
 public slots:
 
-    /** Applies filter settings and filters the current log-page.
-      * @param  iCurrentIndex  Specifies index of current log-page, but it is actually not used in the method. */
-    void applyFilter(const int iCurrentIndex = 0);
 
 private slots:
 
-    /** Adds the new filter term and reapplies the filter. */
-    void sltAddFilterTerm();
-    /** Clear all the filter terms and reset the filtering. */
-    void sltClearFilterTerms();
-    /** Executes the necessary code to handle filter's boolean operator change ('And', 'Or'). */
-    void sltOperatorButtonChanged(int buttonId);
-    void sltRemoveFilterTerm(const QString &termString);
 
 private:
 
-    enum FilterOperatorButton{
-        AndButton = 0,
-        OrButton,
-        ButtonEnd
-    };
-
-    /** Prepares filter-panel. */
     void prepare();
     void prepareWidgets();
-    void prepareRadioButtonGroup();
     void prepareConnections();
 
@@ -96 +81 @@
     void hideEvent(QHideEvent *pEvent);
 
-    bool applyFilterTermsToString(const QString& string);
-    void filter();
-
-    /** Holds the reference to VM Log-Viewer this filter-panel belongs to. */
+    const int m_iMaxBookmarkTextLength;
+    /** Holds the reference to VM Log-Viewer this panel belongs to. */
     UIVMLogViewerWidget *m_pViewer;
     /** Holds the instance of main-layout we create. */
@@ -105 +88 @@
     /** Holds the instance of close-button we create. */
     UIMiniCancelButton  *m_pCloseButton;
-    /** Holds the instance of filter-label we create. */
-    QLabel              *m_pFilterLabel;
-    /** Holds instance of filter combo-box we create. */
-    QComboBox           *m_pFilterComboBox;
+    QComboBox           *m_pBookmarksComboBox;
 
-    QButtonGroup        *m_pButtonGroup;
-    QRadioButton        *m_pAndRadioButton;
-    QRadioButton        *m_pOrRadioButton;
-    QFrame              *m_pRadioButtonContainer;
-    QPushButton         *m_pAddFilterTermButton;
-    QStringList          m_filterTermList;
-    FilterOperatorButton m_eFilterOperatorButton;
-    UIVMFilterLineEdit  *m_pFilterTermsLineEdit;
-    QLabel              *m_pResultLabel;
-    int                  m_iUnfilteredLineCount;
-    int                  m_iFilteredLineCount;
 };
 
-#endif /* !___UIVMLogViewerFilterPanel_h___ */
+#endif /* !___UIVMLogViewerBookmarksPanel_h___ */

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

@@ -204 +204 @@
     QPlainTextEdit *pCurrentPage = m_pViewer->currentLogPage();
     AssertReturnVoid(pCurrentPage);
-    const QString& strInputText = m_pViewer->currentLog();
+    const QString* strInputText = m_pViewer->currentLog();
     m_iUnfilteredLineCount = 0;
     m_iFilteredLineCount = 0;
-    if (strInputText.isNull())
+    if (!strInputText || strInputText->isNull())
         return;
     QTextDocument *document = pCurrentPage->document();
     if (!document)
         return;
-    QStringList stringLines = strInputText.split("\n");
+    QStringList stringLines = strInputText->split("\n");
     m_iUnfilteredLineCount = stringLines.size();
     if (m_filterTermList.empty())
     {
-        document->setPlainText(strInputText);
+        document->setPlainText(*strInputText);
         emit sigFilterApplied();
         m_iFilteredLineCount = document->lineCount();

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

@@ -30 +30 @@
 # include <QPlainTextEdit>
 # include <QScrollBar>
+# include <QTextBlock>
 
 /* GUI includes: */
@@ -38 +39 @@
 # include "UIMessageCenter.h"
 # include "UIVMLogViewerWidget.h"
+# include "UIVMLogViewerBookmarksPanel.h"
 # include "UIVMLogViewerFilterPanel.h"
 # include "UIVMLogViewerSearchPanel.h"
@@ -48 +50 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
 
 /** We use a modified scrollbar style for our QPlainTextEdits to get the
@@ -116 +119 @@
 };
 
+/* Sub-class QPlainTextEdit for some addtional context menu items: */
+class UIVMLogViewerTextEdit : public QPlainTextEdit
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigContextMenuBookmarkAction(LogBookmark bookmark);
+
+public:
+    UIVMLogViewerTextEdit(QWidget* parent = 0, const QString& logFileName = QString())
+        :QPlainTextEdit(parent),
+         m_logFileName(logFileName)
+    {
+        //setStyleSheet("background-color: rgba(240, 240, 240, 75%) ");
+    }
+
+    const QString& logFileName() const
+    {
+        return m_logFileName;
+    }
+
+protected:
+
+    void contextMenuEvent(QContextMenuEvent *pEvent)
+    {
+        QMenu *menu = createStandardContextMenu();
+        QAction *pAction = menu->addAction(tr("Bookmark"));
+        QTextBlock block = cursorForPosition(pEvent->pos()).block();
+        m_iContextMenuBookmark.first = block.firstLineNumber();
+        m_iContextMenuBookmark.second = block.text();
+
+        if(pAction)
+            connect(pAction, &QAction::triggered, this, &UIVMLogViewerTextEdit::sltBookmark);
+
+        menu->exec(pEvent->globalPos());
+
+        if(pAction)
+            disconnect(pAction, &QAction::triggered, this, &UIVMLogViewerTextEdit::sltBookmark);
+
+        delete menu;
+    }
+
+    virtual void mousePressEvent(QMouseEvent *pEvent)
+    {
+        QPlainTextEdit::mousePressEvent(pEvent);
+    }
+
+private slots:
+    /// remove
+    void sltBookmark()
+    {
+        emit sigContextMenuBookmarkAction(m_iContextMenuBookmark);
+    }
+
+private:
+
+    /* Line number and text at the context menu position */
+    LogBookmark m_iContextMenuBookmark;
+    /* Name of the log file this text edit created to show. */
+    QString m_logFileName;
+};
+
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */, const CMachine &machine /* = CMachine() */)
     : QIWithRetranslateUI<QWidget>(pParent)
@@ -122 +188 @@
     , m_pViewerContainer(0)
     , m_iCurrentTabIndex(-1)
+    , m_pSearchPanel(0)
+    , m_pFilterPanel(0)
+    , m_pBookmarksPanel(0)
     , m_pMainLayout(0)
     , m_enmEmbedding(enmEmbedding)
@@ -129 +198 @@
     , m_pActionRefresh(0)
     , m_pActionSave(0)
+    , m_pActionBookmark(0)
     , m_pMenu(0)
 {
@@ -166 +236 @@
 }
 
-void UIVMLogViewerWidget::sltFind()
-{
+void UIVMLogViewerWidget::sltShowHideSearchPanel()
+{
+    if(!m_pSearchPanel)
+        return;
     /* Show/hide search-panel: */
     m_pSearchPanel->isHidden() ? m_pSearchPanel->show() : m_pSearchPanel->hide();
@@ -178 +250 @@
     disconnect(m_pViewerContainer, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltTabIndexChange);
 
-    /* Clearing old data if any: */
-    m_book.clear();
     m_logMap.clear();
     m_pViewerContainer->setEnabled(true);
@@ -226 +296 @@
 
     /* Apply the filter settings: */
-    m_pFilterPanel->applyFilter();
+    if(m_pFilterPanel)
+        m_pFilterPanel->applyFilter();
 
     /* Setup this connection after refresh to avoid initial signals during page creation: */
@@ -238 +309 @@
     m_pActionFilter->setEnabled(!noLogsToShow);
     m_pActionSave->setEnabled(!noLogsToShow);
+    m_pActionBookmark->setEnabled(!noLogsToShow);
     m_pViewerContainer->setEnabled(!noLogsToShow);
     m_pViewerContainer->show();
@@ -248 +320 @@
     if (m_comMachine.isNull())
         return;
+    UIVMLogViewerTextEdit *logPage = qobject_cast<UIVMLogViewerTextEdit*>(currentLogPage());
+    if(!logPage)
+        return;
     /* Prepare "save as" dialog: */
-    const QFileInfo fileInfo(m_book.at(m_pViewerContainer->currentIndex()).first);
+    const QFileInfo fileInfo(logPage->logFileName());
     /* Prepare default filename: */
     const QDateTime dtInfo = fileInfo.lastModified();
@@ -274 +349 @@
 }
 
-void UIVMLogViewerWidget::sltFilter()
-{
+void UIVMLogViewerWidget::sltShowHideFilterPanel()
+{
+    if(!m_pFilterPanel)
+        return;
     /* Show/hide filter-panel: */
     m_pFilterPanel->isHidden() ? m_pFilterPanel->show() : m_pFilterPanel->hide();
@@ -305 +382 @@
 }
 
-void UIVMLogViewerWidget::
-sltFilterApplied()
+void UIVMLogViewerWidget::sltFilterApplied()
 {
     /* Reapply the search to get highlighting etc. correctly */
     if (m_pSearchPanel && m_pSearchPanel->isVisible())
         m_pSearchPanel->refresh();
+}
+
+void UIVMLogViewerWidget::sltShowHideBookmarkPanel()
+{
+    if(!m_pBookmarksPanel)
+        return;
+    m_pBookmarksPanel->isHidden() ? m_pBookmarksPanel->show() : m_pBookmarksPanel->hide();
+}
+
+void UIVMLogViewerWidget::sltCreateBookmarkAtCurrent()
+{
+    if(!currentLogPage())
+        return;
+    QWidget* viewport = currentLogPage()->viewport();
+    if (!viewport)
+        return;
+    QPoint point(0.5 * viewport->width(), 0.5 * viewport->height());
+    QTextBlock block = currentLogPage()->cursorForPosition(point).block();
+    LogBookmark bookmark;
+    bookmark.first = block.firstLineNumber();
+    bookmark.second = block.text();
+    sltCreateBookmarkAtLine(bookmark);
+}
+
+void UIVMLogViewerWidget::sltCreateBookmarkAtLine(LogBookmark bookmark)
+{
+    QVector<LogBookmark> *pBookmarkVector = currentBookmarkVector();
+    if(!pBookmarkVector)
+        return;
+    pBookmarkVector->push_back(bookmark);
+    if(m_pBookmarksPanel)
+    {
+        m_pBookmarksPanel->update();
+        m_pBookmarksPanel->setBookmarkIndex(pBookmarkVector->size() - 1);
+    }
 }
 
@@ -384 +495 @@
                 this, &UIVMLogViewerWidget::sltFilterApplied);
     }
+
+    m_pBookmarksPanel = new UIVMLogViewerBookmarksPanel(this, this);
+    AssertPtrReturnVoid(m_pBookmarksPanel);
+    {
+        installEventFilter(m_pBookmarksPanel);
+        m_pBookmarksPanel->hide();
+        m_pMainLayout->insertWidget(4, m_pBookmarksPanel);
+    }
 }
 
@@ -393 +512 @@
     {
         m_pActionFind->setShortcut(QKeySequence("Ctrl+F"));
-        connect(m_pActionFind, &QAction::triggered, this, &UIVMLogViewerWidget::sltFind);
+        m_pActionFind->setCheckable(true);
+        connect(m_pActionFind, &QAction::triggered, this, &UIVMLogViewerWidget::sltShowHideSearchPanel);
     }
 
@@ -401 +521 @@
     {
         m_pActionFilter->setShortcut(QKeySequence("Ctrl+T"));
-        connect(m_pActionFilter, &QAction::triggered, this, &UIVMLogViewerWidget::sltFilter);
+        m_pActionFilter->setCheckable(true);
+        connect(m_pActionFilter, &QAction::triggered, this, &UIVMLogViewerWidget::sltShowHideFilterPanel);
     }
 
@@ -419 +540 @@
            already assigned to another action in the selector UI: */
         if (m_enmEmbedding == EmbedTo_Dialog)
-        {
             m_pActionSave->setShortcut(QKeySequence("Ctrl+S"));
-            connect(m_pActionSave, &QAction::triggered, this, &UIVMLogViewerWidget::sltSave);
-        }
+        connect(m_pActionSave, &QAction::triggered, this, &UIVMLogViewerWidget::sltSave);
+     }
+
+    /* Create and configure 'Bookmark' action: */
+    m_pActionBookmark = new QAction(this);
+    AssertPtrReturnVoid(m_pActionBookmark);
+    {
+        /* tie Ctrl+D to save only if we show this in a dialog since Ctrl+D is
+           already assigned to another action in the selector UI: */
+        if (m_enmEmbedding == EmbedTo_Dialog)
+            m_pActionBookmark->setShortcut(QKeySequence("Ctrl+D"));
+        m_pActionBookmark->setCheckable(true);
+        connect(m_pActionBookmark, &QAction::triggered, this, &UIVMLogViewerWidget::sltShowHideBookmarkPanel);
     }
 
@@ -451 +582 @@
                                                        QString(":/%1_save_disabled_24px.png").arg(strPrefix)));
 
-
+    if (m_pActionBookmark)
+        m_pActionBookmark->setIcon(UIIconPool::iconSet(QString(":/%1_bookmark_24px.png").arg(strPrefix),
+                                                       QString(":/%1_bookmark_disabled_24px.png").arg(strPrefix)));
 }
 
@@ -476 +609 @@
         if (m_pActionSave)
             m_pToolBar->addAction(m_pActionSave);
+
+        if (m_pActionBookmark)
+            m_pToolBar->addAction(m_pActionBookmark);
 
 #ifdef VBOX_WS_MAC
@@ -505 +641 @@
         if (m_pActionSave)
             m_pMenu->addAction(m_pActionSave);
+        if (m_pActionBookmark)
+            m_pMenu->addAction(m_pActionBookmark);
+
     }
 }
@@ -545 +684 @@
         m_pActionSave->setToolTip(tr("Save the log"));
         m_pActionSave->setStatusTip(tr("Save the log"));
+    }
+
+    if (m_pActionBookmark)
+    {
+        m_pActionBookmark->setText(tr("&Bookmark..."));
+        m_pActionBookmark->setToolTip(tr("Bookmark the line"));
+        m_pActionBookmark->setStatusTip(tr("Bookmark the line"));
     }
 
@@ -616 +762 @@
 }
 
+const QString* UIVMLogViewerWidget::currentLog()
+{
+    if(!currentLogPage())
+        return 0;
+    return &(m_logMap[currentLogPage()]);
+}
+
 QPlainTextEdit* UIVMLogViewerWidget::currentLogPage() const
 {
@@ -630 +783 @@
     return 0;
 }
+
+const QVector<LogBookmark>* UIVMLogViewerWidget::currentBookmarkVector() const
+{
+    UIVMLogViewerTextEdit *logPage = qobject_cast<UIVMLogViewerTextEdit*>(currentLogPage());
+    if(!logPage)
+        return 0;
+    QString logFileName = logPage->logFileName();
+    if(logFileName.isEmpty())
+        return 0;
+
+    return &(m_bookmarkMap[logFileName]);
+}
+
+QVector<LogBookmark>* UIVMLogViewerWidget::currentBookmarkVector()
+{
+    UIVMLogViewerTextEdit *logPage = qobject_cast<UIVMLogViewerTextEdit*>(currentLogPage());
+    if(!logPage)
+        return 0;
+    QString logFileName = logPage->logFileName();
+    if(logFileName.isEmpty())
+        return 0;
+
+    return &(m_bookmarkMap[logFileName]);
+}
+
 
 QPlainTextEdit* UIVMLogViewerWidget::logPage(int pIndex) const
@@ -671 +849 @@
             {
                 /* Create a log viewer page and append the read text to it: */
-                QPlainTextEdit *pLogViewer = createLogPage(QFileInfo(strFileName).fileName());
+                QPlainTextEdit *pLogViewer = createLogPage(strFileName);
                 pLogViewer->setPlainText(strText);
                 /* Move the cursor position to end: */
@@ -677 +855 @@
                 cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
                 pLogViewer->setTextCursor(cursor);
-                /* Add the actual file name and the QPlainTextEdit containing the content to a list: */
-                m_book << qMakePair(strFileName, pLogViewer);
                 /* Add the log-text to the map: */
                 m_logMap[pLogViewer] = strText;
@@ -688 +864 @@
 }
 
-QPlainTextEdit* UIVMLogViewerWidget::createLogPage(const QString &strName)
+QPlainTextEdit* UIVMLogViewerWidget::createLogPage(const QString &strFileName)
 {
     /* Create page-container: */
@@ -698 +874 @@
         AssertPtrReturn(pPageLayout, 0);
         /* Create Log-Viewer: */
-        QPlainTextEdit *pLogViewer = new QPlainTextEdit(pPageContainer);
+        UIVMLogViewerTextEdit *pLogViewer = new UIVMLogViewerTextEdit(pPageContainer, strFileName);
+        connect(pLogViewer, &UIVMLogViewerTextEdit::sigContextMenuBookmarkAction,
+                this, &UIVMLogViewerWidget::sltCreateBookmarkAtLine);
 
         AssertPtrReturn(pLogViewer, 0);
@@ -722 +900 @@
         }
         /* Add page-container to viewer-container: */
-        m_pViewerContainer->addTab(pPageContainer, strName);
+        m_pViewerContainer->addTab(pPageContainer, QFileInfo(strFileName).fileName());
         return pLogViewer;
     }
-}
-
-const QString& UIVMLogViewerWidget::currentLog()
-{
-    return m_logMap[currentLogPage()];
 }
 

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

@@ -37 +37 @@
 class QVBoxLayout;
 class UIToolBar;
+class UIVMLogViewerBookmarksPanel;
 class UIVMLogViewerFilterPanel;
 class UIVMLogViewerSearchPanel;
 
 /* Type definitions: */
-typedef QPair<QString, QPlainTextEdit*> LogPage;
-typedef QList<LogPage> LogBook;
+/** value is the content of the log file */
 typedef QMap<QPlainTextEdit*, QString> VMLogMap;
+/** first is line number, second is block text */
+typedef QPair<int, QString> LogBookmark;
+/** key is log file name, value is a vector of bookmarks. */
+typedef QMap<QString, QVector<LogBookmark> > BookmarkMap;
+
 
 /** QIMainWindow extension
@@ -78 +83 @@
 private slots:
 
-    /** Handles search action triggering. */
-    void sltFind();
     /** Handles refresh action triggering. */
     void sltRefresh();
     /** Handles save action triggering. */
     void sltSave();
-    /** Handles filter action triggering. */
-    void sltFilter();
+
+    void sltShowHideFilterPanel();
+    void sltShowHideSearchPanel();
+    void sltShowHideBookmarkPanel();
 
     /** Handles the search result highlight changes. */
     void sltSearchResultHighLigting();
-
     /** Handles the tab change of the logviewer. */
     void sltTabIndexChange(int tabIndex);
-
     void sltFilterApplied();
+    /* create a bookmark out of line number and block text. */
+    void sltCreateBookmarkAtLine(QPair<int, QString> bookmark);
+    /* Determines the (middle) line number of the visible text and calls sltCreateBookmarkAtLine. */
+    void sltCreateBookmarkAtCurrent();
+
 
 private:
@@ -129 +137 @@
     /** Returns the newly created log-page using @a strPage filename. */
     QPlainTextEdit* createLogPage(const QString &strPage);
-    /** Returns the content of current log-page. */
-    const QString& currentLog();
+    /** Returns the content of current log-file as it is read. */
+    const QString* currentLog();
 
     /** Attempts to read the logs through the API, returns true if there exists any logs, false otherwise. */
@@ -138 +146 @@
     void resetHighlighthing();
 
+    /** Returns the vector of bookmarks for the current log page */
+    QVector<LogBookmark>* currentBookmarkVector();
+    const QVector<LogBookmark>* currentBookmarkVector() const;
+
     /** Holds whether the dialog is polished. */
     bool m_fIsPolished;
@@ -152 +164 @@
     /** Holds the instance of search-panel. */
     UIVMLogViewerSearchPanel *m_pSearchPanel;
-
-    /** Holds the list of log-pages. */
-    LogBook m_book;
-
     /** Holds the instance of filter panel. */
     UIVMLogViewerFilterPanel *m_pFilterPanel;
-
-    /** Holds the list of log-content. */
-    VMLogMap m_logMap;
+    UIVMLogViewerBookmarksPanel *m_pBookmarksPanel;
+
+    /** Holds the list of log file content. */
+    VMLogMap             m_logMap;
+    mutable BookmarkMap  m_bookmarkMap;
 
     QVBoxLayout      *m_pMainLayout;
@@ -179 +189 @@
         /** Holds the Save action instance. */
         QAction   *m_pActionSave;
+        /** Holds the Bookmark action instance. */
+        QAction   *m_pActionBookmark;
+
         /** Holds the menu object instance. */
         QMenu     *m_pMenu;
     /** @} */
 
+    friend class UIVMLogViewerBookmarksPanel;
+    friend class UIVMLogViewerFilterPanel;
     friend class UIVMLogViewerSearchPanel;
-    friend class UIVMLogViewerFilterPanel;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -2468 +2468 @@
     return qobject_cast<UIMediumManagerWidget*>(QIManagerDialog::widget());
 }
-