Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[374] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2009-09-21 20:03:56
|
Revision: 374
http://modplug.svn.sourceforge.net/modplug/?rev=374&view=rev
Author: saga-games
Date: 2009-09-21 20:03:46 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
[New] Color setup: Channel separators can now have custom colors.
[Mod] Color setup: Changed FT2 and IT presets to resemble those two trackers as much as possible.
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/Mptrack.cpp
Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp 2009-09-21 13:05:09 UTC (rev 373)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp 2009-09-21 20:03:46 UTC (rev 374)
@@ -124,9 +124,6 @@
BYTE r,g,b;
m_Dib.SetAllColors(0, MAX_MODCOLORS, CMainFrame::rgbCustomColors);
- m_Dib.SetColor(MODSYSCOLOR_LO, GetSysColor(COLOR_BTNSHADOW));
- m_Dib.SetColor(MODSYSCOLOR_MED, GetSysColor(COLOR_BTNFACE));
- m_Dib.SetColor(MODSYSCOLOR_HI, GetSysColor(COLOR_BTNHIGHLIGHT));
r = hilightcolor(GetRValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKHILIGHT]),
GetRValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKNORMAL]));
g = hilightcolor(GetGValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKHILIGHT]),
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2009-09-21 13:05:09 UTC (rev 373)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2009-09-21 20:03:46 UTC (rev 374)
@@ -364,8 +364,14 @@
{
CString iniFile = theApp.GetConfigFileName();
//CHAR collectedString[INIBUFFERSIZE];
+ MptVersion::VersionNum vIniVersion;
gcsPreviousVersion = GetPrivateProfileCString("Version", "Version", "", iniFile);
+ if(gcsPreviousVersion == "")
+ vIniVersion = MPT_VERSION_NUMERIC;
+ else
+ vIniVersion = MptVersion::ToNum(gcsPreviousVersion);
+
gcsInstallGUID = GetPrivateProfileCString("Version", "InstallGUID", "", iniFile);
gnCheckForUpdates = GetPrivateProfileInt("Version", "CheckForUpdates", 1, iniFile);
gbMdiMaximize = GetPrivateProfileLong("Display", "MDIMaximize", true, iniFile);
@@ -385,10 +391,16 @@
gnMsgBoxVisiblityFlags = GetPrivateProfileDWord("Display", "MsgBoxVisibilityFlags", uint32_max, iniFile);
CHAR s[16];
- for (int ncol=0; ncol<MAX_MODCOLORS; ncol++) {
+ for (int ncol = 0; ncol < MAX_MODCOLORS; ncol++) {
wsprintf(s, "Color%02d", ncol);
rgbCustomColors[ncol] = GetPrivateProfileDWord("Display", s, rgbCustomColors[ncol], iniFile);
}
+ if(rgbCustomColors[MODCOLOR_SEPSHADOW] == rgbCustomColors[MODCOLOR_SEPFACE] == rgbCustomColors[MODCOLOR_SEPHILITE] == 0 && vIniVersion < MAKE_VERSION_NUMERIC(1,17,03,02))
+ {
+ rgbCustomColors[MODCOLOR_SEPSHADOW] = GetSysColor(COLOR_BTNSHADOW);
+ rgbCustomColors[MODCOLOR_SEPFACE] = GetSysColor(COLOR_BTNFACE);
+ rgbCustomColors[MODCOLOR_SEPHILITE] = GetSysColor(COLOR_BTNHIGHLIGHT);
+ }
m_nWaveDevice = GetPrivateProfileLong("Sound Settings", "WaveDevice", (SNDDEV_DSOUND<<8), iniFile);
m_dwSoundSetup = GetPrivateProfileDWord("Sound Settings", "SoundSetup", SOUNDSETUP_SECONDARY, iniFile);
@@ -414,9 +426,9 @@
gnMidiPatternLen = GetPrivateProfileLong("MIDI Settings", "MidiImportPatLen", gnMidiPatternLen, iniFile);
m_dwPatternSetup = GetPrivateProfileDWord("Pattern Editor", "PatternSetup", m_dwPatternSetup, iniFile);
- if(gcsPreviousVersion != "" && MptVersion::ToNum(gcsPreviousVersion) < MAKE_VERSION_NUMERIC(1,17,02,50))
+ if(vIniVersion < MAKE_VERSION_NUMERIC(1,17,02,50))
m_dwPatternSetup |= PATTERN_NOTEFADE;
- if(gcsPreviousVersion != "" && MptVersion::ToNum(gcsPreviousVersion) < MAKE_VERSION_NUMERIC(1,17,03,01))
+ if(vIniVersion < MAKE_VERSION_NUMERIC(1,17,03,01))
m_dwPatternSetup |= PATTERN_RESETCHANNELS;
m_nRowSpacing = GetPrivateProfileDWord("Pattern Editor", "RowSpacing", 16, iniFile);
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2009-09-21 13:05:09 UTC (rev 373)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2009-09-21 20:03:46 UTC (rev 374)
@@ -157,11 +157,11 @@
MODCOLOR_VUMETER_LO,
MODCOLOR_VUMETER_MED,
MODCOLOR_VUMETER_HI,
+ MODCOLOR_SEPSHADOW,
+ MODCOLOR_SEPFACE,
+ MODCOLOR_SEPHILITE,
MAX_MODCOLORS,
// Internal color codes
- MODSYSCOLOR_LO,
- MODSYSCOLOR_MED,
- MODSYSCOLOR_HI,
MODCOLOR_2NDHIGHLIGHT,
MAX_MODPALETTECOLORS
};
Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp 2009-09-21 13:05:09 UTC (rev 373)
+++ trunk/OpenMPT/mptrack/Moptions.cpp 2009-09-21 20:03:46 UTC (rev 374)
@@ -105,6 +105,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:"},
+ {"Channel Separator",0, MODCOLOR_SEPSHADOW, MODCOLOR_SEPFACE, MODCOLOR_SEPHILITE, "Shadow:", "Face:", "Highlight:"},
{"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:"}
@@ -483,6 +484,9 @@
CustomColors[MODCOLOR_PANNING] = RGB(0x00, 0x80, 0x80);
CustomColors[MODCOLOR_PITCH] = RGB(0x80, 0x80, 0x00);
CustomColors[MODCOLOR_GLOBALS] = RGB(0x80, 0x00, 0x00);
+ CustomColors[MODCOLOR_SEPSHADOW] = GetSysColor(COLOR_BTNSHADOW);
+ CustomColors[MODCOLOR_SEPFACE] = GetSysColor(COLOR_BTNFACE);
+ CustomColors[MODCOLOR_SEPHILITE] = GetSysColor(COLOR_BTNHIGHLIGHT);
OnPreviewChanged();
}
@@ -491,20 +495,25 @@
//--------------------------------
{
CustomColors[MODCOLOR_BACKNORMAL] = RGB(0x00, 0x00, 0x00);
- CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0xE0, 0xE0, 0x40);
- CustomColors[MODCOLOR_BACKCURROW] = RGB(0x70, 0x70, 0x70);
- CustomColors[MODCOLOR_TEXTCURROW] = RGB(0xF0, 0xF0, 0x50);
- CustomColors[MODCOLOR_BACKSELECTED] = RGB(0x40, 0x40, 0xA0);
+ CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_BACKCURROW] = RGB(0x49, 0x75, 0x82);
+ CustomColors[MODCOLOR_TEXTCURROW] = RGB(0xFF, 0xFF, 0x5F);
+ CustomColors[MODCOLOR_BACKSELECTED] = RGB(0x28, 0x28, 0x28);
CustomColors[MODCOLOR_TEXTSELECTED] = RGB(0xFF, 0xFF, 0xFF);
- CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x50, 0x50, 0x70);
- CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0xE0, 0xE0, 0x40);
- CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x40, 0x40, 0x80);
- CustomColors[MODCOLOR_NOTE] = RGB(0xE0, 0xE0, 0x40);
- CustomColors[MODCOLOR_INSTRUMENT] = RGB(0xFF, 0xFF, 0x00);
- CustomColors[MODCOLOR_VOLUME] = RGB(0x00, 0xFF, 0x00);
- CustomColors[MODCOLOR_PANNING] = RGB(0x00, 0xFF, 0xFF);
- CustomColors[MODCOLOR_PITCH] = RGB(0xFF, 0xFF, 0x00);
- CustomColors[MODCOLOR_GLOBALS] = RGB(0xFF, 0x40, 0x40);
+ CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x49, 0x75, 0x82);
+ CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0xFF, 0xFF, 0xFF);
+ CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x27, 0x41, 0x47);
+ CustomColors[MODCOLOR_NOTE] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_INSTRUMENT] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_VOLUME] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_PANNING] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_PITCH] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_GLOBALS] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_SAMPLE] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_ENVELOPES] = RGB(0xFF, 0xFF, 0x82);
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x18, 0x28, 0x2C);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0x49, 0x75, 0x82);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0x8A, 0xDB, 0xF3);
OnPreviewChanged();
}
@@ -513,20 +522,25 @@
//-------------------------------
{
CustomColors[MODCOLOR_BACKNORMAL] = RGB(0x00, 0x00, 0x00);
- CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0x00, 0xE0, 0x00);
- CustomColors[MODCOLOR_BACKCURROW] = RGB(0x70, 0x70, 0x70);
- CustomColors[MODCOLOR_TEXTCURROW] = RGB(0x00, 0xE0, 0x00);
- CustomColors[MODCOLOR_BACKSELECTED] = RGB(0xE0, 0xE0, 0xE0);
- CustomColors[MODCOLOR_TEXTSELECTED] = RGB(0x00, 0x00, 0x00);
- CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x80, 0x80, 0x00);
- CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0x00, 0xE0, 0x00);
- CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x40, 0x68, 0x40);
- CustomColors[MODCOLOR_NOTE] = RGB(0x00, 0xFF, 0x00);
- CustomColors[MODCOLOR_INSTRUMENT] = RGB(0xFF, 0xFF, 0x00);
- CustomColors[MODCOLOR_VOLUME] = RGB(0x00, 0xFF, 0x00);
- CustomColors[MODCOLOR_PANNING] = RGB(0x00, 0xFF, 0xFF);
- CustomColors[MODCOLOR_PITCH] = RGB(0xFF, 0xFF, 0x00);
- CustomColors[MODCOLOR_GLOBALS] = RGB(0xFF, 0x40, 0x40);
+ CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0x45, 0x9A, 0x49);
+ CustomColors[MODCOLOR_BACKCURROW] = RGB(0x10, 0x35, 0x00);
+ CustomColors[MODCOLOR_TEXTCURROW] = RGB(0xEB, 0xEB, 0xCB);
+ CustomColors[MODCOLOR_BACKSELECTED] = RGB(0x20, 0x55, 0x00);
+ CustomColors[MODCOLOR_TEXTSELECTED] = RGB(0xEB, 0xEB, 0xCB);
+ CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x59, 0x41, 0x3C);
+ CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0x45, 0x9A, 0x49);
+ CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x59, 0x41, 0x3C);
+ CustomColors[MODCOLOR_NOTE] = RGB(0x45, 0x9A, 0x49);
+ CustomColors[MODCOLOR_INSTRUMENT] = RGB(0x38, 0x9E, 0x75);
+ CustomColors[MODCOLOR_VOLUME] = RGB(0xA2, 0xA2, 0xA2);
+ CustomColors[MODCOLOR_PANNING] = RGB(0x18, 0x75, 0x2C);
+ CustomColors[MODCOLOR_PITCH] = RGB(0x45, 0x9A, 0x49);
+ CustomColors[MODCOLOR_GLOBALS] = RGB(0x45, 0x9A, 0x49);
+ CustomColors[MODCOLOR_SAMPLE] = RGB(0x8E, 0x14, 0x55);
+ CustomColors[MODCOLOR_ENVELOPES] = RGB(0xA2, 0xA2, 0xA2);
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0xB6, 0x96, 0x79);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0xB6, 0x96, 0x79);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0xB6, 0x96, 0x79);
OnPreviewChanged();
}
@@ -540,7 +554,6 @@
CustomColors[MODCOLOR_TEXTCURROW] = 0x00000000;
CustomColors[MODCOLOR_BACKSELECTED] = 0x00000000;
CustomColors[MODCOLOR_TEXTSELECTED] = 0x00ccd7dd;
- CustomColors[MODCOLOR_SAMPLE] = 0x0000ff00;
CustomColors[MODCOLOR_BACKPLAYCURSOR] = 0x007a99a9;
CustomColors[MODCOLOR_TEXTPLAYCURSOR] = 0x00000000;
CustomColors[MODCOLOR_BACKHILIGHT] = 0x00b5c5ce;
@@ -550,7 +563,11 @@
CustomColors[MODCOLOR_PANNING] = 0x00686800;
CustomColors[MODCOLOR_PITCH] = 0x00006262;
CustomColors[MODCOLOR_GLOBALS] = 0x00000066;
+ CustomColors[MODCOLOR_SAMPLE] = 0x0000ff00;
CustomColors[MODCOLOR_ENVELOPES] = 0x000000ff;
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x80, 0x80, 0x80);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0xD4, 0xD0, 0xC8);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0xFF, 0xFF, 0xFF);
OnPreviewChanged();
}
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2009-09-21 13:05:09 UTC (rev 373)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2009-09-21 20:03:46 UTC (rev 374)
@@ -2255,9 +2255,9 @@
m_Dib.bmiHeader.biClrUsed = 0;
m_Dib.bmiHeader.biClrImportant = 256; // MAX_MODPALETTECOLORS;
m_n4BitPalette[0] = (BYTE)m_nTextColor;
- m_n4BitPalette[4] = MODSYSCOLOR_LO;
- m_n4BitPalette[12] = MODSYSCOLOR_MED;
- m_n4BitPalette[14] = MODSYSCOLOR_HI;
+ m_n4BitPalette[4] = MODCOLOR_SEPSHADOW;
+ m_n4BitPalette[12] = MODCOLOR_SEPFACE;
+ m_n4BitPalette[14] = MODCOLOR_SEPHILITE;
m_n4BitPalette[15] = (BYTE)m_nBkColor;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
