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

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

Revision: 378
          http://modplug.svn.sourceforge.net/modplug/?rev=378&view=rev
Author:   saga-games
Date:     2009-09-23 15:04:06 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
[New] Colour setup: Can now specify the blend colour for prev/next patterns.

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

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2009-09-23 11:57:10 UTC (rev 377)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2009-09-23 15:04:06 UTC (rev 378)
@@ -131,7 +131,7 @@
 	b = hilightcolor(GetBValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKHILIGHT]),
 					GetBValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKNORMAL]));
 	m_Dib.SetColor(MODCOLOR_2NDHIGHLIGHT, RGB(r,g,b));
-	m_Dib.SetBlendColor(GetSysColor(COLOR_BTNFACE));
+	m_Dib.SetBlendColor(CMainFrame::rgbCustomColors[MODCOLOR_BLENDCOLOR]);
 }
 
 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2009-09-23 11:57:10 UTC (rev 377)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2009-09-23 15:04:06 UTC (rev 378)
@@ -257,6 +257,8 @@
 		0x00FF00, 0x00FFFF, 0x0000FF,
 		// Channel separators
 		GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNFACE), GetSysColor(COLOR_BTNHIGHLIGHT),
+		// Blend colour
+		GetSysColor(COLOR_BTNFACE),
 	};
 
 // Directory Arrays (Default + Last)

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2009-09-23 11:57:10 UTC (rev 377)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2009-09-23 15:04:06 UTC (rev 378)
@@ -160,6 +160,7 @@
 	MODCOLOR_SEPSHADOW,
 	MODCOLOR_SEPFACE,
 	MODCOLOR_SEPHILITE,
+	MODCOLOR_BLENDCOLOR,
 	MAX_MODCOLORS,
 	// Internal color codes
 	MODCOLOR_2NDHIGHLIGHT,

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2009-09-23 11:57:10 UTC (rev 377)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2009-09-23 15:04:06 UTC (rev 378)
@@ -106,6 +106,7 @@
 	{"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:"},
 	{"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},
 	{"Instrument Editor",2,	MODCOLOR_ENVELOPES, 0, 0, "Envelopes:", NULL, NULL},
 	{"VU-Meters",		0,	MODCOLOR_VUMETER_HI, MODCOLOR_VUMETER_MED, MODCOLOR_VUMETER_LO, "Hi:", "Med:", "Lo:"}
@@ -487,6 +488,7 @@
 	CustomColors[MODCOLOR_SEPSHADOW] = GetSysColor(COLOR_BTNSHADOW);
 	CustomColors[MODCOLOR_SEPFACE] = GetSysColor(COLOR_BTNFACE);
 	CustomColors[MODCOLOR_SEPHILITE] = GetSysColor(COLOR_BTNHIGHLIGHT);
+	CustomColors[MODCOLOR_BLENDCOLOR] = GetSysColor(COLOR_BTNFACE);
 	OnPreviewChanged();
 }
 
@@ -514,6 +516,7 @@
 	CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x18, 0x28, 0x2C);
 	CustomColors[MODCOLOR_SEPFACE] = RGB(0x49, 0x75, 0x82);
 	CustomColors[MODCOLOR_SEPHILITE] = RGB(0x8A, 0xDB, 0xF3);
+	CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x27, 0x41, 0x47);
 	OnPreviewChanged();
 }
 
@@ -541,6 +544,7 @@
 	CustomColors[MODCOLOR_SEPSHADOW] = RGB(0xB6, 0x96, 0x79);
 	CustomColors[MODCOLOR_SEPFACE] = RGB(0xB6, 0x96, 0x79);
 	CustomColors[MODCOLOR_SEPHILITE] = RGB(0xB6, 0x96, 0x79);
+	CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x35, 0x27, 0x24);
 	OnPreviewChanged();
 }
 
@@ -568,6 +572,7 @@
 	CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x80, 0x80, 0x80);
 	CustomColors[MODCOLOR_SEPFACE] = RGB(0xD4, 0xD0, 0xC8);
 	CustomColors[MODCOLOR_SEPHILITE] = RGB(0xFF, 0xFF, 0xFF);
+	CustomColors[MODCOLOR_BLENDCOLOR] = 0x00d0dbe1;
 	OnPreviewChanged();
 }
 

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	2009-09-23 11:57:10 UTC (rev 377)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	2009-09-23 15:04:06 UTC (rev 378)
@@ -2193,7 +2193,7 @@
 		m_CbnMacroCC.ShowWindow(TRUE);
 		m_CbnMacroPlug.ShowWindow(FALSE);
 		m_CbnMacroPlug.ShowWindow(FALSE);
-		SetDlgItemText(IDC_GENMACROLABEL, "Midi CC");
+		SetDlgItemText(IDC_GENMACROLABEL, "MIDI CC");
 		m_CbnMacroCC.SetCurSel(m_pModDoc->MacroToMidiCC(&(m_MidiCfg.szMidiSFXExt[sfx*32])));
 	} else {
 		m_CbnMacroCC.EnableWindow(FALSE);


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