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

Timestamp:

Dec 12, 2017 9:26:08 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​bugref:9072 Adding toolbar and menu to logviewer dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.cpp (modified) (3 diffs)
• logviewer/UIVMLogViewerDialog.h (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (13 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (8 diffs)
• selector/UISelectorWindow.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -191 +191 @@
 void QIManagerDialog::prepareToolBar()
 {
+    if(!m_pWidgetToolbar)
+        return;
     /* Enable unified toolbar on macOS: */
     addToolBar(m_pWidgetToolbar);

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

@@ -58 +58 @@
 {
     button(ButtonType_Close)->setText(UIVMLogViewerWidget::tr("Close"));
+    button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
+    /* Setup a dialog caption: */
+    if (!m_comMachine.isNull())
+        setWindowTitle(tr("%1 - Log Viewer").arg(m_comMachine.GetName()));
+    else
+        setWindowTitle(UIVMLogViewerWidget::tr("Log Viewer"));
 }
 
@@ -63 +69 @@
 {
     /* Create widget: */
-    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(this, m_comMachine);
+    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, this, m_comMachine);
     AssertPtrReturnVoid(pWidget);
     {
         /* Configure widget: */
         setWidget(pWidget);
-        //setWidgetMenu(pWidget->menu());
+        setWidgetMenu(pWidget->menu());
 #ifdef VBOX_WS_MAC
-        //setWidgetToolbar(pWidget->toolbar());
+        setWidgetToolbar(pWidget->toolbar());
 #endif
         /* Add into layout: */
@@ -80 +86 @@
 {
     /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(":/diskimage_32px.png", ":/diskimage_16px.png"));
+    setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
 }
+
+void UIVMLogViewerDialog::finalize()
+{
+    retranslateUi();
+}
+

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

@@ -63 +63 @@
     virtual void configure() /* override */;
     virtual void configureCentralWidget() /* override */;
+    virtual void finalize() /* override */;
 
 private:

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

@@ -23 +23 @@
 # include <QDateTime>
 # include <QDir>
-# include <QDialogButtonBox>
 # include <QVBoxLayout>
 # if defined(RT_OS_SOLARIS)
 #  include <QFontDatabase>
 # endif
-# include <QPushButton>
 # include <QTextEdit>
 
@@ -40 +38 @@
 # include "UIVMLogViewerFilterPanel.h"
 # include "UIVMLogViewerSearchPanel.h"
+# include "UIToolBar.h"
 
 /* COM includes: */
@@ -48 +47 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIVMLogViewerWidget::UIVMLogViewerWidget(QWidget *pParent, const CMachine &machine)
+UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fIsPolished(false)
     , m_comMachine(machine)
-    , m_pButtonBox(0)
     , m_pMainLayout(0)
-    , m_pButtonFind(0)
-    , m_pButtonRefresh(0)
-    , m_pButtonSave(0)
-    , m_pButtonFilter(0)
-
+    , m_enmEmbedding(enmEmbedding)
+    , m_pToolBar(0)
+    , m_pActionFind(0)
+    , m_pActionFilter(0)
+    , m_pActionRefresh(0)
+    , m_pActionSave(0)
+    , m_pMenu(0)
 {
     /* Prepare VM Log-Viewer: */
@@ -90 +90 @@
 }
 
-void UIVMLogViewerWidget::search()
+void UIVMLogViewerWidget::sltFind()
 {
     /* Show/hide search-panel: */
@@ -96 +96 @@
 }
 
-void UIVMLogViewerWidget::refresh()
+void UIVMLogViewerWidget::sltRefresh()
 {
     /* Disconnect this connection to avoid initial signals during page creation/deletion: */
@@ -176 +176 @@
     connect(m_pViewerContainer, SIGNAL(currentChanged(int)), m_pFilterPanel, SLOT(applyFilter(int)));
 
-    /* Enable/Disable save button & tab widget according log presence: */
-    m_pButtonFind->setEnabled(isAnyLogPresent);
-    m_pButtonSave->setEnabled(isAnyLogPresent);
-    m_pButtonFilter->setEnabled(isAnyLogPresent);
+    /* 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::save()
+void UIVMLogViewerWidget::sltSave()
 {
     /* Prepare "save as" dialog: */
@@ -211 +211 @@
 }
 
-void UIVMLogViewerWidget::filter()
+void UIVMLogViewerWidget::sltFilter()
 {
     /* Show/hide filter-panel: */
@@ -219 +219 @@
 void UIVMLogViewerWidget::prepare()
 {
-    m_pButtonBox = new QDialogButtonBox(this);
     m_pMainLayout = new QVBoxLayout(this);
 
-    m_pMainLayout->addWidget(m_pButtonBox);
-
-    /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
+    prepareActions();
+
+    prepareToolBar();
+    prepareMenu();
 
     /* Prepare widgets: */
     prepareWidgets();
 
-    /* Prepare connections: */
-    prepareConnections();
-
     /* Reading log files: */
-    refresh();
+    sltRefresh();
 
     /* Loading language constants: */
@@ -247 +243 @@
     {
         /* Add VM Log-Viewer container to main-layout: */
-        m_pMainLayout->insertWidget(0, m_pViewerContainer);
+        m_pMainLayout->insertWidget(1, m_pViewerContainer);
     }
 
@@ -258 +254 @@
         m_pSearchPanel->hide();
         /* Add VM Log-Viewer search-panel to main-layout: */
-        m_pMainLayout->insertWidget(1, m_pSearchPanel);
+        m_pMainLayout->insertWidget(2, m_pSearchPanel);
     }
 
@@ -269 +265 @@
         m_pFilterPanel->hide();
         /* Add VM Log-Viewer filter-panel to main-layout: */
-        m_pMainLayout->insertWidget(2, m_pFilterPanel);
-    }
-
-    /* Create find-button: */
-    m_pButtonFind = m_pButtonBox->addButton(QString::null, QDialogButtonBox::ActionRole);
-    AssertPtrReturnVoid(m_pButtonFind);
-    /* Create filter-button: */
-    m_pButtonFilter = m_pButtonBox->addButton(QString::null, QDialogButtonBox::ActionRole);
-    AssertPtrReturnVoid(m_pButtonFilter);
-
-    /* Create save-button: */
-    m_pButtonSave = m_pButtonBox->addButton(QDialogButtonBox::Save);
-    AssertPtrReturnVoid(m_pButtonSave);
-    /* Create refresh-button: */
-    m_pButtonRefresh = m_pButtonBox->addButton(QString::null, QDialogButtonBox::ActionRole);
-    AssertPtrReturnVoid(m_pButtonRefresh);
-}
-
-void UIVMLogViewerWidget::prepareConnections()
-{
-    /* Prepare connections: */
-    connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
-    connect(m_pButtonFind, SIGNAL(clicked()), this, SLOT(search()));
-    connect(m_pButtonRefresh, SIGNAL(clicked()), this, SLOT(refresh()));
-    connect(m_pButtonSave, SIGNAL(clicked()), this, SLOT(save()));
-    connect(m_pButtonFilter, SIGNAL(clicked()), this, SLOT(filter()));
+        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);
+    }
 }
 
