X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=8b32046a6e8d3db5aa3ccdfce967bf7022fc3a25;hp=e6f1a5e156c5fa36b72194e9cc6394c704a7a4f5;hb=812c0e3592e51946947b55c54b906bf4a0cb30e9;hpb=f32905530347e1020d5ce7959123cf797c9a4829 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index e6f1a5e1..8b32046a 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -422,10 +422,10 @@ void MainWindow::setup_ui() action_view_sticky_scrolling_->setCheckable(true); action_view_sticky_scrolling_->setChecked(true); - action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_R)); + action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S)); action_view_sticky_scrolling_->setObjectName( QString::fromUtf8("actionViewStickyScrolling")); - action_view_sticky_scrolling_->setText(tr("Sticky Sc&rolling")); + action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling")); menu_view->addAction(action_view_sticky_scrolling_); view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); @@ -623,7 +623,6 @@ void MainWindow::load_file(QString file_name, { const QString errorMessage( QString("Failed to load file %1").arg(file_name)); - const QString infoMessage; try { if (format) @@ -646,7 +645,7 @@ void MainWindow::load_file(QString file_name, update_device_list(); - session_.start_capture([&, errorMessage, infoMessage](QString) { + session_.start_capture([&, errorMessage](QString infoMessage) { session_error(errorMessage, infoMessage); }); }