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

Timestamp:

Dec 18, 2017 10:32:04 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9072 Logviewer widget can be now embedded into machine tools pane

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (6 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (3 diffs)
• selector/UIActionPoolSelector.cpp (modified) (2 diffs)
• selector/UIActionPoolSelector.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (10 diffs)
• selector/UISelectorWindow.h (modified) (1 diff)
• selector/UIToolsPaneMachine.cpp (modified) (6 diffs)
• selector/UIToolsPaneMachine.h (modified) (2 diffs)
• selector/UIToolsToolbar.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -873 +873 @@
         case ToolTypeMachine_Details:   strResult = "Details"; break;
         case ToolTypeMachine_Snapshots: strResult = "Snapshots"; break;
+        case ToolTypeMachine_LogViewer: strResult = "LogViewer"; break;
         default:
         {
@@ -891 +892 @@
     keys << "Details";   values << ToolTypeMachine_Details;
     keys << "Snapshots"; values << ToolTypeMachine_Snapshots;
+    keys << "LogViewer"; values << ToolTypeMachine_LogViewer;
     /* Invalid type for unknown words: */
     if (!keys.contains(strToolTypeMachine, Qt::CaseInsensitive))

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -640 +640 @@
     ToolTypeMachine_Details,
     ToolTypeMachine_Snapshots,
+    ToolTypeMachine_LogViewer
 };
 Q_DECLARE_METATYPE(ToolTypeMachine);

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

@@ -41 +41 @@
 # ifdef VBOX_WS_MAC
 #  include "VBoxUtils-darwin.h"
-# endif
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

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

@@ -48 +48 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine)
+UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */, const CMachine &machine /* = CMachine() */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fIsPolished(false)
@@ -73 +73 @@
 int UIVMLogViewerWidget::defaultLogPageWidth() const
 {
-    if(!m_pViewerContainer)
+    if (!m_pViewerContainer)
         return 0;
 
     QWidget *pContainer = m_pViewerContainer->currentWidget();
-    if(!pContainer)
+    if (!pContainer)
         return 0;
 
@@ -111 +111 @@
     m_logMap.clear();
     m_pViewerContainer->setEnabled(true);
+    /* Hide the container widget during updates to avoid flickering: */
+    m_pViewerContainer->hide();
     while (m_pViewerContainer->count())
     {
@@ -118 +120 @@
     }
 
-    bool isAnyLogPresent = false;
-
+    bool noLogsToShow = false;
+    QString strDummyTabText;
+    /* check if the machine is valid: */
+    if (m_comMachine.isNull())
+    {
+        noLogsToShow = true;
+        strDummyTabText = QString(tr("<p><b>No machine</b> is currently selected. Please select a "
+                                     "Virtual Machine to see its logs"));
+    }
+    /* If machine is valid and check if there are any log files and create viewer tabs: */
+    else if (!createLogViewerPages())
+    {
+        noLogsToShow = true;
+        strDummyTabText = QString(tr("<p>No log files found. Press the "
+                                     "<b>Refresh</b> button to rescan the log folder "
+                                     "<nobr><b>%1</b></nobr>.</p>"));
+    }
+    /* If the machine is not valid or has no log files show a single viewer tab: */
+    if (noLogsToShow)
+    {
+        QPlainTextEdit *pDummyLog = createLogPage("VBox.log");
+        pDummyLog->setWordWrapMode(QTextOption::WordWrap);
+        pDummyLog->appendHtml(strDummyTabText);
+        /* We don't want it to remain white: */
+        QPalette pal = pDummyLog->palette();
+        pal.setColor(QPalette::Base, pal.color(QPalette::Window));
+        pDummyLog->setPalette(pal);
+    }
+
+    /* Show the first tab widget's page after the refresh: */
+    m_pViewerContainer->setCurrentIndex(0);
+
+    /* Apply the filter settings: */
+    m_pFilterPanel->applyFilter();
+
+    /* Setup this connection after refresh to avoid initial signals during page creation: */
+    connect(m_pViewerContainer, SIGNAL(currentChanged(int)), m_pFilterPanel, SLOT(applyFilter(int)));
+
+    /* Enable/Disable toolbar actions (except Refresh) & tab widget according log presence: */
+    m_pActionFind->setEnabled(!noLogsToShow);
+    m_pActionFilter->setEnabled(!noLogsToShow);
+    m_pActionSave->setEnabled(!noLogsToShow);
+    m_pViewerContainer->setEnabled(!noLogsToShow);
+    m_pViewerContainer->show();
+}
+
+void UIVMLogViewerWidget::sltSave()
+{
+    if (m_comMachine.isNull())
+        return;
+    /* Prepare "save as" dialog: */
+    const QFileInfo fileInfo(m_book.at(m_pViewerContainer->currentIndex()).first);
+    /* Prepare default filename: */
+    const QDateTime dtInfo = fileInfo.lastModified();
+    const QString strDtString = dtInfo.toString("yyyy-MM-dd-hh-mm-ss");
+    const QString strDefaultFileName = QString("%1-%2.log").arg(m_comMachine.GetName()).arg(strDtString);
+    const QString strDefaultFullName = QDir::toNativeSeparators(QDir::home().absolutePath() + "/" + strDefaultFileName);
+
+    const QString strNewFileName = QIFileDialog::getSaveFileName(strDefaultFullName,
+                                                                 "",
+                                                                 this,
+                                                                 tr("Save VirtualBox Log As"),
+                                                                 0 /* selected filter */,
+                                                                 true /* resolve symlinks */,
+                                                                 true /* confirm overwrite */);
+    /* Make sure file-name is not empty: */
+    if (!strNewFileName.isEmpty())
+    {
+        /* Delete the previous file if already exists as user already confirmed: */
+        if (QFile::exists(strNewFileName))
+            QFile::remove(strNewFileName);
+        /* Copy log into the file: */
+        QFile::copy(m_comMachine.QueryLogFilename(m_pViewerContainer->currentIndex()), strNewFileName);
+    }
+}
+
+void UIVMLogViewerWidget::sltFilter()
+{
+    /* Show/hide filter-panel: */
+    m_pFilterPanel->isHidden() ? m_pFilterPanel->show() : m_pFilterPanel->hide();
+}
+
+void UIVMLogViewerWidget::setMachine(const CMachine &machine)
+{
+    if (machine == m_comMachine)
+        return;
+    m_comMachine = machine;
+    sltRefresh();
+}
+
+void UIVMLogViewerWidget::prepare()
+{
+    m_pMainLayout = new QVBoxLayout(this);
+
+    prepareActions();
+
+    prepareToolBar();
+    prepareMenu();
+
+    /* Prepare widgets: */
+    prepareWidgets();
+
+    /* Reading log files: */
+    sltRefresh();
+
+    /* Loading language constants: */
+    retranslateUi();
+}
+
+void UIVMLogViewerWidget::prepareWidgets()
+{
+    /* Configure layout: */
+    layout()->setContentsMargins(0, 0, 0, 0);
+#ifdef VBOX_WS_MAC
+        layout()->setSpacing(10);
+#else
+        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
+        layout()->setSpacing(iS);
+#endif
+
+    /* Create VM Log-Viewer container: */
+    m_pViewerContainer = new QITabWidget(this);
+    AssertPtrReturnVoid(m_pViewerContainer);
+    {
+        /* Add VM Log-Viewer container to main-layout: */
+        m_pMainLayout->insertWidget(1, m_pViewerContainer);
+    }
+
+    /* Create VM Log-Viewer search-panel: */
+    m_pSearchPanel = new UIVMLogViewerSearchPanel(this, this);
+    AssertPtrReturnVoid(m_pSearchPanel);
+    {
+        /* Configure VM Log-Viewer search-panel: */
+        installEventFilter(m_pSearchPanel);
+        m_pSearchPanel->hide();
+        /* Add VM Log-Viewer search-panel to main-layout: */
+        m_pMainLayout->insertWidget(2, m_pSearchPanel);
+    }
+
+    /* Create VM Log-Viewer filter-panel: */
+    m_pFilterPanel = new UIVMLogViewerFilterPanel(this, this);
+    AssertPtrReturnVoid(m_pFilterPanel);
+    {
+        /* Configure VM Log-Viewer filter-panel: */
+        installEventFilter(m_pFilterPanel);
+        m_pFilterPanel->hide();
+        /* Add VM Log-Viewer filter-panel to main-layout: */
+        m_pMainLayout->insertWidget(3, m_pFilterPanel);
+    }
+}
+
+void UIVMLogViewerWidget::prepareActions()
+{
+    /* Create and configure 'Find' action: */
+    m_pActionFind = new QAction(this);
+    AssertPtrReturnVoid(m_pActionFind);
+    {
+        m_pActionFind->setShortcut(QKeySequence("Ctrl+F"));
+        connect(m_pActionFind, &QAction::triggered, this, &UIVMLogViewerWidget::sltFind);
+    }
+
+    /* Create and configure 'Filter' action: */
+    m_pActionFilter = new QAction(this);
+    AssertPtrReturnVoid(m_pActionFilter);
+    {
+        m_pActionFilter->setShortcut(QKeySequence("Ctrl+T"));
+        connect(m_pActionFilter, &QAction::triggered, this, &UIVMLogViewerWidget::sltFilter);
+    }
+
+    /* Create and configure 'Refresh' action: */
+    m_pActionRefresh = new QAction(this);
+    AssertPtrReturnVoid(m_pActionRefresh);
+    {
+        m_pActionRefresh->setShortcut(QKeySequence("F5"));
+        connect(m_pActionRefresh, &QAction::triggered, this, &UIVMLogViewerWidget::sltRefresh);
+    }
+
+    /* Create and configure 'Save' action: */
+    m_pActionSave = new QAction(this);
+    AssertPtrReturnVoid(m_pActionSave);
+    {
+        m_pActionSave->setShortcut(QKeySequence("Ctrl+S"));
+        connect(m_pActionSave, &QAction::triggered, this, &UIVMLogViewerWidget::sltSave);
+    }
+
+    /* Update action icons: */
+    prepareActionIcons();
+}
+
+void UIVMLogViewerWidget::prepareActionIcons()
+{
+    QString strPrefix = "log_viewer";
+
+    if (m_pActionFind)
+        m_pActionFind->setIcon(UIIconPool::iconSet(QString(":/%1_find_24px.png").arg(strPrefix),
+                                                       QString(":/%1_find_disabled_24px.png").arg(strPrefix)));
+
+    if (m_pActionFilter)
+        m_pActionFilter->setIcon(UIIconPool::iconSet(QString(":/%1_filter_24px.png").arg(strPrefix),
+                                                         QString(":/%1_filter_disabled_24px.png").arg(strPrefix)));
+
+
+    if (m_pActionRefresh)
+        m_pActionRefresh->setIcon(UIIconPool::iconSet(QString(":/%1_refresh_24px.png").arg(strPrefix),
+                                                          QString(":/%1_refresh_disabled_24px.png").arg(strPrefix)));
+
+
+    if (m_pActionSave)
+        m_pActionSave->setIcon(UIIconPool::iconSet(QString(":/%1_save_24px.png").arg(strPrefix),
+                                                       QString(":/%1_save_disabled_24px.png").arg(strPrefix)));
+
+
+}
+
+void UIVMLogViewerWidget::prepareToolBar()
+{
+    /* Create toolbar: */
+    m_pToolBar = new UIToolBar(parentWidget());
+    AssertPtrReturnVoid(m_pToolBar);
+    {
+        /* Configure toolbar: */
+        const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * 1.375);
+        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
+        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+        /* Add toolbar actions: */
+        if (m_pActionFind)
+            m_pToolBar->addAction(m_pActionFind);
+
+        if (m_pActionFilter)
+            m_pToolBar->addAction(m_pActionFilter);
+
+        if (m_pActionRefresh)
+            m_pToolBar->addAction(m_pActionRefresh);
+
+        if (m_pActionSave)
+            m_pToolBar->addAction(m_pActionSave);
+
+#ifdef VBOX_WS_MAC
+        /* Check whether we are embedded into a stack: */
+        if (m_enmEmbedding == EmbedTo_Stack)
+        {
+            /* Add into layout: */
+            layout()->addWidget(m_pToolBar);
+        }
+#else
+        /* Add into layout: */
+        m_pMainLayout->insertWidget(0, m_pToolBar);
+#endif
+    }
+}
+
+void UIVMLogViewerWidget::prepareMenu()
+{
+    /* Create 'LogViewer' menu: */
+    m_pMenu = new QMenu(this);
+    AssertPtrReturnVoid(m_pMenu);
+    {
+        if (m_pActionFind)
+            m_pMenu->addAction(m_pActionFind);
+        if (m_pActionFilter)
+            m_pMenu->addAction(m_pActionFilter);
+        if (m_pActionRefresh)
+            m_pMenu->addAction(m_pActionRefresh);
+        if (m_pActionSave)
+            m_pMenu->addAction(m_pActionSave);
+    }
+}
+
+void UIVMLogViewerWidget::cleanup()
+{
+}
+
+void UIVMLogViewerWidget::retranslateUi()
+{
+    if (m_pMenu)
+    {
+        m_pMenu->setTitle(tr("&Log Viewer"));
+    }
+
+    if (m_pActionFind)
+    {
+        m_pActionFind->setText(tr("&Find"));
+        m_pActionFind->setToolTip(tr("Find a string within the log"));
+        m_pActionFind->setStatusTip(tr("Find a string within the log"));
+    }
+
+    if (m_pActionFilter)
+    {
+        m_pActionFilter->setText(tr("&Filter"));
+        m_pActionFilter->setToolTip(tr("Filter the log wrt. the given string"));
+        m_pActionFilter->setStatusTip(tr("Filter the log wrt. the given string"));
+    }
+
+    if (m_pActionRefresh)
+    {
+        m_pActionRefresh->setText(tr("&Refresh"));
+        m_pActionRefresh->setToolTip(tr("Reload the log"));
+        m_pActionRefresh->setStatusTip(tr("Reload the log"));
+    }
+
+    if (m_pActionSave)
+    {
+        m_pActionSave->setText(tr("&Save..."));
+        m_pActionSave->setToolTip(tr("Save the log"));
+        m_pActionSave->setStatusTip(tr("Save the log"));
+    }
+
+    /* Translate toolbar: */
+#ifdef VBOX_WS_MAC
+    // WORKAROUND:
+    // There is a bug in Qt Cocoa which result in showing a "more arrow" when
+    // the necessary size of the toolbar is increased. Also for some languages
+    // the with doesn't match if the text increase. So manually adjust the size
+    // after changing the text. */
+    if (m_pToolBar)
+        m_pToolBar->updateLayout();
+#endif
+}
+
+void UIVMLogViewerWidget::showEvent(QShowEvent *pEvent)
+{
+    QWidget::showEvent(pEvent);
+
+    /* One may think that QWidget::polish() is the right place to do things
+     * below, but apparently, by the time when QWidget::polish() is called,
+     * the widget style & layout are not fully done, at least the minimum
+     * size hint is not properly calculated. Since this is sometimes necessary,
+     * we provide our own "polish" implementation: */
+
+    if (m_fIsPolished)
+        return;
+
+    m_fIsPolished = true;
+
+    /* Make sure the log view widget has the focus: */
+    QWidget *pCurrentLogPage = currentLogPage();
+    if (pCurrentLogPage)
+        pCurrentLogPage->setFocus();
+}
+
+void UIVMLogViewerWidget::keyPressEvent(QKeyEvent *pEvent)
+{
+    /* Depending on key pressed: */
+    switch (pEvent->key())
+    {
+        /* Process key escape as VM Log Viewer close: */
+        case Qt::Key_Escape:
+        {
+            return;
+        }
+        /* Process Back key as switch to previous tab: */
+        case Qt::Key_Back:
+        {
+            if (m_pViewerContainer->currentIndex() > 0)
+            {
+                m_pViewerContainer->setCurrentIndex(m_pViewerContainer->currentIndex() - 1);
+                return;
+            }
+            break;
+        }
+        /* Process Forward key as switch to next tab: */
+        case Qt::Key_Forward:
+        {
+            if (m_pViewerContainer->currentIndex() < m_pViewerContainer->count())
+            {
+                m_pViewerContainer->setCurrentIndex(m_pViewerContainer->currentIndex() + 1);
+                return;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    QWidget::keyReleaseEvent(pEvent);
+}
+
+QPlainTextEdit* UIVMLogViewerWidget::currentLogPage() const
+{
+    /* If viewer-container is enabled: */
+    if (m_pViewerContainer->isEnabled())
+    {
+        /* Get and return current log-page: */
+        QWidget *pContainer = m_pViewerContainer->currentWidget();
+        QPlainTextEdit *pBrowser = pContainer->findChild<QPlainTextEdit*>();
+        Assert(pBrowser);
+        return pBrowser ? pBrowser : 0;
+    }
+    /* Return NULL by default: */
+    return 0;
+}
+
+bool UIVMLogViewerWidget::createLogViewerPages()
+{
+    if (m_comMachine.isNull())
+        return false;
+
+    bool logsExists = false;
     const CSystemProperties &sys = vboxGlobal().virtualBox().GetSystemProperties();
     unsigned cMaxLogs = sys.GetLogHistoryCount() + 1 /*VBox.log*/ + 1 /*VBoxHardening.log*/; /** @todo Add api for getting total possible log count! */
@@ -153 +550 @@
                 /* Add the log-text to the map: */
                 m_logMap[pLogViewer] = strText;
-                isAnyLogPresent = true;
+                logsExists = true;
             }
         }
     }
-
-    /* Create an empty log page if there are no logs at all: */
-    if (!isAnyLogPresent)
-    {
-        QPlainTextEdit *pDummyLog = createLogPage("VBox.log");
-        pDummyLog->setWordWrapMode(QTextOption::WordWrap);
-        pDummyLog->appendHtml(tr("<p>No log files found. Press the "
-                              "<b>Refresh</b> button to rescan the log folder "
-                              "<nobr><b>%1</b></nobr>.</p>")
-                              .arg(m_comMachine.GetLogFolder()));
-        /* We don't want it to remain white: */
-        QPalette pal = pDummyLog->palette();
-        pal.setColor(QPalette::Base, pal.color(QPalette::Window));
-        pDummyLog->setPalette(pal);
-    }
-
-    /* Show the first tab widget's page after the refresh: */
-    m_pViewerContainer->setCurrentIndex(0);
-
-    /* Apply the filter settings: */
-    m_pFilterPanel->applyFilter();
-
-    /* Setup this connection after refresh to avoid initial signals during page creation: */
-    connect(m_pViewerContainer, SIGNAL(currentChanged(int)), m_pFilterPanel, SLOT(applyFilter(int)));
-
-    /* Enable/Disable toolbar actions (except Refresh) & tab widget according log presence: */
-    m_pActionFind->setEnabled(isAnyLogPresent);
-    m_pActionFilter->setEnabled(isAnyLogPresent);
-    m_pActionSave->setEnabled(isAnyLogPresent);
-    m_pViewerContainer->setEnabled(isAnyLogPresent);
-}
-
-void UIVMLogViewerWidget::sltSave()
-{
-    /* Prepare "save as" dialog: */
-    const QFileInfo fileInfo(m_book.at(m_pViewerContainer->currentIndex()).first);
-    /* Prepare default filename: */
-    const QDateTime dtInfo = fileInfo.lastModified();
-    const QString strDtString = dtInfo.toString("yyyy-MM-dd-hh-mm-ss");
-    const QString strDefaultFileName = QString("%1-%2.log").arg(m_comMachine.GetName()).arg(strDtString);
-    const QString strDefaultFullName = QDir::toNativeSeparators(QDir::home().absolutePath() + "/" + strDefaultFileName);
-    /* Show "save as" dialog: */
-    const QString strNewFileName = QIFileDialog::getSaveFileName(strDefaultFullName,
-                                                                 "",
-                                                                 this,
-                                                                 tr("Save VirtualBox Log As"),
-                                                                 0 /* selected filter */,
-                                                                 true /* resolve symlinks */,
-                                                                 true /* confirm overwrite */);
-    /* Make sure file-name is not empty: */
-    if (!strNewFileName.isEmpty())
-    {
-        /* Delete the previous file if already exists as user already confirmed: */
-        if (QFile::exists(strNewFileName))
-            QFile::remove(strNewFileName);
-        /* Copy log into the file: */
-        QFile::copy(m_comMachine.QueryLogFilename(m_pViewerContainer->currentIndex()), strNewFileName);
-    }
-}
-
-void UIVMLogViewerWidget::sltFilter()
-{
-    /* Show/hide filter-panel: */
-    m_pFilterPanel->isHidden() ? m_pFilterPanel->show() : m_pFilterPanel->hide();
-}
-
-void UIVMLogViewerWidget::prepare()
-{
-    m_pMainLayout = new QVBoxLayout(this);
-
-    prepareActions();
-
-    prepareToolBar();
-    prepareMenu();
-
-    /* Prepare widgets: */
-    prepareWidgets();
-
-    /* Reading log files: */
-    sltRefresh();
-
-    /* Loading language constants: */
-    retranslateUi();
-}
-
-void UIVMLogViewerWidget::prepareWidgets()
-{
-    /* Configure layout: */
-    layout()->setContentsMargins(0, 0, 0, 0);
-#ifdef VBOX_WS_MAC
-        layout()->setSpacing(10);
-#else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        layout()->setSpacing(iS);
-#endif
-
-    /* Create VM Log-Viewer container: */
-    m_pViewerContainer = new QITabWidget(this);
-    AssertPtrReturnVoid(m_pViewerContainer);
-    {
-        /* Add VM Log-Viewer container to main-layout: */
-        m_pMainLayout->insertWidget(1, m_pViewerContainer);
-    }
-
-    /* Create VM Log-Viewer search-panel: */
-    m_pSearchPanel = new UIVMLogViewerSearchPanel(this, this);
-    AssertPtrReturnVoid(m_pSearchPanel);
-    {
-        /* Configure VM Log-Viewer search-panel: */
-        installEventFilter(m_pSearchPanel);
-        m_pSearchPanel->hide();
-        /* Add VM Log-Viewer search-panel to main-layout: */
-        m_pMainLayout->insertWidget(2, m_pSearchPanel);
-    }
-
-    /* Create VM Log-Viewer filter-panel: */
-    m_pFilterPanel = new UIVMLogViewerFilterPanel(this, this);
-    AssertPtrReturnVoid(m_pFilterPanel);
-    {
-        /* Configure VM Log-Viewer filter-panel: */
-        installEventFilter(m_pFilterPanel);
-        m_pFilterPanel->hide();
-        /* Add VM Log-Viewer filter-panel to main-layout: */
-        m_pMainLayout->insertWidget(3, m_pFilterPanel);
-    }
-}
-
-void UIVMLogViewerWidget::prepareActions()
-{
-    /* Create and configure 'Find' action: */
-    m_pActionFind = new QAction(this);
-    AssertPtrReturnVoid(m_pActionFind);
-    {
-        m_pActionFind->setShortcut(QKeySequence("Ctrl+F"));
-        connect(m_pActionFind, &QAction::triggered, this, &UIVMLogViewerWidget::sltFind);
-    }
-
-    /* Create and configure 'Filter' action: */
-    m_pActionFilter = new QAction(this);
-    AssertPtrReturnVoid(m_pActionFilter);
-    {
-        m_pActionFilter->setShortcut(QKeySequence("Ctrl+T"));
-        connect(m_pActionFilter, &QAction::triggered, this, &UIVMLogViewerWidget::sltFilter);
-    }
-
-    /* Create and configure 'Refresh' action: */
-    m_pActionRefresh = new QAction(this);
-    AssertPtrReturnVoid(m_pActionRefresh);
-    {
-        m_pActionRefresh->setShortcut(QKeySequence("F5"));
-        connect(m_pActionRefresh, &QAction::triggered, this, &UIVMLogViewerWidget::sltRefresh);
-    }
-
-    /* Create and configure 'Save' action: */
-    m_pActionSave = new QAction(this);
-    AssertPtrReturnVoid(m_pActionSave);
-    {
-        m_pActionSave->setShortcut(QKeySequence("Ctrl+S"));
-        connect(m_pActionSave, &QAction::triggered, this, &UIVMLogViewerWidget::sltSave);
-    }
-
-    /* Update action icons: */
-    prepareActionIcons();
-}
-
-void UIVMLogViewerWidget::prepareActionIcons()
-{
-    QString strPrefix = "log_viewer";
-
-    if (m_pActionFind)
-        m_pActionFind->setIcon(UIIconPool::iconSet(QString(":/%1_find_24px.png").arg(strPrefix),
-                                                       QString(":/%1_find_disabled_24px.png").arg(strPrefix)));
-
-    if (m_pActionFilter)
-        m_pActionFilter->setIcon(UIIconPool::iconSet(QString(":/%1_filter_24px.png").arg(strPrefix),
-                                                         QString(":/%1_filter_disabled_24px.png").arg(strPrefix)));
-
-
-    if (m_pActionRefresh)
-        m_pActionRefresh->setIcon(UIIconPool::iconSet(QString(":/%1_refresh_24px.png").arg(strPrefix),
-                                                          QString(":/%1_refresh_disabled_24px.png").arg(strPrefix)));
-
-
-    if (m_pActionSave)
-        m_pActionSave->setIcon(UIIconPool::iconSet(QString(":/%1_save_24px.png").arg(strPrefix),
-                                                       QString(":/%1_save_disabled_24px.png").arg(strPrefix)));
-
-
-}
-
-void UIVMLogViewerWidget::prepareToolBar()
-{
-    /* Create toolbar: */
-    m_pToolBar = new UIToolBar(parentWidget());
-    AssertPtrReturnVoid(m_pToolBar);
-    {
-        /* Configure toolbar: */
-        const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * 1.375);
-        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
-        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-        /* Add toolbar actions: */
-        if (m_pActionFind)
-            m_pToolBar->addAction(m_pActionFind);
-
-        if (m_pActionFilter)
-            m_pToolBar->addAction(m_pActionFilter);
-
-        if (m_pActionRefresh)
-            m_pToolBar->addAction(m_pActionRefresh);
-
-        if (m_pActionSave)
-            m_pToolBar->addAction(m_pActionSave);
-
-#ifdef VBOX_WS_MAC
-        /* Check whether we are embedded into a stack: */
-        if (m_enmEmbedding == EmbedTo_Stack)
-        {
-            /* Add into layout: */
-            layout()->addWidget(m_pToolBar);
-        }
-#else
-        /* Add into layout: */
-        m_pMainLayout->insertWidget(0, m_pToolBar);
-#endif
-    }
-}
-
-void UIVMLogViewerWidget::prepareMenu()
-{
-    /* Create 'LogViewer' menu: */
-    m_pMenu = new QMenu(this);
-    AssertPtrReturnVoid(m_pMenu);
-    {
-        if (m_pActionFind)
-            m_pMenu->addAction(m_pActionFind);
-        if (m_pActionFilter)
-            m_pMenu->addAction(m_pActionFilter);
-        if (m_pActionRefresh)
-            m_pMenu->addAction(m_pActionRefresh);
-        if (m_pActionSave)
-            m_pMenu->addAction(m_pActionSave);
-    }
-}
-
-void UIVMLogViewerWidget::cleanup()
-{
-}
-
-void UIVMLogViewerWidget::retranslateUi()
-{
-    if(m_pMenu)
-    {
-        m_pMenu->setTitle(tr("&Log Viewer"));
-    }
-
-    if (m_pActionFind)
-    {
-        m_pActionFind->setText(tr("&Find..."));
-        m_pActionFind->setToolTip(tr("Find a string within the log"));
-        m_pActionFind->setStatusTip(tr("Find a string within the log"));
-    }
-
-    if (m_pActionFilter)
-    {
-        m_pActionFilter->setText(tr("&Filter..."));
-        m_pActionFilter->setToolTip(tr("Filter the log wrt. the given string"));
-        m_pActionFilter->setStatusTip(tr("Filter the log wrt. the given string"));
-    }
-
-    if (m_pActionRefresh)
-    {
-        m_pActionRefresh->setText(tr("&Refresh..."));
-        m_pActionRefresh->setToolTip(tr("Reload the log"));
-        m_pActionRefresh->setStatusTip(tr("Reload the log"));
-    }
-
-    if (m_pActionSave)
-    {
-        m_pActionSave->setText(tr("&Save..."));
-        m_pActionSave->setToolTip(tr("Save the log"));
-        m_pActionSave->setStatusTip(tr("Save the log"));
-    }
-
-    /* Translate toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // There is a bug in Qt Cocoa which result in showing a "more arrow" when
-    // the necessary size of the toolbar is increased. Also for some languages
-    // the with doesn't match if the text increase. So manually adjust the size
-    // after changing the text. */
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
-}
-
-void UIVMLogViewerWidget::showEvent(QShowEvent *pEvent)
-{
-    QWidget::showEvent(pEvent);
-
-    /* One may think that QWidget::polish() is the right place to do things
-     * below, but apparently, by the time when QWidget::polish() is called,
-     * the widget style & layout are not fully done, at least the minimum
-     * size hint is not properly calculated. Since this is sometimes necessary,
-     * we provide our own "polish" implementation: */
-
-    if (m_fIsPolished)
-        return;
-
-    m_fIsPolished = true;
-
-    /* Make sure the log view widget has the focus: */
-    QWidget *pCurrentLogPage = currentLogPage();
-    if (pCurrentLogPage)
-        pCurrentLogPage->setFocus();
-}
-
-void UIVMLogViewerWidget::keyPressEvent(QKeyEvent *pEvent)
-{
-    /* Depending on key pressed: */
-    switch (pEvent->key())
-    {
-        /* Process key escape as VM Log Viewer close: */
-        case Qt::Key_Escape:
-        {
-            return;
-        }
-        /* Process Back key as switch to previous tab: */
-        case Qt::Key_Back:
-        {
-            if (m_pViewerContainer->currentIndex() > 0)
-            {
-                m_pViewerContainer->setCurrentIndex(m_pViewerContainer->currentIndex() - 1);
-                return;
-            }
-            break;
-        }
-        /* Process Forward key as switch to next tab: */
-        case Qt::Key_Forward:
-        {
-            if (m_pViewerContainer->currentIndex() < m_pViewerContainer->count())
-            {
-                m_pViewerContainer->setCurrentIndex(m_pViewerContainer->currentIndex() + 1);
-                return;
-            }
-            break;
-        }
-        default:
-            break;
-    }
-    QWidget::keyReleaseEvent(pEvent);
-}
-
-QPlainTextEdit* UIVMLogViewerWidget::currentLogPage() const
-{
-    /* If viewer-container is enabled: */
-    if (m_pViewerContainer->isEnabled())
-    {
-        /* Get and return current log-page: */
-        QWidget *pContainer = m_pViewerContainer->currentWidget();
-        QPlainTextEdit *pBrowser = pContainer->findChild<QPlainTextEdit*>();
-        Assert(pBrowser);
-        return pBrowser ? pBrowser : 0;
-    }
-    /* Return NULL by default: */
-    return 0;
+    return logsExists;
 }
 
