Subversion Repositories spk

Rev

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

Rev 170 Rev 175
Line 549... Line 549...
549 
					MessageBox::Show(this, "Unable to open package file:\n" + file + "\n\nFile doesn't exist", "Load Error", MessageBoxButtons::OK, MessageBoxIcon::Error);
 549 
					MessageBox::Show(this, "Unable to open package file:\n" + file + "\n\nFile doesn't exist", "Load Error", MessageBoxButtons::OK, MessageBoxIcon::Error);
550 
				return;
 550 
				return;
551 
			}
 551 
			}
552 
 
 552 
 
553 
			float fVersion;
 553 
			float fVersion;
554 
			CyString sFile = CyStringFromSystemString(file);
 554 
			Utils::String sFile = _S(file);
555 
			int fileType = CSpkFile::CheckFile(sFile, &fVersion);
 555 
			int fileType = CSpkFile::CheckFile(sFile, &fVersion);
556 
 
 556 
 
557 
			if ( fVersion > (float)FILEVERSION )
 557 
			if ( fVersion > (float)FILEVERSION )
558 
			{
 558 
			{
559 
				if ( display )
 559 
				if ( display )
Line 610... Line 610...
610 
					{
 610 
					{
611 
						if (package->icon())
 611 
						if (package->icon())
612 
						{
 612 
						{
613 
							package->ReadIconFileToMemory();
 613 
							package->ReadIconFileToMemory();
614 
							Utils::String sIconFile = _S(IO::Path::GetTempPath()) + "\\" + CFileIO(sFile).baseName() + "." + package->iconExt();
 614 
							Utils::String sIconFile = _S(IO::Path::GetTempPath()) + "\\" + CFileIO(sFile).baseName() + "." + package->iconExt();
615 
							if ( package->ExtractFile(package->icon(), CFileIO(sIconFile).fullFilename(), false) )
 615 
							if ( package->extractFile(package->icon(), CFileIO(sIconFile).fullFilename(), false) )
616 
							{
 616 
							{
617 
								String ^iconFile = _US(sIconFile);
 617 
								String ^iconFile = _US(sIconFile);
618 
								if ( IO::File::Exists(iconFile) )
 618 
								if ( IO::File::Exists(iconFile) )
619 
								{
 619 
								{
620 
									String ^ext = System::IO::FileInfo(iconFile).Extension;
 620 
									String ^ext = System::IO::FileInfo(iconFile).Extension;
Line 655... Line 655...
655 
				}
 655 
				}
656 
				childForm->WindowState = FormWindowState::Maximized;
 656 
				childForm->WindowState = FormWindowState::Maximized;
657 
				childForm->ChangeView(m_curView);
 657 
				childForm->ChangeView(m_curView);
658 
 
 658 
 
659 
				// adjust the loaded list
 659 
				// adjust the loaded list
660 
				sFile.FindReplace("/", "\\");
 660 
				sFile = sFile.findReplace("/", "\\").remove(9).remove('\r').remove('\n');
661 
				sFile.RemoveChar(9);
 - 
 
662 
				sFile.RemoveChar('\r');
 - 
 
663 
				sFile.RemoveChar('\n');
 - 
 
664 
				m_pLoadedList->Remove(sFile, true);
 661 
				m_pLoadedList->Remove(sFile, true);
665 
				m_pLoadedList->PushFront(sFile);
 662 
				m_pLoadedList->PushFront(CyString(sFile));
666 
 
 663 
 
667 
				while ( m_pLoadedList->Count() > 15 )
 664 
				while ( m_pLoadedList->Count() > 15 )
668 
					m_pLoadedList->PopBack();
 665 
					m_pLoadedList->PopBack();
669 
 
 666 
 
670 
				this->SaveData();
 667 
				this->SaveData();