Subversion Repositories spk

Rev

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

Rev 175 Rev 182
Line 450... Line 450...
450
			}			
450
			}			
451
		}
451
		}
452
 
452
 
453
		void ExportPackage(String ^file)
453
		void ExportPackage(String ^file)
454
		{
454
		{
455
			CyString sFile = CyStringFromSystemString(file);
455
			Utils::String sFile = _S(file);
456
			int error = 0;
456
			int error = 0;
457
 
457
 
458
			CBaseFile *p = m_pPackages->OpenPackage(sFile, &error, 0, SPKREAD_NODATA);
458
			CBaseFile *p = m_pPackages->openPackage(sFile, &error, 0, SPKREAD_NODATA);
459
			if ( !p ) {
459
			if ( !p ) {
460
				MessageBox::Show(this, "Error: Unable to open package file\n" + file, "Error Opening", MessageBoxButtons::OK, MessageBoxIcon::Error);
460
				MessageBox::Show(this, "Error: Unable to open package file\n" + file, "Error Opening", MessageBoxButtons::OK, MessageBoxIcon::Error);
461
			}
461
			}
462
			else {
462
			else {
463
				String ^to = IO::FileInfo(file).DirectoryName;
463
				String ^to = IO::FileInfo(file).DirectoryName;
Line 495... Line 495...
495
		void ExtractPackage(String ^file, bool here)
495
		void ExtractPackage(String ^file, bool here)
496
		{
496
		{
497
			Utils::String sFile = _S(file);
497
			Utils::String sFile = _S(file);
498
			int error = 0;
498
			int error = 0;
499
 
499
 
500
			CBaseFile *p = m_pPackages->OpenPackage(sFile, &error, 0, SPKREAD_NODATA);
500
			CBaseFile *p = m_pPackages->openPackage(sFile, &error, 0, SPKREAD_NODATA);
501
			if ( !p ) {
501
			if ( !p ) {
502
				MessageBox::Show(this, "Error: Unable to open package file\n" + file, "Error Opening", MessageBoxButtons::OK, MessageBoxIcon::Error);
502
				MessageBox::Show(this, "Error: Unable to open package file\n" + file, "Error Opening", MessageBoxButtons::OK, MessageBoxIcon::Error);
503
			}
503
			}
504
			else {
504
			else {
505
				String ^to = nullptr;
505
				String ^to = nullptr;
Line 718... Line 718...
718
 
718
 
719
					for ( int i = 0; i < Files->Length; i++ )
719
					for ( int i = 0; i < Files->Length; i++ )
720
					{
720
					{
721
						Utils::String file = _S(Files[i]);
721
						Utils::String file = _S(Files[i]);
722
						int error = 0;
722
						int error = 0;
723
						CBaseFile *p = m_pPackages->OpenPackage(file, &error, 0, SPKREAD_NODATA);
723
						CBaseFile *p = m_pPackages->openPackage(file, &error, 0, SPKREAD_NODATA);
724
						if ( !p )
724
						if ( !p )
725
							continue;
725
							continue;
726
 
726
 
727
						Utils::String ufile = p->createUpdateFile(_S(fbd->SelectedPath));
727
						Utils::String ufile = p->createUpdateFile(_S(fbd->SelectedPath));
728
						if ( !ufile.empty() )
728
						if ( !ufile.empty() )
Line 757... Line 757...
757
 
757
 
758
					for ( int i = 0; i < Files->Length; i++ )
758
					for ( int i = 0; i < Files->Length; i++ )
759
					{
759
					{
760
						Utils::String file = _S(Files[i]);
760
						Utils::String file = _S(Files[i]);
761
						int error = 0;
761
						int error = 0;
762
						CBaseFile *p = m_pPackages->OpenPackage(file, &error, 0, SPKREAD_NODATA);
762
						CBaseFile *p = m_pPackages->openPackage(file, &error, 0, SPKREAD_NODATA);
763
						if ( !p )
763
						if ( !p )
764
							continue;
764
							continue;
765
 
765
 
766
						filedata.pushBack(CPackages::FormatAvailablePackageData(p));
766
						filedata.pushBack(CPackages::FormatAvailablePackageData(p));
767
						delete p;
767
						delete p;
Line 862... Line 862...
862
			bool loaded = false;
862
			bool loaded = false;
863
 
863
 
864
			int error;
864
			int error;
865
			if ( fileType == SPKFILE_MULTI )
865
			if ( fileType == SPKFILE_MULTI )
866
			{
866
			{
867
				CMultiSpkFile *mspk = m_pPackages->OpenMultiPackage(sFile, &error);
867
				CMultiSpkFile *mspk = m_pPackages->openMultiPackage(sFile, &error);
868
				if ( mspk )
868
				if ( mspk )
869
				{
869
				{
870
					loaded = true;
870
					loaded = true;
871
					BaseForm ^childForm = this->OpenPackage(display, mspk, file, "");
871
					BaseForm ^childForm = this->OpenPackage(display, mspk, file, "");
872
					childForm->Text = file;
872
					childForm->Text = file;
873
				}
873
				}
874
			}
874
			}
875
			else
875
			else
876
			{
876
			{
877
				CBaseFile *package = (convertFile) ? convertFile : m_pPackages->OpenPackage(sFile, &error);
877
				CBaseFile *package = (convertFile) ? convertFile : m_pPackages->openPackage(sFile, &error);
878
				if ( package )
878
				if ( package )
879
				{
879
				{
880
					loaded = true;
880
					loaded = true;
881
					PackageForm ^childForm = this->OpenPackage(display, package, file, "");
881
					PackageForm ^childForm = this->OpenPackage(display, package, file, "");
882
					if ( convertFile )
882
					if ( convertFile )
Line 2109... Line 2109...
2109
private: System::Void fromArchiveToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
2109
private: System::Void fromArchiveToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
2110
			 OpenArchive();
2110
			 OpenArchive();
2111
		 }
2111
		 }
2112
private: System::Void backgroundWorker1_DoWork(System::Object^  sender, System::ComponentModel::DoWorkEventArgs^  e) {
2112
private: System::Void backgroundWorker1_DoWork(System::Object^  sender, System::ComponentModel::DoWorkEventArgs^  e) {
2113
			 Threading::Thread::Sleep(500);
2113
			 Threading::Thread::Sleep(500);
2114
			 m_pConverted = m_pPackages->CreateFromArchive(CyStringFromSystemString(m_sConvertFile));
2114
			 m_pConverted = m_pPackages->createFromArchive(_S(m_sConvertFile));
2115
		 }
2115
		 }
2116
private: System::Void backgroundWorker1_RunWorkerCompleted(System::Object^  sender, System::ComponentModel::RunWorkerCompletedEventArgs^  e) {
2116
private: System::Void backgroundWorker1_RunWorkerCompleted(System::Object^  sender, System::ComponentModel::RunWorkerCompletedEventArgs^  e) {
2117
			 if ( m_pWait ) 
2117
			 if ( m_pWait ) 
2118
			 {
2118
			 {
2119
				 m_pWait->Close();
2119
				 m_pWait->Close();