6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-07-11 02:28:54 +00:00
Code Issues Projects Releases Wiki Activity

Add keyboard shortcuts for applying hints

Browse Source 
Each is a two-key combo.  Hit Ctrl+H, then Ctrl+C/D/I/R as desired.
Hitting Ctrl+H followed by any other key results in an error beep.
This commit is contained in:
Andy McFadden 2018-10-07 21:13:37 -07:00
parent 360204a16d
commit 93c76e219f
5 changed files with 80 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
SourceGen/AppForms/ProjectView.Designer.cs generated
View File

@ -90,6 +90,7 @@ namespace SourceGen.AppForms
this.hintAsInlineDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeHintToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripSeparator();
this.formatSplitAddressTableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toggleSingleBytesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.deleteNoteCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator();
@ -174,7 +175,6 @@ namespace SourceGen.AppForms
this.symbolNameColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.infoGroupBox = new System.Windows.Forms.GroupBox();
this.infoTextBox = new System.Windows.Forms.TextBox();
this.formatSplitAddressTableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mainMenuStrip.SuspendLayout();
this.mainStatusStrip.SuspendLayout();
this.mainToolStrip.SuspendLayout();
@ -477,14 +477,14 @@ namespace SourceGen.AppForms
// setAddressToolStripMenuItem
//
this.setAddressToolStripMenuItem.Name = "setAddressToolStripMenuItem";
this.setAddressToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.setAddressToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.setAddressToolStripMenuItem.Text = "Set Address...";
this.setAddressToolStripMenuItem.Click += new System.EventHandler(this.EditAddress_Click);
//
// overrideStatusFlagsToolStripMenuItem
//
this.overrideStatusFlagsToolStripMenuItem.Name = "overrideStatusFlagsToolStripMenuItem";
this.overrideStatusFlagsToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.overrideStatusFlagsToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.overrideStatusFlagsToolStripMenuItem.Text = "Override Status Flags...";
this.overrideStatusFlagsToolStripMenuItem.Click += new System.EventHandler(this.EditStatusFlags_Click);
//
@ -492,21 +492,21 @@ namespace SourceGen.AppForms
//
this.editLabelToolStripMenuItem.Name = "editLabelToolStripMenuItem";
this.editLabelToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));
this.editLabelToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editLabelToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editLabelToolStripMenuItem.Text = "Edit Label...";
this.editLabelToolStripMenuItem.Click += new System.EventHandler(this.EditLabel_Click);
//
// editOperandToolStripMenuItem
//
this.editOperandToolStripMenuItem.Name = "editOperandToolStripMenuItem";
this.editOperandToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editOperandToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editOperandToolStripMenuItem.Text = "Edit Operand...";
this.editOperandToolStripMenuItem.Click += new System.EventHandler(this.EditOperand_Click);
//
// editDataFormatToolStripMenuItem
//
this.editDataFormatToolStripMenuItem.Name = "editDataFormatToolStripMenuItem";
this.editDataFormatToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editDataFormatToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editDataFormatToolStripMenuItem.Text = "Edit Data Format...";
this.editDataFormatToolStripMenuItem.Click += new System.EventHandler(this.EditData_Click);
//
@ -514,7 +514,7 @@ namespace SourceGen.AppForms
//
this.editCommentToolStripMenuItem.Name = "editCommentToolStripMenuItem";
this.editCommentToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Oem1)));
this.editCommentToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editCommentToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editCommentToolStripMenuItem.Text = "Edit Comment...";
this.editCommentToolStripMenuItem.Click += new System.EventHandler(this.EditComment_Click);
//
@ -522,7 +522,7 @@ namespace SourceGen.AppForms
//
this.editLongCommentToolStripMenuItem.Name = "editLongCommentToolStripMenuItem";
this.editLongCommentToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.M)));
this.editLongCommentToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editLongCommentToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editLongCommentToolStripMenuItem.Text = "Edit Long Comment...";
this.editLongCommentToolStripMenuItem.Click += new System.EventHandler(this.EditLongComment_Click);
//
@ -530,60 +530,71 @@ namespace SourceGen.AppForms
//
this.editNoteToolStripMenuItem.Name = "editNoteToolStripMenuItem";
this.editNoteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.editNoteToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editNoteToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editNoteToolStripMenuItem.Text = "Edit Note...";
this.editNoteToolStripMenuItem.Click += new System.EventHandler(this.EditNote_Click);
//
// editProjectSymbolToolStripMenuItem
//
this.editProjectSymbolToolStripMenuItem.Name = "editProjectSymbolToolStripMenuItem";
this.editProjectSymbolToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.editProjectSymbolToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.editProjectSymbolToolStripMenuItem.Text = "Edit Project Symbol...";
this.editProjectSymbolToolStripMenuItem.Click += new System.EventHandler(this.EditProjectSymbol_Click);
//
// actionsMenuSeparator1
//
this.actionsMenuSeparator1.Name = "actionsMenuSeparator1";
this.actionsMenuSeparator1.Size = new System.Drawing.Size(252, 6);
this.actionsMenuSeparator1.Size = new System.Drawing.Size(286, 6);
//
// hintAsCodeToolStripMenuItem
//
this.hintAsCodeToolStripMenuItem.Name = "hintAsCodeToolStripMenuItem";
this.hintAsCodeToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.hintAsCodeToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+H, Ctrl+C";
this.hintAsCodeToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.hintAsCodeToolStripMenuItem.Text = "Hint As Code Entry Point";
this.hintAsCodeToolStripMenuItem.Click += new System.EventHandler(this.MarkAsCode_Click);
//
// hintAsDataToolStripMenuItem
//
this.hintAsDataToolStripMenuItem.Name = "hintAsDataToolStripMenuItem";
this.hintAsDataToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.hintAsDataToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+H, Ctrl+D";
this.hintAsDataToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.hintAsDataToolStripMenuItem.Text = "Hint As Data Start";
this.hintAsDataToolStripMenuItem.Click += new System.EventHandler(this.MarkAsData_Click);
//
// hintAsInlineDataToolStripMenuItem
//
this.hintAsInlineDataToolStripMenuItem.Name = "hintAsInlineDataToolStripMenuItem";
this.hintAsInlineDataToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.hintAsInlineDataToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+H, Ctrl+I";
this.hintAsInlineDataToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.hintAsInlineDataToolStripMenuItem.Text = "Hint As Inline Data";
this.hintAsInlineDataToolStripMenuItem.Click += new System.EventHandler(this.MarkAsInlineData_Click);
//
// removeHintToolStripMenuItem
//
this.removeHintToolStripMenuItem.Name = "removeHintToolStripMenuItem";
this.removeHintToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.removeHintToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+H, Ctrl+R";
this.removeHintToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.removeHintToolStripMenuItem.Text = "Remove Hints";
this.removeHintToolStripMenuItem.Click += new System.EventHandler(this.MarkAsNoHint_Click);
//
// toolStripMenuItem11
//
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
this.toolStripMenuItem11.Size = new System.Drawing.Size(252, 6);
this.toolStripMenuItem11.Size = new System.Drawing.Size(286, 6);
//
// formatSplitAddressTableToolStripMenuItem
//
this.formatSplitAddressTableToolStripMenuItem.Name = "formatSplitAddressTableToolStripMenuItem";
this.formatSplitAddressTableToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.formatSplitAddressTableToolStripMenuItem.Text = "Format Split-Address Table";
this.formatSplitAddressTableToolStripMenuItem.Click += new System.EventHandler(this.FormatSplitAddressTable_Click);
//
// toggleSingleBytesToolStripMenuItem
//
this.toggleSingleBytesToolStripMenuItem.Name = "toggleSingleBytesToolStripMenuItem";
this.toggleSingleBytesToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
this.toggleSingleBytesToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.toggleSingleBytesToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.toggleSingleBytesToolStripMenuItem.Text = "Toggle Single-Byte Format";
this.toggleSingleBytesToolStripMenuItem.Click += new System.EventHandler(this.ToggleSingleBytes_Click);
//
@ -591,19 +602,19 @@ namespace SourceGen.AppForms
//
this.deleteNoteCommentToolStripMenuItem.Name = "deleteNoteCommentToolStripMenuItem";
this.deleteNoteCommentToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.deleteNoteCommentToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.deleteNoteCommentToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.deleteNoteCommentToolStripMenuItem.Text = "Delete Note/Long Comment";
this.deleteNoteCommentToolStripMenuItem.Click += new System.EventHandler(this.DeleteNoteComment_Click);
//
// toolStripMenuItem9
//
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
this.toolStripMenuItem9.Size = new System.Drawing.Size(252, 6);
this.toolStripMenuItem9.Size = new System.Drawing.Size(286, 6);
//
// showHexDumpToolStripMenuItem
//
this.showHexDumpToolStripMenuItem.Name = "showHexDumpToolStripMenuItem";
this.showHexDumpToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.showHexDumpToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.showHexDumpToolStripMenuItem.Text = "Show Hex Dump";
this.showHexDumpToolStripMenuItem.Click += new System.EventHandler(this.ShowHexDump_Click);
//
@ -1435,13 +1446,6 @@ namespace SourceGen.AppForms
this.infoTextBox.Size = new System.Drawing.Size(177, 120);
this.infoTextBox.TabIndex = 0;
//
// formatSplitAddressTableToolStripMenuItem
//
this.formatSplitAddressTableToolStripMenuItem.Name = "formatSplitAddressTableToolStripMenuItem";
this.formatSplitAddressTableToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.formatSplitAddressTableToolStripMenuItem.Text = "Format Split-Address Table";
this.formatSplitAddressTableToolStripMenuItem.Click += new System.EventHandler(this.FormatSplitAddressTable_Click);
//
// ProjectView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

