From 9ff35e3e38e649ab77dab12f0ff1aebcd89749eb Mon Sep 17 00:00:00 2001
From: Bryant <bwmairs@ucsc.edu>
Date: Fri, 7 Jun 2013 10:35:50 -0700
Subject: [PATCH] All subwindows are now centered on the screen.

---
 src/ui/CommConfigurationWindow.cc | 5 +++++
 src/ui/JoystickWidget.cc          | 9 ++++++++-
 src/ui/QGCSettingsWidget.cc       | 5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index 43a3698a1..b1fbac86e 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -62,6 +62,11 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
     // Setup the user interface according to link type
     ui.setupUi(this);
 
+    // Center the window on the screen.
+    QRect position = frameGeometry();
+    position.moveCenter(QDesktopWidget().availableGeometry().center());
+    move(position.topLeft());
+
     // Initialize basic ui state
 
     // Do not allow changes here unless advanced is checked
diff --git a/src/ui/JoystickWidget.cc b/src/ui/JoystickWidget.cc
index 21b077b55..1fb49e249 100644
--- a/src/ui/JoystickWidget.cc
+++ b/src/ui/JoystickWidget.cc
@@ -1,13 +1,20 @@
 #include "JoystickWidget.h"
 #include "ui_JoystickWidget.h"
 #include <QDebug>
+#include <QDesktopWidget>
 
 JoystickWidget::JoystickWidget(JoystickInput* joystick, QWidget *parent) :
     QDialog(parent),
     m_ui(new Ui::JoystickWidget)
 {
     m_ui->setupUi(this);
-	clearKeys();
+
+    // Center the window on the screen.
+    QRect position = frameGeometry();
+    position.moveCenter(QDesktopWidget().availableGeometry().center());
+    move(position.topLeft());
+
+    clearKeys();
     this->joystick = joystick;
 
     m_ui->rollMapSpinBox->setValue(joystick->getMappingXAxis());
diff --git a/src/ui/QGCSettingsWidget.cc b/src/ui/QGCSettingsWidget.cc
index eab0fbdca..5f16ce117 100644
--- a/src/ui/QGCSettingsWidget.cc
+++ b/src/ui/QGCSettingsWidget.cc
@@ -18,6 +18,11 @@ QGCSettingsWidget::QGCSettingsWidget(QWidget *parent, Qt::WindowFlags flags) :
 {
     ui->setupUi(this);
 
+    // Center the window on the screen.
+    QRect position = frameGeometry();
+    position.moveCenter(QDesktopWidget().availableGeometry().center());
+    move(position.topLeft());
+
     // Add all protocols
     QList<ProtocolInterface*> protocols = LinkManager::instance()->getProtocols();
     foreach (ProtocolInterface* protocol, protocols) {
-- 
2.22.0