X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=eaaea089964c9ba32c245e6d8641c6c592997a02;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hp=879c8a522d9121f8c27a907a9d1fc2bf78717dc4;hpb=24c29d4f917ffac5a280d572cc04d1edb66a81b9;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 879c8a5..eaaea08 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -17,14 +17,15 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cassert>
-
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+#include <cassert>
 #include <algorithm>
 #include <iterator>
+#include <cstdint>
+#include <cstdarg>
 
 #include <QAction>
 #include <QApplication>
@@ -48,8 +49,6 @@
 #include "view/view.hpp"
 #include "views/trace/standardbar.hpp"
 
-#include <stdint.h>
-#include <stdarg.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::dynamic_pointer_cast;
@@ -138,7 +137,7 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 
 	// ...otherwise find the dock widget the widget with focus is contained in
 	QObject *w = QApplication::focusWidget();
-	QDockWidget *dock = 0;
+	QDockWidget *dock = nullptr;
 
 	while (w) {
 	    dock = qobject_cast<QDockWidget*>(w);
@@ -159,6 +158,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 	views::ViewType type, Session &session)
 {
 	GlobalSettings settings;
+	shared_ptr<views::ViewBase> v;
 
 	QMainWindow *main_window = nullptr;
 	for (auto entry : session_windows_)
@@ -167,72 +167,78 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
 	assert(main_window);
 
-	if (type == views::ViewTypeTrace) {
-		QDockWidget* dock = new QDockWidget(title, main_window);
-		dock->setObjectName(title);
-		main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
-
-		// Insert a QMainWindow into the dock widget to allow for a tool bar
-		QMainWindow *dock_main = new QMainWindow(dock);
-		dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
+	shared_ptr<MainBar> main_bar = session.main_bar();
 
-		shared_ptr<views::TraceView::View> v =
-			make_shared<views::TraceView::View>(session, dock_main);
-		view_docks_[dock] = v;
-		session.register_view(v);
+	QDockWidget* dock = new QDockWidget(title, main_window);
+	dock->setObjectName(title);
+	main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
 
-		dock_main->setCentralWidget(v.get());
-		dock->setWidget(dock_main);
+	// Insert a QMainWindow into the dock widget to allow for a tool bar
+	QMainWindow *dock_main = new QMainWindow(dock);
+	dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
 
-		dock->setFeatures(QDockWidget::DockWidgetMovable |
-			QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+	if (type == views::ViewTypeTrace)
+		// This view will be the main view if there's no main bar yet
+		v = make_shared<views::TraceView::View>(session,
+			(main_bar ? false : true), dock_main);
 
-		QAbstractButton *close_btn =
-			dock->findChildren<QAbstractButton*>
-				("qt_dockwidget_closebutton").front();
+	if (!v)
+		return nullptr;
 
-		connect(close_btn, SIGNAL(clicked(bool)),
-			this, SLOT(on_view_close_clicked()));
+	view_docks_[dock] = v;
+	session.register_view(v);
 
-		if (type == views::ViewTypeTrace) {
-			connect(&session, SIGNAL(trigger_event(util::Timestamp)),
-				qobject_cast<views::ViewBase*>(v.get()),
-				SLOT(trigger_event(util::Timestamp)));
+	dock_main->setCentralWidget(v.get());
+	dock->setWidget(dock_main);
 
-			v->enable_sticky_scrolling(true);
-			v->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+	dock->setFeatures(QDockWidget::DockWidgetMovable |
+		QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
-			shared_ptr<MainBar> main_bar = session.main_bar();
-			if (!main_bar) {
-				/* Initial view, create the main bar */
-				main_bar = make_shared<MainBar>(session, this, v.get());
-				dock_main->addToolBar(main_bar.get());
-				session.set_main_bar(main_bar);
+	QAbstractButton *close_btn =
+		dock->findChildren<QAbstractButton*>
+			("qt_dockwidget_closebutton").front();
 
-				connect(main_bar.get(), SIGNAL(new_view(Session*)),
-					this, SLOT(on_new_view(Session*)));
+	connect(close_btn, SIGNAL(clicked(bool)),
+		this, SLOT(on_view_close_clicked()));
 
-				main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+	connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+		qobject_cast<views::ViewBase*>(v.get()),
+		SLOT(trigger_event(util::Timestamp)));
 
-				/* For the main view we need to prevent the dock widget from
-				 * closing itself when its close button is clicked. This is
-				 * so we can confirm with the user first. Regular views don't
-				 * need this */
-				close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close()));
-			} else {
-				/* Additional view, create a standard bar */
-				pv::views::trace::StandardBar *standard_bar =
-					new pv::views::trace::StandardBar(session, this, v.get());
-				dock_main->addToolBar(standard_bar);
-
-				standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
-			}
+	if (type == views::ViewTypeTrace) {
+		views::TraceView::View *tv =
+			qobject_cast<views::TraceView::View*>(v.get());
+
+		tv->enable_sticky_scrolling(true);
+		tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+
+		if (!main_bar) {
+			/* Initial view, create the main bar */
+			main_bar = make_shared<MainBar>(session, this, tv);
+			dock_main->addToolBar(main_bar.get());
+			session.set_main_bar(main_bar);
+
+			connect(main_bar.get(), SIGNAL(new_view(Session*)),
+				this, SLOT(on_new_view(Session*)));
+
+			main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
+
+			/* For the main view we need to prevent the dock widget from
+			 * closing itself when its close button is clicked. This is
+			 * so we can confirm with the user first. Regular views don't
+			 * need this */
+			close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close()));
+		} else {
+			/* Additional view, create a standard bar */
+			pv::views::trace::StandardBar *standard_bar =
+				new pv::views::trace::StandardBar(session, this, tv);
+			dock_main->addToolBar(standard_bar);
+
+			standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
 		}
-
-		return v;
 	}
 
-	return nullptr;
+	return v;
 }
 
 void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
@@ -251,7 +257,7 @@ void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
 				// call deleteLater() on it, which causes a double free
 				// since the shared_ptr in view_docks_ doesn't know
 				// that Qt keeps a pointer to the view around
-				view->setParent(0);
+				view->setParent(nullptr);
 
 				// Delete the view's dock widget and all widgets inside it
 				entry.first->deleteLater();
@@ -666,7 +672,7 @@ void MainWindow::on_view_close_clicked()
 {
 	// Find the dock widget that contains the close button that was clicked
 	QObject *w = QObject::sender();
-	QDockWidget *dock = 0;
+	QDockWidget *dock = nullptr;
 
 	while (w) {
 	    dock = qobject_cast<QDockWidget*>(w);