From ef38471ff108244e0cc617d79eeff26c78073f84 Mon Sep 17 00:00:00 2001 From: Perfare Date: Thu, 6 Aug 2020 13:11:41 +0800 Subject: [PATCH] move code --- AssetStudioGUI/AssetStudioGUIForm.Designer.cs | 3 +++ AssetStudioGUI/AssetStudioGUIForm.cs | 11 +++++------ AssetStudioGUI/AssetStudioGUIForm.resx | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs index 7fbf1fd..45652ce 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs @@ -958,6 +958,7 @@ // // AssetStudioGUIForm // + this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1264, 681); @@ -970,6 +971,8 @@ this.Name = "AssetStudioGUIForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "AssetStudioGUI"; + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.AssetStudioGUIForm_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.AssetStudioGUIForm_DragEnter); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AssetStudioForm_KeyDown); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index bd78c90..c5391c8 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -99,20 +99,19 @@ namespace AssetStudioGUI Logger.Default = new GUILogger(StatusStripUpdate); Progress.Default = new GUIProgress(SetProgressBarValue); Studio.StatusStripUpdate = StatusStripUpdate; - - this.AllowDrop = true; - this.DragEnter += AssetStudioGUIForm_DragEnter; - this.DragDrop += AssetStudioGUIForm_DragDrop; } private void AssetStudioGUIForm_DragEnter(object sender, DragEventArgs e) { - if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Move; + if (e.Data.GetDataPresent(DataFormats.FileDrop)) + { + e.Effect = DragDropEffects.Move; + } } private async void AssetStudioGUIForm_DragDrop(object sender, DragEventArgs e) { - string[] paths = (string[])e.Data.GetData(DataFormats.FileDrop); + var paths = (string[])e.Data.GetData(DataFormats.FileDrop); if (paths.Length > 0) { ResetForm(); diff --git a/AssetStudioGUI/AssetStudioGUIForm.resx b/AssetStudioGUI/AssetStudioGUIForm.resx index 2ba6a7a..f5d72e1 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.resx +++ b/AssetStudioGUI/AssetStudioGUIForm.resx @@ -120,6 +120,9 @@ 312, 17 + + 432, 17 + abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWYZ 1234567890.:,;'\"(!?)+-*/= @@ -138,9 +141,6 @@ The quick brown fox jumps over the lazy dog. 1234567890 The quick brown fox jumps over the lazy dog. 1234567890 - - 432, 17 - 553, 17