From d5fd2dc088e43f43a5f42fc42024b99d5c495904 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 17 Sep 2012 07:40:05 +0200
Subject: [PATCH] Updated deployment script, disabled unfinished windows

---
 deploy/mac_create_dmg.sh |  9 ++++++---
 src/ui/MainWindow.cc     | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/deploy/mac_create_dmg.sh b/deploy/mac_create_dmg.sh
index e9c0218b1..c986cdbca 100644
--- a/deploy/mac_create_dmg.sh
+++ b/deploy/mac_create_dmg.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
-cp -r ../../qgroundcontrol-build-desktop/qgroundcontrol.app .
+cp -r ../../qgroundcontrol-build-desktop-Desktop_Qt_4_8_1_for_GCC__Qt_SDK__Release/qgroundcontrol.app .
 
 
-cp -r ../audio qgroundcontrol.app/Contents/MacOs/.
+cp -r ../files/audio qgroundcontrol.app/Contents/MacOs/.
 mkdir -p qgroundcontrol.app/Contents/Frameworks/
+mkdir -p qgroundcontrol.app/Contents/PlugIns/imageformats
+mkdir -p qgroundcontrol.app/Contents/PlugIns/codecs
+mkdir -p qgroundcontrol.app/Contents/PlugIns/accessible
 # SDL is not copied by Qt - for whatever reason
 cp -r /Library/Frameworks/SDL.framework qgroundcontrol.app/Contents/Frameworks/.
 echo -e '\n\nStarting to create disk image. This may take a while..\n'
-macdeployqt qgroundcontrol.app -dmg
+$HOME/QtSDK/Desktop/Qt/4.8.1/gcc/bin/macdeployqt qgroundcontrol.app -dmg
 rm -rf qgroundcontrol.app
 echo -e '\n\n QGroundControl .DMG file is now ready for publishing\n'
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 779291aef..75e53ba41 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -552,11 +552,11 @@ void MainWindow::buildCommonWidgets()
         addCentralWidget(protocolWidget, "Mavlink Generator");
     }
 
-    if (!firmwareUpdateWidget)
-    {
-        firmwareUpdateWidget    = new QGCFirmwareUpdate(this);
-        addCentralWidget(firmwareUpdateWidget, "Firmware Update");
-    }
+//    if (!firmwareUpdateWidget)
+//    {
+//        firmwareUpdateWidget    = new QGCFirmwareUpdate(this);
+//        addCentralWidget(firmwareUpdateWidget, "Firmware Update");
+//    }
 
     if (!hudWidget)
     {
@@ -564,11 +564,11 @@ void MainWindow::buildCommonWidgets()
         addCentralWidget(hudWidget, tr("Head Up Display"));
     }
 
-    if (!configWidget)
-    {
-        configWidget = new QGCVehicleConfig(this);
-        addCentralWidget(configWidget, tr("Vehicle Configuration"));
-    }
+//    if (!configWidget)
+//    {
+//        configWidget = new QGCVehicleConfig(this);
+//        addCentralWidget(configWidget, tr("Vehicle Configuration"));
+//    }
 
     if (!dataplotWidget)
     {
-- 
2.22.0