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

Timestamp:

May 3, 2021 1:09:49 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144168

Message:

FE/Qt: bugref:9930. Implementing reload slot

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (3 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (7 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -1376 +1376 @@
         setName(QApplication::translate("UIActionPool", "&Refresh"));
         setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer"));
-        setStatusTip(QApplication::translate("UIActionPool", "Refresh selected virtual machine log"));
-        setToolTip(  QApplication::translate("UIActionPool", "Refresh Virtual Machine Log")
+        setStatusTip(QApplication::translate("UIActionPool", "Refresh the currently viewed log"));
+        setToolTip(  QApplication::translate("UIActionPool", "Refresh the Currently Viewed Log")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+/** Simple action extension, used as 'Perform Reload' action class. */
+class UIActionMenuSelectorLogPerformReload : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorLogPerformReload(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/log_viewer_refresh_32px.png", ":/log_viewer_refresh_16px.png",
+                         ":/log_viewer_refresh_disabled_32px.png", ":/log_viewer_refresh_disabled_16px.png")
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("ReloadAllLogs");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Returns standard shortcut. */
+    virtual QKeySequence standardShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Reload"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer"));
+        setStatusTip(QApplication::translate("UIActionPool", "Reread all the log files and refresh pages"));
+        setToolTip(  QApplication::translate("UIActionPool", "Reread All the Log Files and Refresh Pages")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -2539 +2586 @@
     m_pool[UIActionIndex_M_Log_T_Options] = new UIActionMenuSelectorLogTogglePaneOptions(this);
     m_pool[UIActionIndex_M_Log_S_Refresh] = new UIActionMenuSelectorLogPerformRefresh(this);
+    m_pool[UIActionIndex_M_Log_S_Reload] = new UIActionMenuSelectorLogPerformReload(this);
     m_pool[UIActionIndex_M_Log_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
 
@@ -2963 +3011 @@
     /* 'Refresh' action: */
     fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_S_Refresh)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_S_Reload)) || fSeparator;
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -96 +96 @@
     UIActionIndex_M_Log_T_Options,
     UIActionIndex_M_Log_S_Refresh,
+    UIActionIndex_M_Log_S_Reload,
     UIActionIndex_M_Log_S_Save,
 

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

@@ -332 +332 @@
 }
 
+void UIVMLogViewerWidget::sltReload()
+{
+    if (!m_pTabWidget)
+        return;
+
+    m_pTabWidget->blockSignals(true);
+    m_pTabWidget->hide();
+
+    removeAllLogPages();
+    createLogViewerPages(m_machines);
+
+    /* re-Apply the filter settings: */
+    if (m_pFilterPanel)
+        m_pFilterPanel->applyFilter();
+
+    m_pTabWidget->blockSignals(false);
+    setTabColorPerMachine();
+    m_pTabWidget->show();
+}
+
 void UIVMLogViewerWidget::sltSave()
 {
@@ -588 +608 @@
     connect(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh), &QAction::triggered,
             this, &UIVMLogViewerWidget::sltRefresh);
+    connect(m_pActionPool->action(UIActionIndex_M_Log_S_Reload), &QAction::triggered,
+            this, &UIVMLogViewerWidget::sltReload);
     connect(m_pActionPool->action(UIActionIndex_M_Log_S_Save), &QAction::triggered,
             this, &UIVMLogViewerWidget::sltSave);
@@ -725 +747 @@
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Reload));
 
 #ifdef VBOX_WS_MAC
@@ -843 +866 @@
 QPlainTextEdit* UIVMLogViewerWidget::logPage(int pIndex) const
 {
-    if (!m_pTabWidget->isEnabled())
+    if (m_pTabWidget)
         return 0;
     QWidget* pContainer = m_pTabWidget->widget(pIndex);
@@ -850 +873 @@
     QPlainTextEdit *pBrowser = pContainer->findChild<QPlainTextEdit*>();
     return pBrowser;
+}
+
+QVector<UIVMLogPage*> UIVMLogViewerWidget::logPages()
+{
+    QVector<UIVMLogPage*> pages;
+    if (m_pTabWidget)
+        return pages;
+    for (int i = 0; i < m_pTabWidget->count(); ++i)
+    {
+        UIVMLogPage *pPage = logPage(i);
+        if (pPage)
+            pages << pPage;
+    }
+    return pages;
 }
 
@@ -963 +1000 @@
     /* Remove all the tabs from tab widget, note that this does not delete tab widgets: */
     m_pTabWidget->clear();
+    QVector<UIVMLogPage*> pagesToRemove;
     /* Add tab widgets (log pages) back as long as machine id is not in machineList: */
     for (int i = 0; i < logPages.size(); ++i)
@@ -971 +1009 @@
 
         if (machineList.contains(id))
-            continue;
-        m_pTabWidget->addTab(logPages[i].first, logPages[i].second);
-    }
+            pagesToRemove << logPages[i].first;
+        else
+            m_pTabWidget->addTab(logPages[i].first, logPages[i].second);
+    }
+    /* Delete all the other pages: */
+    qDeleteAll(pagesToRemove.begin(), pagesToRemove.end());
     m_pTabWidget->blockSignals(false);
 }
 
+void UIVMLogViewerWidget::removeAllLogPages()
+{
+    if (!m_pTabWidget)
+        return;
+
+    QVector<UIVMLogPage*> pagesToRemove = logPages();
+    m_pTabWidget->clear();
+    qDeleteAll(pagesToRemove.begin(), pagesToRemove.end());
+}
 
 void UIVMLogViewerWidget::resetHighlighthing()

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

@@ -101 +101 @@
     /** Rereads the log file shown in the current tab. */
     void sltRefresh();
+    /** Rereads all the log files . */
+    void sltReload();
     /** Handles save action triggering. */
     void sltSave();
@@ -179 +181 @@
     /** Returns the log page at tab with iIndex if it contains a log page. Return 0 otherwise. */
     UIVMLogPage *logPage(int iIndex);
+    /** Returns a vector of all the log pages of the tab widget. */
+    QVector<UIVMLogPage*> logPages();
 
     void createLogViewerPages(const QVector<QUuid> &machineList);
     /** Removes the log pages/tabs that shows logs of the machines from @p machineList. */
     void removeLogViewerPages(const QVector<QUuid> &machineList);
+    void removeAllLogPages();
     /** We alternate tab colors between two `darker and lighter` one per machine. This function goes over tabs and
       * sets tab data so tab our QTabBar extension can color tabs correctly. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -943 +943 @@
                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Options));
                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_S_Refresh));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_S_Reload));
                     m_pToolBar->addSeparator();
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));