Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[365] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2009-09-15 22:10:56
|
Revision: 365
http://modplug.svn.sourceforge.net/modplug/?rev=365&view=rev
Author: saga-games
Date: 2009-09-15 22:10:35 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
[New] Shareable color schemes (via config dialog)
[Fix] Instrument tab: Pitch/Pan input field allows negative values
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/Moptions.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/resource.h
Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp 2009-09-15 17:15:29 UTC (rev 364)
+++ trunk/OpenMPT/mptrack/Moptions.cpp 2009-09-15 22:10:35 UTC (rev 365)
@@ -117,21 +117,23 @@
BEGIN_MESSAGE_MAP(COptionsColors, CPropertyPage)
ON_WM_DRAWITEM()
- ON_CBN_SELCHANGE(IDC_COMBO1, OnColorSelChanged)
- ON_EN_CHANGE(IDC_PRIMARYHILITE,OnSettingsChanged)
+ ON_CBN_SELCHANGE(IDC_COMBO1, OnColorSelChanged)
+ ON_EN_CHANGE(IDC_PRIMARYHILITE, OnSettingsChanged)
ON_EN_CHANGE(IDC_SECONDARYHILITE, OnSettingsChanged)
- ON_COMMAND(IDC_BUTTON1, OnSelectColor1)
- ON_COMMAND(IDC_BUTTON2, OnSelectColor2)
- ON_COMMAND(IDC_BUTTON3, OnSelectColor3)
- ON_COMMAND(IDC_BUTTON5, OnPresetMPT)
- ON_COMMAND(IDC_BUTTON6, OnPresetFT2)
- ON_COMMAND(IDC_BUTTON7, OnPresetIT)
- ON_COMMAND(IDC_BUTTON8, OnPresetBuzz)
- ON_COMMAND(IDC_CHECK1, OnSettingsChanged)
- ON_COMMAND(IDC_CHECK2, OnPreviewChanged)
- ON_COMMAND(IDC_CHECK3, OnSettingsChanged)
- ON_COMMAND(IDC_CHECK4, OnPreviewChanged)
- ON_COMMAND(IDC_CHECK5, OnHiliteTimeSigsChanged)
+ ON_COMMAND(IDC_BUTTON1, OnSelectColor1)
+ ON_COMMAND(IDC_BUTTON2, OnSelectColor2)
+ ON_COMMAND(IDC_BUTTON3, OnSelectColor3)
+ ON_COMMAND(IDC_BUTTON5, OnPresetMPT)
+ ON_COMMAND(IDC_BUTTON6, OnPresetFT2)
+ ON_COMMAND(IDC_BUTTON7, OnPresetIT)
+ ON_COMMAND(IDC_BUTTON8, OnPresetBuzz)
+ ON_COMMAND(IDC_LOAD_COLORSCHEME, OnLoadColorScheme)
+ ON_COMMAND(IDC_SAVE_COLORSCHEME, OnSaveColorScheme)
+ ON_COMMAND(IDC_CHECK1, OnSettingsChanged)
+ ON_COMMAND(IDC_CHECK2, OnPreviewChanged)
+ ON_COMMAND(IDC_CHECK3, OnSettingsChanged)
+ ON_COMMAND(IDC_CHECK4, OnPreviewChanged)
+ ON_COMMAND(IDC_CHECK5, OnHiliteTimeSigsChanged)
END_MESSAGE_MAP()
@@ -538,7 +540,7 @@
CustomColors[MODCOLOR_TEXTCURROW] = 0x00000000;
CustomColors[MODCOLOR_BACKSELECTED] = 0x00000000;
CustomColors[MODCOLOR_TEXTSELECTED] = 0x00ccd7dd;
- //CustomColors[MODCOLOR_SAMPLE] = 0x0000ff00;
+ CustomColors[MODCOLOR_SAMPLE] = 0x0000ff00;
CustomColors[MODCOLOR_BACKPLAYCURSOR] = 0x007a99a9;
CustomColors[MODCOLOR_TEXTPLAYCURSOR] = 0x00000000;
CustomColors[MODCOLOR_BACKHILIGHT] = 0x00b5c5ce;
@@ -548,10 +550,54 @@
CustomColors[MODCOLOR_PANNING] = 0x00686800;
CustomColors[MODCOLOR_PITCH] = 0x00006262;
CustomColors[MODCOLOR_GLOBALS] = 0x00000066;
- //CustomColors[MODCOLOR_ENVELOPES] = 0x000000ff;
+ CustomColors[MODCOLOR_ENVELOPES] = 0x000000ff;
OnPreviewChanged();
}
+void COptionsColors::OnLoadColorScheme()
+//--------------------------------------
+{
+ CFileDialog dlg(TRUE, NULL, NULL,
+ OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST,
+ "OpenMPT Color Schemes|*.mptcolor|"
+ "All Files (*.*)|*.*||",
+ this);
+ if (dlg.DoModal() != IDOK) return;
+
+
+ TCHAR sFilename[MAX_PATH];
+ strcpy(sFilename, dlg.GetPathName());
+
+ for(int i = 0; i < MAX_MODCOLORS; i++)
+ {
+ TCHAR sKeyName[16];
+ wsprintf(sKeyName, "Color%02d", i);
+ CustomColors[i] = CMainFrame::GetPrivateProfileLong("Colors", sKeyName, CustomColors[i], sFilename);
+ }
+ OnPreviewChanged();
+}
+
+void COptionsColors::OnSaveColorScheme()
+//--------------------------------------
+{
+ CFileDialog dlg(FALSE, "mptcolor", NULL,
+ OFN_HIDEREADONLY| OFN_ENABLESIZING | OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST | OFN_NOREADONLYRETURN,
+ "OpenMPT Color Schemes|*.mptcolor|",
+ this);
+ if (dlg.DoModal() != IDOK) return;
+
+ TCHAR sFilename[MAX_PATH];
+ strcpy(sFilename, dlg.GetPathName());
+
+ for(int i = 0; i < MAX_MODCOLORS; i++)
+ {
+ TCHAR sKeyName[16];
+ wsprintf(sKeyName, "Color%02d", i);
+ CMainFrame::WritePrivateProfileLong("Colors", sKeyName, CustomColors[i], sFilename);
+ }
+}
+
+
/////////////////////////////////////////////////////////////////////////////////
// COptionsGeneral
Modified: trunk/OpenMPT/mptrack/Moptions.h
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.h 2009-09-15 17:15:29 UTC (rev 364)
+++ trunk/OpenMPT/mptrack/Moptions.h 2009-09-15 22:10:35 UTC (rev 365)
@@ -81,6 +81,8 @@
afx_msg void OnPresetFT2();
afx_msg void OnPresetIT();
afx_msg void OnPresetBuzz();
+ afx_msg void OnLoadColorScheme();
+ afx_msg void OnSaveColorScheme();
afx_msg void OnPreviewChanged();
DECLARE_MESSAGE_MAP();
};
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2009-09-15 17:15:29 UTC (rev 364)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2009-09-15 22:10:35 UTC (rev 365)
@@ -210,7 +210,7 @@
PUSHBUTTON "Clear Log",IDC_CLEARLOG,227,85,37,9
END
-IDD_OPTIONS_COLORS DIALOGEX 0, 0, 272, 231
+IDD_OPTIONS_COLORS DIALOGEX 0, 0, 272, 281
STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Colors"
FONT 8, "MS Sans Serif", 0, 0, 0x0
@@ -222,24 +222,26 @@
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,159,26,22,12
- PUSHBUTTON "FT2",IDC_BUTTON6,185,26,22,12
- PUSHBUTTON "IT",IDC_BUTTON7,210,25,22,12
- PUSHBUTTON "Buzz",IDC_BUTTON8,235,25,22,12
+ 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
CONTROL "Color",IDC_BUTTON1,"Button",BS_OWNERDRAW,25,194,51,15
CONTROL "Color",IDC_BUTTON2,"Button",BS_OWNERDRAW,98,194,51,15
CONTROL "Color",IDC_BUTTON3,"Button",BS_OWNERDRAW,168,194,51,15
LTEXT "Background:",IDC_TEXT1,25,183,60,8
LTEXT "Foreground:",IDC_TEXT2,98,183,62,8
LTEXT "Highlight:",IDC_TEXT3,169,185,61,8
- GROUPBOX "",IDC_STATIC,5,5,260,220
+ GROUPBOX "",IDC_STATIC,5,5,260,211
LTEXT "Select color for:",IDC_STATIC,15,15,63,8
LTEXT "rows",IDC_STATIC,138,92,16,8
- LTEXT "Presets:",IDC_STATIC,159,15,28,8
LTEXT "rows",IDC_STATIC,138,110,16,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
+ GROUPBOX "Color Presets",IDC_STATIC,6,228,264,42
END
IDD_OPTIONS_MIDI DIALOGEX 0, 0, 272, 281
@@ -478,7 +480,7 @@
CONTROL "Pan",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,55,71,29,10
EDITTEXT IDC_EDIT9,87,70,34,12,ES_NUMBER
CONTROL "Spin1",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,74,8,11
- EDITTEXT IDC_EDIT15,33,99,27,13,ES_NUMBER
+ EDITTEXT IDC_EDIT15,33,99,27,13
CONTROL "Spin1",IDC_SPIN12,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,61,103,7,11
COMBOBOX IDC_COMBO4,95,99,27,91,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_SLIDER5,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS,47,135,36,10
@@ -1399,7 +1401,7 @@
IDD_OPTIONS_COLORS, DIALOG
BEGIN
RIGHTMARGIN, 247
- BOTTOMMARGIN, 151
+ BOTTOMMARGIN, 201
END
IDD_OPTIONS_MIDI, DIALOG
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2009-09-15 17:15:29 UTC (rev 364)
+++ trunk/OpenMPT/mptrack/resource.h 2009-09-15 22:10:35 UTC (rev 365)
@@ -883,6 +883,8 @@
#define IDC_RADIO_RESIZETO 2384
#define IDC_EDIT_MODLOADING_WARNINGS 2385
#define IDC_CHECK_PATRECORD 2386
+#define IDC_LOAD_COLORSCHEME 2387
+#define IDC_SAVE_COLORSCHEME 2388
#define ID_FILE_NEWMOD 32771
#define ID_FILE_NEWXM 32772
#define ID_FILE_NEWS3M 32773
@@ -1116,7 +1118,7 @@
#define ID_OVERFLOWPASTE 59226
#define ID_NOTEMAP_COPY_NOTE 59227
#define ID_CLEANUP_REARRANGESAMPLES 59228
-#define ID_ORDERLIST_RENDER 59229
+#define ID_ORDERLIST_RENDER 59229
// Next default values for new objects
//
@@ -1125,7 +1127,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 521
#define _APS_NEXT_COMMAND_VALUE 59230
-#define _APS_NEXT_CONTROL_VALUE 2387
+#define _APS_NEXT_CONTROL_VALUE 2389
#define _APS_NEXT_SYMED_VALUE 901
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
