X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=47704c2fc8f7abe1ab614c33f684ba4a87f1d513;hp=88cbd6fd8f6492e4870d6263b77525402b76a581;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 88cbd6fd..47704c2f 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -18,10 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_H
+#define PULSEVIEW_PV_MAINWINDOW_H
+
+#include <list>
+
+#include <boost/weak_ptr.hpp>
 
 #include <QMainWindow>
+#include <QSignalMapper>
 
 #include "sigsession.h"
 
@@ -35,7 +40,12 @@ class QWidget;
 
 namespace pv {
 
+class DeviceManager;
+
+namespace toolbars {
+class ContextBar;
 class SamplingBar;
+}
 
 namespace view {
 class View;
@@ -46,46 +56,85 @@ class MainWindow : public QMainWindow
 	Q_OBJECT
 
 public:
-	explicit MainWindow(QWidget *parent = 0);
+	explicit MainWindow(DeviceManager &device_manager,
+		const char *open_file_name = NULL,
+		QWidget *parent = 0);
 
 private:
 	void setup_ui();
 
-private:
-
-	SigSession _session;
-	pv::view::View *_view;
+	void session_error(const QString text, const QString info_text);
 
-	QAction *_action_open;
-	QAction *_action_view_zoom_in;
-	QAction *_action_view_zoom_out;
-	QAction *_action_about;
+	/**
+	 * Updates the device list in the sampling bar, and updates the
+	 * selection.
+	 * @param selected_device The device to select, or NULL if the
+	 * first device in the device list should be selected.
+	 */
+	void update_device_list(
+		struct sr_dev_inst *selected_device = NULL);
 
-	QMenuBar *_menu_bar;
-	QMenu *_menu_file;
-	QMenu *_menu_view;
-	QMenu *_menu_help;
+	static gint decoder_name_cmp(gconstpointer a, gconstpointer b);
+	void setup_add_decoders(QMenu *parent);
 
-	QWidget *_central_widget;
-	QVBoxLayout *_vertical_layout;
+private slots:
+	void load_file(QString file_name);
 
-	QToolBar *_toolbar;
-	SamplingBar *_sampling_bar;
-	QStatusBar *_status_bar;
 
-private slots:
+	void show_session_error(
+		const QString text, const QString info_text);
 
 	void on_actionOpen_triggered();
+	void on_actionQuit_triggered();
+
+	void on_actionConnect_triggered();
 
 	void on_actionViewZoomIn_triggered();
 
 	void on_actionViewZoomOut_triggered();
 
+	void on_actionViewShowCursors_triggered();
+
 	void on_actionAbout_triggered();
 
+	void add_decoder(QObject *action);
+
 	void run_stop();
+
+	void capture_state_changed(int state);
+
+private:
+	DeviceManager &_device_manager;
+
+	SigSession _session;
+
+	pv::view::View *_view;
+
+	QMenuBar *_menu_bar;
+	QMenu *_menu_file;
+	QAction *_action_open;
+	QAction *_action_connect;
+	QAction *_action_quit;
+
+	QMenu *_menu_view;
+	QAction *_action_view_zoom_in;
+	QAction *_action_view_zoom_out;
+	QAction *_action_view_show_cursors;
+
+	QMenu *_menu_decoders;
+	QMenu *_menu_decoders_add;
+	QSignalMapper _decoders_add_mapper;
+
+	QMenu *_menu_help;
+	QAction *_action_about;
+
+	QWidget *_central_widget;
+	QVBoxLayout *_vertical_layout;
+
+	QToolBar *_toolbar;
+	toolbars::SamplingBar *_sampling_bar;
 };
 
 } // namespace pv
 
-#endif // MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_H