Changeset 70745 in vbox

Timestamp:

Jan 25, 2018 3:52:00 PM (7 years ago)

Author:

vboxsync

Message:

FE\Qt: bugref:9072 Polishing:Working on shortcuts and tooltips

Location:

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

Files:

• UIVMLogViewerDialog.cpp (modified) (1 diff)
• UIVMLogViewerFilterPanel.cpp (modified) (1 diff)
• UIVMLogViewerPanel.cpp (modified) (1 diff)
• UIVMLogViewerSearchPanel.cpp (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (11 diffs)

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

@@ -64 +64 @@
 {
     button(ButtonType_Close)->setText(UIVMLogViewerWidget::tr("Close"));
-    button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
     /* Setup a dialog caption: */
     if (!m_comMachine.isNull())

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

@@ -484 +484 @@
     UIVMLogViewerPanel::retranslateUi();
     m_pFilterComboBox->setToolTip(UIVMLogViewerWidget::tr("Enter filtering string here."));
-    m_pAddFilterTermButton->setToolTip(UIVMLogViewerWidget::tr("Add filter term."));
+    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

@@ -107 +107 @@
 bool UIVMLogViewerPanel::eventFilter(QObject *pObject, QEvent *pEvent)
 {
-    return QWidget::eventFilter(pObject, pEvent);
+    /* Dont consume this event. Pass it back to Qt's event system: */
+    return false;
 }
 

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

@@ -360 +360 @@
 
     if (m_pNextButton)
-        m_pNextButton->setToolTip(UIVMLogViewerWidget::tr("Search for the previous occurrence of the string"));
+        m_pNextButton->setToolTip(UIVMLogViewerWidget::tr("Search for the previous occurrence of the string (F3)"));
 
     if (m_pPreviousButton)
-        m_pPreviousButton->setToolTip(UIVMLogViewerWidget::tr("Search for the previous occurrence of the string"));
+        m_pPreviousButton->setToolTip(UIVMLogViewerWidget::tr("Search for the previous occurrence of the string (Shift+F3)"));
 
 
@@ -420 +420 @@
     switch (pEvent->type())
     {
-
         /* Process key press only: */
         case QEvent::KeyPress:

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

@@ -427 +427 @@
     if (m_pBookmarksPanel)
     {
-        installEventFilter(m_pBookmarksPanel);
         m_pBookmarksPanel->hide();
         m_pMainLayout->addWidget(m_pBookmarksPanel);
@@ -441 +440 @@
     if (m_pSettingsPanel)
     {
-        installEventFilter(m_pSettingsPanel);
         m_pSettingsPanel->hide();
         /* Initialize settings' panel checkboxes and input fields: */
@@ -490 +488 @@
     if (m_pActionSettings)
     {
+        m_pActionSettings->setShortcut(QKeySequence("Ctrl+P"));
         m_pActionSettings->setCheckable(true);
         connect(m_pActionSettings, &QAction::triggered, this, &UIVMLogViewerWidget::sltPanelActionTriggered);
     }
-
 
     /* Create and configure 'Refresh' action: */
@@ -627 +625 @@
     {
         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"));
+        m_pActionFind->setToolTip(tr("Show/Hide 'Find' Panel (Ctrl+F)"));
+        m_pActionFind->setStatusTip(tr("Show/Hide 'Find' Panel (Ctrl+F)"));
     }
 
@@ -634 +632 @@
     {
         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"));
+        m_pActionFilter->setToolTip(tr("Show/Hide 'Filter' Panel (Ctrl+T)"));
+        m_pActionFilter->setStatusTip(tr("Show/Hide 'Filter' Panel (Ctrl+T)"));
     }
 
@@ -641 +639 @@
     {
         m_pActionRefresh->setText(tr("&Refresh"));
-        m_pActionRefresh->setToolTip(tr("Reload the log"));
-        m_pActionRefresh->setStatusTip(tr("Reload the log"));
+        m_pActionRefresh->setToolTip(tr("Reload the log (F5)"));
+        m_pActionRefresh->setStatusTip(tr("Reload the log (F5)"));
     }
 
@@ -648 +646 @@
     {
         m_pActionSave->setText(tr("&Save..."));
-        m_pActionSave->setToolTip(tr("Save the log"));
-        m_pActionSave->setStatusTip(tr("Save the log"));
+        if (m_enmEmbedding == EmbedTo_Dialog)
+        {
+            m_pActionSave->setToolTip(tr("Save the log (Ctrl+S)"));
+            m_pActionSave->setStatusTip(tr("Save the log (Ctrl+S)"));
+        }
+        else
+        {
+            m_pActionSave->setToolTip(tr("Save the log"));
+            m_pActionSave->setStatusTip(tr("Save the log"));
+        }
     }
 
@@ -655 +661 @@
     {
         m_pActionBookmark->setText(tr("&Bookmarks"));
-        m_pActionBookmark->setToolTip(tr("Bookmark the line"));
-        m_pActionBookmark->setStatusTip(tr("Bookmark the line"));
+        if (m_enmEmbedding == EmbedTo_Dialog)
+        {
+            m_pActionBookmark->setToolTip(tr("Show/Hide 'Bookmarks' Panel (Ctrl+D)"));
+            m_pActionBookmark->setStatusTip(tr("Show/Hide 'Bookmarks' Panel (Ctrl+D)"));
+        }
+        else
+        {
+            m_pActionBookmark->setToolTip(tr("Show/Hide 'Bookmarks' Panel"));
+            m_pActionBookmark->setStatusTip(tr("Show/Hide 'Bookmarks' Panel"));
+        }
     }
 
@@ -662 +676 @@
     {
         m_pActionSettings->setText(tr("&Settings"));
-        m_pActionSettings->setToolTip(tr("LogViewer Settings"));
-        m_pActionSettings->setStatusTip(tr("LogViewer Settings"));
+        m_pActionSettings->setToolTip(tr("Show/Hide 'Settings' Panel (Ctrl+P)"));
+        m_pActionSettings->setStatusTip(tr("Show/Hide 'Settings' Panel (Ctrl+P)"));
     }
 
@@ -699 +713 @@
     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:
@@ -727 +736 @@
             break;
     }
-    QWidget::keyReleaseEvent(pEvent);
+    QWidget::keyPressEvent(pEvent);
 }