X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=35ccf0655d10b4e37699f87d47d9f308cb007822;hb=dd3fd4df34d129c83f7f5d80ff1e8b998beca63d;hp=bf491156f7552781c4f3456228a478c5fa78f334;hpb=619dfb1195735dd7dca2886bec563fefc2ba5efb;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index bf49115..35ccf06 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
@@ -75,9 +81,27 @@ public:
 		const char *open_file_name = NULL,
 		QWidget *parent = 0);
 
+	QAction* action_open() const;
+	QAction* action_save_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_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);
 
 private:
 	void setup_ui();
@@ -89,14 +113,20 @@ 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();	
 
+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);
@@ -135,8 +165,23 @@ private:
 	QVBoxLayout *vertical_layout_;
 
 	toolbars::MainBar *main_bar_;
+
+	QAction *const action_open_;
+	QAction *const action_save_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_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