@@ -303 +392 @@
 void UIVMLogViewerWidget::retranslateUi()
 {
-    /* Setup a dialog caption: */
-    if (!m_comMachine.isNull())
-        setWindowTitle(tr("%1 - VirtualBox Log Viewer").arg(m_comMachine.GetName()));
-
-    /* Translate other tags: */
-    m_pButtonFind->setText(tr("&Find"));
-    m_pButtonRefresh->setText(tr("&Refresh"));
-    m_pButtonSave->setText(tr("&Save"));
-    m_pButtonFilter->setText(tr("Fil&ter"));
+    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
 }
 
@@ -424 +547 @@
     return m_logMap[currentLogPage()];
 }
+

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

@@ -25 +25 @@
 
 /* GUI includes: */
+#include "QIManagerDialog.h"
 #include "QIWithRetranslateUI.h"
 
@@ -32 +33 @@
 
 /* Forward declarations: */
-class QDialogButtonBox;
 class QITabWidget;
-class QPushButton;
 class QTextEdit;
 class QVBoxLayout;
+class UIToolBar;
 class UIVMLogViewerFilterPanel;
 class UIVMLogViewerSearchPanel;
@@ -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(QWidget *pParent, const CMachine &machine);
+    UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine);
     /** Destructs the VM Log-Viewer. */
     ~UIVMLogViewerWidget();