@@ -562 +595 @@
     return m_logMap[currentLogPage()];
 }
-

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

@@ -54 +54 @@
     /** Constructs the VM Log-Viewer by passing @a pParent to QWidget base-class constructor.
       * @param  machine  Specifies the machine for which VM Log-Viewer is requested. */
-    UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine);
+    UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent = 0, const CMachine &machine = CMachine());
     /** Destructs the VM Log-Viewer. */
     ~UIVMLogViewerWidget();
@@ -67 +67 @@
     UIToolBar *toolbar() const { return m_pToolBar; }
 #endif
+
+    /** Sets the machine whose logs to show. */
+    void setMachine(const CMachine &machine);
 
 protected:
@@ -120 +123 @@
     const QString& currentLog();
 
+    /** Attempts to read the logs through the API, returns true if there exists any logs, false otherwise. */
+    bool createLogViewerPages();
+
     /** Holds whether the dialog is polished. */
     bool m_fIsPolished;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -1021 +1021 @@
         setName(QApplication::translate("UIActionPool", "&Snapshots"));
         setStatusTip(QApplication::translate("UIActionPool", "Open the machine snapshots pane"));
+    }
+};
+
+class UIActionSimpleToolsMachineLogViewer : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleToolsMachineLogViewer(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/vm_show_logs_32px.png", ":/vm_show_logs_32px.png",
+                         ":/vm_show_logs_32px.png", ":/vm_show_logs_32px.png") {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("ToolsMachineLogViewer");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&LogViewer"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the machine logviewer pane"));
     }
 };
