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

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index eee1d85..bf49115 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,19 +26,23 @@
 
 #include <QMainWindow>
 
-#include "sigsession.hpp"
+#include "session.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
+namespace sigrok {
+class Device;
+}
+
 namespace pv {
 
 class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
-class SamplingBar;
+class MainBar;
 }
 
 namespace view {
@@ -53,6 +57,19 @@ 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,
@@ -60,6 +77,8 @@ public:
 
 	void run_stop();
 
+	void select_device(std::shared_ptr<sigrok::Device> device);
+
 private:
 	void setup_ui();
 
@@ -106,28 +125,16 @@ 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_;
 
-	SigSession session_;
+	Session session_;
 
 	pv::view::View *view_;
 
 	QWidget *central_widget_;
 	QVBoxLayout *vertical_layout_;
 
-	toolbars::SamplingBar *sampling_bar_;
+	toolbars::MainBar *main_bar_;
 };
 
 } // namespace pv