From a94449f8a2605ca853bb1c1aa2ad41392602044d Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Sun, 15 Dec 2019 10:10:00 +1300 Subject: [PATCH] improv sizability --- RMDEC/MVProjectToolset.Designer.cs | 19 ++++++++++--------- RMDEC/MVProjectToolset.cs | 8 +++++--- RMDEC/projectSelector.Designer.cs | 7 ++++--- RMDEC/projectSelector.cs | 19 +++++++++++++------ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/RMDEC/MVProjectToolset.Designer.cs b/RMDEC/MVProjectToolset.Designer.cs index 0900a5a..b6b8963 100644 --- a/RMDEC/MVProjectToolset.Designer.cs +++ b/RMDEC/MVProjectToolset.Designer.cs @@ -63,7 +63,7 @@ this.decryptSelected.Enabled = false; this.decryptSelected.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.decryptSelected.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.decryptSelected.Location = new System.Drawing.Point(387, 102); + this.decryptSelected.Location = new System.Drawing.Point(387, 98); this.decryptSelected.Name = "decryptSelected"; this.decryptSelected.Size = new System.Drawing.Size(48, 48); this.decryptSelected.TabIndex = 4; @@ -92,7 +92,7 @@ this.encryptSelected.Enabled = false; this.encryptSelected.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.encryptSelected.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.encryptSelected.Location = new System.Drawing.Point(387, 216); + this.encryptSelected.Location = new System.Drawing.Point(387, 208); this.encryptSelected.Name = "encryptSelected"; this.encryptSelected.Size = new System.Drawing.Size(48, 48); this.encryptSelected.TabIndex = 6; @@ -129,9 +129,9 @@ this.makeMV.Dock = System.Windows.Forms.DockStyle.Fill; this.makeMV.Enabled = false; this.makeMV.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.makeMV.Location = new System.Drawing.Point(3, 3); + this.makeMV.Location = new System.Drawing.Point(417, 3); this.makeMV.Name = "makeMV"; - this.makeMV.Size = new System.Drawing.Size(408, 24); + this.makeMV.Size = new System.Drawing.Size(409, 24); this.makeMV.TabIndex = 9; this.makeMV.Text = "Un-Deploy MV Project"; this.makeMV.UseVisualStyleBackColor = false; @@ -144,9 +144,9 @@ this.unmakeMV.Enabled = false; this.unmakeMV.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.unmakeMV.ForeColor = System.Drawing.SystemColors.InactiveCaptionText; - this.unmakeMV.Location = new System.Drawing.Point(417, 3); + this.unmakeMV.Location = new System.Drawing.Point(3, 3); this.unmakeMV.Name = "unmakeMV"; - this.unmakeMV.Size = new System.Drawing.Size(409, 24); + this.unmakeMV.Size = new System.Drawing.Size(408, 24); this.unmakeMV.TabIndex = 10; this.unmakeMV.Text = "Deploy MV Project"; this.unmakeMV.UseVisualStyleBackColor = false; @@ -173,7 +173,7 @@ this.layout1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 22.89562F)); this.layout1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 39.05724F)); this.layout1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 38.04714F)); - this.layout1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 65F)); + this.layout1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 74F)); this.layout1.Size = new System.Drawing.Size(826, 363); this.layout1.TabIndex = 7; // @@ -184,8 +184,8 @@ this.layout2.ColumnCount = 2; this.layout2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.layout2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.layout2.Controls.Add(this.unmakeMV, 1, 0); - this.layout2.Controls.Add(this.makeMV, 0, 0); + this.layout2.Controls.Add(this.unmakeMV, 0, 0); + this.layout2.Controls.Add(this.makeMV, 1, 0); this.layout2.Location = new System.Drawing.Point(12, 380); this.layout2.Name = "layout2"; this.layout2.RowCount = 1; @@ -204,6 +204,7 @@ this.Controls.Add(this.processingBar); this.Controls.Add(this.layout1); this.Controls.Add(this.layout2); + this.MinimumSize = new System.Drawing.Size(869, 481); this.Name = "MVProjectToolset"; this.Text = "RMDec - RPG Maker MV"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MVProjectToolset_FormClosing); diff --git a/RMDEC/MVProjectToolset.cs b/RMDEC/MVProjectToolset.cs index 620ca4e..28b3083 100644 --- a/RMDEC/MVProjectToolset.cs +++ b/RMDEC/MVProjectToolset.cs @@ -620,7 +620,11 @@ namespace RMDEC private void onUnMakeMvComplete() { string rpgProject = Path.Combine(mvProject.FilePath, "Game.rpgproject"); - File.Delete(rpgProject); + + if(File.Exists(rpgProject)) + { + File.Delete(rpgProject); + } processingText.BackColor = Color.Green; processingText.Text = "Game Deployed!"; @@ -695,8 +699,6 @@ namespace RMDEC onUnMakeMvComplete(); }); - - }); encryptFilesThread.Start(); } diff --git a/RMDEC/projectSelector.Designer.cs b/RMDEC/projectSelector.Designer.cs index 2c5b6d9..2fa80a6 100644 --- a/RMDEC/projectSelector.Designer.cs +++ b/RMDEC/projectSelector.Designer.cs @@ -45,7 +45,7 @@ this.projectList.FormattingEnabled = true; this.projectList.Location = new System.Drawing.Point(12, 34); this.projectList.Name = "projectList"; - this.projectList.Size = new System.Drawing.Size(637, 366); + this.projectList.Size = new System.Drawing.Size(637, 392); this.projectList.TabIndex = 0; // // label1 @@ -92,7 +92,7 @@ this.selectButton.BackColor = System.Drawing.SystemColors.InactiveCaption; this.selectButton.Enabled = false; this.selectButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.selectButton.Location = new System.Drawing.Point(12, 407); + this.selectButton.Location = new System.Drawing.Point(12, 436); this.selectButton.Name = "selectButton"; this.selectButton.Size = new System.Drawing.Size(637, 23); this.selectButton.TabIndex = 4; @@ -105,12 +105,13 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.ClientSize = new System.Drawing.Size(661, 437); + this.ClientSize = new System.Drawing.Size(661, 466); this.Controls.Add(this.projectList); this.Controls.Add(this.selectButton); this.Controls.Add(this.browseButton); this.Controls.Add(this.projectDir); this.Controls.Add(this.label1); + this.MinimumSize = new System.Drawing.Size(677, 505); this.Name = "projectSelector"; this.Text = "RMDec - Project Selection"; this.ResumeLayout(false); diff --git a/RMDEC/projectSelector.cs b/RMDEC/projectSelector.cs index 49f83d4..6df7207 100644 --- a/RMDEC/projectSelector.cs +++ b/RMDEC/projectSelector.cs @@ -34,7 +34,7 @@ namespace RMDEC mvProjectList.Add(proj); projectList.Items.Add("[RMMV] - "+ proj.GameTitle + " - " + relativeName); } - finally { } + catch(Exception) { } } private void updateProjectList(string projectDir) { @@ -45,17 +45,24 @@ namespace RMDEC Thread indexProjects = new Thread(() => { + IEnumerable fileList = Directory.EnumerateFiles(projectDir, "*", SearchOption.AllDirectories); - foreach (string fileEntry in fileList) + + try { - if (Path.GetFileName(fileEntry) == "System.json") + foreach (string fileEntry in fileList) { - Invoke((Action)delegate + if (Path.GetFileName(fileEntry) == "System.json") { - tryAddProject(fileEntry); - }); + Invoke((Action)delegate + { + tryAddProject(fileEntry); + }); + } } } + catch (Exception) { }; + Invoke((Action)delegate {