35
SourceGen/AppForms/ProjectView.cs
View File

@ -151,6 +151,11 @@ namespace SourceGen.AppForms {
/// </summary>
private int mTargetHighlightIndex = -1;
/// <summary>
/// Set to true if the last key hit was Ctrl+H.
/// </summary>
private bool mCtrlHSeen;
/// <summary>
/// CPU definition used when the Formatter was created. If the CPU choice or
/// inclusion of undocumented opcodes changes, we need to wipe the formatter.
@ -1130,6 +1135,36 @@ namespace SourceGen.AppForms {
// regardless of which has focus, making it useful for keyboard shortcuts.
// Return true to indicate that we've handled the key.
protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
// Handle the Ctrl+H chord.
if (mCtrlHSeen) {
if (keyData == (Keys.Control | Keys.C)) {
if (hintAsCodeToolStripMenuItem.Enabled) {
MarkAsCode_Click(null, null);
}
} else if (keyData == (Keys.Control | Keys.D)) {
if (hintAsDataToolStripMenuItem.Enabled) {
MarkAsData_Click(null, null);
}
} else if (keyData == (Keys.Control | Keys.I)) {
if (hintAsInlineDataToolStripMenuItem.Enabled) {
MarkAsInlineData_Click(null, null);
}
} else if (keyData == (Keys.Control | Keys.R)) {
if (removeHintToolStripMenuItem.Enabled) {
MarkAsNoHint_Click(null, null);
}
} else {
System.Media.SystemSounds.Beep.Play();
}
mCtrlHSeen = false;
toolStripStatusLabel.Text = Properties.Resources.STATUS_READY;
return true;
} else if (keyData == (Keys.Control | Keys.H)) {
mCtrlHSeen = true;
toolStripStatusLabel.Text = Properties.Resources.STATUS_CTRL_H_HIT;
return true;
}
// Ctrl-Shift-Z is an alias for Redo (Ctrl-Y).
if (keyData == (Keys.Control | Keys.Shift | Keys.Z)) {
if (redoToolStripMenuItem.Enabled) {

9
SourceGen/Properties/Resources.Designer.cs generated
View File

@ -897,6 +897,15 @@ namespace SourceGen.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Ctrl+H was pressed, waiting for second key of chord....
/// </summary>
internal static string STATUS_CTRL_H_HIT {
get {
return ResourceManager.GetString("STATUS_CTRL_H_HIT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Ready.
/// </summary>

3
SourceGen/Properties/Resources.resx
View File

@ -396,6 +396,9 @@
<data name="SHOW_COL" xml:space="preserve">
<value>Show</value>
</data>
<data name="STATUS_CTRL_H_HIT" xml:space="preserve">
<value>Ctrl+H was pressed, waiting for second key of chord...</value>
</data>
<data name="STATUS_READY" xml:space="preserve">
<value>Ready</value>
</data>

3
SourceGen/RuntimeData/Help/mainwin.html
View File

@ -182,7 +182,8 @@ enabled will depend on what you have selected in the main window.</p>
<li><a href="#hints">Hinting</a> (Hint As Code Entry Point, Hint As
Data Start, Hint As Inline Data, Remove Hints). Enabled when one or more
code and data lines are selected. Remove Hints is only enabled when
at least one line has hints.</li>
at least one line has hints. The keyboard shortcuts for hints are
two-key combinations.</li>
<li><a href="#toggle-single">Toggle Single-Byte Format</a>. Toggles
a range of lines between default format and single-byte format. Enabled
when one or more data lines are selected.</li>