Subversion Repositories spk

Rev

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

Rev 158 Rev 160
Line 1148... Line 1148...
1148
			{
1148
			{
1149
				System::String ^file = fileArray[i];
1149
				System::String ^file = fileArray[i];
1150
				int filetype = m_pP->AdjustFileType(CyStringFromSystemString(file), ofd->FilterIndex - 1);				
1150
				int filetype = m_pP->AdjustFileType(CyStringFromSystemString(file), ofd->FilterIndex - 1);				
1151
				C_File *f = m_pPackage->AddFile(CyStringFromSystemString(file), dir, filetype, this->ComboGameFilter->SelectedIndex > 1 ? (1 << (this->ComboGameFilter->SelectedIndex - 1) | 1 << 31) : 0);
1151
				C_File *f = m_pPackage->AddFile(CyStringFromSystemString(file), dir, filetype, this->ComboGameFilter->SelectedIndex > 1 ? (1 << (this->ComboGameFilter->SelectedIndex - 1) | 1 << 31) : 0);
1152
				if ( (ofd->FilterIndex - 1) == FILETYPE_MOD )
1152
				if ( (ofd->FilterIndex - 1) == FILETYPE_MOD )
1153
					m_pPackage->AddFile(CFileIO(CyStringFromSystemString(file)).ChangeFileExtension("dat"), dir, filetype);
1153
					m_pPackage->AddFile(CFileIO(CyStringFromSystemString(file)).changeFileExtension("dat"), dir, filetype);
1154
			}
1154
			}
1155
			m_pPackage->UpdateSigned(false);
1155
			m_pPackage->UpdateSigned(false);
1156
			this->UpdateFileList();
1156
			this->UpdateFileList();
1157
			this->UpdateDisplayPic();
1157
			this->UpdateDisplayPic();
1158
			this->UpdateChanged();
1158
			this->UpdateChanged();
Line 1394... Line 1394...
1394
		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
1394
		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
1395
		{
1395
		{
1396
			Utils::String file = _S(ofd->FileName);
1396
			Utils::String file = _S(ofd->FileName);
1397
			C_File *icon = new C_File(file);
1397
			C_File *icon = new C_File(file);
1398
			if ( icon->ReadFromFile() )
1398
			if ( icon->ReadFromFile() )
1399
				m_pPackage->SetIcon(icon, CFileIO(file).GetFileExtension());
1399
				m_pPackage->SetIcon(icon, CFileIO(file).extension());
1400
 
1400
 
1401
			this->UpdateDisplayIcon();
1401
			this->UpdateDisplayIcon();
1402
			this->UpdateChanged();
1402
			this->UpdateChanged();
1403
		}
1403
		}
1404
	}
1404
	}