Changeset 358 for AE/Installer/trunk/source/main_window.cpp

Timestamp:

Jun 20, 2009, 12:25:08 AM (11 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

File:

• AE/Installer/trunk/source/main_window.cpp (modified) (2 diffs)

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());
+        }
+        
 }