@@ -1320 +1345 @@
     m_pool[UIActionIndexST_M_Tools_M_Machine_S_Details] = new UIActionSimpleToolsMachineDetails(this);
     m_pool[UIActionIndexST_M_Tools_M_Machine_S_Snapshots] = new UIActionSimpleToolsMachineSnapshots(this);
+    m_pool[UIActionIndexST_M_Tools_M_Machine_S_LogViewer] = new UIActionSimpleToolsMachineLogViewer(this);
 
     /* Global Tools actions: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

@@ -97 +97 @@
     UIActionIndexST_M_Tools_M_Machine_S_Details,
     UIActionIndexST_M_Tools_M_Machine_S_Snapshots,
+    UIActionIndexST_M_Tools_M_Machine_S_LogViewer,
 
     /* Global Tools actions: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -159 +159 @@
         mapActionsMachine[ToolTypeMachine_Details] = actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Details);
         mapActionsMachine[ToolTypeMachine_Snapshots] = actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots);
+        mapActionsMachine[ToolTypeMachine_LogViewer] = actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer);
         for (int i = m_orderMachine.size() - 1; i >= 0; --i)
             if (m_orderMachine.at(i) != ToolTypeMachine_Invalid)
@@ -251 +252 @@
 
 void UISelectorWindow::sltHandleChooserPaneIndexChange(bool fUpdateDetails /* = true */,
-                                                       bool fUpdateSnapshots /* = true */)
+                                                       bool fUpdateSnapshots /* = true */,
+                                                       bool fUpdateLogViewer /* = true*/)
 {
     /* Get current item: */
@@ -279 +281 @@
             if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
                 actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots)->trigger();
+            else
+            if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_LogViewer))
+                actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer)->trigger();
         }
 
@@ -285 +290 @@
             && m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
             m_pPaneToolsMachine->setItems(currentItems());
-        /* Update Snapshots-pane (if requested): */
-        if (   fUpdateSnapshots
-            && m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
+        /* Update the Snapshots-pane or/and Logviewer-pane (if requested): */
+        if (fUpdateSnapshots || fUpdateLogViewer)
             m_pPaneToolsMachine->setMachine(pItem->machine());
     }
@@ -306 +310 @@
         if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
             m_pPaneToolsMachine->setItems(currentItems());
-        /* Update Snapshots-pane (in any case): */
-        if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
-            m_pPaneToolsMachine->setMachine(CMachine());
+        /* Update Snapshots-pane and Logviewer-pane (in any case): */
+        m_pPaneToolsMachine->setMachine(CMachine());
     }
 }
@@ -1141 +1144 @@
 
     /* Make sure chosen item fetched: */
-    sltHandleChooserPaneIndexChange(false /* update details? */, false /* update snapshots? */);
+    sltHandleChooserPaneIndexChange(false /* update details? */, false /* update snapshots? */, false /* update the logviewer? */);
 }
 
