[OMPT-svn-commit] OpenMPT r21115 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sat Jun 29 18:11:51 2024
New Revision: 21115
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21115

Log:
Merged revision(s) 21113 from trunk/OpenMPT:
[New] Pattern tab: Added shortcuts to go to a specific column within a pattern cell (https://bugs.openmpt.org/view.php?id=1797).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/CommandSet.cpp
   branches/OpenMPT-1.31/mptrack/CommandSet.h
   branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp
   branches/OpenMPT-1.31/mptrack/View_pat.cpp

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Sat Jun 29 15:33:32 2024	(r21114)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Sat Jun 29 18:11:51 2024	(r21115)
@@ -1369,6 +1369,11 @@
 	{KeyCommand::Hidden, kcDataEntryDownCoarseStop, _T("Stop Data Entry Down (Coarse)")},
 	{2068, kcSampleConvertNormalLoopToSustain, _T("Convert Normal Loop to Sustain Loop")},
 	{2069, kcSampleConvertSustainLoopToNormal, _T("Convert Sustain Loop to Normal Loop")},
+	{2070, kcGotoNoteColumn, _T("Go to note column")},
+	{2071, kcGotoInstrColumn, _T("Go to instrument column")},
+	{2072, kcGotoVolumeColumn, _T("Go to volume effect column")},
+	{2073, kcGotoCommandColumn, _T("Go to effect command column")},
+	{2074, kcGotoParamColumn, _T("Go to effect parameter column")},
 };
 
 // Get command descriptions etc.. loaded up.

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.h	Sat Jun 29 15:33:32 2024	(r21114)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.h	Sat Jun 29 18:11:51 2024	(r21115)
@@ -236,7 +236,16 @@
 
 	//Pattern Editing
 	kcStartPatternEditing,
-	kcStartPatternScrolling = kcStartPatternEditing,
+
+	kcStartGotoColumn = kcStartPatternEditing,
+	kcGotoNoteColumn = kcStartGotoColumn,
+	kcGotoInstrColumn,
+	kcGotoVolumeColumn,
+	kcGotoCommandColumn,
+	kcGotoParamColumn,
+	kcEndGotoColumn = kcGotoParamColumn,
+
+	kcStartPatternScrolling,
 	kcPatternScrollLeft = kcStartPatternScrolling,
 	kcPatternScrollRight,
 	kcPatternScrollUp,

Modified: branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Sat Jun 29 15:33:32 2024	(r21114)
+++ branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Sat Jun 29 18:11:51 2024	(r21115)
@@ -246,6 +246,7 @@
 		newCat.AddCommands(kcStartPlainNavigate, kcEndPlainNavigate, true);
 		newCat.AddCommands(kcStartJumpSnap, kcEndJumpSnap, true);
 		newCat.AddCommands(kcStartHomeEnd, kcEndHomeEnd, true);
+		newCat.AddCommands(kcStartGotoColumn, kcEndGotoColumn, true);
 		newCat.AddCommands(kcPrevPattern, kcNextSequence, true);
 		newCat.AddCommands(kcStartPatternScrolling, kcEndPatternScrolling, true);
 		newCat.AddCommands(kcStartSelect, kcEndSelect, true);

Modified: branches/OpenMPT-1.31/mptrack/View_pat.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_pat.cpp	Sat Jun 29 15:33:32 2024	(r21114)
+++ branches/OpenMPT-1.31/mptrack/View_pat.cpp	Sat Jun 29 18:11:51 2024	(r21115)
@@ -4426,6 +4426,14 @@
 								if (GetCurrentRow() < pModDoc->GetPatternSize(m_nPattern) - 1) SetCurrentRow(pModDoc->GetPatternSize(m_nPattern) - 1);
 								return wParam;
 
+		case kcGotoNoteColumn:
+		case kcGotoInstrColumn:
+		case kcGotoVolumeColumn:
+		case kcGotoCommandColumn:
+		case kcGotoParamColumn:
+			SetCurrentColumn(m_Cursor.GetChannel(), static_cast<PatternCursor::Columns>(wParam - kcGotoNoteColumn + PatternCursor::firstColumn));
+			return wParam;
+
 		case kcPrevEntryInColumn:
 		case kcNextEntryInColumn:
 			JumpToPrevOrNextEntry(wParam == kcNextEntryInColumn, false);