Subversion Repositories spk

Rev

Rev 185 | Rev 196 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 185 Rev 191
Line 421... Line 421...
421 
				catch (System::IO::IOException ^) {}
 421 
				catch (System::IO::IOException ^) {}
422 
				catch (System::Exception ^) {}
 422 
				catch (System::Exception ^) {}
423 
 
 423 
 
424 
				if ( lines )
 424 
				if ( lines )
425 
				{
 425 
				{
426 
					CyString strLines = CyStringFromSystemString(lines);
 426 
					Utils::WString strLines = _WS(lines);
427 
					int num;
 427 
					int num;
428 
					CyString *aLines = strLines.SplitToken("\n", &num);
 428 
					Utils::WString *aLines = strLines.tokenise(L"\n", &num);
429 
					if ( num && aLines )
 429 
					if ( num && aLines )
430 
					{
 430 
					{
431 
						ArrayList ^list = gcnew ArrayList();
 431 
						ArrayList ^list = gcnew ArrayList();
432 
						for ( int i = 0; i < num; i++ )
 432 
						for ( int i = 0; i < num; i++ )
433 
						{
 433 
						{
434 
							CyString l = aLines[i];
 434 
							Utils::WString l = aLines[i];
435 
							l = l.Remove(&quot;\r&quot;);
 435 
							l = l.remove(&apos;\r&apos;);
436 
							CyString first = l.GetToken(":", 1, 1);
 436 
							Utils::WString first = l.token(L":", 1);
437 
							CyString rest = l.GetToken(":", 2);
 437 
							Utils::WString rest = l.tokens(L":", 2);
438 
							rest.RemoveFirstSpace();
 438 
							rest.removeFirstSpace();
439 
 
 439 
 
440 
							if ( first.Compare("File") )
 440 
							if ( first.Compare("File") )
441 
								list->Add(SystemStringFromCyString(rest));
 441 
								list->Add(_US(rest));
442 
						}
 442 
						}
443 
 
 443 
 
444 
						CLEANSPLIT(aLines, num)
 444 
						CLEANSPLIT(aLines, num)
445 
 
 445 
 
446 
						this->OpenFiles(list, true, true);
 446 
						this->OpenFiles(list, true, true);
Line 480... Line 480...
480 
						exportFilename = CFileIO(exportFilename).dir() + "/" + CFileIO(exportFilename).baseName() + "_" + CBaseFile::ConvertGameToString(game) + ".zip";
 480 
						exportFilename = CFileIO(exportFilename).dir() + "/" + CFileIO(exportFilename).baseName() + "_" + CBaseFile::ConvertGameToString(game) + ".zip";
481 
					}
 481 
					}
482 
					if ( p->saveToArchive(exportFilename, game, m_pPackages->GetGameExe()) ) {
 482 
					if ( p->saveToArchive(exportFilename, game, m_pPackages->GetGameExe()) ) {
483 
						String ^message = "Export: " + file + "\nTo: " + _US(CFileIO(exportFilename).filename());
 483 
						String ^message = "Export: " + file + "\nTo: " + _US(CFileIO(exportFilename).filename());
484 
						if ( game ) {
 484 
						if ( game ) {
485 
							message += "\nGame: " + SystemStringFromCyString(m_pPackages->GetGameExe()->GetGame(game - 1)->sName);
 485 
							message += "\nGame: " + _US(m_pPackages->GetGameExe()->GetGame(game - 1)->sName);
486 
						}
 486 
						}
487 
						MessageBox::Show(this, message, "Exported Package", MessageBoxButtons::OK, MessageBoxIcon::Information);
 487 
						MessageBox::Show(this, message, "Exported Package", MessageBoxButtons::OK, MessageBoxIcon::Information);
488 
					}
 488 
					}
489 
					else {
 489 
					else {
490 
						MessageBox::Show(this, "Error: Unable to export to:\n" + _US(exportFilename), "Error Export", MessageBoxButtons::OK, MessageBoxIcon::Error);					}
 490 
						MessageBox::Show(this, "Error: Unable to export to:\n" + _US(exportFilename), "Error Export", MessageBoxButtons::OK, MessageBoxIcon::Error);					}
Line 903... Line 903...
903 
			}
903 
			}
904 
			else
 904 
			else
905 
			{
 905 
			{
906 
				if ( display )
 906 
				if ( display )
907 
				{
 907 
				{
908 
					System::String ^sError = "Unknown Error (" + SystemStringFromCyString(CyString::Number(error)) + ")";
 908 
					System::String ^sError = "Unknown Error (" + _US(Utils::WString::Number(error)) + ")";
909 
					switch ( error )
 909 
					switch ( error )
910 
					{
 910 
					{
911 
						case INSTALLERR_OLD:
 911 
						case INSTALLERR_OLD:
912 
							sError = "Old unsupported package file";
 912 
							sError = "Old unsupported package file";
913 
							break;
 913 
							break;
Line 1011... Line 1011...
1011 
			// add all none open items
 1011 
			// add all none open items
1012 
			bool sep = false;
 1012 
			bool sep = false;
1013 
			for ( SStringList *str = m_pLoadedList->Head(); str; str = str->next )
 1013 
			for ( SStringList *str = m_pLoadedList->Head(); str; str = str->next )
1014 
			{
 1014 
			{
1015 
				// check if we have it open
 1015 
				// check if we have it open
1016 
				System::String ^sFile = SystemStringFromCyString(str->str.findreplace("/", "\\"));
 1016 
				System::String ^sFile = _US(str->str.findreplace("/", "\\").ToString());
1017 
				if ( this->IsOpen(sFile) )
 1017 
				if ( this->IsOpen(sFile) )
1018 
					continue;
 1018 
					continue;
1019 
				if ( this->IsOpen(SystemStringFromCyString(str->str.findreplace("\\", "/"))) )
 1019 
				if ( this->IsOpen(_US(str->str.findreplace("\\", "/").ToString())) )
1020 
					continue;
 1020 
					continue;
1021 
 
 1021 
 
1022 
				if ( !IO::File::Exists(sFile) )
 1022 
				if ( !IO::File::Exists(sFile) )
1023 
					continue;
 1023 
					continue;
1024 
 
 1024