@@ -1170 +1173 @@
         m_pPaneToolsMachine->setItems(currentItems());
     /* If that was 'Snapshot' => pass there current or null machine: */
-    if (   enmType == ToolTypeMachine_Snapshots
-        && m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
+    if (enmType == ToolTypeMachine_Snapshots || enmType == ToolTypeMachine_LogViewer)
     {
         UIVMItem *pItem = currentItem();
@@ -1226 +1228 @@
 
     /* Make sure chosen item fetched: */
-    sltHandleChooserPaneIndexChange(false /* update details? */, false /* update snapshots? */);
+    sltHandleChooserPaneIndexChange(false /* update details? */, false /* update snapshots? */, false /* update the logviewer? */);
 
 #ifdef VBOX_WS_MAC
@@ -2430 +2432 @@
     actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Details)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_S_Details, items));
     actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_S_Snapshots, items));
+    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_S_LogViewer, items));
 }
 
@@ -2559 +2562 @@
         case UIActionIndexST_M_Tools_M_Machine_S_Details:
         case UIActionIndexST_M_Tools_M_Machine_S_Snapshots:
+        case UIActionIndexST_M_Tools_M_Machine_S_LogViewer:
         {
             return pItem->accessible();

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -93 +93 @@
       * @param  fUpdateSnapshots  Brings whether tools should be updated. */
     void sltHandleChooserPaneIndexChange(bool fUpdateDetails = true,
-                                         bool fUpdateSnapshots = true);
+                                         bool fUpdateSnapshots = true,
+                                         bool fUpdateLogViewer = true);
 
     /** Handles signal about medium-enumeration finished. */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp

