[OMPT-svn-commit] SF.net SVN: modplug:[974] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 974
          http://modplug.svn.sourceforge.net/modplug/?rev=974&view=rev
Author:   saga-games
Date:     2011-08-10 17:21:53 +0000 (Wed, 10 Aug 2011)

Log Message:
-----------
[New] Added option to select whole channel when double-clicking a pattern cell (tx ko0x)
[Mod] OpenMPT: Version is now 1.20.00.07

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2011-08-09 14:45:39 UTC (rev 973)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2011-08-10 17:21:53 UTC (rev 974)
@@ -188,7 +188,7 @@
 #define PATTERN_FOLLOWSONGOFF		0x80000		// follow song off by default
 #define PATTERN_MIDIRECORD			0x100000	// MIDI Record on by default
 #define PATTERN_NOCLOSEDIALOG		0x200000	// Don't use OpenMPT's custom close dialog with a list of saved files when closing the main window
-//#define PATTERN_HILITETIMESIGS		0x400000	// highlight on song signature, deprecated (now always enabled)
+#define PATTERN_DBLCLICKSELECT		0x400000	// Double-clicking pattern selects whole channel
 #define PATTERN_OLDCTXMENUSTYLE		0x800000	// mpt 1.16 pattern context menu style
 #define PATTERN_SYNCMUTE			0x1000000	// maintain sample sync on mute
 #define PATTERN_AUTODELAY			0x2000000	// automatically insert delay commands in pattern when entering notes

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2011-08-09 14:45:39 UTC (rev 973)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2011-08-10 17:21:53 UTC (rev 974)
@@ -576,7 +576,7 @@
 	{PATTERN_CONTSCROLL,	"Continuous scroll",				"Jumps to the next pattern when moving past the end of a pattern"},
 	{PATTERN_KBDNOTEOFF,	"Record note off",					"Record note off when a key is released on the PC keyboard (Only works in instrument mode)."},
 	{PATTERN_FOLLOWSONGOFF,	"Follow song off by default",		"Ensure follow song is off when opening or starting a new song."},
-	{PATTERN_MIDIRECORD,	"Midi record",						"Enable midi in record by default."},
+	{PATTERN_MIDIRECORD,	"MIDI record",						"Enable MIDI in record by default."},
 	{PATTERN_OLDCTXMENUSTYLE, "Old style pattern context menu", "Check this option to hide unavailable items in the pattern editor context menu. Uncheck to grey-out unavailable items instead."}, 
 	{PATTERN_SYNCMUTE,		"Maintain sample sync on mute",		"Samples continue to be processed when channels are muted (like in IT2 and FT2)"},
 	{PATTERN_AUTODELAY,		"Automatic delay commands",			"Automatically insert appropriate note-delay commands when recording notes during live playback."},
@@ -585,6 +585,7 @@
 	{PATTERN_RESETCHANNELS,	"Reset channels on loop",			"If enabled, channels will be reset to their initial state when song looping is enabled.\nNote: This does not affect manual song loops (i.e. triggered by pattern commands) and is recommended to be enabled."},
 	{PATTERN_LIVEUPDATETREE,"Update sample status in tree",		"If enabled, active samples and instruments will be indicated by a different icon in the treeview."},
 	{PATTERN_NOCLOSEDIALOG,	"Disable modern close dialog",		"When closing the main window, a confirmation window is shown for every unsaved document instead of one single window with a list of unsaved documents."},
+	{PATTERN_DBLCLICKSELECT, "Double-click to select channel",	"Instead of showing the note properties, double-clicking a pattern cell selects the whole channel."},
 };
 
 

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2011-08-09 14:45:39 UTC (rev 973)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2011-08-10 17:21:53 UTC (rev 974)
@@ -252,6 +252,7 @@
 		RpcStringFree(&Str);
 	}
 
+	// GUI Stuff
 	gbMdiMaximize = CMainFrame::GetPrivateProfileLong("Display", "MDIMaximize", gbMdiMaximize, iniFile);
 	glTreeWindowWidth = CMainFrame::GetPrivateProfileLong("Display", "MDITreeWidth", glTreeWindowWidth, iniFile);
 	glTreeSplitRatio = CMainFrame::GetPrivateProfileLong("Display", "MDITreeRatio", glTreeSplitRatio, iniFile);
@@ -359,8 +360,12 @@
 		m_dwPatternSetup |= PATTERN_RESETCHANNELS;
 	if(vIniVersion < MAKE_VERSION_NUMERIC(1,19,00,07))
 		m_dwPatternSetup &= ~0x800;					// this was previously deprecated and is now used for something else
+	if(vIniVersion < MAKE_VERSION_NUMERIC(1,20,00,04))
+		m_dwPatternSetup &= ~0x200000;				// dito
+	if(vIniVersion < MAKE_VERSION_NUMERIC(1,20,00,07))
+		m_dwPatternSetup &= ~0x400000;				// dito
 	if(vIniVersion < MptVersion::num)
-		m_dwPatternSetup &= ~(0x200000|0x400000|0x10000000);	// various deprecated old options
+		m_dwPatternSetup &= ~0x10000000;			// various deprecated old options
 
 	m_nRowHighlightMeasures = CMainFrame::GetPrivateProfileDWord("Pattern Editor", "RowSpacing", m_nRowHighlightMeasures, iniFile);
 	m_nRowHighlightBeats = CMainFrame::GetPrivateProfileDWord("Pattern Editor", "RowSpacing2", m_nRowHighlightBeats, iniFile);

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2011-08-09 14:45:39 UTC (rev 973)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2011-08-10 17:21:53 UTC (rev 974)
@@ -1112,7 +1112,14 @@
 	DWORD dwPos = GetPositionFromPoint(point);
 	if ((dwPos == (CreateCursor(m_nRow) | m_dwCursor)) && (point.y >= m_szHeader.cy))
 	{
-		if (ShowEditWindow()) return;
+		if((CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_DBLCLICKSELECT))
+		{
+			OnSelectCurrentColumn();
+			return;
+		} else
+		{
+			if (ShowEditWindow()) return;
+		}
 	}
 	OnLButtonDown(uFlags, point);
 }
@@ -3247,7 +3254,7 @@
 
 
 LRESULT CViewPattern::OnMidiMsg(WPARAM dwMidiDataParam, LPARAM)
-//--------------------------------------------------------
+//-------------------------------------------------------------
 {
 	const DWORD dwMidiData = dwMidiDataParam;
 	static BYTE midivolume = 127;

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2011-08-09 14:45:39 UTC (rev 973)
+++ trunk/OpenMPT/mptrack/version.h	2011-08-10 17:21:53 UTC (rev 974)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					00
-#define VER_MINORMINOR				06
+#define VER_MINORMINOR				07
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.