X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=a6b2c89831ab60ab6796297918bce86eb3277430;hb=4c60462b00cc329e61daedd1c2e66724077bd412;hp=2e6e55c1d1dee53bbb12c796bbd3d6c28a1e7046;hpb=079d39ea735015597a65390e4c5cacc7d272f78c;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 2e6e55c..a6b2c89 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,12 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
+#define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
+#include <glibmm/variant.h>
+
 #include <QMainWindow>
 
 #include "session.hpp"
@@ -33,7 +36,8 @@ struct srd_decoder;
 class QVBoxLayout;
 
 namespace sigrok {
-class Device;
+class InputFormat;
+class OutputFormat;
 }
 
 namespace pv {
@@ -50,7 +54,9 @@ class View;
 }
 
 namespace widgets {
+#ifdef ENABLE_DECODE
 class DecoderMenu;
+#endif
 }
 
 class MainWindow : public QMainWindow
@@ -72,7 +78,7 @@ private:
 
 public:
 	explicit MainWindow(DeviceManager &device_manager,
-		const char *open_file_name = NULL,
+		const char *open_file_name = nullptr,
 		QWidget *parent = 0);
 
 	QAction* action_open() const;
@@ -86,11 +92,17 @@ public:
 	QAction* action_view_show_cursors() const;
 	QAction* action_about() const;
 
+#ifdef ENABLE_DECODE
 	QMenu* menu_decoder_add() const;
+#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();
@@ -104,12 +116,18 @@ private:
 	/**
 	 * Updates the device list in the toolbar
 	 */
-	void update_device_list();
+	void update_device_list();	
 
+private:
 	void closeEvent(QCloseEvent *event);
 
+	void keyReleaseEvent(QKeyEvent *event);
+
 private Q_SLOTS:
-	void load_file(QString file_name);
+	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>());
 
 	void show_session_error(
 		const QString text, const QString info_text);
@@ -160,9 +178,11 @@ private:
 	QAction *const action_view_show_cursors_;
 	QAction *const action_about_;
 
+#ifdef ENABLE_DECODE
 	QMenu *const menu_decoders_add_;
+#endif
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP