Changeset 71370 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 16, 2018 3:20:58 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072: Adding new icons to logviewer panels + some improvements

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (3 diffs)
• VirtualBox2.qrc (modified) (1 diff)
• images/log_viewer_bookmark_off_16px.png (added)
• images/log_viewer_bookmark_on_16px.png (added)
• images/log_viewer_delete_all_bookmarks_16px.png (added)
• images/log_viewer_delete_current_bookmark_16px.png (added)
• images/log_viewer_filter_add_16px.png (added)
• images/log_viewer_goto_next_bookmark_16px.png (added)
• images/log_viewer_goto_previous_bookmark_16px.png (added)
• images/log_viewer_goto_selected_bookmark_16px.png (added)
• images/log_viewer_search_backward_16px.png (added)
• images/log_viewer_search_forward_16px.png (added)
• images/log_viewer_settings_16px.png (added)
• images/log_viewer_settings_22px.png (added)
• images/log_viewer_settings_disabled_16px.png (added)
• images/log_viewer_settings_disabled_22px.png (added)
• src/logviewer/UIVMLogViewerBookmarksPanel.cpp (modified) (5 diffs)
• src/logviewer/UIVMLogViewerFilterPanel.cpp (modified) (7 diffs)
• src/logviewer/UIVMLogViewerPanel.cpp (modified) (1 diff)
• src/logviewer/UIVMLogViewerSearchPanel.cpp (modified) (3 diffs)
• src/logviewer/UIVMLogViewerTextEdit.cpp (modified) (7 diffs)
• src/logviewer/UIVMLogViewerTextEdit.h (modified) (1 diff)
• src/logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -1 +1 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource suffix="/">
         <file alias="add_host_iface_16px.png">images/add_host_iface_16px.png</file>
         <file alias="add_host_iface_22px.png">images/add_host_iface_22px.png</file>
@@ -230 +230 @@
         <file alias="log_viewer_bookmark_24px.png">images/log_viewer_bookmark_24px.png</file>
         <file alias="log_viewer_bookmark_disabled_24px.png">images/log_viewer_bookmark_disabled_24px.png</file>
+        <file alias="log_viewer_bookmark_off_16px.png">images/log_viewer_bookmark_off_16px.png</file>
+        <file alias="log_viewer_bookmark_on_16px.png">images/log_viewer_bookmark_on_16px.png</file>
+        <file alias="log_viewer_delete_all_bookmarks_16px.png">images/log_viewer_delete_all_bookmarks_16px.png</file>
+        <file alias="log_viewer_delete_current_bookmark_16px.png">images/log_viewer_delete_current_bookmark_16px.png</file>
         <file alias="log_viewer_filter_24px.png">images/log_viewer_filter_24px.png</file>
+        <file alias="log_viewer_filter_add_16px.png">images/log_viewer_filter_add_16px.png</file>
         <file alias="log_viewer_filter_disabled_24px.png">images/log_viewer_filter_disabled_24px.png</file>
         <file alias="log_viewer_find_24px.png">images/log_viewer_find_24px.png</file>
         <file alias="log_viewer_find_disabled_24px.png">images/log_viewer_find_disabled_24px.png</file>
+        <file alias="log_viewer_goto_next_bookmark_16px.png">images/log_viewer_goto_next_bookmark_16px.png</file>
+        <file alias="log_viewer_goto_previous_bookmark_16px.png">images/log_viewer_goto_previous_bookmark_16px.png</file>
+        <file alias="log_viewer_goto_selected_bookmark_16px.png">images/log_viewer_goto_selected_bookmark_16px.png</file>
         <file alias="log_viewer_refresh_24px.png">images/log_viewer_refresh_24px.png</file>
         <file alias="log_viewer_refresh_disabled_24px.png">images/log_viewer_refresh_disabled_24px.png</file>
         <file alias="log_viewer_save_24px.png">images/log_viewer_save_24px.png</file>
         <file alias="log_viewer_save_disabled_24px.png">images/log_viewer_save_disabled_24px.png</file>
+        <file alias="log_viewer_search_backward_16px.png">images/log_viewer_search_backward_16px.png</file>
+        <file alias="log_viewer_search_forward_16px.png">images/log_viewer_search_forward_16px.png</file>
+        <file alias="log_viewer_settings_16px.png">images/log_viewer_settings_16px.png</file>
+        <file alias="log_viewer_settings_22px.png">images/log_viewer_settings_22px.png</file>
+        <file alias="log_viewer_settings_disabled_16px.png">images/log_viewer_settings_disabled_16px.png</file>
+        <file alias="log_viewer_settings_disabled_22px.png">images/log_viewer_settings_disabled_22px.png</file>
         <file alias="machine_16px.png">images/machine_16px.png</file>
         <file alias="machine_24px.png">images/machine_24px.png</file>
