Changeset 358 for AE


Ignore:
Timestamp:
Jun 20, 2009, 12:25:08 AM (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • AE/Installer/trunk/source/aeinstallerapp.cpp

    r356 r358  
    99// Licence:     
    1010/////////////////////////////////////////////////////////////////////////////
     11#include "boost/thread.hpp"
     12#include <boost/thread/mutex.hpp>
    1113
    1214#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
     
    117119                }
    118120                else {
    119                         //globalize...
     121                        TheWindow->InstallButton->Disable();
     122                TheWindow->ReglobalizeButton->Disable();
     123
     124#ifdef WIN32
     125
     126                boost::thread thrd3(globalizeData);
     127                //globalizeData();
     128                //boost::thread::create_thread(&globalizeData);
     129                //       boost::thread_group Tg;
     130                // Tg.create_thread( &globalizeData(), this );
     131#else
     132                globalizeData();
     133                setProgressBar(1000);
     134                setStatusArea("Done!");
     135#endif
     136               
     137                TheWindow->InstallButton->Enable();
     138                TheWindow->ReglobalizeButton->Enable();
    120139                }
    121140        }
  • AE/Installer/trunk/source/installer.h

    r355 r358  
    4949                cout << "\n";
    5050        }
    51        
    52              bool operator < (const ModPackage &fs)
     51
     52             bool operator < (const ModPackage &fs) const
    5353     { return (name < fs.name);}
    5454
    55      bool operator > (const ModPackage &fs)
     55     bool operator > (const ModPackage &fs) const
    5656     { return (name > fs.name);}
    5757
    58      bool operator == (const ModPackage &fs)
     58     bool operator == (const ModPackage &fs) const
    5959     { return (name == fs.name);}
    6060};
  • AE/Installer/trunk/source/main_window.cpp

    r357 r358  
    301301                for(int j = 0; j < GDFPaths.size(); j++) {
    302302                        logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
    303                         setStatusArea("Step" + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
     303                        setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
    304304                        system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
    305305                        parts_done++;
     
    12801280        if (!event.GetInt() ) {
    12811281                OptionsPanel->Hide();
    1282                 MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
     1282                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
    12831283        else {
    1284                 //Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
    1285                 //wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                      "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
    1286                 //YesNoDialog->ShowModal();
     1284//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
     1285                wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
     1286                YesNoDialog->ShowModal();
    12871287                OptionsPanel->Show();
    1288                 MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
    1289         }
     1288                this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
     1289        }
     1290       
    12901291}
    12911292
Note: See TracChangeset for help on using the changeset viewer.