Subversion Repositories spk

Rev

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

Rev 126 Rev 129
Line 28... Line 28...
28
			// update graphic
28
			// update graphic
29
			bool addedIcon = false;
29
			bool addedIcon = false;
30
			C_File *picFile = p->GetFirstFile(FILETYPE_ADVERT);
30
			C_File *picFile = p->GetFirstFile(FILETYPE_ADVERT);
31
			if ( picFile )
31
			if ( picFile )
32
			{
32
			{
33
				System::String ^pic = SystemStringFromCyString(picFile->GetFilePointer());
33
				System::String ^pic = _US(picFile->filePointer());
34
				if ( System::IO::File::Exists(pic) )
34
				if ( System::IO::File::Exists(pic) )
35
				{
35
				{
36
					Bitmap ^myBitmap = gcnew Bitmap(pic);
36
					Bitmap ^myBitmap = gcnew Bitmap(pic);
37
					if ( myBitmap )
37
					if ( myBitmap )
38
					{
38
					{
Line 220... Line 220...
220
				p->ReadIconFileToMemory();
220
				p->ReadIconFileToMemory();
221
				p->GetIcon()->SetFilename(m_pPackages->GetTempDirectory().FindReplace("\\", "/") + "/" + p->author() + "_" + p->name() + "." + p->GetIconExt());
221
				p->GetIcon()->SetFilename(m_pPackages->GetTempDirectory().FindReplace("\\", "/") + "/" + p->author() + "_" + p->name() + "." + p->GetIconExt());
222
				p->GetIcon()->SetFullDir(m_pPackages->GetTempDirectory());
222
				p->GetIcon()->SetFullDir(m_pPackages->GetTempDirectory());
223
				if ( p->GetIcon()->UncompressData() )
223
				if ( p->GetIcon()->UncompressData() )
224
				{
224
				{
225
					if ( p->GetIcon()->WriteFilePointer() )
225
					if ( p->GetIcon()->writeFilePointer() )
226
						addedIcon = true;
226
						addedIcon = true;
227
				}
227
				}
228
 
228
 
229
				if ( !addedIcon )
229
				if ( !addedIcon )
230
					p->SetIcon(NULL, "");
230
					p->SetIcon(NULL, "");
Line 237... Line 237...
237
				if ( p->ReadFileToMemory(f) )
237
				if ( p->ReadFileToMemory(f) )
238
				{
238
				{
239
					f->SetFullDir(m_pPackages->GetTempDirectory());
239
					f->SetFullDir(m_pPackages->GetTempDirectory());
240
					if ( f->UncompressData() )
240
					if ( f->UncompressData() )
241
					{
241
					{
242
						if ( f->WriteFilePointer() )
242
						if ( f->writeFilePointer() )
243
							done = true;
243
							done = true;
244
					}
244
					}
245
				}
245
				}
246
 
246
 
247
				if ( !done )
247
				if ( !done )
Line 313... Line 313...
313
		if ( m_lAvailablePackages )
313
		if ( m_lAvailablePackages )
314
		{
314
		{
315
			for ( CBaseFile *p = m_lAvailablePackages->First(); p; p = m_lAvailablePackages->Next() )
315
			for ( CBaseFile *p = m_lAvailablePackages->First(); p; p = m_lAvailablePackages->Next() )
316
			{
316
			{
317
				if ( p->GetIcon() )
317
				if ( p->GetIcon() )
318
					CFileIO::Remove(p->GetIcon()->GetFilePointer().ToString());
318
					CFileIO::Remove(p->GetIcon()->filePointer());
319
				delete p;
319
				delete p;
320
			}
320
			}
321
			m_lAvailablePackages->destroy();
321
			m_lAvailablePackages->destroy();
322
			delete m_lAvailablePackages;
322
			delete m_lAvailablePackages;
323
		}
323
		}
Line 472... Line 472...
472
						// update graphic
472
						// update graphic
473
						bool addedIcon = false;
473
						bool addedIcon = false;
474
						C_File *picFile = p->GetFirstFile(FILETYPE_ADVERT);
474
						C_File *picFile = p->GetFirstFile(FILETYPE_ADVERT);
475
						if ( picFile )
475
						if ( picFile )
476
						{
476
						{
477
							System::String ^pic = SystemStringFromCyString(picFile->GetFilePointer());
477
							System::String ^pic = _US(picFile->filePointer());
478
							if ( System::IO::File::Exists(pic) )
478
							if ( System::IO::File::Exists(pic) )
479
							{
479
							{
480
								Bitmap ^myBitmap = gcnew Bitmap(pic);
480
								Bitmap ^myBitmap = gcnew Bitmap(pic);
481
								if ( myBitmap )
481
								if ( myBitmap )
482
								{
482
								{