diff --git a/src/NFirmwareEditor/NFirmwareEditor.csproj b/src/NFirmwareEditor/NFirmwareEditor.csproj index a410c57..5d6ce05 100644 --- a/src/NFirmwareEditor/NFirmwareEditor.csproj +++ b/src/NFirmwareEditor/NFirmwareEditor.csproj @@ -67,6 +67,12 @@ + + Form + + + HotkeyHelpWindow.cs + Form @@ -110,6 +116,9 @@ DecryptionWindow.cs + + HotkeyHelpWindow.cs + ImportImageWindow.cs diff --git a/src/NFirmwareEditor/Windows/HotkeyHelpWindow.Designer.cs b/src/NFirmwareEditor/Windows/HotkeyHelpWindow.Designer.cs new file mode 100644 index 0000000..689cb58 --- /dev/null +++ b/src/NFirmwareEditor/Windows/HotkeyHelpWindow.Designer.cs @@ -0,0 +1,108 @@ +namespace NFirmwareEditor.Windows +{ + partial class HotkeyHelpWindow + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyHelpWindow)); + this.MessageTextBox = new System.Windows.Forms.TextBox(); + this.ControlBorderedPanel = new NFirmwareEditor.UI.BorderedPanel(); + this.OkButton = new System.Windows.Forms.Button(); + this.ControlBorderedPanel.SuspendLayout(); + this.SuspendLayout(); + // + // MessageTextBox + // + this.MessageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MessageTextBox.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MessageTextBox.Location = new System.Drawing.Point(5, 5); + this.MessageTextBox.Multiline = true; + this.MessageTextBox.Name = "MessageTextBox"; + this.MessageTextBox.ReadOnly = true; + this.MessageTextBox.Size = new System.Drawing.Size(219, 187); + this.MessageTextBox.TabIndex = 2; + this.MessageTextBox.TabStop = false; + this.MessageTextBox.Text = resources.GetString("MessageTextBox.Text"); + // + // ControlBorderedPanel + // + this.ControlBorderedPanel.BackColor = System.Drawing.Color.Transparent; + this.ControlBorderedPanel.BorderBottom = false; + this.ControlBorderedPanel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(185)))), ((int)(((byte)(185))))); + this.ControlBorderedPanel.BorderLeft = false; + this.ControlBorderedPanel.BorderRight = false; + this.ControlBorderedPanel.BorderTop = true; + this.ControlBorderedPanel.BorderWidth = 1F; + this.ControlBorderedPanel.Controls.Add(this.OkButton); + this.ControlBorderedPanel.Dock = System.Windows.Forms.DockStyle.Bottom; + this.ControlBorderedPanel.Location = new System.Drawing.Point(0, 197); + this.ControlBorderedPanel.Name = "ControlBorderedPanel"; + this.ControlBorderedPanel.Padding = new System.Windows.Forms.Padding(0, 1, 0, 0); + this.ControlBorderedPanel.Size = new System.Drawing.Size(229, 39); + this.ControlBorderedPanel.TabIndex = 0; + this.ControlBorderedPanel.Text = "borderedPanel1"; + // + // OkButton + // + this.OkButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.OkButton.Location = new System.Drawing.Point(125, 5); + this.OkButton.Name = "OkButton"; + this.OkButton.Size = new System.Drawing.Size(100, 30); + this.OkButton.TabIndex = 0; + this.OkButton.Text = "Ok"; + this.OkButton.UseVisualStyleBackColor = true; + // + // HotkeyHelpWindow + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(229, 236); + this.Controls.Add(this.MessageTextBox); + this.Controls.Add(this.ControlBorderedPanel); + this.Font = new System.Drawing.Font("Tahoma", 8.25F); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "HotkeyHelpWindow"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Hotkey\'s help"; + this.ControlBorderedPanel.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private UI.BorderedPanel ControlBorderedPanel; + private System.Windows.Forms.Button OkButton; + private System.Windows.Forms.TextBox MessageTextBox; + } +} \ No newline at end of file diff --git a/src/NFirmwareEditor/Windows/HotkeyHelpWindow.cs b/src/NFirmwareEditor/Windows/HotkeyHelpWindow.cs new file mode 100644 index 0000000..70711e6 --- /dev/null +++ b/src/NFirmwareEditor/Windows/HotkeyHelpWindow.cs @@ -0,0 +1,14 @@ +using System.Windows.Forms; +using NFirmwareEditor.Core; + +namespace NFirmwareEditor.Windows +{ + public partial class HotkeyHelpWindow : Form + { + public HotkeyHelpWindow() + { + InitializeComponent(); + Icon = Paths.ApplicationIcon; + } + } +} diff --git a/src/NFirmwareEditor/Windows/HotkeyHelpWindow.resx b/src/NFirmwareEditor/Windows/HotkeyHelpWindow.resx new file mode 100644 index 0000000..462a8fb --- /dev/null +++ b/src/NFirmwareEditor/Windows/HotkeyHelpWindow.resx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Clear - Ctrl + C +Invert - Ctrl + I + +Copy - Ctrl + C +Paste - Ctrl + V +Resize - Ctrl + R + +Shift Up - Ctrl + Up +Shift Down - Ctrl + Down +Shift Left - Ctrl + Left +Shift Right - Ctrl + Right + + \ No newline at end of file diff --git a/src/NFirmwareEditor/Windows/Tabs/ImageEditorTabPage.cs b/src/NFirmwareEditor/Windows/Tabs/ImageEditorTabPage.cs index 68d1011..681cfe2 100644 --- a/src/NFirmwareEditor/Windows/Tabs/ImageEditorTabPage.cs +++ b/src/NFirmwareEditor/Windows/Tabs/ImageEditorTabPage.cs @@ -442,21 +442,7 @@ private void BitmapImportButton_Click(object sender, EventArgs eventArgs) private void ImageEditorHotkeyInformationButton_Click(object sender, EventArgs e) { - var sb = new StringBuilder(); - { - sb.AppendLine("{0, -15} - {1}", "Clear", "Ctrl + C"); - sb.AppendLine("{0, -15} - {1}", "Invert", "Ctrl + I"); - sb.AppendLine(); - sb.AppendLine("{0, -15} - {1}", "Copy", "Ctrl + C"); - sb.AppendLine("{0, -15} - {1}", "Paste", "Ctrl + V"); - sb.AppendLine("{0, -15} - {1}", "Resize", "Ctrl + R"); - sb.AppendLine(); - sb.AppendLine("{0, -15} - {1}", "Shift Up", "Ctrl + Up"); - sb.AppendLine("{0, -15} - {1}", "Shift Down", "Ctrl + Down"); - sb.AppendLine("{0, -15} - {1}", "Shift Left", "Ctrl + Left"); - sb.AppendLine("{0, -15} - {1}", "Shift Right", "Ctrl + Right"); - } - InfoBox.Show(sb.ToString()); + new HotkeyHelpWindow().ShowDialog(); } private void ExportContextMenuItem_Click(object sender, EventArgs e)