X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=ea36a77e90957609158017775c9a01bfae694247;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hp=0adb6c9250c3bd17ca45c4e8da4d28466a97a7c1;hpb=d552c5c7f25ac892b7dc218264d6fe2823db44ef;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 0adb6c9..ea36a77 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -89,6 +89,8 @@ const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainBar::MainBar(Session &session, MainWindow &main_window) :
 	QToolBar("Sampling Bar", &main_window),
+	action_new_session_(new QAction(this)),
+	action_new_view_(new QAction(this)),
 	action_open_(new QAction(this)),
 	action_save_as_(new QAction(this)),
 	action_save_selection_as_(new QAction(this)),
@@ -114,8 +116,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	icon_green_(":/icons/status-green.svg"),
 	icon_grey_(":/icons/status-grey.svg"),
 	run_stop_button_(this),
-	run_stop_button_action_(nullptr),
-	menu_button_(this)
+	run_stop_button_action_(nullptr)
 #ifdef ENABLE_DECODE
 	, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
@@ -127,6 +128,18 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	setContextMenuPolicy(Qt::PreventContextMenu);
 
 	// Actions
+	action_new_session_->setText(tr("New &Session"));
+	action_new_session_->setIcon(QIcon::fromTheme("document-new",
+		QIcon(":/icons/document-new.png")));
+	connect(action_new_session_, SIGNAL(triggered(bool)),
+		this, SLOT(on_actionNewSession_triggered()));
+
+	action_new_view_->setText(tr("New &View"));
+	action_new_view_->setIcon(QIcon::fromTheme("window-new",
+		QIcon(":/icons/window-new.png")));
+	connect(action_new_view_, SIGNAL(triggered(bool)),
+		this, SLOT(on_actionNewView_triggered()));
+
 	action_open_->setText(tr("&Open..."));
 	action_open_->setIcon(QIcon::fromTheme("document-open",
 		QIcon(":/icons/document-open.png")));
@@ -255,6 +268,9 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 #endif
 
 	// Setup the toolbar
+	addAction(action_new_session_);
+	addAction(action_new_view_);
+	addSeparator();
 	addWidget(open_button);
 	addWidget(save_button);
 	addSeparator();
@@ -296,12 +312,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	addWidget(add_decoder_button);
 #endif
 
-	QWidget *const spacer = new QWidget();
-	spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-	addWidget(spacer);
-
-	addWidget(&menu_button_);
-
 	sample_count_.installEventFilter(this);
 	sample_rate_.installEventFilter(this);
 
@@ -485,12 +495,12 @@ void MainBar::load_file(QString file_name,
 		return;
 	}
 
-	session_.set_name(QFileInfo(file_name).fileName());
-
 	update_device_list();
 
 	session_.start_capture([&, errorMessage](QString infoMessage) {
 		session_error(errorMessage, infoMessage); });
+
+	session_.set_name(QFileInfo(file_name).fileName());
 }
 
 void MainBar::update_sample_rate_selector()
@@ -799,7 +809,10 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 
 	// Selection only? Verify that the cursors are active and fetch their values
 	if (selection_only) {
-		if (!session_.main_view()->cursors()->enabled()) {
+		views::TraceView::View *trace_view =
+			qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+		if (!trace_view->cursors()->enabled()) {
 			show_session_error(tr("Missing Cursors"), tr("You need to set the " \
 					"cursors before you can save the data enclosed by them " \
 					"to a session file (e.g. using ALT-V - Show Cursors)."));
@@ -808,8 +821,8 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 
 		const double samplerate = session_.get_samplerate();
 
-		const pv::util::Timestamp& start_time = session_.main_view()->cursors()->first()->time();
-		const pv::util::Timestamp& end_time = session_.main_view()->cursors()->second()->time();
+		const pv::util::Timestamp& start_time = trace_view->cursors()->first()->time();
+		const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time();
 
 		const uint64_t start_sample =
 			std::max((double)0, start_time.convert_to<double>() * samplerate);
@@ -944,6 +957,16 @@ void MainBar::on_config_changed()
 	commit_sample_rate();	
 }
 
+void MainBar::on_actionNewSession_triggered()
+{
+	new_session();
+}
+
+void MainBar::on_actionNewView_triggered()
+{
+	new_view(&session_);
+}
+
 void MainBar::on_actionOpen_triggered()
 {
 	QSettings settings;
@@ -990,31 +1013,46 @@ void MainBar::on_actionConnect_triggered()
 
 void MainBar::on_actionViewZoomIn_triggered()
 {
-	session_.main_view()->zoom(1);
+	views::TraceView::View *trace_view =
+		qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+	trace_view->zoom(1);
 }
 
 void MainBar::on_actionViewZoomOut_triggered()
 {
-	session_.main_view()->zoom(-1);
+	views::TraceView::View *trace_view =
+		qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+	trace_view->zoom(-1);
 }
 
 void MainBar::on_actionViewZoomFit_triggered()
 {
-	session_.main_view()->zoom_fit(action_view_zoom_fit_->isChecked());
+	views::TraceView::View *trace_view =
+		qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+	trace_view->zoom_fit(action_view_zoom_fit_->isChecked());
 }
 
 void MainBar::on_actionViewZoomOneToOne_triggered()
 {
-	session_.main_view()->zoom_one_to_one();
+	views::TraceView::View *trace_view =
+		qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+	trace_view->zoom_one_to_one();
 }
 
 void MainBar::on_actionViewShowCursors_triggered()
 {
-	const bool show = !session_.main_view()->cursors_shown();
+	views::TraceView::View *trace_view =
+		qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+	const bool show = !trace_view->cursors_shown();
 	if (show)
-		session_.main_view()->centre_cursors();
+		trace_view->centre_cursors();
 
-	session_.main_view()->show_cursors(show);
+	trace_view->show_cursors(show);
 }
 
 void MainBar::on_always_zoom_to_fit_changed(bool state)