diff -r ddde0ac1472b -r 2422ea85d100 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sun Sep 27 22:25:27 2009 +0000 +++ b/QTfrontend/hwform.cpp Fri Oct 02 16:49:31 2009 +0000 @@ -55,10 +55,13 @@ #include "ammoSchemeModel.h" #include "bgwidget.h" -#ifdef SPARKLE_ENABLED +#ifdef __APPLE__ #include "CocoaInitializer.h" +#include "M3Panel.h" +#ifdef SPARKLE_ENABLED #include "SparkleAutoUpdater.h" #endif +#endif // I started handing this down to each place it touches, but it was getting ridiculous // and this one flag does not warrant a static class @@ -82,12 +85,15 @@ namegen = new HWNamegen(); +#ifdef __APPLE__ + panel = new M3Panel; #ifdef SPARKLE_ENABLED AutoUpdater* updater; CocoaInitializer initializer; updater = new SparkleAutoUpdater("http://files.getdropbox.com/u/24468/appcast.xml"); //this has to change before release!!! if(updater && config->isAutoUpdateEnabled()) updater->checkForUpdates(); +#endif #endif UpdateTeamsLists(); @@ -427,9 +433,13 @@ void HWForm::btnExitClicked() { - if (eggTimer.elapsed() < 3000) + if (eggTimer.elapsed() < 3000){ +#ifdef __APPLE__ + panel->showInstallController(); +#endif close(); - else + } + else { QPushButton * btn = findChild("imageButt"); if (btn)