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

Timestamp:

Apr 5, 2018 1:07:14 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072 Handle logviewer bookmarks a bit better in case of log viewer page refresh

Location:

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

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogPage.h (modified) (5 diffs)
• UIVMLogViewerBookmarksPanel.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (4 diffs)

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

@@ -244 +244 @@
 }
 
+void UIVMLogPage::setBookmarkVector(const QVector<LogBookmark>& bookmarks)
+{
+    m_bookmarkVector = bookmarks;
+    updateTextEditBookmarkLineSet();
+}
+
 void UIVMLogPage::showEvent(QShowEvent *pEvent)
 {

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

@@ -39 +39 @@
 
 /** UIVMLogPage defines data and functionalities of the each tab page of a UIVMLogViewerWidget.
-    It stores the original log file content , a list of bookmarks, etc */
+ *  It stores the original log file content , a list of bookmarks, etc */
 class UIVMLogPage  : public QIWithRetranslateUI<QWidget>
 {
@@ -71 +71 @@
 
     /** Set plaintextEdit's text. Note that the text we
-        show currently might be different than
-        m_strLog. For example during filtering. */
+     *  show currently might be different than
+     *  m_strLog. For example during filtering. */
     void setTextEditText(const QString &strText);
     void setTextEditTextAsHtml(const QString &strText);
@@ -88 +88 @@
 
     const QVector<LogBookmark>& bookmarkVector() const;
+    void setBookmarkVector(const QVector<LogBookmark>& booksmarks);
+
     void deleteAllBookmarks();
     /** Scrolls the plain text edit to the bookmark with index @a bookmarkIndex. */
@@ -99 +101 @@
 
     /** setFilterParameters is called at the end of filtering operation to store the parameter etc.
-        these parameters are used to decide whether we have to reapply the filter, and if not to
-        update filter panel with correct line counts etc.*/
+     *  these parameters are used to decide whether we have to reapply the filter, and if not to
+     *  update filter panel with correct line counts etc.*/
     void setFilterParameters(const QSet<QString> &filterTermSet, int filterOperationType,
                              int iFilteredLineCount, int iUnfilteredLineCount);
@@ -106 +108 @@
     int  unfilteredLineCount() const;
     /** Compares filter parameters with previous filter operation's parameters to decide if the
-        filter should be applied again. */
+     *  filter should be applied again. */
     bool shouldFilterBeApplied(const QSet<QString> &filterTermSet, int filterOperationType) const;
 

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

@@ -28 +28 @@
 
 /** UIVMLogViewerPanel extension providing GUI for bookmark management. Show a list of bookmarks currently set
-  for displayed log page. It has controls to navigate and clear bookmarks. */
+ *  for displayed log page. It has controls to navigate and clear bookmarks. */
 class UIVMLogViewerBookmarksPanel : public UIVMLogViewerPanel
 {
@@ -44 +44 @@
 
     /** Adds a single bookmark to an existing list of bookmarks. Possibly called
-       by UIVMLogViewerWidget when user adds a bookmark thru context menu etc. */
+     *  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. */
+     *  user switches to another log page tab etc. */
     void setBookmarksList(const QVector<QPair<int, QString> > &bookmarkList);
     void updateBookmarkList(const QVector<QPair<int, QString> > &bookmarkVector);

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

@@ -180 +180 @@
     m_logPageList.clear();
     m_pTabWidget->setEnabled(true);
+    int currentTabIndex = m_pTabWidget->currentIndex();
     /* Hide the container widget during updates to avoid flickering: */
     m_pTabWidget->hide();
+    QVector<QVector<LogBookmark> > logPageBookmarks;
     /* Clear the tab widget. This might be an overkill but most secure way to deal with the case where
-       number of the log files changes. */
+       number of the log files changes. Store the bookmark vectors before deleting the pages*/
     while (m_pTabWidget->count())
     {
         QWidget *pFirstPage = m_pTabWidget->widget(0);
+        UIVMLogPage *pLogPage = qobject_cast<UIVMLogPage*>(pFirstPage);
+        if (pLogPage)
+            logPageBookmarks.push_back(pLogPage->bookmarkVector());
         m_pTabWidget->removeTab(0);
         delete pFirstPage;
@@ -192 +197 @@
 
     bool noLogsToShow = createLogViewerPages();
-
-    /* Show the first tab widget's page after the refresh: */
-    m_pTabWidget->setCurrentIndex(0);
 
     /* Apply the filter settings: */
     if (m_pFilterPanel)
         m_pFilterPanel->applyFilter();
+    /* Restore the bookmarks: */
+    for (int i = 0; i < !noLogsToShow && m_pTabWidget->count(); ++i)
+    {
+        UIVMLogPage *pLogPage = qobject_cast<UIVMLogPage*>(m_pTabWidget->widget(i));
+        if (pLogPage && i < logPageBookmarks.size())
+            pLogPage->setBookmarkVector(logPageBookmarks[i]);
+    }
 
     /* Setup this connection after refresh to avoid initial signals during page creation: */
@@ -205 +214 @@
     connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltTabIndexChange);
 
+    /* Show the first tab widget's page after the refresh: */
+    int tabIndex = (currentTabIndex < m_pTabWidget->count()) ? currentTabIndex : 0;
+    m_pTabWidget->setCurrentIndex(tabIndex);
+    sltTabIndexChange(tabIndex);
     /* Enable/Disable toolbar actions (except Refresh) & tab widget according log presence: */
     if (m_pActionFind)
@@ -220 +233 @@
     if (m_pSearchPanel && m_pSearchPanel->isVisible())
         m_pSearchPanel->refresh();
+
+    /* If there are no log files to show the hide all the open panels: */
+    if (noLogsToShow)
+    {
+        for(QMap<UIVMLogViewerPanel*, QAction*>::iterator iterator = m_panelActionMap.begin();
+            iterator != m_panelActionMap.end(); ++iterator)
+        {
+            if (iterator.key())
+            hidePanel(iterator.key());
+        }
+    }
 }