X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=2548e0ef4d8a1ceade73d6e2ea3cabf76adcd011;hp=8a67c615ca0718ec16e37f8cab203bc087edab5b;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=51cf49fe312f92cccde3e861d357e4b459976c0d

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 8a67c615..2548e0ef 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,15 +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 <memory>
 
 #include <QMainWindow>
 
-#include "sigsession.hpp"
+#include "session.hpp"
 
 struct srd_decoder;
 
@@ -42,7 +42,7 @@ class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
-class SamplingBar;
+class MainBar;
 }
 
 namespace view {
@@ -57,11 +57,37 @@ 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,
 		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;
+
+	QMenu* menu_decoder_add() const;
+
 	void run_stop();
 
 	void select_device(std::shared_ptr<sigrok::Device> device);
@@ -76,12 +102,15 @@ 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);
 
@@ -112,18 +141,6 @@ private Q_SLOTS:
 	void device_selected();
 
 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;
-
 	DeviceManager &device_manager_;
 
 	Session session_;
@@ -133,9 +150,22 @@ private:
 	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_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_;
+
+	QMenu *const menu_decoders_add_;
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP