handling shortcuts manually in the context menu of ChartWidget

diff --git a/src/analyze/gui/chartwidget.cpp b/src/analyze/gui/chartwidget.cpp
index 697342db6a8e654bf282598ac0595cf8d5dd10c7..5b19944a32bf53bc912c049f2382c8a73e19f729 100644 (file)
--- a/src/analyze/gui/chartwidget.cpp
+++ b/src/analyze/gui/chartwidget.cpp
@@ -140,33 +140,39 @@ ChartWidget::ChartWidget(QWidget* parent)
     m_vLinePen.setColor(Qt::gray);
 
     m_showTotalAction = new QAction(i18n("Show Total"), this);
-    // TODO!! shortcuts don't work under Windows (Qt 5.10.0)
-    m_showTotalAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_T));
-    m_showTotalAction->setShortcutVisibleInContextMenu(true);
     m_showTotalAction->setStatusTip(i18n("Show the total amount curve"));
     m_showTotalAction->setCheckable(true);
     connect(m_showTotalAction, &QAction::triggered, this, &ChartWidget::toggleShowTotal);
 
     m_showLegendAction = new QAction(i18n("Show Legend"), this);
-    m_showLegendAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_L));
-    m_showLegendAction->setShortcutVisibleInContextMenu(true);
     m_showLegendAction->setStatusTip(i18n("Show the chart legend"));
     m_showLegendAction->setCheckable(true);
     connect(m_showLegendAction, &QAction::triggered, this, &ChartWidget::toggleShowLegend);
 
     m_showSymbolsAction = new QAction(i18n("Show Symbols"), this);
-    m_showSymbolsAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_S));
-    m_showSymbolsAction->setShortcutVisibleInContextMenu(true);
     m_showSymbolsAction->setStatusTip(i18n("Show symbols (chart data points)"));
     m_showSymbolsAction->setCheckable(true);
     connect(m_showSymbolsAction, &QAction::triggered, this, &ChartWidget::toggleShowSymbols);
 
     m_showVLinesAction = new QAction(i18n("Show Vertical Lines"), this);
-    m_showVLinesAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_V));
-    m_showVLinesAction->setShortcutVisibleInContextMenu(true);
     m_showVLinesAction->setStatusTip(i18n("Show vertical lines corresponding to timestamps"));
     m_showVLinesAction->setCheckable(true);
     connect(m_showVLinesAction, &QAction::triggered, this, &ChartWidget::toggleShowVLines);
+
+    // shortcuts don't work under Windows (Qt 5.10.0) so using a workaround (manual processing
+    // in keyPressEvent)
+
+    m_showTotalAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_T));
+    m_showLegendAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_L));
+    m_showSymbolsAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_S));
+    m_showVLinesAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_V));
+
+    m_showTotalAction->setShortcutVisibleInContextMenu(true);
+    m_showLegendAction->setShortcutVisibleInContextMenu(true);
+    m_showSymbolsAction->setShortcutVisibleInContextMenu(true);
+    m_showVLinesAction->setShortcutVisibleInContextMenu(true);
+
+    setFocusPolicy(Qt::StrongFocus);
 #endif
 #ifdef SHOW_TABLES
     auto hLayout = new QHBoxLayout();
@@ -323,6 +329,7 @@ void ChartWidget::modelReset()
     updateQwtChart();
 }
 
+#ifndef QT_NO_CONTEXTMENU
 void ChartWidget::contextMenuEvent(QContextMenuEvent *event)
 {
     QMenu menu(this);
@@ -337,6 +344,37 @@ void ChartWidget::contextMenuEvent(QContextMenuEvent *event)
     menu.addAction(m_showVLinesAction);
     menu.exec(event->globalPos());
 }
+#endif
+
+void ChartWidget::keyPressEvent(QKeyEvent *event)
+{
+    if (event->modifiers() & Qt::AltModifier)
+    {
+        switch (event->key())
+        {
+        case Qt::Key_T:
+            toggleShowTotal(!globalShowTotal);
+            break;
+        case Qt::Key_L:
+            toggleShowLegend(!globalShowLegend);
+            break;
+        case Qt::Key_S:
+            toggleShowSymbols(!globalShowSymbols);
+            break;
+        case Qt::Key_V:
+            toggleShowVLines(!globalShowVLines);
+            break;
+        default:
+            event->ignore();
+            return;
+        }
+        event->accept();
+    }
+    else
+    {
+        event->ignore();
+    }
+}
 
 void ChartWidget::toggleShowTotal(bool checked)
 {

diff --git a/src/analyze/gui/chartwidget.h b/src/analyze/gui/chartwidget.h
index 615c78e24684d7d1146119257ad08b23fae078c2..161bab7a535750d4d0b3add726405e011acb4390 100644 (file)
--- a/src/analyze/gui/chartwidget.h
+++ b/src/analyze/gui/chartwidget.h
@@ -65,7 +65,9 @@ public slots:
 protected:
     virtual void contextMenuEvent(QContextMenuEvent *event) override;
 #endif
-#endif
+    // workaround for handling the context menu shortcuts
+    virtual void keyPressEvent(QKeyEvent *event) override;
+#endif // QWT_FOUND
 
 private:
 #if defined(KChart_FOUND)

diff --git a/src/analyze/gui/mainwindow.cpp b/src/analyze/gui/mainwindow.cpp
index e9defc2c8919c2d89615964ef996c26123f28b8f..055bcb6357d5091063429098230bb7b02671d614 100644 (file)
--- a/src/analyze/gui/mainwindow.cpp
+++ b/src/analyze/gui/mainwindow.cpp
@@ -703,6 +703,7 @@ void MainWindow::setupStacks()
         const auto chartWidget = dynamic_cast<ChartWidget*>(widget);
         if (chartWidget) {
             chartWidget->updateIfOptionsChanged();
+            chartWidget->setFocus(); // to handle keyboard events in the widget
         }
 #endif
     };