diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 2a1eaac..aa01f88 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -59,7 +59,7 @@ This file is part of the QGROUNDCONTROL project * @see QMainWindow::show() **/ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), - settings() +settings() { this->hide(); this->setVisible(false); @@ -437,6 +437,10 @@ void MainWindow::loadOperatorView() container6->setWidget(detection); addDockWidget(Qt::RightDockWidgetArea, container6); + // PROCESS CONTROL + QDockWidget* pControl = new QDockWidget(tr("Process Control"), this); + pControl->setWidget(watchdogControl); + addDockWidget(Qt::RightDockWidgetArea, pControl); this->show(); } diff --git a/src/ui/XMLCommProtocolWidget.ui b/src/ui/XMLCommProtocolWidget.ui index c9b7fd3..4604ef5 100644 --- a/src/ui/XMLCommProtocolWidget.ui +++ b/src/ui/XMLCommProtocolWidget.ui @@ -13,7 +13,7 @@ Form - + 6 diff --git a/src/ui/watchdog/WatchdogControl.ui b/src/ui/watchdog/WatchdogControl.ui index a05f603..1da7713 100644 --- a/src/ui/watchdog/WatchdogControl.ui +++ b/src/ui/watchdog/WatchdogControl.ui @@ -1,7 +1,5 @@ + - - - WatchdogControl @@ -15,7 +13,19 @@ Form + + + + + + + + 0 Processes Core 1: 0% Core 2: 0% + + + + - +