ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/main_window.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 389 by gumby, Mon Jul 6 00:59:40 2009 UTC vs.
Revision 390 by gumby, Mon Jul 6 14:02:56 2009 UTC

# Line 148 | Line 148 | int globalizeData(void)
148  
149                  if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats");
150                  create_directory( "packages/VanillaDats" );
151 –
151                  create_directory( "packages/VanillaDats/level0_Final/" );
152                  //blah blah finish this.
153                  //logfile <<  "packages/VanillaDats/level0_Final/ created";
# Line 261 | Line 260 | int globalizeData(void)
260                                                                  if(!exists( Archive / dir_itr->filename())) rename(dir_itr->path(), Archive / dir_itr->filename());
261                                                                  else remove(dir_itr->path());
262                                                  }
263 +                                                else if (dir_itr->path().filename().substr(0,4) == "ONWC") { //fix for buggy ONWC overriding
264 +                                                                cout <<dir_itr->path().filename() << "\n";
265 +
266 +                                                                if(!exists( "packages/VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "packages/VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final/" +  dir_itr->filename());
267 +                                                                else remove(dir_itr->path());
268 +                                                }
269                                                  if (exists(dir_itr->path())) {
270  
271                                                  }
# Line 330 | Line 335 | int globalizeData(void)
335                  setProgressBar( 1000 );
336                  
337                  // 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/
338 <                
339 <                // CIP:then copy persist.dat and keyconfig.txt into edition/ as well
340 <                
338 >                // or we could just include it in the zip in the proper place already.
339 >
340 >                copy("../../persist.dat","../persist.dat");
341 >                copy("../../keyconfig.txt","../keyconfig.txt");
342   #ifndef WIN32
343                  /* 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).
344                     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,
# Line 345 | Line 351 | int globalizeData(void)
351                  
352   #endif
353                  
354 +                
355                  setStatusArea((string)"Done! Now select your mod packages and click install.");
356                  //      while(1) Sleep(-1);
357  
# Line 974 | Line 981 | void MainWindow::CreateControls()
981      itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
982      menuBar->Append(itemMenu42, _("Options"));
983      wxMenu* itemMenu44 = new wxMenu;
984 <    itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
985 <    menuBar->Append(itemMenu44, _("Help"));
984 > #ifdef WIN32
985 >        itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
986 >        menuBar->Append(itemMenu44, _("Help"));
987 > #else
988 >        itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
989 > #endif  
990 >
991      itemFrame1->SetMenuBar(menuBar);
992  
993      wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
# Line 1116 | Line 1128 | void MainWindow::CreateControls()
1128                  strImportOption = "-import:nosep";
1129                  splitInstances = SPLIT;
1130          }
1131 <
1131 >        
1132          globalPackages = getPackages();
1133          globalInstalledMods = getInstallString();
1134          for (int i = 0; i < globalPackages.size(); i++) {
# Line 1128 | Line 1140 | void MainWindow::CreateControls()
1140          TheInstallButton = InstallButton;
1141          TheProgressBar = ProgressBar;
1142          OptionsPanel->Hide();
1143 +        
1144 + //#ifndef WIN32
1145 + //      itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1146 +        
1147 + //#endif
1148 +        
1149          if(splitInstances == SPLIT) SeperatedRadio->SetValue(true);
1150          else CompleteRadio->SetValue(true);
1133 –
1134 –
1135 –
1151          if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
1152          else SepRadio->SetValue(true);
1153  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)