X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=165d3a705db17551fcc1070da6a559c1daea2577;hb=abad24e2d61c0c84ac8495c22d29a8a3a49ee9fa;hp=145d7d997db6cfe089d1fc18b4bafd3874e9e22c;hpb=6db7315814ee9d2f92d4b326be7c5b9e6e4b789b;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 145d7d99..165d3a70 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -32,6 +32,7 @@
 #include <QMessageBox>
 #include <QMenu>
 #include <QMenuBar>
+#include <QSettings>
 #include <QStatusBar>
 #include <QVBoxLayout>
 #include <QWidget>
@@ -67,6 +68,9 @@ namespace view {
 class SelectableItem;
 }
 
+const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
+const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
+
 MainWindow::MainWindow(DeviceManager &device_manager,
 	const char *open_file_name,
 	QWidget *parent) :
@@ -339,13 +343,21 @@ void MainWindow::show_session_error(
 
 void MainWindow::on_actionOpen_triggered()
 {
+	QSettings settings;
+	const QString dir = settings.value(SettingOpenDirectory).toString();
+
 	// Show the dialog
 	const QString file_name = QFileDialog::getOpenFileName(
-		this, tr("Open File"), "", tr(
+		this, tr("Open File"), dir, tr(
 			"Sigrok Sessions (*.sr);;"
 			"All Files (*.*)"));
-	if (!file_name.isEmpty())
+
+	if (!file_name.isEmpty()) {
 		load_file(file_name);
+
+		const QString abs_path = QFileInfo(file_name).absolutePath();
+		settings.setValue(SettingOpenDirectory, abs_path);
+	}
 }
 
 void MainWindow::on_actionSaveAs_triggered()
@@ -355,13 +367,19 @@ void MainWindow::on_actionSaveAs_triggered()
 	// Stop any currently running capture session
 	_session.stop_capture();
 
+	QSettings settings;
+	const QString dir = settings.value(SettingSaveDirectory).toString();
+
 	// Show the dialog
 	const QString file_name = QFileDialog::getSaveFileName(
-		this, tr("Save File"), "", tr("Sigrok Sessions (*.sr)"));
+		this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)"));
 
 	if (file_name.isEmpty())
 		return;
 
+	const QString abs_path = QFileInfo(file_name).absolutePath();
+	settings.setValue(SettingSaveDirectory, abs_path);
+
 	StoreProgress *dlg = new StoreProgress(file_name, _session, this);
 	dlg->run();
 }