Subversion Repositories spk

Rev

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

Rev 160 Rev 170
Line 148... Line 148...
148 
			{
 148 
			{
149 
				CBaseFile *activePackage = ((PackageForm ^)active)->GetPackage();
 149 
				CBaseFile *activePackage = ((PackageForm ^)active)->GetPackage();
150 
				if ( !activePackage )
 150 
				if ( !activePackage )
151 
					e = false;
 151 
					e = false;
152 
				else
 152 
				else
153 
					this->StatusFiles->Text = "Files: " + activePackage->GetFileList()->size() + " (" + SystemStringFromCyString(activePackage->GetFullFileSizeString()) + ")";
 153 
					this->StatusFiles->Text = "Files: " + activePackage->fileList().size() + " (" + _US(activePackage->fileSizeString()) + ")";
154 
			}
 154 
			}
155 
			else if ( active && active->GetFormType() == FORMTYPE_MULTI )
 155 
			else if ( active && active->GetFormType() == FORMTYPE_MULTI )
156 
			{
 156 
			{
157 
				CMultiSpkFile *activePackage = ((MultiForm ^)active)->GetPackage();
 157 
				CMultiSpkFile *activePackage = ((MultiForm ^)active)->GetPackage();
158 
				if ( !activePackage )
 158 
				if ( !activePackage )
159 
					e = false;
 159 
					e = false;
160 
				else
 160 
				else
161 
					this->StatusFiles->Text = "Files: " + activePackage->GetAvailableFiles() + " (" + SystemStringFromCyString(SPK::GetSizeString(activePackage->GetFileSize())) + ")";
 161 
					this->StatusFiles->Text = "Files: " + activePackage->GetAvailableFiles() + " (" + _US(SPK::GetSizeString(activePackage->GetFileSize())) + ")";
162 
			}
 162 
			}
163 
			else
 163 
			else
164 
				e = false;
 164 
				e = false;
165 
 
 165 
 
166 
			if ( !e  )
 166 
			if ( !e  )
Line 642... Line 642...
642 
		{
 642 
		{
643 
			CyString sFile = CyStringFromSystemString(file);
 643 
			CyString sFile = CyStringFromSystemString(file);
644 
 
 644 
 
645 
			if ( this->imageList1->Images->IndexOfKey(file) == -1 )
 645 
			if ( this->imageList1->Images->IndexOfKey(file) == -1 )
646 
			{
 646 
			{
647 
				if ( package->GetIcon() )
 647 
				if ( package->icon() )
648 
				{
 648 
				{
649 
					package->ReadIconFileToMemory();
 649 
					package->ReadIconFileToMemory();
650 
					Utils::String sIconFile = _S(IO::Path::GetTempPath()) + "\\" + CFileIO(sFile).baseName() + "." + package->iconExt();
 650 
					Utils::String sIconFile = _S(IO::Path::GetTempPath()) + "\\" + CFileIO(sFile).baseName() + "." + package->iconExt();
651 
					if ( package->ExtractFile(package->GetIcon(), CFileIO(sIconFile).fullFilename(), false) )
 651 
					if ( package->ExtractFile(package->icon(), CFileIO(sIconFile).fullFilename(), false) )
652 
					{
 652 
					{
653 
						String ^iconFile = _US(sIconFile);
 653 
						String ^iconFile = _US(sIconFile);
654 
						if ( IO::File::Exists(iconFile) )
 654 
						if ( IO::File::Exists(iconFile) )
655 
						{
 655 
						{
656 
							String ^ext = System::IO::FileInfo(iconFile).Extension;
 656 
							String ^ext = System::IO::FileInfo(iconFile).Extension;