Browse Source

Minor improvements

QGC4.4
pixhawk 15 years ago
parent
commit
5d7774ee03
  1. 6
      src/ui/MainWindow.cc
  2. 2
      src/ui/XMLCommProtocolWidget.ui
  3. 18
      src/ui/watchdog/WatchdogControl.ui

6
src/ui/MainWindow.cc

@ -59,7 +59,7 @@ This file is part of the QGROUNDCONTROL project
* @see QMainWindow::show() * @see QMainWindow::show()
**/ **/
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
settings() settings()
{ {
this->hide(); this->hide();
this->setVisible(false); this->setVisible(false);
@ -437,6 +437,10 @@ void MainWindow::loadOperatorView()
container6->setWidget(detection); container6->setWidget(detection);
addDockWidget(Qt::RightDockWidgetArea, container6); addDockWidget(Qt::RightDockWidgetArea, container6);
// PROCESS CONTROL
QDockWidget* pControl = new QDockWidget(tr("Process Control"), this);
pControl->setWidget(watchdogControl);
addDockWidget(Qt::RightDockWidgetArea, pControl);
this->show(); this->show();
} }

2
src/ui/XMLCommProtocolWidget.ui

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,10,0,0,0" columnstretch="1,1,1,10"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,100,0,0,0" columnstretch="1,1,1,100">
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>6</number>
</property> </property>

18
src/ui/watchdog/WatchdogControl.ui

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author/>
<comment/>
<exportmacro/>
<class>WatchdogControl</class> <class>WatchdogControl</class>
<widget class="QWidget" name="WatchdogControl"> <widget class="QWidget" name="WatchdogControl">
<property name="geometry"> <property name="geometry">
@ -15,7 +13,19 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="100,0">
<item>
<widget class="QWidget" name="mainWidget" native="true"/>
</item>
<item>
<widget class="QLabel" name="processInfoLabel">
<property name="text">
<string>0 Processes Core 1: 0% Core 2: 0%</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<pixmapfunction/> <resources/>
<connections/> <connections/>
</ui> </ui>

Loading…
Cancel
Save