X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1ee3f4e0d62b0142ac7e93d6db544d60545ecc90;hp=6b0fa676303052cb9478f2e1f4eaff7abd3a1bbf;hb=1d478458c2b7b314a48981ceb3264ebc852df40d;hpb=9d4e5cd8c46b33faa44f99d0dc3bdd347758b3d8 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 6b0fa676..1ee3f4e0 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -46,10 +46,17 @@ namespace pv { -MainWindow::MainWindow(QWidget *parent) : +MainWindow::MainWindow(const char *open_file_name, + QWidget *parent) : QMainWindow(parent) { setup_ui(); + if (open_file_name) { + const QString s(QString::fromUtf8(open_file_name)); + QMetaObject::invokeMethod(this, "load_file", + Qt::QueuedConnection, + Q_ARG(QString, s)); + } } void MainWindow::setup_ui() @@ -175,12 +182,17 @@ void MainWindow::setup_ui() } +void MainWindow::load_file(QString file_name) +{ + _session.load_file(file_name.toStdString()); +} + void MainWindow::on_actionOpen_triggered() { - QString file_name = QFileDialog::getOpenFileName( + const QString file_name = QFileDialog::getOpenFileName( this, tr("Open File"), "", tr("Sigrok Sessions (*.sr)")); - _session.load_file(file_name.toStdString()); + load_file(file_name); } void MainWindow::on_actionQuit_triggered()