X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=208cbe4367e163062b59fb8fc05e6e3695da219a;hp=9a000c2a261f54e3123cdaf7c81d9bc0459e4c12;hb=c28fa62bc89656ba3b1b01011a45e941d6c7d42a;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 9a000c2a..208cbe43 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,27 +18,35 @@
  * 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 "sigsession.hpp"
+#include "session.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
+namespace sigrok {
+class InputFormat;
+class OutputFormat;
+}
+
 namespace pv {
 
 class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
-class SamplingBar;
+class MainBar;
 }
 
 namespace view {
@@ -46,21 +54,69 @@ class View;
 }
 
 namespace widgets {
+#ifdef ENABLE_DECODE
 class DecoderMenu;
+#endif
 }
 
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
 
+private:
+	/**
+	 * Name of the setting used to remember the directory
+	 * containing the last file that was opened.
+	 */
+	static const char *SettingOpenDirectory;
+
+	/**
+	 * Name of the setting used to remember the directory
+	 * containing the last file that was saved.
+	 */
+	static const char *SettingSaveDirectory;
+
 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;
+	QAction* action_save_as() const;
+	QAction* action_save_selection_as() const;
+	QAction* action_connect() const;
+	QAction* action_quit() const;
+	QAction* action_view_zoom_in() const;
+	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_coloured_bg() 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<devices::Device> device);
+
+public Q_SLOTS:
+	void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+		bool selection_only = false);
+	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();
@@ -68,20 +124,29 @@ private:
 	void session_error(const QString text, const QString info_text);
 
 	/**
-	 * Updates the device list in the sampling bar
+	 * Updates the device list in the toolbar
 	 */
-	void update_device_list();
+	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>());
+
+	void save_selection_to_file();
 
+private:
 	void closeEvent(QCloseEvent *event);
 
-private Q_SLOTS:
-	void load_file(QString file_name);
+	void keyReleaseEvent(QKeyEvent *event);
 
+private Q_SLOTS:
 	void show_session_error(
 		const QString text, const QString info_text);
 
 	void on_actionOpen_triggered();
 	void on_actionSaveAs_triggered();
+	void on_actionSaveSelectionAs_triggered();
 	void on_actionQuit_triggered();
 
 	void on_actionConnect_triggered();
@@ -94,41 +159,54 @@ private Q_SLOTS:
 
 	void on_actionViewZoomOneToOne_triggered();
 
+	void on_actionViewStickyScrolling_triggered();
+
+	void on_actionViewColouredBg_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
 
 	void add_decoder(srd_decoder *decoder);
 
-	void run_stop();
-
 	void capture_state_changed(int state);
+	void device_selected();
 
-private:
-	/**
-	 * Name of the setting used to remember the directory
-	 * containing the last file that was opened.
-	 */
-	static const char *SettingOpenDirectory;
+	void sticky_scrolling_changed(bool state);
 
-	/**
-	 * Name of the setting used to remember the directory
-	 * containing the last file that was saved.
-	 */
-	static const char *SettingSaveDirectory;
+	void always_zoom_to_fit_changed(bool state);
 
+private:
 	DeviceManager &device_manager_;
 
-	SigSession session_;
+	Session session_;
 
 	pv::view::View *view_;
 
 	QWidget *central_widget_;
 	QVBoxLayout *vertical_layout_;
 
-	toolbars::SamplingBar *sampling_bar_;
+	toolbars::MainBar *main_bar_;
+
+	QAction *const action_open_;
+	QAction *const action_save_as_;
+	QAction *const action_save_selection_as_;
+	QAction *const action_connect_;
+	QAction *const action_quit_;
+	QAction *const action_view_zoom_in_;
+	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_coloured_bg_;
+	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