WebSVN – spk – Diff – /Creator/src/Forms/SaveDialog.h

 			m_iStatus = 0;
 			m_pMultiPackage = NULL;
 			m_pPackage = package;
 			m_sSaveFile = saveFile;
 			m_pInfo = new CProgressInfoDone;
+			m_pInfo2 = new CProgressInfoDone;
+		}
 		SaveDialog(CMultiSpkFile *package, String ^saveFile)
+		{
 			InitializeComponent();
 			m_iStatus = 0;
 			m_pMultiPackage = package;
 			m_pPackage = NULL;
 			m_sSaveFile = saveFile;
 			m_pInfo = new CProgressInfoDone;
+			m_pInfo2 = new CProgressInfoDone;
+		}
 	protected:
 		/// <summary>
 		/// Clean up any resources being used.
 			if (components)
+			{
 				delete components;
+			}
 			delete m_pInfo;
+			delete m_pInfo2;
+		}
 		int m_iStatus;
 		CBaseFile *m_pPackage;
 		CMultiSpkFile *m_pMultiPackage;
 		CProgressInfoDone *m_pInfo;
+		CProgressInfoDone *m_pInfo2;
 		String	^m_sSaveFile;
 	private: System::Windows::Forms::Timer^  timer1;
 	protected:
 	private: System::Windows::Forms::Label^  label1;
 	private: System::Windows::Forms::Panel^  panel1;
 	private: System::Windows::Forms::Label^  LabelCompress;
 	private: System::Windows::Forms::Label^  LabelStatus;
 	private: System::ComponentModel::BackgroundWorker^  backgroundWorker1;
 	private: System::Windows::Forms::ProgressBar^  progressBar1;
 	private: System::Windows::Forms::Panel^  panel2;
+	private: System::Windows::Forms::Panel^  panel3;
+	private: System::Windows::Forms::ProgressBar^  progressBar2;
 	private: System::ComponentModel::IContainer^  components;
 	private:
 		/// <summary>
 		/// Required designer variable.
 			this->LabelCompress = (gcnew System::Windows::Forms::Label());
 			this->LabelStatus = (gcnew System::Windows::Forms::Label());
 			this->backgroundWorker1 = (gcnew System::ComponentModel::BackgroundWorker());
 			this->progressBar1 = (gcnew System::Windows::Forms::ProgressBar());
 			this->panel2 = (gcnew System::Windows::Forms::Panel());
+			this->panel3 = (gcnew System::Windows::Forms::Panel());
+			this->progressBar2 = (gcnew System::Windows::Forms::ProgressBar());
 			this->panel1->SuspendLayout();
 			this->PanelCompress->SuspendLayout();
 			this->panel2->SuspendLayout();
+			this->panel3->SuspendLayout();
 			this->SuspendLayout();
 			//
 			// timer1
 			//
 			this->timer1->Enabled = true;
 			this->panel1->Controls->Add(this->label2);
 			this->panel1->Controls->Add(this->label1);
 			this->panel1->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel1->Location = System::Drawing::Point(0, 0);
 			this->panel1->Name = L"panel1";
-			this->panel1->Size = System::Drawing::Size(579, 28);
+			this->panel1->Size = System::Drawing::Size(636, 28);
 			this->panel1->TabIndex = 1;
 			this->panel1->UseWaitCursor = true;
 			//
 			// label2
 			//
 			this->label2->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->label2->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 12, System::Drawing::FontStyle::Italic, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label2->Location = System::Drawing::Point(163, 0);
 			this->label2->Name = L"label2";
-			this->label2->Size = System::Drawing::Size(416, 28);
+			this->label2->Size = System::Drawing::Size(473, 28);
 			this->label2->TabIndex = 1;
 			this->label2->Text = L"filename";
 			this->label2->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			this->label2->UseWaitCursor = true;
 			//
 			this->PanelCompress->Controls->Add(this->LabelCompress);
 			this->PanelCompress->Controls->Add(this->LabelStatus);
 			this->PanelCompress->Dock = System::Windows::Forms::DockStyle::Top;
 			this->PanelCompress->Location = System::Drawing::Point(0, 28);
 			this->PanelCompress->Name = L"PanelCompress";
-			this->PanelCompress->Size = System::Drawing::Size(579, 28);
+			this->PanelCompress->Size = System::Drawing::Size(636, 28);
 			this->PanelCompress->TabIndex = 2;
 			this->PanelCompress->UseWaitCursor = true;
 			//
 			// LabelCompress
 			//
 			this->LabelCompress->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->LabelCompress->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 12, System::Drawing::FontStyle::Italic, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->LabelCompress->Location = System::Drawing::Point(163, 0);
 			this->LabelCompress->Name = L"LabelCompress";
-			this->LabelCompress->Size = System::Drawing::Size(416, 28);
+			this->LabelCompress->Size = System::Drawing::Size(473, 28);
 			this->LabelCompress->TabIndex = 1;
 			this->LabelCompress->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			this->LabelCompress->UseWaitCursor = true;
 			//
 			// LabelStatus
 			//
 			this->progressBar1->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->progressBar1->Location = System::Drawing::Point(10, 10);
 			this->progressBar1->Maximum = 1000;
 			this->progressBar1->Name = L"progressBar1";
