WebSVN – spk – Diff – /SpkExplorer/src/Forms/ExtractDialog.cpp



		if ( m_sFailed->Length )
		{
			if ( m_pMultiPackage )
				m_pFailedList->PushBack(CyString(m_pWorkingPackage->sName), CyStringFromSystemString(m_sFailed));
			else
				m_pFailedList->PushBack(CyString(m_pWorkingFile->getNameDirectory(NULL)), CyStringFromSystemString(m_sFailed));
		}
 
		if ( m_iWorkingStatus == WORKER_WRITE || m_sFailed->Length )
			this->DoNextFile();
		else

		{
			case WORKER_READ:
				{
					String ^checkFile;
					if ( m_pMultiPackage )
						checkFile = m_sToDir + "/" + _US(m_pWorkingPackage->sName);
					else
						checkFile = m_sToDir + "/" + _US(m_pWorkingFile->getNameDirectory(NULL));
					if ( !this->CheckExists(checkFile) )
					{
						start = false;
						if ( !m_bCancel )
							this->DoNextFile();

	}
 
 
	void ExtractDialog::UpdateDisplay()
	{
		Utils::String sToDir = _S(m_sToDir);
 
		int max = 0;
		if ( m_pMultiPackage )
			max = m_pMultiList->size();
		else
			max = m_pList->size();
 
		this->Text = "Extracting Files [" + (m_iCount + 1) + "/" + max + "]";
 
		Utils::String filename;
		if ( m_pMultiPackage )
			filename = sToDir + "/" + m_pWorkingPackage->sName;
		else
			filename = sToDir + "/" + m_pWorkingFile->getNameDirectory(NULL);
 
		Utils::String displayFilename = filename;
		displayFilename = displayFilename.findReplace("/", "\\");
		this->LabFilename->Text = _US(displayFilename);
 
		if ( m_pMultiPackage )
			this->LabSize->Text = _US(SPK::GetSizeString(m_pWorkingPackage->lSize));
		else
			this->LabSize->Text = _US(m_pWorkingFile->uncompressedSizeString());
		this->LabStatus->Text = "Waiting";
	}
 
	void ExtractDialog::Start()
	{

Rev 177	Rev 178
Line 133...	Line 133...
133	`if ( m_sFailed->Length )`	133	`if ( m_sFailed->Length )`
134	`{`	134	`{`
135	`if ( m_pMultiPackage )`	135	`if ( m_pMultiPackage )`
136	`m_pFailedList->PushBack(CyString(m_pWorkingPackage->sName), CyStringFromSystemString(m_sFailed));`	136	`m_pFailedList->PushBack(CyString(m_pWorkingPackage->sName), CyStringFromSystemString(m_sFailed));`
137	`else`	137	`else`
138	`m_pFailedList->PushBack(m_pWorkingFile->GetNameDirectory(NULL), CyStringFromSystemString(m_sFailed));`	138	`m_pFailedList->PushBack(CyString(m_pWorkingFile->getNameDirectory(NULL)), CyStringFromSystemString(m_sFailed));`
139	`}`	139	`}`
140		140
141	`if ( m_iWorkingStatus == WORKER_WRITE \|\| m_sFailed->Length )`	141	`if ( m_iWorkingStatus == WORKER_WRITE \|\| m_sFailed->Length )`
142	`this->DoNextFile();`	142	`this->DoNextFile();`
143	`else`	143	`else`
Line 206...	Line 206...
206	`{`	206	`{`
207	`case WORKER_READ:`	207	`case WORKER_READ:`
208	`{`	208	`{`
209	`String ^checkFile;`	209	`String ^checkFile;`
210	`if ( m_pMultiPackage )`	210	`if ( m_pMultiPackage )`
211	`checkFile = m_sToDir + "/" + SystemStringFromCyString(m_pWorkingPackage->sName);`	211	`checkFile = m_sToDir + "/" + _US(m_pWorkingPackage->sName);`
212	`else`	212	`else`
213	`checkFile = m_sToDir + "/" + SystemStringFromCyString(m_pWorkingFile->GetNameDirectory(NULL));`	213	`checkFile = m_sToDir + "/" + _US(m_pWorkingFile->getNameDirectory(NULL));`
214	`if ( !this->CheckExists(checkFile) )`	214	`if ( !this->CheckExists(checkFile) )`
215	`{`	215	`{`
216	`start = false;`	216	`start = false;`
217	`if ( !m_bCancel )`	217	`if ( !m_bCancel )`
218	`this->DoNextFile();`	218	`this->DoNextFile();`
Line 239...	Line 239...
239	`}`	239	`}`
240		240
241		241
242	`void ExtractDialog::UpdateDisplay()`	242	`void ExtractDialog::UpdateDisplay()`
243	`{`	243	`{`
244	`CyString sToDir = CyStringFromSystemString(m_sToDir);`	244	`Utils::String sToDir = _S(m_sToDir);`
245		245
246	`int max = 0;`	246	`int max = 0;`
247	`if ( m_pMultiPackage )`	247	`if ( m_pMultiPackage )`
248	`max = m_pMultiList->size();`	248	`max = m_pMultiList->size();`
249	`else`	249	`else`
250	`max = m_pList->size();`	250	`max = m_pList->size();`
251		251
252	`this->Text = "Extracting Files [" + (m_iCount + 1) + "/" + max + "]";`	252	`this->Text = "Extracting Files [" + (m_iCount + 1) + "/" + max + "]";`
253		253
254	`CyString filename;`	254	`Utils::String filename;`
255	`if ( m_pMultiPackage )`	255	`if ( m_pMultiPackage )`
256	`filename = sToDir + "/" + m_pWorkingPackage->sName;`	256	`filename = sToDir + "/" + m_pWorkingPackage->sName;`
257	`else`	257	`else`
258	`filename = sToDir + "/" + m_pWorkingFile->GetNameDirectory(NULL);`	258	`filename = sToDir + "/" + m_pWorkingFile->getNameDirectory(NULL);`
259		259
260	`CyString displayFilename = filename;`	260	`Utils::String displayFilename = filename;`
261	`displayFilename.FindReplace("/", "\\");`	261	`displayFilename = displayFilename.findReplace("/", "\\");`
262	`this->LabFilename->Text = SystemStringFromCyString(displayFilename);`	262	`this->LabFilename->Text = _US(displayFilename);`
263		263
264	`if ( m_pMultiPackage )`	264	`if ( m_pMultiPackage )`
265	`this->LabSize->Text = SystemStringFromCyString(SPK::GetSizeString(m_pWorkingPackage->lSize));`	265	`this->LabSize->Text = _US(SPK::GetSizeString(m_pWorkingPackage->lSize));`
266	`else`	266	`else`
267	`this->LabSize->Text = SystemStringFromCyString(m_pWorkingFile->GetUncompressedSizeString());`	267	`this->LabSize->Text = _US(m_pWorkingFile->uncompressedSizeString());`
268	`this->LabStatus->Text = "Waiting";`	268	`this->LabStatus->Text = "Waiting";`
269	`}`	269	`}`
270		270
271	`void ExtractDialog::Start()`	271	`void ExtractDialog::Start()`
272	`{`	272	`{`

Subversion Repositories spk

(root)/SpkExplorer/src/Forms/ExtractDialog.cpp – Rev 177 → 178