Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3879] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2014-03-13 15:31:01
|
Revision: 3879
http://sourceforge.net/p/modplug/code/3879
Author: saga-games
Date: 2014-03-13 15:30:52 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
[Mod] Rename "row spacing" to "edit step".
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/View_pat.h
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2014-03-12 23:23:32 UTC (rev 3878)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2014-03-13 15:30:52 UTC (rev 3879)
@@ -391,7 +391,7 @@
DefineKeyCommand(kcCopySelectWithNav, 1314, _T("kcCopySelectWithNav"), kcHidden, kcNoDummy);
DefineKeyCommand(kcCopySelectOffWithNav, 1315, _T("kcCopySelectOffWithNav"), kcHidden, kcNoDummy);
DefineKeyCommand(kcChordModifier, 1316, _T("Chord Modifier"), kcVisible, kcDummy);
- DefineKeyCommand(kcSetSpacing, 1317, _T("Set row spacing on note entry"), kcVisible, kcDummy);
+ DefineKeyCommand(kcSetSpacing, 1317, _T("Set edit step on note entry"), kcVisible, kcDummy);
DefineKeyCommand(kcSetSpacing0, 1318, _T(""), kcHidden, kcNoDummy);
DefineKeyCommand(kcSetSpacing1, 1319, _T(""), kcHidden, kcNoDummy);
DefineKeyCommand(kcSetSpacing2, 1320, _T(""), kcHidden, kcNoDummy);
@@ -609,8 +609,8 @@
DefineKeyCommand(kcSelectBeat, 1858, _T("Select Beat"));
DefineKeyCommand(kcSelectMeasure, 1859, _T("Select Measure"));
DefineKeyCommand(kcFileSaveTemplate, 1860, _T("File/Save As Template"));
- DefineKeyCommand(kcIncreaseSpacing, 1861, _T("Increase Row Spacing"));
- DefineKeyCommand(kcDecreaseSpacing, 1862, _T("Decrease Row Spacing"));
+ DefineKeyCommand(kcIncreaseSpacing, 1861, _T("Increase Edit Step"));
+ DefineKeyCommand(kcDecreaseSpacing, 1862, _T("Decrease Edit Step"));
DefineKeyCommand(kcSampleAutotune, 1863, _T("Tune Sample to given Note"));
DefineKeyCommand(kcFileCloseAll, 1864, _T("File/Close All"));
DefineKeyCommand(kcSetOctaveStop0, 1865, _T(""), kcHidden);
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2014-03-12 23:23:32 UTC (rev 3878)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2014-03-13 15:30:52 UTC (rev 3879)
@@ -5259,7 +5259,7 @@
}
}
- // Set new cursor position (row spacing)
+ // Set new cursor position (edit step aka row spacing)
if(!liveRecord)
{
if((m_nSpacing > 0) && (m_nSpacing <= MAX_SPACING))
@@ -5501,7 +5501,7 @@
prevChordNote = note;
prevChordBaseNote = baseNote;
- // Set new cursor position (row spacing) - only when not recording live
+ // Set new cursor position (edit step aka row spacing) - only when not recording live
if(recordEnabled && !liveRecord)
{
if(m_nSpacing > 0 && m_nSpacing <= MAX_SPACING)
Modified: trunk/OpenMPT/mptrack/View_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.h 2014-03-12 23:23:32 UTC (rev 3878)
+++ trunk/OpenMPT/mptrack/View_pat.h 2014-03-13 15:30:52 UTC (rev 3879)
@@ -22,14 +22,14 @@
class COpenGLEditor;
// Drag & Drop info
-#define DRAGITEM_VALUEMASK 0x00FFFF
-#define DRAGITEM_MASK 0xFF0000
-#define DRAGITEM_CHNHEADER 0x010000
-#define DRAGITEM_PATTERNHEADER 0x020000
-#define DRAGITEM_PLUGNAME 0x040000 //rewbs.patPlugName
+#define DRAGITEM_VALUEMASK 0x00FFFFFF
+#define DRAGITEM_MASK 0xFF000000
+#define DRAGITEM_CHNHEADER 0x01000000
+#define DRAGITEM_PATTERNHEADER 0x02000000
+#define DRAGITEM_PLUGNAME 0x04000000
-// Row Spacing
+// Edit Step aka Row Spacing
const ROWINDEX MAX_SPACING = 64; // MAX_PATTERN_ROWS
@@ -135,8 +135,7 @@
psFocussed = 0x04, // Is the pattern editor focussed
psFollowSong = 0x08, // Does the cursor follow playback
psRecordingEnabled = 0x10, // Recording enabled
- psDragHScroll = 0x20, // Some weird dragging stuff (?) - unused
- psDragVScroll = 0x40, // Some weird dragging stuff (?)
+ psDragVScroll = 0x40, // Indicates that the vertical scrollbar is being dragged
psShowVUMeters = 0x80, // Display channel VU meters
psChordPlaying = 0x100, // Is a chord playing? (pretty much unused)
psDragnDropEdit = 0x200, // Drag & Drop editing (?)
@@ -150,7 +149,7 @@
psShiftDragging = 0x20000, // Drag&Drop: Dragging an item around and holding shift
// All possible drag flags, to test if user is dragging a selection or a scrollbar
- psDragActive = psDragVScroll | psDragHScroll | psMouseDragSelect | psRowSelection | psChannelSelection,
+ psDragActive = psDragVScroll | psMouseDragSelect | psRowSelection | psChannelSelection,
};
protected:
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2014-03-12 23:23:32 UTC (rev 3878)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2014-03-13 15:30:52 UTC (rev 3879)
@@ -780,9 +780,9 @@
BEGIN
CONTROL "Toolbar1",IDC_TOOLBAR1,"ToolbarWindow32",WS_GROUP | 0x4d,2,4,370,18
CONTROL "Spin1",IDC_SPIN_INSTRUMENT,"msctls_updown32",0x0,6,31,11,12
- COMBOBOX IDC_COMBO_INSTRUMENT,18,31,102,137,CBS_DROPDOWNLIST | WS_VSCROLL
- PUSHBUTTON "Plugin",IDC_PATINSTROPLUGGUI,126,31,33,13,0,WS_EX_STATICEDGE
- CTEXT "Row Spacing",IDC_STATIC,168,33,42,8,SS_CENTERIMAGE
+ COMBOBOX IDC_COMBO_INSTRUMENT,18,31,120,137,CBS_DROPDOWNLIST | WS_VSCROLL
+ PUSHBUTTON "Plugin",IDC_PATINSTROPLUGGUI,144,30,33,13,0,WS_EX_STATICEDGE
+ RTEXT "Edit Step",IDC_STATIC,180,33,30,8,SS_CENTERIMAGE
EDITTEXT IDC_EDIT_SPACING,216,31,28,12,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_TABSTOP
CONTROL "Spin1",IDC_SPIN_SPACING,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,236,31,11,11
CONTROL "Loop Pattern",IDC_PATTERN_LOOP,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,252,33,57,8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