@@ -306 +320 @@
         <file alias="os_netbsd.png">images/os_netbsd.png</file>
         <file alias="os_netware.png">images/os_netware.png</file>
-        <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
-        <file alias="os_openbsd.png">images/os_openbsd.png</file>
-        <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
-        <file alias="os_opensuse.png">images/os_opensuse.png</file>
-        <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
-        <file alias="os_oracle.png">images/os_oracle.png</file>
-        <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -1 +1 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource suffix="/">
+        <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
+        <file alias="os_openbsd.png">images/os_openbsd.png</file>
+        <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
+        <file alias="os_opensuse.png">images/os_opensuse.png</file>
+        <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
+        <file alias="os_oracle.png">images/os_oracle.png</file>
+        <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
         <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
         <file alias="os_os2ecs.png">images/os_os2ecs.png</file>

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

@@ -116 +116 @@
     {
         mainLayout()->addWidget(m_pGotoSelectedBookmark, 0);
-        m_pGotoSelectedBookmark->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
+        m_pGotoSelectedBookmark->setIcon(UIIconPool::iconSet(":/log_viewer_goto_selected_bookmark_16px.png"));
     }
 
@@ -138 +138 @@
     {
         pContainerLayout->addWidget(m_pPreviousButton);
-        m_pPreviousButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
+        m_pPreviousButton->setIcon(UIIconPool::iconSet(":/log_viewer_goto_previous_bookmark_16px.png"));
     }
 
@@ -144 +144 @@
     if (m_pNextButton){
         pContainerLayout->addWidget(m_pNextButton);
-        m_pNextButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
+        m_pNextButton->setIcon(UIIconPool::iconSet(":/log_viewer_goto_next_bookmark_16px.png"));
     }
     }
@@ -152 +152 @@
     {
         mainLayout()->addWidget(m_pDeleteCurrentButton, 0);
-        m_pDeleteCurrentButton->setIcon(m_pDeleteCurrentButton->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
+        m_pDeleteCurrentButton->setIcon(UIIconPool::iconSet(":/log_viewer_delete_current_bookmark_16px.png"));
     }
 
@@ -159 +159 @@
     {
         mainLayout()->addWidget(m_pDeleteAllButton, 2);
+        m_pDeleteAllButton->setIcon(UIIconPool::iconSet(":/log_viewer_delete_all_bookmarks_16px.png"));
     }
 

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

@@ -65 +65 @@
         :QLineEdit(parent)
         , m_pRemoveTermButton(0)
+        , m_iRemoveTermButtonSize(16)
+        , m_iTrailingSpaceCount(1)
     {
         setReadOnly(true);
         home(false);
         createButtons();
+       /** Try to guess the width of the space between filter terms so that remove button
+                we display when a term is selected does not hide the next/previous word: */
+        int spaceWidth = fontMetrics().width(' ');
+        if (spaceWidth != 0)
+            m_iTrailingSpaceCount = (m_iRemoveTermButtonSize / spaceWidth) + 1;
     }
 
@@ -78 +85 @@
         {
             QString newString(filterTermString);
-            insert(newString.prepend(' '));
+            QString space(m_iTrailingSpaceCount, QChar(' '));
+            insert(newString.prepend(space));
         }
     }
@@ -112 +120 @@
             m_pRemoveTermButton->show();
             int buttonY = 0.5 * (height() - 16);
-            int buttonSize = 16;
+            int buttonSize = m_iRemoveTermButtonSize;
             int charWidth = fontMetrics().width('x');
             int buttonLeft = cursorRect().right() - 0.5 * charWidth;
@@ -137 +145 @@
         emit sigFilterTermRemoved(selectedText());
         /* Remove the string from text() including the trailing space: */
-        setText(text().remove(selectionStart(), selectedText().length()+1));
+        setText(text().remove(selectionStart(), selectedText().length() + m_iTrailingSpaceCount));
     }
 
@@ -173 +181 @@
     QToolButton *m_pRemoveTermButton;
     QToolButton *m_pClearAllButton;
+    const int    m_iRemoveTermButtonSize;
+    int          m_iTrailingSpaceCount;
 };
 
@@ -372 +382 @@
     if (m_pAddFilterTermButton)
     {
-        m_pAddFilterTermButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
+        m_pAddFilterTermButton->setIcon(UIIconPool::iconSet(":/log_viewer_filter_add_16px.png"));
         mainLayout()->addWidget(m_pAddFilterTermButton,0);
     }
@@ -484 +494 @@
     UIVMLogViewerPanel::retranslateUi();
     m_pFilterComboBox->setToolTip(UIVMLogViewerWidget::tr("Enter filtering string here."));
