Subversion Repositories spk

Rev

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

Rev 191 Rev 196
Line 1148... Line 1148...
1148 
			{
 1148 
			{
1149 
				System::String ^file = fileArray[i];
 1149 
				System::String ^file = fileArray[i];
1150 
				FileType filetype = m_pP->adjustFileType(_S(file), static_cast<FileType>(ofd->FilterIndex - 1));
 1150 
				FileType filetype = m_pP->adjustFileType(_S(file), static_cast<FileType>(ofd->FilterIndex - 1));
1151 
				C_File *f = m_pPackage->addFile(_S(file), dir, filetype, this->ComboGameFilter->SelectedIndex > 1 ? (1 << (this->ComboGameFilter->SelectedIndex - 1) | 1 << 31) : 0);
 1151 
				C_File *f = m_pPackage->addFile(_S(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(_S(file)).changeFileExtension("dat"), dir, filetype);
 1153 
					m_pPackage->addFile(CFileIO(_S(file)).changeFileExtension(L"dat").toString(), 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 1391... Line 1391...
1391 
		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
 1391 
		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
1392 
		{
 1392 
		{
1393 
			Utils::String file = _S(ofd->FileName);
 1393 
			Utils::String file = _S(ofd->FileName);
1394 
			C_File *icon = new C_File(file);
 1394 
			C_File *icon = new C_File(file);
1395 
			if ( icon->ReadFromFile() )
 1395 
			if ( icon->ReadFromFile() )
1396 
				m_pPackage->setIcon(icon, CFileIO(file).extension());
 1396 
				m_pPackage->setIcon(icon, CFileIO(file).extension().toString());
1397 
 
 1397 
 
1398 
			this->UpdateDisplayIcon();
 1398 
			this->UpdateDisplayIcon();
1399 
			this->UpdateChanged();
 1399 
			this->UpdateChanged();
1400 
		}
 1400 
		}
1401 
	}
 1401 
	}