X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=e86dd183bbee32192a6511b58bf29441c585be9c;hb=cef5997ee1e08d713663d2ae02c839a315f41409;hp=c0717e4fc3fb94b929958f2eb108bc35725aceb3;hpb=1c4c23b87cde3778792caa1400030075b0504129;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index c0717e4f..e86dd183 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,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;
@@ -83,18 +90,30 @@ public:
 	QAction* action_view_zoom_out() const;
 	QAction* action_view_zoom_fit() const;
 	QAction* action_view_zoom_one_to_one() const;
+	QAction* action_view_sticky_scrolling() const;
 	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();
 
+	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();
@@ -106,14 +125,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);
 
@@ -131,6 +153,8 @@ private Q_SLOTS:
 
 	void on_actionViewZoomOneToOne_triggered();
 
+	void on_actionViewStickyScrolling_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
@@ -140,6 +164,10 @@ private Q_SLOTS:
 	void capture_state_changed(int state);
 	void device_selected();
 
+	void sticky_scrolling_changed(bool state);
+
+	void always_zoom_to_fit_changed(bool state);
+
 private:
 	DeviceManager &device_manager_;
 
@@ -160,12 +188,15 @@ private:
 	QAction *const action_view_zoom_out_;
 	QAction *const action_view_zoom_fit_;
 	QAction *const action_view_zoom_one_to_one_;
+	QAction *const action_view_sticky_scrolling_;
 	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