X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=f928de5166afe46063be9ccaf6215063961d3689;hp=b21d5a9fe57a80874b31b1f56ebebe1eaa984822;hb=f1e2d26b867fc5ab5723d83c00bd9467add2f748;hpb=0ff97f965aca66a69fd44a870d42f2bd67d38e94

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index b21d5a9..f928de5 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -89,7 +89,6 @@ 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)),
@@ -128,12 +127,6 @@ 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")));
@@ -268,7 +261,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 #endif
 
 	// Setup the toolbar
-	addAction(action_new_session_);
 	addAction(action_new_view_);
 	addSeparator();
 	addWidget(open_button);
@@ -809,7 +801,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)."));
@@ -818,8 +813,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);
@@ -954,11 +949,6 @@ void MainBar::on_config_changed()
 	commit_sample_rate();	
 }
 
-void MainBar::on_actionNewSession_triggered()
-{
-	new_session();
-}
-
 void MainBar::on_actionNewView_triggered()
 {
 	new_view(&session_);
@@ -1010,31 +1000,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)