Subversion Repositories spk

Rev

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

Rev 173 Rev 175
Line 91... Line 91...
91
		}
91
		}
92
		else
92
		else
93
			m_pPackage = base;
93
			m_pPackage = base;
94
		
94
		
95
		m_pPackage->adjustChanged(false);
95
		m_pPackage->adjustChanged(false);
96
		m_pPackage->UpdateSigned(true);
96
		m_pPackage->updateSigned(true);
97
		this->UpdateChanged();
97
		this->UpdateChanged();
98
		m_bLoading = true;
98
		m_bLoading = true;
99
 
99
 
100
		if ( m_pPackage->AnyFileType(FILETYPE_ADVERT) )
100
		if ( m_pPackage->AnyFileType(FILETYPE_ADVERT) )
101
		{
101
		{
Line 316... Line 316...
316
			this->ListWares->Items->Add(item);
316
			this->ListWares->Items->Add(item);
317
		}
317
		}
318
		this->ListWares->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
318
		this->ListWares->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
319
 
319
 
320
		this->UpdateWareText();
320
		this->UpdateWareText();
321
		m_pPackage->UpdateSigned(false);
321
		m_pPackage->updateSigned(false);
322
		this->UpdateChanged();
322
		this->UpdateChanged();
323
	}
323
	}
324
 
324
 
325
	void PackageForm::UpdateWareText()
325
	void PackageForm::UpdateWareText()
326
	{
326
	{
Line 1150... Line 1150...
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("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();
1159
		}
1159
		}
1160
	}
1160
	}
Line 1312... Line 1312...
1312
						 e->Cancel = true;
1312
						 e->Cancel = true;
1313
						 return;
1313
						 return;
1314
					}
1314
					}
1315
				}
1315
				}
1316
 
1316
 
1317
				if ( !m_pPackage->WriteFile(m_pPackage->filename()) )
1317
				if ( !m_pPackage->writeFile(m_pPackage->filename()) )
1318
				{
1318
				{
1319
					e->Cancel = true;
1319
					e->Cancel = true;
1320
					MessageBox::Show("Unable to save package\n" + _US(m_pPackage->filename()), "Save Error", MessageBoxButtons::OK, MessageBoxIcon::Error);
1320
					MessageBox::Show("Unable to save package\n" + _US(m_pPackage->filename()), "Save Error", MessageBoxButtons::OK, MessageBoxIcon::Error);
1321
					return;
1321
					return;
1322
				}
1322
				}
Line 1675... Line 1675...
1675
 
1675
 
1676
		if ( removeFiles.size() )
1676
		if ( removeFiles.size() )
1677
		{
1677
		{
1678
			for ( C_File *f = removeFiles.First(); f; f = removeFiles.Next() )
1678
			for ( C_File *f = removeFiles.First(); f; f = removeFiles.Next() )
1679
				m_pPackage->removeFile(f);
1679
				m_pPackage->removeFile(f);
1680
			m_pPackage->UpdateSigned(false);
1680
			m_pPackage->updateSigned(false);
1681
			this->UpdateFileList();
1681
			this->UpdateFileList();
1682
			this->UpdateDisplayPic();
1682
			this->UpdateDisplayPic();
1683
			this->UpdateChanged();
1683
			this->UpdateChanged();
1684
		}
1684
		}
1685
 
1685