diff --git a/ObfuscarMappingParser/Forms/LauncherForm.Designer.cs b/ObfuscarMappingParser/Forms/LauncherForm.Designer.cs index dd066c1..f019801 100644 --- a/ObfuscarMappingParser/Forms/LauncherForm.Designer.cs +++ b/ObfuscarMappingParser/Forms/LauncherForm.Designer.cs @@ -148,7 +148,6 @@ private void InitializeComponent() this.HeaderColor = System.Drawing.Color.White; this.HeaderPosition = new System.Drawing.Point(55, 7); this.HeaderText = "Open File"; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "LauncherForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Obfuscar Mapping Parser Launcher"; diff --git a/ObfuscarMappingParser/Forms/MainForm.Designer.cs b/ObfuscarMappingParser/Forms/MainForm.Designer.cs index a84f623..6cf0ebd 100644 --- a/ObfuscarMappingParser/Forms/MainForm.Designer.cs +++ b/ObfuscarMappingParser/Forms/MainForm.Designer.cs @@ -35,6 +35,8 @@ private void InitializeComponent() this.statusStrip = new System.Windows.Forms.StatusStrip(); this.spbLoading = new System.Windows.Forms.ToolStripProgressBar(); this.slblSelected = new System.Windows.Forms.ToolStripStatusLabel(); + this.slblType = new System.Windows.Forms.ToolStripStatusLabel(); + this.slblModule = new System.Windows.Forms.ToolStripStatusLabel(); this.ilIcons = new System.Windows.Forms.ImageList(this.components); this.tsTools = new System.Windows.Forms.ToolStrip(); this.btnOpen = new System.Windows.Forms.ToolStripDropDownButton(); @@ -107,7 +109,9 @@ private void InitializeComponent() this.statusStrip.AllowMerge = false; this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.spbLoading, - this.slblSelected}); + this.slblSelected, + this.slblModule, + this.slblType}); this.statusStrip.Location = new System.Drawing.Point(0, 528); this.statusStrip.Name = "statusStrip"; this.statusStrip.ShowItemToolTips = true; @@ -125,9 +129,26 @@ private void InitializeComponent() // // slblSelected // + this.slblSelected.AutoSize = false; this.slblSelected.Name = "slblSelected"; this.slblSelected.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; - this.slblSelected.Size = new System.Drawing.Size(0, 17); + this.slblSelected.Size = new System.Drawing.Size(279, 17); + this.slblSelected.Spring = true; + this.slblSelected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // slblType + // + this.slblType.AutoSize = false; + this.slblType.Name = "slblType"; + this.slblType.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; + this.slblType.Size = new System.Drawing.Size(100, 17); + // + // slblModule + // + this.slblModule.AutoSize = false; + this.slblModule.Name = "slblModule"; + this.slblModule.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; + this.slblModule.Size = new System.Drawing.Size(200, 17); // // ilIcons // @@ -572,14 +593,10 @@ private void InitializeComponent() this.ptvElements.CollapseImage = global::ObfuscarMappingParser.Properties.Resources.Collapse; this.ptvElements.ColumnHeaderStyle = BrokenEvent.Shared.Controls.ColumnHeaderStyle.None; pineappleTreeColumn1.Autosize = true; - pineappleTreeColumn1.HeaderAlignment = ((BrokenEvent.Shared.Controls.ItemTextAlignment)((BrokenEvent.Shared.Controls.ItemTextAlignment.HorizontalLeft | BrokenEvent.Shared.Controls.ItemTextAlignment.VerticalTop))); pineappleTreeColumn1.HeaderText = "Classname"; pineappleTreeColumn1.Multiline = true; - pineappleTreeColumn1.TextAlignment = ((BrokenEvent.Shared.Controls.ItemTextAlignment)((BrokenEvent.Shared.Controls.ItemTextAlignment.HorizontalLeft | BrokenEvent.Shared.Controls.ItemTextAlignment.VerticalTop))); pineappleTreeColumn1.Width = 477; - pineappleTreeColumn2.HeaderAlignment = ((BrokenEvent.Shared.Controls.ItemTextAlignment)((BrokenEvent.Shared.Controls.ItemTextAlignment.HorizontalLeft | BrokenEvent.Shared.Controls.ItemTextAlignment.VerticalTop))); pineappleTreeColumn2.HeaderText = "Renamed"; - pineappleTreeColumn2.TextAlignment = ((BrokenEvent.Shared.Controls.ItemTextAlignment)((BrokenEvent.Shared.Controls.ItemTextAlignment.HorizontalLeft | BrokenEvent.Shared.Controls.ItemTextAlignment.VerticalTop))); pineappleTreeColumn2.Width = 250; this.ptvElements.Columns.Add(pineappleTreeColumn1); this.ptvElements.Columns.Add(pineappleTreeColumn2); @@ -697,6 +714,8 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem miReport; private System.Windows.Forms.ToolStripMenuItem miVersionHistory; private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; + private System.Windows.Forms.ToolStripStatusLabel slblType; + private System.Windows.Forms.ToolStripStatusLabel slblModule; } } diff --git a/ObfuscarMappingParser/Forms/MainForm.cs b/ObfuscarMappingParser/Forms/MainForm.cs index 4099b03..0d7f1d1 100644 --- a/ObfuscarMappingParser/Forms/MainForm.cs +++ b/ObfuscarMappingParser/Forms/MainForm.cs @@ -135,6 +135,10 @@ private void BeginLoading(string operation) { this.SetTaskbarProgressState(Taskbar.ThumbnailProgressState.Indeterminate); spbLoading.Visible = true; + slblType.Visible = false; + slblType.Text = ""; + slblModule.Visible = false; + slblModule.Text = ""; menuStrip.Enabled = ptvElements.Enabled = tsTools.Enabled = false; commandManager.BeginDisable(); slblSelected.Text = operation; @@ -144,6 +148,7 @@ private void EndLoading(string result) { menuStrip.Enabled = ptvElements.Enabled = tsTools.Enabled = true; spbLoading.Visible = false; + slblType.Visible = slblModule.Visible = true; commandManager.EndDisable(); slblSelected.Text = result; this.SetTaskbarProgressState(Taskbar.ThumbnailProgressState.NoProgress); @@ -177,7 +182,7 @@ private async void OpenFile(string filename) Text = $"{APP_TITLE} - {PathUtils.GetFilename(filename)}"; Configs.Instance.AddRecent(filename); - BeginLoading("Loading: " + filename); + BeginLoading($"Loading: {filename}"); while (openedForms.Count > 0) openedForms[0].Close(); @@ -196,7 +201,7 @@ private async void OpenFile(string filename) pdbfiles.Clear(); BuildMapping(); EnableMappingActions(true); - EndLoading("Mapping loaded in " + mapping.LoadTime + " ms"); + EndLoading($"Mapping loaded in {mapping.LoadTime} ms"); AttachRelatedPdbs(Configs.Instance.GetRecentPdb(mapping.Filename), false); AttachRelatedPdbs(pdbToAttach, true); @@ -207,7 +212,7 @@ private async void OpenFile(string filename) private async void ReloadFile() { - BeginLoading("Reloading: " + mapping.Filename); + BeginLoading($"Reloading: {mapping.Filename}"); while (openedForms.Count > 0) openedForms[0].Close(); @@ -224,7 +229,7 @@ private async void ReloadFile() BuildMapping(); EnableMappingActions(true); - EndLoading("Mapping reloaded in " + mapping.LoadTime + " ms"); + EndLoading($"Mapping reloaded in {mapping.LoadTime} ms"); tbSearch.AutoCompleteCustomSource = mapping.GetNewNamesCollection(); } @@ -258,7 +263,7 @@ private void BuildMapping() ptvElements.CollapseAll(); ptvElements.EndUpdate(); sw.Stop(); - Debug.WriteLine("Tree building: " + sw.ElapsedMilliseconds + " ms"); + Debug.WriteLine($"Tree building: {sw.ElapsedMilliseconds} ms"); } private void tbSearch_KeyDown(object sender, KeyEventArgs e) @@ -414,6 +419,8 @@ private void ptvElements_NodeSelect(object sender, NodeSelectEventArgs e) EnableSelectionActions(focusedItem != null); slblSelected.Text = focusedItem == null ? "" : focusedItem.TransformSimple; + slblType.Text = focusedItem == null ? "" : focusedItem.EntityType.ToString(); + slblModule.Text = focusedItem == null ? "" : focusedItem.ModuleOld; commandManager.SetEnabled(Actions.OpenInEditor, focusedItem != null && DetectMarkersForVS(out focusedFilename, out focusedLine, focusedItem)); } @@ -928,5 +935,6 @@ private async void miVersionHistory_Click(object sender, EventArgs e) process.WaitForInputIdle(); File.Delete(filename); } + } } \ No newline at end of file diff --git a/ObfuscarMappingParser/Forms/PDBManagerForm.Designer.cs b/ObfuscarMappingParser/Forms/PDBManagerForm.Designer.cs index ef6c7fe..9f83720 100644 --- a/ObfuscarMappingParser/Forms/PDBManagerForm.Designer.cs +++ b/ObfuscarMappingParser/Forms/PDBManagerForm.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDBManagerForm)); this.lvList = new System.Windows.Forms.ListView(); this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chGuid = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -95,15 +96,15 @@ private void InitializeComponent() this.btnAttach.Name = "btnAttach"; this.btnAttach.Size = new System.Drawing.Size(100, 23); this.btnAttach.TabIndex = 3; - this.btnAttach.Text = "Attach"; + this.btnAttach.Text = "Attach..."; this.btnAttach.UseVisualStyleBackColor = true; this.btnAttach.Click += new System.EventHandler(this.btnAttach_Click); // // btnDetach // - this.btnDetach.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btnDetach.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnDetach.Enabled = false; - this.btnDetach.Location = new System.Drawing.Point(121, 291); + this.btnDetach.Location = new System.Drawing.Point(283, 291); this.btnDetach.Name = "btnDetach"; this.btnDetach.Size = new System.Drawing.Size(100, 23); this.btnDetach.TabIndex = 4; diff --git a/ObfuscarMappingParser/Forms/SettingsForm.Designer.cs b/ObfuscarMappingParser/Forms/SettingsForm.Designer.cs index 6f31db1..1f8ed09 100644 --- a/ObfuscarMappingParser/Forms/SettingsForm.Designer.cs +++ b/ObfuscarMappingParser/Forms/SettingsForm.Designer.cs @@ -412,7 +412,6 @@ private void InitializeComponent() this.HeaderColor = System.Drawing.Color.White; this.HeaderPosition = new System.Drawing.Point(55, 7); this.HeaderText = "Settings"; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "SettingsForm"; this.ShowIcon = false; this.ShowInTaskbar = false; diff --git a/ObfuscarMappingParser/Forms/StacktraceSourceForm.Designer.cs b/ObfuscarMappingParser/Forms/StacktraceSourceForm.Designer.cs index 80f23c4..aaa7025 100644 --- a/ObfuscarMappingParser/Forms/StacktraceSourceForm.Designer.cs +++ b/ObfuscarMappingParser/Forms/StacktraceSourceForm.Designer.cs @@ -200,7 +200,6 @@ private void InitializeComponent() this.HeaderColor = System.Drawing.Color.White; this.HeaderPosition = new System.Drawing.Point(55, 7); this.HeaderText = "Select Stacktrace Source"; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "StacktraceSourceForm"; this.ShowIcon = false; this.ShowInTaskbar = false;