From e186cedd96df3467a4164b2f461d926a7cc87b5d Mon Sep 17 00:00:00 2001
From: pixhawk <pixhawk@student.ethz.ch>
Date: Wed, 26 May 2010 07:28:09 +0200
Subject: [PATCH] Fixed a bug introduced by watchdog view which deactivated the
 main window

---
 src/ui/MainWindow.cc | 3 +++
 src/ui/MainWindow.ui | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 5caa3ef..2a1eaac 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -99,6 +99,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     parameters = new ParameterInterface(this);
     parameters->setVisible(false);
     watchdogControl = new WatchdogControl(this);
+    watchdogControl->setVisible(false);
 
     QStringList* acceptList = new QStringList();
     acceptList->append("roll IMU");
@@ -459,6 +460,7 @@ void MainWindow::loadSettingsView()
     QDockWidget* container6 = new QDockWidget(tr("Onboard Parameters"), this);
     container6->setWidget(parameters);
     addDockWidget(Qt::RightDockWidgetArea, container6);
+    this->show();
 }
 
 void MainWindow::loadEngineerView()
@@ -504,6 +506,7 @@ void MainWindow::loadMAVLinkView()
 {
     clearView();
     centerStack->setCurrentWidget(protocol);
+    this->show();
 }
 
 void MainWindow::loadAllView()
diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
index 4e0fd43..c39082d 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -35,7 +35,7 @@
      <x>0</x>
      <y>0</y>
      <width>1000</width>
-     <height>22</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuMGround">
@@ -257,7 +257,7 @@
   <action name="actionShow_MAVLink_view">
    <property name="icon">
     <iconset resource="../../mavground.qrc">
-     <normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
+     <normaloff>:/images/devices/network-wired.svg</normaloff>:/images/devices/network-wired.svg</iconset>
    </property>
    <property name="text">
     <string>Show MAVLink view</string>