Changeset 358

Timestamp:

Jun 20, 2009, 12:25:08 AM (15 years ago)

Author:

gumby

Message:

Fixed bugs:
Missing globalize code on start
possibly fixed adv option menu
type "Step33/36"
const thing in struct ModPackage

Location:

AE/Installer/trunk/source

Files:

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

AE/Installer/trunk/source/aeinstallerapp.cpp

@@ -9 +9 @@
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
+#include "boost/thread.hpp"
+#include <boost/thread/mutex.hpp>
 
 #include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
@@ -117 +119 @@
                 }
                 else {
-                        //globalize...
+                        TheWindow->InstallButton->Disable();
+                TheWindow->ReglobalizeButton->Disable();
+
+#ifdef WIN32
+
+                boost::thread thrd3(globalizeData);
+                //globalizeData();
+                //boost::thread::create_thread(&globalizeData);
+                //       boost::thread_group Tg;
+                // Tg.create_thread( &globalizeData(), this );
+#else
+                globalizeData();
+                setProgressBar(1000);
+                setStatusArea("Done!");
+#endif
+                
+                TheWindow->InstallButton->Enable();
+                TheWindow->ReglobalizeButton->Enable();
                 }
         }

AE/Installer/trunk/source/installer.h

@@ -49 +49 @@
                 cout << "\n";
         }
-        
-             bool operator < (const ModPackage &fs)
+
+             bool operator < (const ModPackage &fs) const
      { return (name < fs.name);}
 
-     bool operator > (const ModPackage &fs)
+     bool operator > (const ModPackage &fs) const
      { return (name > fs.name);}
 
-     bool operator == (const ModPackage &fs)
+     bool operator == (const ModPackage &fs) const
      { return (name == fs.name);}
 };

AE/Installer/trunk/source/main_window.cpp

@@ -301 +301 @@
                 for(int j = 0; j < GDFPaths.size(); j++) {
                         logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
-                        setStatusArea("Step" + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
+                        setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
                         system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
                         parts_done++;
@@ -1280 +1280 @@
         if (!event.GetInt() ) {
                 OptionsPanel->Hide(); 
-                MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
+                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
         else {
-                //Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
-                //wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                      "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
-                //YesNoDialog->ShowModal();
+//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
+                wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
+                YesNoDialog->ShowModal();
                 OptionsPanel->Show();
-                MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
-        }
+                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
+        }
+        
 }