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

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

Revision: 796
          http://modplug.svn.sourceforge.net/modplug/?rev=796&view=rev
Author:   saga-games
Date:     2011-02-11 22:45:26 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
[Imp] Pattern Editor: The dodgy note colour is now also customisable.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Draw_pat.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/Moptions.cpp

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2011-02-08 11:09:20 UTC (rev 795)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2011-02-11 22:45:26 UTC (rev 796)
@@ -135,7 +135,6 @@
 	b = hilightcolor(GetBValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKHILIGHT]),
 					GetBValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKNORMAL]));
 	m_Dib.SetColor(MODCOLOR_2NDHIGHLIGHT, RGB(r,g,b));
-	m_Dib.SetColor(MODCOLOR_DODGY_COMMANDS, RGB(255, 0, 0));
 	m_Dib.SetBlendColor(CMainFrame::rgbCustomColors[MODCOLOR_BLENDCOLOR]);
 }
 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2011-02-08 11:09:20 UTC (rev 795)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2011-02-11 22:45:26 UTC (rev 796)
@@ -261,6 +261,8 @@
 		GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNFACE), GetSysColor(COLOR_BTNHIGHLIGHT),
 		// Blend colour
 		GetSysColor(COLOR_BTNFACE),
+		// Dodgy commands
+		RGB(0xC0, 0x00, 0x00),
 	};
 
 // Directory Arrays (Default + Last)

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2011-02-08 11:09:20 UTC (rev 795)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2011-02-11 22:45:26 UTC (rev 796)
@@ -152,10 +152,10 @@
 	MODCOLOR_SEPFACE,
 	MODCOLOR_SEPHILITE,
 	MODCOLOR_BLENDCOLOR,
+	MODCOLOR_DODGY_COMMANDS,
 	MAX_MODCOLORS,
-	// Internal color codes
+	// Internal color codes (not saved to color preset files)
 	MODCOLOR_2NDHIGHLIGHT,
-	MODCOLOR_DODGY_COMMANDS,
 	MAX_MODPALETTECOLORS
 };
 

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2011-02-08 11:09:20 UTC (rev 795)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2011-02-11 22:45:26 UTC (rev 796)
@@ -28,6 +28,7 @@
 	{"Play Cursor",		0,	MODCOLOR_BACKPLAYCURSOR, MODCOLOR_TEXTPLAYCURSOR, 0, "Background:", "Foreground:", NULL},
 	{"Note Highlight",	0,	MODCOLOR_NOTE, MODCOLOR_INSTRUMENT, MODCOLOR_VOLUME, "Note:", "Instrument:", "Volume:"},
 	{"Effect Highlight",0,	MODCOLOR_PANNING, MODCOLOR_PITCH, MODCOLOR_GLOBALS, "Panning Effects:", "Pitch Effects:", "Global Effects:"},
+	{"Invalid Commands",0,	MODCOLOR_DODGY_COMMANDS, 0, 0, "Invalid Note:", NULL, NULL},
 	{"Channel Separator",0,	MODCOLOR_SEPSHADOW, MODCOLOR_SEPFACE, MODCOLOR_SEPHILITE, "Shadow:", "Face:", "Highlight:"},
 	{"Next/Prev Pattern",0,	MODCOLOR_BLENDCOLOR, 0, 0, "Blend color:", NULL, NULL},
 	{"Sample Editor",	1,	MODCOLOR_SAMPLE, 0, 0, "Sample Data:", NULL, NULL},
@@ -397,6 +398,7 @@
 	CustomColors[MODCOLOR_SEPFACE] = GetSysColor(COLOR_BTNFACE);
 	CustomColors[MODCOLOR_SEPHILITE] = GetSysColor(COLOR_BTNHIGHLIGHT);
 	CustomColors[MODCOLOR_BLENDCOLOR] = GetSysColor(COLOR_BTNFACE);
+	CustomColors[MODCOLOR_DODGY_COMMANDS] = RGB(0xC0, 0x00, 0x00);
 	OnPreviewChanged();
 }
 
@@ -429,6 +431,7 @@
 	CustomColors[MODCOLOR_SEPFACE] = RGB(0x40, 0x40, 0x80);
 	CustomColors[MODCOLOR_SEPHILITE] = RGB(0x99, 0x99, 0xCC);
 	CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x2E, 0x2E, 0x5A);
+	CustomColors[MODCOLOR_DODGY_COMMANDS] = RGB(0xC0, 0x40, 0x40);
 	OnPreviewChanged();
 }
 
@@ -461,6 +464,7 @@
 	CustomColors[MODCOLOR_SEPFACE] = RGB(0x40, 0x68, 0x40);
 	CustomColors[MODCOLOR_SEPHILITE] = RGB(0x94, 0xBC, 0x94);
 	CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x00, 0x40, 0x00);
+	CustomColors[MODCOLOR_DODGY_COMMANDS] = RGB(0xFF, 0x80, 0x80);
 	OnPreviewChanged();
 }
 
@@ -492,6 +496,7 @@
 	CustomColors[MODCOLOR_SEPFACE] = RGB(0xD6, 0xD0, 0xC6);
 	CustomColors[MODCOLOR_SEPHILITE] = RGB(0xEC, 0xE8, 0xE1);
 	CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0xE1, 0xDB, 0xD0);
+	CustomColors[MODCOLOR_DODGY_COMMANDS] = RGB(0xC0, 0x00, 0x00);
 	OnPreviewChanged();
 }
 
@@ -700,8 +705,8 @@
 	CHAR szPath[_MAX_PATH] = "";
 	BROWSEINFO bi;
 
-	GetDlgItemText(nID, szPath, sizeof(szPath));
-	memset(&bi, 0, sizeof(bi));
+	GetDlgItemText(nID, szPath, CountOf(szPath));
+	MemsetZero(bi);
 	bi.hwndOwner = m_hWnd;
 	bi.lpszTitle = "Select a default folder...";
 	bi.pszDisplayName = szPath;


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