@@ -32 +32 @@
 # include "UIToolsPaneMachine.h"
 # include "UIVMItem.h"
+# include "UIVMLogViewerWidget.h"
 
 /* Other VBox includes: */
@@ -47 +48 @@
     , m_pPaneDetails(0)
     , m_pPaneSnapshots(0)
+    , m_pPaneLogViewer(0)
 {
     /* Prepare: */
@@ -141 +143 @@
                 break;
             }
+            case ToolTypeMachine_LogViewer:
+            {
+                /* Create the Logviewer pane: */
+                m_pPaneLogViewer = new UIVMLogViewerWidget(EmbedTo_Stack);
+                AssertPtrReturnVoid(m_pPaneLogViewer);
+                {
+                    /* Configure pane: */
+                    m_pPaneLogViewer->setProperty("ToolType", QVariant::fromValue(ToolTypeMachine_LogViewer));
+
+                    /* Add into layout: */
+                    m_pLayout->addWidget(m_pPaneLogViewer);
+                    m_pLayout->setCurrentWidget(m_pPaneLogViewer);
+                }
+                break;
+            }
             default:
                 AssertFailedReturnVoid();
@@ -164 +181 @@
             case ToolTypeMachine_Details:   m_pPaneDetails = 0; break;
             case ToolTypeMachine_Snapshots: m_pPaneSnapshots = 0; break;
