Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[461] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2010-01-10 14:50:43
|
Revision: 461
http://modplug.svn.sourceforge.net/modplug/?rev=461&view=rev
Author: saga-games
Date: 2010-01-10 14:50:33 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
[Mod] Reverted the "IT" and "FT2" colour schemes to what they used to be until 1.17.02.54, since those colour schemes worked better. However, since they do not resemble IT or FT2 in any way, they have been simply renamed to "Green" and "Blue".
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp 2010-01-09 20:06:18 UTC (rev 460)
+++ trunk/OpenMPT/mptrack/Moptions.cpp 2010-01-10 14:50:33 UTC (rev 461)
@@ -422,30 +422,31 @@
void COptionsColors::OnPresetFT2()
//--------------------------------
{
+ // "blue"
CustomColors[MODCOLOR_BACKNORMAL] = RGB(0x00, 0x00, 0x00);
- 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_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_TEXTSELECTED] = RGB(0xFF, 0xFF, 0xFF);
- 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_VUMETER_LO] = RGB(0x4B, 0x7C, 0x89);
- CustomColors[MODCOLOR_VUMETER_MED] = RGB(0x5F, 0x98, 0xA7);
- CustomColors[MODCOLOR_VUMETER_HI] = RGB(0xEA, 0x1C, 0x78);
- 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);
+ CustomColors[MODCOLOR_SAMPLE] = RGB(0xFF, 0x00, 0x00);
+ 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_ENVELOPES] = RGB(0x00, 0x00, 0xFF);
+ CustomColors[MODCOLOR_VUMETER_LO] = RGB(0x00, 0xC8, 0x00);
+ CustomColors[MODCOLOR_VUMETER_MED] = RGB(0xFF, 0xC8, 0x00);
+ CustomColors[MODCOLOR_VUMETER_HI] = RGB(0xE1, 0x00, 0x00);
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x2E, 0x2E, 0x5C);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0x40, 0x40, 0x80);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0x99, 0x99, 0xCC);
+ CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x2E, 0x2E, 0x5A);
OnPreviewChanged();
}
@@ -453,30 +454,31 @@
void COptionsColors::OnPresetIT()
//-------------------------------
{
+ // "green"
CustomColors[MODCOLOR_BACKNORMAL] = RGB(0x00, 0x00, 0x00);
- 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_VUMETER_LO] = RGB(0x25, 0x7D, 0x00);
- CustomColors[MODCOLOR_VUMETER_MED] = RGB(0xEC, 0x99, 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_SAMPLE] = RGB(0xFF, 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_ENVELOPES] = RGB(0x00, 0x00, 0xFF);
+ CustomColors[MODCOLOR_VUMETER_LO] = RGB(0x00, 0xC8, 0x00);
+ CustomColors[MODCOLOR_VUMETER_MED] = RGB(0xFF, 0xC8, 0x00);
CustomColors[MODCOLOR_VUMETER_HI] = RGB(0xE1, 0x00, 0x00);
- 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);
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x23, 0x38, 0x23);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0x40, 0x68, 0x40);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0x94, 0xBC, 0x94);
+ CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x00, 0x40, 0x00);
OnPreviewChanged();
}
@@ -612,7 +614,7 @@
{PATTERN_SINGLEEXPAND, "Single click to expand tree", "Single-clicking in the left tree view will expand a branch"},
{PATTERN_MUTECHNMODE, "Ignored muted channels", "Notes will not be played on muted channels (unmuting will only start on a new note)."},
{PATTERN_AUTOSPACEBAR, "Quick cursor paste Auto-Repeat", "Leaving the space bar pressed will auto-repeat the action"},
- {PATTERN_NOEXTRALOUD, "No loud samples", "Disable loud playback of samples in the sample/instrument editor"},
+ {PATTERN_NOEXTRALOUD, "No loud samples", "Disable loud playback of samples in the sample/instrument editor. Sample volume depends on the sample volume slider on the general tab when activated."},
{PATTERN_SHOWPREVIOUS, "Show Prev/Next patterns", "Displays grayed-out version of the previous/next patterns in the pattern editor. Does not work if \"always center active row\" is disabled."},
{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)."},
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2010-01-09 20:06:18 UTC (rev 460)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2010-01-10 14:50:33 UTC (rev 461)
@@ -298,7 +298,7 @@
END
IDD_OPTIONS_COLORS DIALOGEX 0, 0, 272, 281
-STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Colours"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -309,10 +309,10 @@
EDITTEXT IDC_SECONDARYHILITE,114,108,21,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Enable effect highlighting",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,60,114,10
CONTROL "Use small font",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,102,10
- PUSHBUTTON "MPT",IDC_BUTTON5,144,246,24,15
- PUSHBUTTON "FT2",IDC_BUTTON6,204,246,24,15
- PUSHBUTTON "IT",IDC_BUTTON7,174,246,24,15
- PUSHBUTTON "Buzz",IDC_BUTTON8,234,246,24,15
+ PUSHBUTTON "MPT",IDC_BUTTON5,126,246,30,15
+ PUSHBUTTON "Blue",IDC_BUTTON6,198,246,30,15
+ PUSHBUTTON "Green",IDC_BUTTON7,162,246,30,15
+ PUSHBUTTON "Buzz",IDC_BUTTON8,234,246,30,15
CONTROL "Colour",IDC_BUTTON1,"Button",BS_OWNERDRAW,25,194,51,15
CONTROL "Colour",IDC_BUTTON2,"Button",BS_OWNERDRAW,98,194,51,15
CONTROL "Colour",IDC_BUTTON3,"Button",BS_OWNERDRAW,168,194,51,15
@@ -326,8 +326,8 @@
CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,65,130,114,43
CONTROL "Set highlights to songs' time signatures",IDC_CHECK5,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,75,136,10
- PUSHBUTTON "Load...",IDC_LOAD_COLORSCHEME,18,246,48,15
- PUSHBUTTON "Save...",IDC_SAVE_COLORSCHEME,72,246,48,15
+ PUSHBUTTON "Load...",IDC_LOAD_COLORSCHEME,18,246,42,15
+ PUSHBUTTON "Save...",IDC_SAVE_COLORSCHEME,66,246,42,15
GROUPBOX "Colour Presets",IDC_STATIC,6,228,264,42
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