-			this->progressBar1->Size = System::Drawing::Size(559, 25);
+			this->progressBar1->Size = System::Drawing::Size(616, 25);
 			this->progressBar1->TabIndex = 5;
 			this->progressBar1->UseWaitCursor = true;
 			//
 			// panel2
 			//
 			this->panel2->Controls->Add(this->progressBar1);
 			this->panel2->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel2->Location = System::Drawing::Point(0, 56);
 			this->panel2->Name = L"panel2";
 			this->panel2->Padding = System::Windows::Forms::Padding(10);
-			this->panel2->Size = System::Drawing::Size(579, 45);
+			this->panel2->Size = System::Drawing::Size(636, 45);
 			this->panel2->TabIndex = 6;
 			this->panel2->UseWaitCursor = true;
+			//
+			// panel3
+			//
+			this->panel3->Controls->Add(this->progressBar2);
+			this->panel3->Dock = System::Windows::Forms::DockStyle::Top;
+			this->panel3->Location = System::Drawing::Point(0, 101);
+			this->panel3->Name = L"panel3";
+			this->panel3->Padding = System::Windows::Forms::Padding(10);
+			this->panel3->Size = System::Drawing::Size(636, 45);
+			this->panel3->TabIndex = 7;
+			this->panel3->UseWaitCursor = true;
+			//
+			// progressBar2
+			//
+			this->progressBar2->Dock = System::Windows::Forms::DockStyle::Fill;
+			this->progressBar2->Location = System::Drawing::Point(10, 10);
+			this->progressBar2->Maximum = 1000;
+			this->progressBar2->Name = L"progressBar2";
+			this->progressBar2->Size = System::Drawing::Size(616, 25);
+			this->progressBar2->TabIndex = 5;
+			this->progressBar2->UseWaitCursor = true;
 			//
 			// SaveDialog
 			//
 			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
 			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
-			this->ClientSize = System::Drawing::Size(579, 101);
+			this->ClientSize = System::Drawing::Size(636, 147);
 			this->ControlBox = false;
+			this->Controls->Add(this->panel3);
 			this->Controls->Add(this->panel2);
 			this->Controls->Add(this->PanelCompress);
 			this->Controls->Add(this->panel1);
 			this->Name = L"SaveDialog";
 			this->ShowInTaskbar = false;
 			this->UseWaitCursor = true;
 			this->Load += gcnew System::EventHandler(this, &SaveDialog::SaveDialog_Load);
 			this->panel1->ResumeLayout(false);
 			this->PanelCompress->ResumeLayout(false);
 			this->panel2->ResumeLayout(false);
+			this->panel3->ResumeLayout(false);
 			this->ResumeLayout(false);
+		}
 #pragma endregion
 	private: System::Void SaveDialog_Load(System::Object^  sender, System::EventArgs^  e) {
 				 this->label2->Text = m_sSaveFile;
 				 m_pInfo->SetDone(0);
+				 m_pInfo2->SetDone(0);
 				 this->backgroundWorker1->RunWorkerAsync();
+			 }
 	private: System::Void timer1_Tick(System::Object^  sender, System::EventArgs^  e) {
 				 if ( m_iStatus == 0 )
+				 {
 								this->progressBar1->Value = m_pInfo->GetDone();
+						}
+					}
 					else
 						LabelCompress->Text = "";
+					this->progressBar2->Maximum = m_pInfo2->GetMax();
+					if ( (int)m_pInfo2->GetDone() >= this->progressBar2->Minimum )
+					{
+						if ( (int)m_pInfo2->GetDone() > this->progressBar2->Maximum )
+							this->progressBar2->Value = this->progressBar2->Maximum;
+						else
+							this->progressBar2->Value = m_pInfo2->GetDone();
+					}
+				 }
 				 else if ( m_iStatus == 3 )
+				 {
 					this->progressBar1->Style = Windows::Forms::ProgressBarStyle::Marquee;
 					LabelStatus->Text = "Writing..";
 private: System::Void backgroundWorker1_DoWork(System::Object^  sender, System::ComponentModel::DoWorkEventArgs^  e) {
 				m_iStatus = 0;
 				if ( m_pPackage )
+				{
 					m_pPackage->UpdateSigned(true);
-					m_pPackage->CompressAllFiles(SPKCOMPRESS_LZMA, m_pInfo);
+					m_pPackage->CompressAllFiles(SPKCOMPRESS_LZMA, m_pInfo, m_pInfo2);
 					m_iStatus = 3;
 					if ( !m_pPackage->WriteFile(CyStringFromSystemString(m_sSaveFile), m_pInfo) )
 						m_iStatus = 1;
 					else

Subversion Repositories spk

(root)/Creator/src/Forms/SaveDialog.h – Rev 1 → 47