+            case ToolTypeMachine_LogViewer: m_pPaneLogViewer = 0; break;
             default: break;
         }
@@ -203 +221 @@
 void UIToolsPaneMachine::setMachine(const CMachine &comMachine)
 {
-    /* Update snapshots pane: */
-    AssertPtrReturnVoid(m_pPaneSnapshots);
-    m_pPaneSnapshots->setMachine(comMachine);
+    /* Update snapshots pane is it is open: */
+    if(isToolOpened(ToolTypeMachine_Snapshots))
+    {
+        AssertPtrReturnVoid(m_pPaneSnapshots);
+        m_pPaneSnapshots->setMachine(comMachine);
+    }
+    /* Update logviewer pane is it is open: */
+    if(isToolOpened(ToolTypeMachine_LogViewer))
+    {
+        AssertPtrReturnVoid(m_pPaneLogViewer);
+        m_pPaneLogViewer->setMachine(comMachine);
+    }
 }
 
@@ -265 +292 @@
                                               "<u>restore</u> (make current) and observe their properties. Allows to "
                                               "<u>edit</u> snapshot attributes like <u>name</u> and <u>description</u>."));
+        QAction *pAction3 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer);
+        m_pPaneDesktop->addToolDescription(pAction3,
+                                           tr("Tool to display  virtual machine (VM) logs. "));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h

