Changeset 379 for AE

Timestamp:

Jun 29, 2009, 9:23:42 PM (16 years ago)

Author:

iritscen

Message:

Adding GDF switch code to Mac side post-globalization.
Preparing way for new code (search for 'CIP' in proj).
Clarifying re-globalization warning.

Location:

AE/Installer/trunk/source

Files:

• aeinstallerapp.cpp (modified) (2 diffs)
• aeinstallerapp.h (modified) (1 diff)
• installer.cpp (modified) (2 diffs)
• installer.h (modified) (1 diff)
• main_window.cpp (modified) (5 diffs)

AE/Installer/trunk/source/aeinstallerapp.cpp

@@ -11 +11 @@
 #include "boost/thread.hpp"
 #include <boost/thread/mutex.hpp>
-
+#include <fstream>
 #include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
 #include "boost/lexical_cast.hpp" //int -> string
@@ -111 +111 @@
         TheWindow = mainWindow;
         
+#ifndef WIN32
+        // CIP: test for the third-party mono framework, because without it, on Mac, we are up a creek
+        
+        
+        if (!monoPresent) // abort! abort! abort!
+        {
+                // CIP: disable window controls, present alert with URL to download mono, alert window has one button, "Quit"
+        }
+#endif
+
         //anything after this is done after the window appears...
                 if ( !exists("../GameDataFolder") ) {

AE/Installer/trunk/source/aeinstallerapp.h

@@ -22 +22 @@
 #include "main_window.h"
 ////@end includes
+
+bool monoPresent = false; // the Mac won't be able to do anything without mono installed
 
 /*!

AE/Installer/trunk/source/installer.cpp

@@ -1 +1 @@
 /*
  AE/Mod Installer
- v1.0
  by Gumby and Iritscen
- */
+*/
 
 #define DEBUG
@@ -28 +27 @@
 #endif
 
-const string strInstallerVersion = "1.0";
+//const string strInstallerVersion = "1.0";
 const bool SPLIT = 1;
 const bool NOT_SPLIT = 0;

AE/Installer/trunk/source/installer.h

@@ -14 +14 @@
 static string DIRSLASH = "\\";
 string strInstallCfg = "../GameDataFolder/Add.cfg";
-
-
+static string strInstallerVersion = "1.0";
 
 #define STRUCT_DEFS 

AE/Installer/trunk/source/main_window.cpp

@@ -1 +1 @@
 /*
-AE/Mod Installer
-by Gumby and Iritscen
+ AE/Mod Installer
+ by Gumby and Iritscen
 */
 
 // To-do: - Load credits from text resource file
-//                - Version number in credits should be universalized
 //                - Institute lots of checks into file-handling
 //                - Clear mod info fields when mod is de-selected
@@ -32 +31 @@
 #endif
 
-const string strInstallerVersion = "1.0";
+//const string strInstallerVersion = "1.0";
 const bool SPLIT = 1;
 const bool NOT_SPLIT = 0;
@@ -326 +325 @@
                 create_directory((path)"../GameDataFolder/IGMD");
                 copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
-                setProgressBar( 1000 ); 
+                setProgressBar( 1000 );
+                
+                // CIP:last of all, set up the edition folder as a playable Oni installation by placing the latest application (+ Daodan DLL on Windows) in edition/
+                
+                // CIP:then copy persist.dat and keyconfig.txt into edition/ as well
+                
+#ifndef WIN32
+                /* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
+                   If there are no Oni prefs (only possible if Oni has not been run even once), then the above line will fail silently, no harm done,
+                   and when the user does run Oni for the first time, using the copy of the app in the AE GDF, Oni will set the prefs to use that GDF at that point */
+                path fullAEpath = system_complete("."); // get full path for Installer
+                char prefsCommand[300] = "defaults write com.godgames.oni RetailInstallationPath -string '";
+                strcat(prefsCommand, fullAEpath.parent_path().parent_path().string().c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
+                strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
+                system(prefsCommand);
+                
+#endif
+                
                 setStatusArea((string)"Done! Now select your mod packages and click install.");
                 //      while(1) Sleep(-1);
@@ -1284 +1300 @@
                 YesNoDialog->ShowModal();
                 OptionsPanel->Show();
-                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight()+2);
+                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight()+1);
+                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-1);
         }
 }
@@ -1546 +1563 @@
 void MainWindow::OnReGlobalizeButtonClick( wxCommandEvent& event )
 {
-        wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: This will DELETE the Edition's GameDataFolder and reglobalize all of your data. \n Are you SURE you want to do this? ", "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION  , wxDefaultPosition);
+        wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: This will DELETE the Edition's GameDataFolder and recreate it from the vanilla Oni game data. \n Are you SURE you want to do this? ", "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION    , wxDefaultPosition);
 
         if (YesNoDialog->ShowModal() == wxID_NO) { //if the user said no...