X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=6a4bdfc80f4b46134fde599d33f4eea2dda469a1;hb=793208c83a8bde80be063a7bcb159ee7ffae2b9f;hp=d2bcd918361ce6fc4e053f3f7d6196d37412154f;hpb=e79171dc88959745ce0bf483dc25e86b28f253ed;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index d2bcd918..6a4bdfc8 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -22,8 +22,11 @@
 #define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
+#include <glibmm/variant.h>
+
 #include <QMainWindow>
 
 #include "session.hpp"
@@ -33,7 +36,7 @@ struct srd_decoder;
 class QVBoxLayout;
 
 namespace sigrok {
-class Device;
+class InputFormat;
 class OutputFormat;
 }
 
@@ -53,7 +56,7 @@ class View;
 namespace widgets {
 #ifdef ENABLE_DECODE
 class DecoderMenu;
-#endif /* ENABLE_DECODE */
+#endif
 }
 
 class MainWindow : public QMainWindow
@@ -75,7 +78,8 @@ private:
 
 public:
 	explicit MainWindow(DeviceManager &device_manager,
-		const char *open_file_name = NULL,
+		std::string open_file_name = std::string(),
+		std::string open_file_format = std::string(),
 		QWidget *parent = 0);
 
 	QAction* action_open() const;
@@ -91,18 +95,24 @@ public:
 
 #ifdef ENABLE_DECODE
 	QMenu* menu_decoder_add() const;
-#endif /* ENABLE_DECODE */
+#endif
 
 	void run_stop();
 
-	void select_device(std::shared_ptr<sigrok::Device> device);
+	void select_device(std::shared_ptr<devices::Device> device);
 
 public Q_SLOTS:
 	void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+	void import_file(std::shared_ptr<sigrok::InputFormat> format);
 
 private:
 	void setup_ui();
 
+	void select_init_device();
+
+	void load_init_file(const std::string &file_name,
+		const std::string &format);
+
 	void save_ui_settings();
 
 	void restore_ui_settings();
@@ -114,14 +124,17 @@ private:
 	 */
 	void update_device_list();	
 
+	void load_file(QString file_name,
+		std::shared_ptr<sigrok::InputFormat> format = nullptr,
+		const std::map<std::string, Glib::VariantBase> &options =
+			std::map<std::string, Glib::VariantBase>());
+
 private:
 	void closeEvent(QCloseEvent *event);
 
 	void keyReleaseEvent(QKeyEvent *event);
 
 private Q_SLOTS:
-	void load_file(QString file_name);
-
 	void show_session_error(
 		const QString text, const QString info_text);
 
@@ -173,7 +186,7 @@ private:
 
 #ifdef ENABLE_DECODE
 	QMenu *const menu_decoders_add_;
-#endif /* ENABLE_DECODE */
+#endif
 };
 
 } // namespace pv