-    m_pAddFilterTermButton->setToolTip(UIVMLogViewerWidget::tr("Add filter term. (Enter"));
+    m_pAddFilterTermButton->setToolTip(UIVMLogViewerWidget::tr("Add filter term. (Enter)"));
     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."));

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

@@ -88 +88 @@
     if (m_pCloseButton)
     {
-        m_pCloseButton->setIcon(m_pCloseButton->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
+        //m_pCloseButton->setIcon(UIIconPool::iconSet(":/log_viewer_close_16px.png"));
+        m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
         m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft);
     }

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

@@ -255 +255 @@
        {
            pContainerLayout->addWidget(m_pPreviousButton);
-           m_pPreviousButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
+           m_pPreviousButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_backward_16px.png"));
        }
 
@@ -261 +261 @@
        if (m_pNextButton){
            pContainerLayout->addWidget(m_pNextButton);
-           m_pNextButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
+           m_pNextButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_forward_16px.png"));
        }
     }
@@ -360 +360 @@
 
     if (m_pNextButton)
-        m_pNextButton->setToolTip(UIVMLogViewerWidget::tr("Search for the previous occurrence of the string (F3)"));
+        m_pNextButton->setToolTip(UIVMLogViewerWidget::tr("Search for the next occurrence of the string (F3)"));
 
     if (m_pPreviousButton)

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

@@ -32 +32 @@
 
 /* GUI includes: */
+# include "UIIconPool.h"
 # include "UIVMLogViewerTextEdit.h"
 # include "UIVMLogViewerWidget.h"
@@ -90 +91 @@
     {
         QScrollBar::paintEvent(pEvent);
-        /* Put a red line to marking position: */
+        /* Put a red line to mark the bookmark positions: */
         for (int i = 0; i < m_markingsVector.size(); ++i)
         {
@@ -160 +161 @@
     , m_bShowLineNumbers(true)
     , m_bWrapLines(false)
+    , m_bHasContextMenu(false)
 {
     setMouseTracking(true);
@@ -245 +247 @@
                 painter.drawPath(path);
             }
-            if ((blockNumber + 1) == m_mouseCursorLine && underMouse())
+            /* Draw a unfilled red rectangled around the line number to indicate line the mouse cursor is currently
+               hovering on. Do this only if mouse is over the ext edit or the context menu is around: */
+            if ((blockNumber + 1) == m_mouseCursorLine && (underMouse() || m_bHasContextMenu))
             {
                 painter.setPen(Qt::red);
@@ -317 +321 @@
         return;
     }
-
+    m_bHasContextMenu = true;
     QMenu *menu = createStandardContextMenu();
+
+
     QAction *pAction = menu->addAction(UIVMLogViewerWidget::tr("Bookmark"));
-    m_iContextMenuBookmark = bookmarkForPos(pEvent->pos());
     if (pAction)
+    {
+        pAction->setCheckable(true);
+        QPair<int, QString> menuBookmark = bookmarkForPos(pEvent->pos());
+        pAction->setChecked(m_bookmarkLineSet.contains(menuBookmark.first));
+        if (pAction->isChecked())
+            pAction->setIcon(UIIconPool::iconSet(":/log_viewer_bookmark_on_16px.png"));
+        else
+            pAction->setIcon(UIIconPool::iconSet(":/log_viewer_bookmark_off_16px.png"));
+
+        m_iContextMenuBookmark = menuBookmark;
         connect(pAction, &QAction::triggered, this, &UIVMLogViewerTextEdit::sltBookmark);
 
+    }
     menu->exec(pEvent->globalPos());
 
@@ -330 +346 @@
 
     delete menu;
+    m_bHasContextMenu = false;
 }
 
@@ -376 +393 @@
 void UIVMLogViewerTextEdit::sltBookmark()
 {
-    emit sigAddBookmark(m_iContextMenuBookmark);
+    toggleBookmark(m_iContextMenuBookmark);
 }
 

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

@@ -109 +109 @@
     QString              m_strBackgroungText;
     friend class UILineNumberArea;
+    bool                 m_bHasContextMenu;
 };
 

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

@@ -525 +525 @@
         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)));
-
     if (m_pActionBookmarks)
         m_pActionBookmarks->setIcon(UIIconPool::iconSet(QString(":/%1_bookmark_24px.png").arg(strPrefix),
                                                        QString(":/%1_bookmark_disabled_24px.png").arg(strPrefix)));
-
     if (m_pActionSettings)
-        m_pActionSettings->setIcon(UIIconPool::iconSet(QString(":/%1_bookmark_24px.png").arg(strPrefix),
-                                                       QString(":/%1_bookmark_disabled_24px.png").arg(strPrefix)));
+        m_pActionSettings->setIcon(UIIconPool::iconSet(QString(":/%1_settings_22px.png").arg(strPrefix),
+                                                       QString(":/%1_settings_disabled_22px.png").arg(strPrefix)));
 }