X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=039f4aeb7b3c9871f66cd8ebddf78ca69cc0d5c8;hp=81b49057adfa25f72a44db14eaa7ce3c7f54700b;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=4523c5096aa9f719661805a7945f125495b55953 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 81b49057..039f4aeb 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -326,7 +326,7 @@ void MainWindow::setup_ui() setMenuBar(menu_bar); QMetaObject::connectSlotsByName(this); - // Setup the sampling bar + // Setup the toolbar main_bar_ = new toolbars::MainBar(session_, *this); // Populate the device list and select the initially selected device @@ -463,7 +463,7 @@ void MainWindow::load_file(QString file_name) const QString infoMessage; try { - session_.set_file(file_name.toStdString()); + session_.set_session_file(file_name.toStdString()); } catch(Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device(); @@ -527,7 +527,9 @@ void MainWindow::on_actionSaveAs_triggered() const QString abs_path = QFileInfo(file_name).absolutePath(); settings.setValue(SettingSaveDirectory, abs_path); - StoreProgress *dlg = new StoreProgress(file_name, session_, this); + StoreProgress *dlg = new StoreProgress(file_name, + device_manager_.context()->output_formats()["srzip"], + session_, this); dlg->run(); }