@@ -60 +60 @@
     int currentLogPagewidth() const;
 
+    /** Returns the menu. */
+    QMenu *menu() const { return m_pMenu; }
+
+#ifdef VBOX_WS_MAC
+    /** Returns the toolbar. */
+    UIToolBar *toolbar() const { return m_pToolBar; }
+#endif
+    
 protected:
 
@@ -69 +77 @@
 
     /** Handles search action triggering. */
-    void search();
+    void sltFind();
     /** Handles refresh action triggering. */
-    void refresh();
+    void sltRefresh();
     /** Handles save action triggering. */
-    void save();
+    void sltSave();
     /** Handles filter action triggering. */
-    void filter();
+    void sltFilter();
 
 private:
@@ -85 +93 @@
         /** Prepares widgets. */
         void prepareWidgets();
-        /** Prepares connections. */
-        void prepareConnections();
+        void prepareActions();
+        void prepareActionIcons();
+        void prepareToolBar();
+        void prepareMenu();
 
         /** Cleanups VM Log-Viewer. */
@@ -110 +120 @@
     const QString& currentLog();
 
-
     /** Holds whether the dialog is polished. */
     bool m_fIsPolished;
@@ -132 +141 @@
     VMLogMap m_logMap;
 
-    QDialogButtonBox *m_pButtonBox;
     QVBoxLayout      *m_pMainLayout;
 
-    /** Holds the find button instance. */
-    QPushButton *m_pButtonFind;
-    /** Holds the refresh button instance. */
-    QPushButton *m_pButtonRefresh;
-    /** Holds the save button instance. */
-    QPushButton *m_pButtonSave;
-    /** Holds the filter button instance. */
-    QPushButton *m_pButtonFilter;
+    /** Holds the widget embedding type. */
+    const EmbedTo m_enmEmbedding;
+
+    /** @name Toolbar and menu variables.
+      * @{ */
+        /** Holds the toolbar widget instance. */
+        UIToolBar *m_pToolBar;
+        /** Holds the Find action instance. */
+        QAction   *m_pActionFind;
+        /** Holds the Filter action instance. */
+        QAction   *m_pActionFilter;
+        /** Holds the Refresh action instance. */
+        QAction   *m_pActionRefresh;
+        /** Holds the Save action instance. */
+        QAction   *m_pActionSave;
+        /** Holds the menu object instance. */
+        QMenu     *m_pMenu;
+    /** @} */
 
     friend class UIVMLogViewerSearchPanel;

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

@@ -1024 +1024 @@
             continue;
 
-        /* Show VM Log Viewer: */
+        QIManagerDialog *pLogViewerDialog = 0;
+        /* Create and Show VM Log Viewer: */
         if (!m_logViewers[pItem->machine().GetHardwareUUID()])
         {
-            QIManagerDialog *pLogViewerDialog;
             UIVMLogViewerDialogFactory dialogFactory(pItem->machine());
             dialogFactory.prepare(pLogViewerDialog, this);
@@ -1033 +1033 @@
             {
                 m_logViewers[pItem->machine().GetHardwareUUID()] = pLogViewerDialog;
-
-                /* Show instance: */
-                pLogViewerDialog->show();
-                pLogViewerDialog->setWindowState(pLogViewerDialog->windowState() & ~Qt::WindowMinimized);
-                pLogViewerDialog->activateWindow();
                 connect(pLogViewerDialog, &QIManagerDialog::sigClose,
                         this, &UISelectorWindow::sltCloseLogViewerWindow);
             }
+        }
+        else
+        {
+            pLogViewerDialog = m_logViewers[pItem->machine().GetHardwareUUID()];
+        }
+        if (pLogViewerDialog)
+        {
+            /* Show instance: */
+            pLogViewerDialog->show();
+            pLogViewerDialog->setWindowState(pLogViewerDialog->windowState() & ~Qt::WindowMinimized);
+            pLogViewerDialog->activateWindow();
         }
     }