Subversion Repositories spk

Rev

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

Rev 134 Rev 158
Line 331... Line 331...
331
 
331
 
332
		// now display
332
		// now display
333
		for ( i = 0; i < aPackages->Length; i++ )
333
		for ( i = 0; i < aPackages->Length; i++ )
334
		{
334
		{
335
			CBaseFile *p = (m_bSortingAsc) ? aPackages[i]->Package : aPackages[(aPackages->Length - 1 - i)]->Package;
335
			CBaseFile *p = (m_bSortingAsc) ? aPackages[i]->Package : aPackages[(aPackages->Length - 1 - i)]->Package;
336
			CyString name;
336
			Utils::String name;
337
			if ( p->GetType() == TYPE_ARCHIVE )
337
			if ( p->GetType() == TYPE_ARCHIVE )
338
				name = CFileIO(p->filename()).GetFilename();
338
				name = CFileIO(p->filename()).filename();
339
			else
339
			else
340
				name = p->GetLanguageName(m_pPackages->GetLanguage());
340
				name = p->GetLanguageName(m_pPackages->GetLanguage()).ToString();
341
 
341
 
342
			int indent = 0;
342
			int indent = 0;
343
			CBaseFile *parent = p;
343
			CBaseFile *parent = p;
344
 
344
 
345
			if ( p->GetParent() && p->GetParent()->GetType() == TYPE_SPK && ((CSpkFile *)p->GetParent())->IsLibrary() )
345
			if ( p->GetParent() && p->GetParent()->GetType() == TYPE_SPK && ((CSpkFile *)p->GetParent())->IsLibrary() )
Line 593... Line 593...
593
	{
593
	{
594
		bool errored = false;
594
		bool errored = false;
595
 
595
 
596
		if ( file->Length )
596
		if ( file->Length )
597
		{
597
		{
598
			int error;
598
			int error = INSTALLERR_NONE;
599
			CBaseFile *package = m_pPackages->OpenPackage(CyStringFromSystemString(file), &error, 0, SPKREAD_NODATA, READFLAG_NOUNCOMPRESS);
599
			CBaseFile *package = m_pPackages->OpenPackage(CyStringFromSystemString(file), &error, 0, SPKREAD_NODATA, READFLAG_NOUNCOMPRESS);
600
			if ( error == INSTALLERR_NOMULTI )
600
			if ( error == INSTALLERR_NOMULTI )
601
			{
601
			{
602
				CLinkList<CBaseFile> erroredList;
602
				CLinkList<CBaseFile> erroredList;
603
				m_pPackages->PrepareMultiPackage(CyStringFromSystemString(file), &erroredList, &error, 0);
603
				m_pPackages->PrepareMultiPackage(CyStringFromSystemString(file), &erroredList, &error, 0);
Line 2272... Line 2272...
2272
							if ( l != m_pPackages->GetLanguage() )
2272
							if ( l != m_pPackages->GetLanguage() )
2273
								continue;
2273
								continue;
2274
						}
2274
						}
2275
 
2275
 
2276
						Windows::Forms::ToolStripMenuItem ^item = gcnew Windows::Forms::ToolStripMenuItem();
2276
						Windows::Forms::ToolStripMenuItem ^item = gcnew Windows::Forms::ToolStripMenuItem();
2277
						item->Text = SystemStringFromCyString(f->GetFilename());
2277
						item->Text = _US(f->filename());
2278
						item->Image = this->viewReadmeToolStripMenuItem->Image;
2278
						item->Image = this->viewReadmeToolStripMenuItem->Image;
2279
						item->ImageScaling = ToolStripItemImageScaling::None;
2279
						item->ImageScaling = ToolStripItemImageScaling::None;
2280
						item->Click += gcnew System::EventHandler(this, &MainGui::RunItem);
2280
						item->Click += gcnew System::EventHandler(this, &MainGui::RunItem);
2281
						item->Tag = _US(f->filePointer());
2281
						item->Tag = _US(f->filePointer());
2282
						this->viewReadmeToolStripMenuItem->DropDownItems->Add(item);
2282
						this->viewReadmeToolStripMenuItem->DropDownItems->Add(item);
Line 2297... Line 2297...
2297
					{
2297
					{
2298
						if ( !f->GetDir().Left(6).Compare("extras") )
2298
						if ( !f->GetDir().Left(6).Compare("extras") )
2299
							continue;
2299
							continue;
2300
 
2300
 
2301
						Windows::Forms::ToolStripMenuItem ^item = gcnew Windows::Forms::ToolStripMenuItem();
2301
						Windows::Forms::ToolStripMenuItem ^item = gcnew Windows::Forms::ToolStripMenuItem();
2302
						item->Text = SystemStringFromCyString(f->GetFilename());
2302
						item->Text = _US(f->filename());
2303
						if ( this->imageList2->Images->IndexOfKey(SystemStringFromCyString(f->GetFileExt().ToLower())) > -1 )
2303
						if ( this->imageList2->Images->IndexOfKey(_US(f->fileExt().lower())) > -1 )
2304
							item->Image = this->imageList2->Images[this->imageList2->Images->IndexOfKey(SystemStringFromCyString(f->GetFileExt().ToLower()))];
2304
							item->Image = this->imageList2->Images[this->imageList2->Images->IndexOfKey(_US(f->fileExt().lower()))];
2305
						else
2305
						else
2306
						{
2306
						{
2307
							Utils::String exe = f->filePointer();
2307
							Utils::String exe = f->filePointer();
2308
							exe = exe.findReplace("/", "\\");
2308
							exe = exe.findReplace("/", "\\");
2309
							wchar_t wText[200];
2309
							wchar_t wText[200];