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 239... Line 239...
239 
			}
 239 
			}
240 
 
 240 
 
241 
			if ( !e || !activePackage )
 241 
			if ( !e || !activePackage )
242 
				this->StatusFiles->Text = "";
 242 
				this->StatusFiles->Text = "";
243 
			else
 243 
			else
244 
				this->StatusFiles->Text = "Files: " + activePackage->GetFileList()->size() + " (" + SystemStringFromCyString(activePackage->GetFullFileSizeString()) + ")";
 244 
				this->StatusFiles->Text = "Files: " + activePackage->fileList().size() + " (" + _US(activePackage->fileSizeString()) + ")";
245 
		}
 245 
		}
246 
 
 246 
 
247 
		void SelectedFile(bool selected)
 247 
		void SelectedFile(bool selected)
248 
		{
 248 
		{
249 
			this->ToolExtract->Enabled = selected;
 249 
			this->ToolExtract->Enabled = selected;
Line 606... Line 606...
606 
				if ( package )
 606 
				if ( package )
607 
				{
 607 
				{
608 
					tp = gcnew TabPage();
 608 
					tp = gcnew TabPage();
609 
					if ( this->imageList1->Images->IndexOfKey(file) == -1 )
 609 
					if ( this->imageList1->Images->IndexOfKey(file) == -1 )
610 
					{
 610 
					{
611 
						if ( package->GetIcon() )
 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->GetIcon(), CFileIO(sIconFile).fullFilename(), false) )
 615 
							if ( package->ExtractFile(package->icon(), CFileIO(sIconFile).fullFilename(), false) )
616 
							{
 616 
							{
617 
								String ^iconFile = SystemStringFromCyString(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;
621 
									if ( !String::Compare(ext, "bmp", false) || !String::Compare(ext, "ico", false) )
 621 
									if ( !String::Compare(ext, "bmp", false) || !String::Compare(ext, "ico", false) )
622 
										this->imageList1->Images->Add(file, Bitmap::FromFile(iconFile));
 622 
										this->imageList1->Images->Add(file, Bitmap::FromFile(iconFile));