@@ -33 +33 @@
 class UIDesktopPane;
 class UIGDetails;
+class UIVMLogViewerWidget;
 class UISnapshotPane;
 class UIVMItem;
@@ -103 +104 @@
 
     /** Holds the stacked-layout instance. */
-    QStackedLayout *m_pLayout;
+    QStackedLayout      *m_pLayout;
     /** Holds the Desktop pane instance. */
-    UIDesktopPane  *m_pPaneDesktop;
+    UIDesktopPane       *m_pPaneDesktop;
     /** Holds the Details pane instance. */
-    UIGDetails     *m_pPaneDetails;
+    UIGDetails          *m_pPaneDetails;
     /** Holds the Snapshots pane instance. */
-    UISnapshotPane *m_pPaneSnapshots;
+    UISnapshotPane      *m_pPaneSnapshots;
+    /** Holds the Logviewer pane instance. */
+    UIVMLogViewerWidget *m_pPaneLogViewer;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp

@@ -219 +219 @@
         m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots)
             ->setProperty("ToolTypeMachine", QVariant::fromValue(ToolTypeMachine_Snapshots));
+
+        /* Add 'LogViewer' action: */
+        pMenuMachine->addAction(m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer));
+        connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer), &UIAction::triggered,
+                this, &UIToolsToolbar::sltHandleOpenToolMachine);
+        m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer)
+            ->setProperty("ToolTypeMachine", QVariant::fromValue(ToolTypeMachine_LogViewer));
     }