Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5184] trunk/OpenMPT
|
From: <sag...@us...> - 2015-05-25 20:25:04
|
Revision: 5184
http://sourceforge.net/p/modplug/code/5184
Author: saga-games
Date: 2015-05-25 20:24:50 +0000 (Mon, 25 May 2015)
Log Message:
-----------
[New] Can now set default artist name and mod type from the general options.
[Mod] Moved default paths and autosaver setup to a new/renamed option tab, "Paths / Auto Save"
[Ref] Move dialogs from Moptions.cpp/.h into separate source and header files to keep them more tidy.
Modified Paths:
--------------
trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters
trunk/OpenMPT/common/mptPathString.h
trunk/OpenMPT/mptrack/AutoSaver.cpp
trunk/OpenMPT/mptrack/AutoSaver.h
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/Mpt_midi.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/TrackerSettings.h
trunk/OpenMPT/mptrack/UpdateCheck.cpp
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
Added Paths:
-----------
trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp
trunk/OpenMPT/mptrack/AdvancedConfigDlg.h
trunk/OpenMPT/mptrack/ColorConfigDlg.cpp
trunk/OpenMPT/mptrack/ColorConfigDlg.h
trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
trunk/OpenMPT/mptrack/GeneralConfigDlg.h
trunk/OpenMPT/mptrack/PathConfigDlg.cpp
trunk/OpenMPT/mptrack/PathConfigDlg.h
trunk/OpenMPT/mptrack/SampleConfigDlg.cpp
trunk/OpenMPT/mptrack/SampleConfigDlg.h
Removed Paths:
-------------
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/Moptions.h
Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-25 20:24:50 UTC (rev 5184)
@@ -804,6 +804,14 @@
>
</File>
<File
+ RelativePath="..\..\mptrack\AdvancedConfigDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mptrack\AdvancedConfigDlg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\mptrack\AppendModule.cpp"
>
</File>
@@ -872,6 +880,14 @@
>
</File>
<File
+ RelativePath="..\..\mptrack\ColorConfigDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mptrack\ColorConfigDlg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\mptrack\ColourEdit.cpp"
>
</File>
@@ -1004,6 +1020,14 @@
>
</File>
<File
+ RelativePath="..\..\mptrack\GeneralConfigDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mptrack\GeneralConfigDlg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\mptrack\Globals.cpp"
>
</File>
@@ -1108,14 +1132,6 @@
>
</File>
<File
- RelativePath="..\..\mptrack\Moptions.cpp"
- >
- </File>
- <File
- RelativePath="..\..\mptrack\Moptions.h"
- >
- </File>
- <File
RelativePath="..\..\mptrack\MoveFXSlotDialog.cpp"
>
</File>
@@ -1164,6 +1180,14 @@
>
</File>
<File
+ RelativePath="..\..\mptrack\PathConfigDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mptrack\PathConfigDlg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\mptrack\PatternClipboard.cpp"
>
</File>
@@ -1208,6 +1232,14 @@
>
</File>
<File
+ RelativePath="..\..\mptrack\SampleConfigDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mptrack\SampleConfigDlg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\mptrack\SampleEditorDialogs.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-05-25 20:24:50 UTC (rev 5184)
@@ -373,6 +373,7 @@
<ClInclude Include="..\..\common\versionNumber.h" />
<ClInclude Include="..\..\mptrack\AboutDialog.h" />
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h" />
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h" />
<ClInclude Include="..\..\mptrack\AutoSaver.h" />
<ClInclude Include="..\..\mptrack\Autotune.h" />
<ClInclude Include="..\..\mptrack\CImageListEx.h" />
@@ -382,6 +383,7 @@
<ClInclude Include="..\..\mptrack\Childfrm.h" />
<ClInclude Include="..\..\mptrack\CleanupSong.h" />
<ClInclude Include="..\..\mptrack\CloseMainDialog.h" />
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h" />
<ClInclude Include="..\..\mptrack\ColourEdit.h" />
<ClInclude Include="..\..\mptrack\CommandSet.h" />
<ClInclude Include="..\..\mptrack\CreditStatic.h" />
@@ -398,6 +400,7 @@
<ClInclude Include="..\..\mptrack\FadeLaws.h" />
<ClInclude Include="..\..\mptrack\FileDialog.h" />
<ClInclude Include="..\..\mptrack\FolderScanner.h" />
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h" />
<ClInclude Include="..\..\mptrack\Globals.h" />
<ClInclude Include="..\..\mptrack\InputHandler.h" />
<ClInclude Include="..\..\mptrack\KeyConfigDlg.h" />
@@ -409,19 +412,20 @@
<ClInclude Include="..\..\mptrack\Mainfrm.h" />
<ClInclude Include="..\..\mptrack\ModConvert.h" />
<ClInclude Include="..\..\mptrack\Moddoc.h" />
- <ClInclude Include="..\..\mptrack\Moptions.h" />
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h" />
<ClInclude Include="..\..\mptrack\Mpdlgs.h" />
<ClInclude Include="..\..\mptrack\Mptrack.h" />
<ClInclude Include="..\..\mptrack\Notification.h" />
<ClInclude Include="..\..\mptrack\PNG.h" />
<ClInclude Include="..\..\mptrack\PSRatioCalc.h" />
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h" />
<ClInclude Include="..\..\mptrack\PatternClipboard.h" />
<ClInclude Include="..\..\mptrack\PatternCursor.h" />
<ClInclude Include="..\..\mptrack\PatternEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\PatternFont.h" />
<ClInclude Include="..\..\mptrack\PatternGotoDialog.h" />
<ClInclude Include="..\..\mptrack\Reporting.h" />
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h" />
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\SampleGenerator.h" />
<ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" />
@@ -548,6 +552,7 @@
<ClCompile Include="..\..\common\version.cpp" />
<ClCompile Include="..\..\mptrack\AboutDialog.cpp" />
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp" />
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\AppendModule.cpp" />
<ClCompile Include="..\..\mptrack\AutoSaver.cpp" />
<ClCompile Include="..\..\mptrack\Autotune.cpp" />
@@ -556,6 +561,7 @@
<ClCompile Include="..\..\mptrack\Childfrm.cpp" />
<ClCompile Include="..\..\mptrack\CleanupSong.cpp" />
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp" />
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\ColourEdit.cpp" />
<ClCompile Include="..\..\mptrack\CommandSet.cpp" />
<ClCompile Include="..\..\mptrack\CreditStatic.cpp" />
@@ -573,6 +579,7 @@
<ClCompile Include="..\..\mptrack\ExternalSamples.cpp" />
<ClCompile Include="..\..\mptrack\FileDialog.cpp" />
<ClCompile Include="..\..\mptrack\FolderScanner.cpp" />
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\Globals.cpp" />
<ClCompile Include="..\..\mptrack\InputHandler.cpp" />
<ClCompile Include="..\..\mptrack\KeyConfigDlg.cpp" />
@@ -588,18 +595,19 @@
<ClCompile Include="..\..\mptrack\ModConvert.cpp" />
<ClCompile Include="..\..\mptrack\Moddoc.cpp" />
<ClCompile Include="..\..\mptrack\Modedit.cpp" />
- <ClCompile Include="..\..\mptrack\Moptions.cpp" />
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp" />
<ClCompile Include="..\..\mptrack\Mpdlgs.cpp" />
<ClCompile Include="..\..\mptrack\Mpt_midi.cpp" />
<ClCompile Include="..\..\mptrack\Mptrack.cpp" />
<ClCompile Include="..\..\mptrack\PNG.cpp" />
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp" />
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp" />
<ClCompile Include="..\..\mptrack\PatternEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\PatternFont.cpp" />
<ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" />
<ClCompile Include="..\..\mptrack\Reporting.cpp" />
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\SampleGenerator.cpp" />
<ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" />
Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-05-25 20:24:50 UTC (rev 5184)
@@ -116,6 +116,9 @@
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\AutoSaver.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -143,6 +146,9 @@
<ClInclude Include="..\..\mptrack\CloseMainDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\ColourEdit.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -191,6 +197,9 @@
<ClInclude Include="..\..\mptrack\FolderScanner.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\Globals.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -224,9 +233,6 @@
<ClInclude Include="..\..\mptrack\Moddoc.h">
<Filter>mptrack</Filter>
</ClInclude>
- <ClInclude Include="..\..\mptrack\Moptions.h">
- <Filter>mptrack</Filter>
- </ClInclude>
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -245,6 +251,9 @@
<ClInclude Include="..\..\mptrack\PSRatioCalc.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\PatternClipboard.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -263,6 +272,9 @@
<ClInclude Include="..\..\mptrack\Reporting.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -616,6 +628,9 @@
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\AppendModule.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -640,6 +655,9 @@
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\ColourEdit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -691,6 +709,9 @@
<ClCompile Include="..\..\mptrack\FolderScanner.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\Globals.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -736,9 +757,6 @@
<ClCompile Include="..\..\mptrack\Modedit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
- <ClCompile Include="..\..\mptrack\Moptions.cpp">
- <Filter>mptrack</Filter>
- </ClCompile>
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -757,6 +775,9 @@
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -772,6 +793,9 @@
<ClCompile Include="..\..\mptrack\Reporting.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp">
<Filter>mptrack</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-05-25 20:24:50 UTC (rev 5184)
@@ -379,6 +379,7 @@
<ClInclude Include="..\..\common\versionNumber.h" />
<ClInclude Include="..\..\mptrack\AboutDialog.h" />
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h" />
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h" />
<ClInclude Include="..\..\mptrack\AutoSaver.h" />
<ClInclude Include="..\..\mptrack\Autotune.h" />
<ClInclude Include="..\..\mptrack\CImageListEx.h" />
@@ -388,6 +389,7 @@
<ClInclude Include="..\..\mptrack\Childfrm.h" />
<ClInclude Include="..\..\mptrack\CleanupSong.h" />
<ClInclude Include="..\..\mptrack\CloseMainDialog.h" />
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h" />
<ClInclude Include="..\..\mptrack\ColourEdit.h" />
<ClInclude Include="..\..\mptrack\CommandSet.h" />
<ClInclude Include="..\..\mptrack\CreditStatic.h" />
@@ -404,6 +406,7 @@
<ClInclude Include="..\..\mptrack\FadeLaws.h" />
<ClInclude Include="..\..\mptrack\FileDialog.h" />
<ClInclude Include="..\..\mptrack\FolderScanner.h" />
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h" />
<ClInclude Include="..\..\mptrack\Globals.h" />
<ClInclude Include="..\..\mptrack\InputHandler.h" />
<ClInclude Include="..\..\mptrack\KeyConfigDlg.h" />
@@ -415,19 +418,20 @@
<ClInclude Include="..\..\mptrack\Mainfrm.h" />
<ClInclude Include="..\..\mptrack\ModConvert.h" />
<ClInclude Include="..\..\mptrack\Moddoc.h" />
- <ClInclude Include="..\..\mptrack\Moptions.h" />
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h" />
<ClInclude Include="..\..\mptrack\Mpdlgs.h" />
<ClInclude Include="..\..\mptrack\Mptrack.h" />
<ClInclude Include="..\..\mptrack\Notification.h" />
<ClInclude Include="..\..\mptrack\PNG.h" />
<ClInclude Include="..\..\mptrack\PSRatioCalc.h" />
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h" />
<ClInclude Include="..\..\mptrack\PatternClipboard.h" />
<ClInclude Include="..\..\mptrack\PatternCursor.h" />
<ClInclude Include="..\..\mptrack\PatternEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\PatternFont.h" />
<ClInclude Include="..\..\mptrack\PatternGotoDialog.h" />
<ClInclude Include="..\..\mptrack\Reporting.h" />
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h" />
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\SampleGenerator.h" />
<ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" />
@@ -554,6 +558,7 @@
<ClCompile Include="..\..\common\version.cpp" />
<ClCompile Include="..\..\mptrack\AboutDialog.cpp" />
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp" />
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\AppendModule.cpp" />
<ClCompile Include="..\..\mptrack\AutoSaver.cpp" />
<ClCompile Include="..\..\mptrack\Autotune.cpp" />
@@ -562,6 +567,7 @@
<ClCompile Include="..\..\mptrack\Childfrm.cpp" />
<ClCompile Include="..\..\mptrack\CleanupSong.cpp" />
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp" />
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\ColourEdit.cpp" />
<ClCompile Include="..\..\mptrack\CommandSet.cpp" />
<ClCompile Include="..\..\mptrack\CreditStatic.cpp" />
@@ -579,6 +585,7 @@
<ClCompile Include="..\..\mptrack\ExternalSamples.cpp" />
<ClCompile Include="..\..\mptrack\FileDialog.cpp" />
<ClCompile Include="..\..\mptrack\FolderScanner.cpp" />
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\Globals.cpp" />
<ClCompile Include="..\..\mptrack\InputHandler.cpp" />
<ClCompile Include="..\..\mptrack\KeyConfigDlg.cpp" />
@@ -594,18 +601,19 @@
<ClCompile Include="..\..\mptrack\ModConvert.cpp" />
<ClCompile Include="..\..\mptrack\Moddoc.cpp" />
<ClCompile Include="..\..\mptrack\Modedit.cpp" />
- <ClCompile Include="..\..\mptrack\Moptions.cpp" />
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp" />
<ClCompile Include="..\..\mptrack\Mpdlgs.cpp" />
<ClCompile Include="..\..\mptrack\Mpt_midi.cpp" />
<ClCompile Include="..\..\mptrack\Mptrack.cpp" />
<ClCompile Include="..\..\mptrack\PNG.cpp" />
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp" />
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp" />
<ClCompile Include="..\..\mptrack\PatternEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\PatternFont.cpp" />
<ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" />
<ClCompile Include="..\..\mptrack\Reporting.cpp" />
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\SampleGenerator.cpp" />
<ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" />
Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-05-25 20:24:50 UTC (rev 5184)
@@ -116,6 +116,9 @@
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\AutoSaver.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -143,6 +146,9 @@
<ClInclude Include="..\..\mptrack\CloseMainDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\ColourEdit.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -191,6 +197,9 @@
<ClInclude Include="..\..\mptrack\FolderScanner.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\Globals.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -224,9 +233,6 @@
<ClInclude Include="..\..\mptrack\Moddoc.h">
<Filter>mptrack</Filter>
</ClInclude>
- <ClInclude Include="..\..\mptrack\Moptions.h">
- <Filter>mptrack</Filter>
- </ClInclude>
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -245,6 +251,9 @@
<ClInclude Include="..\..\mptrack\PSRatioCalc.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\PatternClipboard.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -263,6 +272,9 @@
<ClInclude Include="..\..\mptrack\Reporting.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -616,6 +628,9 @@
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\AppendModule.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -640,6 +655,9 @@
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\ColourEdit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -691,6 +709,9 @@
<ClCompile Include="..\..\mptrack\FolderScanner.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\Globals.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -736,9 +757,6 @@
<ClCompile Include="..\..\mptrack\Modedit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
- <ClCompile Include="..\..\mptrack\Moptions.cpp">
- <Filter>mptrack</Filter>
- </ClCompile>
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -757,6 +775,9 @@
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -772,6 +793,9 @@
<ClCompile Include="..\..\mptrack\Reporting.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp">
<Filter>mptrack</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-05-25 20:24:50 UTC (rev 5184)
@@ -380,6 +380,7 @@
<ClInclude Include="..\..\common\versionNumber.h" />
<ClInclude Include="..\..\mptrack\AboutDialog.h" />
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h" />
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h" />
<ClInclude Include="..\..\mptrack\AutoSaver.h" />
<ClInclude Include="..\..\mptrack\Autotune.h" />
<ClInclude Include="..\..\mptrack\CImageListEx.h" />
@@ -389,6 +390,7 @@
<ClInclude Include="..\..\mptrack\Childfrm.h" />
<ClInclude Include="..\..\mptrack\CleanupSong.h" />
<ClInclude Include="..\..\mptrack\CloseMainDialog.h" />
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h" />
<ClInclude Include="..\..\mptrack\ColourEdit.h" />
<ClInclude Include="..\..\mptrack\CommandSet.h" />
<ClInclude Include="..\..\mptrack\CreditStatic.h" />
@@ -405,6 +407,7 @@
<ClInclude Include="..\..\mptrack\FadeLaws.h" />
<ClInclude Include="..\..\mptrack\FileDialog.h" />
<ClInclude Include="..\..\mptrack\FolderScanner.h" />
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h" />
<ClInclude Include="..\..\mptrack\Globals.h" />
<ClInclude Include="..\..\mptrack\InputHandler.h" />
<ClInclude Include="..\..\mptrack\KeyConfigDlg.h" />
@@ -416,19 +419,20 @@
<ClInclude Include="..\..\mptrack\Mainfrm.h" />
<ClInclude Include="..\..\mptrack\ModConvert.h" />
<ClInclude Include="..\..\mptrack\Moddoc.h" />
- <ClInclude Include="..\..\mptrack\Moptions.h" />
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h" />
<ClInclude Include="..\..\mptrack\Mpdlgs.h" />
<ClInclude Include="..\..\mptrack\Mptrack.h" />
<ClInclude Include="..\..\mptrack\Notification.h" />
<ClInclude Include="..\..\mptrack\PNG.h" />
<ClInclude Include="..\..\mptrack\PSRatioCalc.h" />
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h" />
<ClInclude Include="..\..\mptrack\PatternClipboard.h" />
<ClInclude Include="..\..\mptrack\PatternCursor.h" />
<ClInclude Include="..\..\mptrack\PatternEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\PatternFont.h" />
<ClInclude Include="..\..\mptrack\PatternGotoDialog.h" />
<ClInclude Include="..\..\mptrack\Reporting.h" />
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h" />
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\SampleGenerator.h" />
<ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" />
@@ -555,6 +559,7 @@
<ClCompile Include="..\..\common\version.cpp" />
<ClCompile Include="..\..\mptrack\AboutDialog.cpp" />
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp" />
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\AppendModule.cpp" />
<ClCompile Include="..\..\mptrack\AutoSaver.cpp" />
<ClCompile Include="..\..\mptrack\Autotune.cpp" />
@@ -563,6 +568,7 @@
<ClCompile Include="..\..\mptrack\Childfrm.cpp" />
<ClCompile Include="..\..\mptrack\CleanupSong.cpp" />
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp" />
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\ColourEdit.cpp" />
<ClCompile Include="..\..\mptrack\CommandSet.cpp" />
<ClCompile Include="..\..\mptrack\CreditStatic.cpp" />
@@ -580,6 +586,7 @@
<ClCompile Include="..\..\mptrack\ExternalSamples.cpp" />
<ClCompile Include="..\..\mptrack\FileDialog.cpp" />
<ClCompile Include="..\..\mptrack\FolderScanner.cpp" />
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\Globals.cpp" />
<ClCompile Include="..\..\mptrack\InputHandler.cpp" />
<ClCompile Include="..\..\mptrack\KeyConfigDlg.cpp" />
@@ -595,18 +602,19 @@
<ClCompile Include="..\..\mptrack\ModConvert.cpp" />
<ClCompile Include="..\..\mptrack\Moddoc.cpp" />
<ClCompile Include="..\..\mptrack\Modedit.cpp" />
- <ClCompile Include="..\..\mptrack\Moptions.cpp" />
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp" />
<ClCompile Include="..\..\mptrack\Mpdlgs.cpp" />
<ClCompile Include="..\..\mptrack\Mpt_midi.cpp" />
<ClCompile Include="..\..\mptrack\Mptrack.cpp" />
<ClCompile Include="..\..\mptrack\PNG.cpp" />
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp" />
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp" />
<ClCompile Include="..\..\mptrack\PatternEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\PatternFont.cpp" />
<ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" />
<ClCompile Include="..\..\mptrack\Reporting.cpp" />
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\SampleGenerator.cpp" />
<ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" />
Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-05-25 20:24:50 UTC (rev 5184)
@@ -116,6 +116,9 @@
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\AutoSaver.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -143,6 +146,9 @@
<ClInclude Include="..\..\mptrack\CloseMainDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\ColourEdit.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -191,6 +197,9 @@
<ClInclude Include="..\..\mptrack\FolderScanner.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\Globals.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -224,9 +233,6 @@
<ClInclude Include="..\..\mptrack\Moddoc.h">
<Filter>mptrack</Filter>
</ClInclude>
- <ClInclude Include="..\..\mptrack\Moptions.h">
- <Filter>mptrack</Filter>
- </ClInclude>
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -245,6 +251,9 @@
<ClInclude Include="..\..\mptrack\PSRatioCalc.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\PatternClipboard.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -263,6 +272,9 @@
<ClInclude Include="..\..\mptrack\Reporting.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -616,6 +628,9 @@
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\AppendModule.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -640,6 +655,9 @@
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\ColourEdit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -691,6 +709,9 @@
<ClCompile Include="..\..\mptrack\FolderScanner.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\Globals.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -736,9 +757,6 @@
<ClCompile Include="..\..\mptrack\Modedit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
- <ClCompile Include="..\..\mptrack\Moptions.cpp">
- <Filter>mptrack</Filter>
- </ClCompile>
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -757,6 +775,9 @@
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -772,6 +793,9 @@
<ClCompile Include="..\..\mptrack\Reporting.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp">
<Filter>mptrack</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-05-25 20:24:50 UTC (rev 5184)
@@ -380,6 +380,7 @@
<ClInclude Include="..\..\common\versionNumber.h" />
<ClInclude Include="..\..\mptrack\AboutDialog.h" />
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h" />
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h" />
<ClInclude Include="..\..\mptrack\AutoSaver.h" />
<ClInclude Include="..\..\mptrack\Autotune.h" />
<ClInclude Include="..\..\mptrack\CImageListEx.h" />
@@ -389,6 +390,7 @@
<ClInclude Include="..\..\mptrack\Childfrm.h" />
<ClInclude Include="..\..\mptrack\CleanupSong.h" />
<ClInclude Include="..\..\mptrack\CloseMainDialog.h" />
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h" />
<ClInclude Include="..\..\mptrack\ColourEdit.h" />
<ClInclude Include="..\..\mptrack\CommandSet.h" />
<ClInclude Include="..\..\mptrack\CreditStatic.h" />
@@ -405,6 +407,7 @@
<ClInclude Include="..\..\mptrack\FadeLaws.h" />
<ClInclude Include="..\..\mptrack\FileDialog.h" />
<ClInclude Include="..\..\mptrack\FolderScanner.h" />
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h" />
<ClInclude Include="..\..\mptrack\Globals.h" />
<ClInclude Include="..\..\mptrack\InputHandler.h" />
<ClInclude Include="..\..\mptrack\KeyConfigDlg.h" />
@@ -416,19 +419,20 @@
<ClInclude Include="..\..\mptrack\Mainfrm.h" />
<ClInclude Include="..\..\mptrack\ModConvert.h" />
<ClInclude Include="..\..\mptrack\Moddoc.h" />
- <ClInclude Include="..\..\mptrack\Moptions.h" />
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h" />
<ClInclude Include="..\..\mptrack\Mpdlgs.h" />
<ClInclude Include="..\..\mptrack\Mptrack.h" />
<ClInclude Include="..\..\mptrack\Notification.h" />
<ClInclude Include="..\..\mptrack\PNG.h" />
<ClInclude Include="..\..\mptrack\PSRatioCalc.h" />
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h" />
<ClInclude Include="..\..\mptrack\PatternClipboard.h" />
<ClInclude Include="..\..\mptrack\PatternCursor.h" />
<ClInclude Include="..\..\mptrack\PatternEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\PatternFont.h" />
<ClInclude Include="..\..\mptrack\PatternGotoDialog.h" />
<ClInclude Include="..\..\mptrack\Reporting.h" />
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h" />
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h" />
<ClInclude Include="..\..\mptrack\SampleGenerator.h" />
<ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" />
@@ -555,6 +559,7 @@
<ClCompile Include="..\..\common\version.cpp" />
<ClCompile Include="..\..\mptrack\AboutDialog.cpp" />
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp" />
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\AppendModule.cpp" />
<ClCompile Include="..\..\mptrack\AutoSaver.cpp" />
<ClCompile Include="..\..\mptrack\Autotune.cpp" />
@@ -563,6 +568,7 @@
<ClCompile Include="..\..\mptrack\Childfrm.cpp" />
<ClCompile Include="..\..\mptrack\CleanupSong.cpp" />
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp" />
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\ColourEdit.cpp" />
<ClCompile Include="..\..\mptrack\CommandSet.cpp" />
<ClCompile Include="..\..\mptrack\CreditStatic.cpp" />
@@ -580,6 +586,7 @@
<ClCompile Include="..\..\mptrack\ExternalSamples.cpp" />
<ClCompile Include="..\..\mptrack\FileDialog.cpp" />
<ClCompile Include="..\..\mptrack\FolderScanner.cpp" />
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\Globals.cpp" />
<ClCompile Include="..\..\mptrack\InputHandler.cpp" />
<ClCompile Include="..\..\mptrack\KeyConfigDlg.cpp" />
@@ -595,18 +602,19 @@
<ClCompile Include="..\..\mptrack\ModConvert.cpp" />
<ClCompile Include="..\..\mptrack\Moddoc.cpp" />
<ClCompile Include="..\..\mptrack\Modedit.cpp" />
- <ClCompile Include="..\..\mptrack\Moptions.cpp" />
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp" />
<ClCompile Include="..\..\mptrack\Mpdlgs.cpp" />
<ClCompile Include="..\..\mptrack\Mpt_midi.cpp" />
<ClCompile Include="..\..\mptrack\Mptrack.cpp" />
<ClCompile Include="..\..\mptrack\PNG.cpp" />
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp" />
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp" />
<ClCompile Include="..\..\mptrack\PatternEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\PatternFont.cpp" />
<ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" />
<ClCompile Include="..\..\mptrack\Reporting.cpp" />
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp" />
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp" />
<ClCompile Include="..\..\mptrack\SampleGenerator.cpp" />
<ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" />
Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-05-25 20:24:50 UTC (rev 5184)
@@ -116,6 +116,9 @@
<ClInclude Include="..\..\mptrack\AbstractVstEditor.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\AdvancedConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\AutoSaver.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -143,6 +146,9 @@
<ClInclude Include="..\..\mptrack\CloseMainDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\ColorConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\ColourEdit.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -191,6 +197,9 @@
<ClInclude Include="..\..\mptrack\FolderScanner.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\GeneralConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\Globals.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -224,9 +233,6 @@
<ClInclude Include="..\..\mptrack\Moddoc.h">
<Filter>mptrack</Filter>
</ClInclude>
- <ClInclude Include="..\..\mptrack\Moptions.h">
- <Filter>mptrack</Filter>
- </ClInclude>
<ClInclude Include="..\..\mptrack\MoveFXSlotDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -245,6 +251,9 @@
<ClInclude Include="..\..\mptrack\PSRatioCalc.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\PathConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\PatternClipboard.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -263,6 +272,9 @@
<ClInclude Include="..\..\mptrack\Reporting.h">
<Filter>mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\..\mptrack\SampleConfigDlg.h">
+ <Filter>mptrack</Filter>
+ </ClInclude>
<ClInclude Include="..\..\mptrack\SampleEditorDialogs.h">
<Filter>mptrack</Filter>
</ClInclude>
@@ -616,6 +628,9 @@
<ClCompile Include="..\..\mptrack\AbstractVstEditor.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\AdvancedConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\AppendModule.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -640,6 +655,9 @@
<ClCompile Include="..\..\mptrack\CloseMainDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\ColorConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\ColourEdit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -691,6 +709,9 @@
<ClCompile Include="..\..\mptrack\FolderScanner.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\GeneralConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\Globals.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -736,9 +757,6 @@
<ClCompile Include="..\..\mptrack\Modedit.cpp">
<Filter>mptrack</Filter>
</ClCompile>
- <ClCompile Include="..\..\mptrack\Moptions.cpp">
- <Filter>mptrack</Filter>
- </ClCompile>
<ClCompile Include="..\..\mptrack\MoveFXSlotDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -757,6 +775,9 @@
<ClCompile Include="..\..\mptrack\PSRatioCalc.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\PathConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\PatternClipboard.cpp">
<Filter>mptrack</Filter>
</ClCompile>
@@ -772,6 +793,9 @@
<ClCompile Include="..\..\mptrack\Reporting.cpp">
<Filter>mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\..\mptrack\SampleConfigDlg.cpp">
+ <Filter>mptrack</Filter>
+ </ClCompile>
<ClCompile Include="..\..\mptrack\SampleEditorDialogs.cpp">
<Filter>mptrack</Filter>
</ClCompile>
Modified: trunk/OpenMPT/common/mptPathString.h
===================================================================
--- trunk/OpenMPT/common/mptPathString.h 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/common/mptPathString.h 2015-05-25 20:24:50 UTC (rev 5184)
@@ -96,7 +96,9 @@
PathString GetPath() const; // Drive + Dir, e.g. "C:\OpenMPT\"
PathString GetFileName() const; // File name without extension, e.g. "mptrack"
PathString GetFileExt() const; // Extension including dot, e.g. ".exe"
- PathString GetFullFileName() const; // File name + extension, e.g. "mptrack.exe"+
+ PathString GetFullFileName() const; // File name + extension, e.g. "mptrack.exe"
+
+ size_t Length() const { return path.size(); }
// Verify if this path represents a valid directory on the file system.
bool IsDirectory() const { return ::PathIsDirectoryW(path.c_str()) != FALSE; }
Added: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp (rev 0)
+++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp 2015-05-25 20:24:50 UTC (rev 5184)
@@ -0,0 +1,140 @@
+/*
+ * AdvancedConfigDlg.cpp
+ * ---------------------
+ * Purpose: Implementation of the advanced settings dialog.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
+#include "stdafx.h"
+#include "Mainfrm.h"
+#include "AdvancedConfigDlg.h"
+#include "Settings.h"
+#include "dlg_misc.h"
+
+#if defined(MPT_SETTINGS_CACHE)
+
+OPENMPT_NAMESPACE_BEGIN
+
+BEGIN_MESSAGE_MAP(COptionsAdvanced, CPropertyPage)
+ ON_LBN_DBLCLK(IDC_LIST4, OnOptionDblClick)
+ ON_EN_CHANGE(IDC_EDIT1, OnFindStringChanged)
+END_MESSAGE_MAP()
+
+void COptionsAdvanced::DoDataExchange(CDataExchange* pDX)
+//-------------------------------------------------------
+{
+ CDialog::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(CModTypeDlg)
+ DDX_Control(pDX, IDC_LIST4, m_List);
+ //}}AFX_DATA_MAP
+}
+
+
+static CString FormatSetting(const SettingPath &path, const SettingValue &val)
+//----------------------------------------------------------------------------
+{
+ return mpt::ToCString(path.FormatAsString() + MPT_USTRING(" = ") + val.FormatAsString());
+}
+
+
+BOOL COptionsAdvanced::PreTranslateMessage(MSG *msg)
+//--------------------------------------------------
+{
+ if(msg->message == WM_KEYDOWN && msg->wParam == VK_RETURN)
+ {
+ OnOptionDblClick();
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
+BOOL COptionsAdvanced::OnInitDialog()
+//-----------------------------------
+{
+ CPropertyPage::OnInitDialog();
+ ReInit();
+ return TRUE;
+}
+
+
+void COptionsAdvanced::ReInit()
+//-----------------------------
+{
+ m_List.SetRedraw(FALSE);
+ m_List.ResetContent();
+ m_IndexToPath.clear();
+ CString findStr;
+ GetDlgItemText(IDC_EDIT1, findStr);
+ findStr.MakeLower();
+ for(SettingsContainer::SettingsMap::const_iterator it = theApp.GetSettings().begin(); it != theApp.GetSettings().end(); ++it)
+ {
+ CString str = FormatSetting(it->first, it->second);
+ bool addString = true;
+ if(!findStr.IsEmpty())
+ {
+ CString strLower = str;
+ addString = strLower.MakeLower().Find(findStr) >= 0;
+ }
+ if(addString)
+ {
+ int index = m_List.AddString(str);
+ m_IndexToPath[index] = it->first;
+ }
+ }
+ m_List.SetRedraw(TRUE);
+ m_List.Invalidate(FALSE);
+}
+
+
+void COptionsAdvanced::OnOK()
+//---------------------------
+{
+ CPropertyPage::OnOK();
+}
+
+
+BOOL COptionsAdvanced::OnSetActive()
+//----------------------------------
+{
+ ReInit();
+ CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_ADVANCED;
+ return CPropertyPage::OnSetActive();
+}
+
+
+void COptionsAdvanced::OnOptionDblClick()
+//---------------------------------------
+{
+ const int index = m_List.GetCurSel();
+ if(m_IndexToPath.find(index) == m_IndexToPath.end())
+ {
+ return;
+ }
+ const SettingPath path = m_IndexToPath[index];
+ SettingValue val = theApp.GetSettings().GetMap().find(path)->second;
+ if(val.GetType() == SettingTypeBool)
+ {
+ val = !val.as<bool>();
+ } else
+ {
+ CInputDlg inputDlg(this, mpt::ToCString(path.FormatAsString()), mpt::ToCString(val.FormatValueAsString()));
+ if(inputDlg.DoModal() != IDOK)
+ {
+ return;
+ }
+ val.SetFromString(inputDlg.resultString);
+ }
+ theApp.GetSettings().Write(path, val);
+ m_List.DeleteString(index);
+ m_List.InsertString(index, FormatSetting(path, val));
+ m_List.SetCurSel(index);
+ OnSettingsChanged();
+}
+
+OPENMPT_NAMESPACE_END
+
+#endif // MPT_SETTINGS_CACHE
Property changes on: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-c++src
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/OpenMPT/mptrack/AdvancedConfigDlg.h
===================================================================
--- trunk/OpenMPT/mptrack/AdvancedConfigDlg.h (rev 0)
+++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.h 2015-05-25 20:24:50 UTC (rev 5184)
@@ -0,0 +1,45 @@
+/*
+ * AdvancedConfigDlg.h
+ * -------------------
+ * Purpose: Implementation of the advanced settings dialog.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
+#pragma once
+
+#if defined(MPT_SETTINGS_CACHE)
+
+OPENMPT_NAMESPACE_BEGIN
+
+//==========================================
+class COptionsAdvanced: public CPropertyPage
+//==========================================
+{
+protected:
+ CListBox m_List;
+ std::map<int, SettingPath> m_IndexToPath;
+
+public:
+ COptionsAdvanced():CPropertyPage(IDD_OPTIONS_ADVANCED) {}
+
+protected:
+ virtual BOOL OnInitDialog();
+ virtual void OnOK();
+ virtual BOOL OnSetActive();
+ virtual void DoDataExchange(CDataExchange* pDX);
+ virtual BOOL PreTranslateMessage(MSG *msg);
+ afx_msg void OnOptionDblClick();
+ afx_msg void OnSettingsChanged() { SetModified(TRUE); }
+ afx_msg void OnFindStringChanged() { ReInit(); }
+
+ void ReInit();
+
+ DECLARE_MESSAGE_MAP();
+};
+
+OPENMPT_NAMESPACE_END
+
+#endif // MPT_SETTINGS_CACHE
Property changes on: trunk/OpenMPT/mptrack/AdvancedConfigDlg.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-chdr
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/OpenMPT/mptrack/AutoSaver.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.cpp 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/mptrack/AutoSaver.cpp 2015-05-25 20:24:50 UTC (rev 5184)
@@ -9,11 +9,10 @@
#include "stdafx.h"
-#include "mptrack.h"
-#include "mainfrm.h"
-#include "moddoc.h"
+#include "Mptrack.h"
+#include "Mainfrm.h"
+#include "Moddoc.h"
#include "AutoSaver.h"
-#include "moptions.h"
#include "FileDialog.h"
#include <algorithm>
@@ -223,148 +222,4 @@
}
-///////////////////////////////////////////////////////////////////////////////////////
-// CAutoSaverGUI dialog : AutoSaver GUI
-///////////////////////////////////////////////////////////////////////////////////////
-
-
-IMPLEMENT_DYNAMIC(CAutoSaverGUI, CPropertyPage)
-CAutoSaverGUI::CAutoSaverGUI(CAutoSaver* pAutoSaver)
- : CPropertyPage(CAutoSaverGUI::IDD)
-{
- m_pAutoSaver = pAutoSaver;
-}
-
-
-void CAutoSaverGUI::DoDataExchange(CDataExchange* pDX)
-//----------------------------------------------------
-{
- CPropertyPage::DoDataExchange(pDX);
-}
-
-BEGIN_MESSAGE_MAP(CAutoSaverGUI, CPropertyPage)
- ON_BN_CLICKED(IDC_AUTOSAVE_BROWSE, OnBnClickedAutosaveBrowse)
- ON_BN_CLICKED(IDC_AUTOSAVE_ENABLE, OnBnClickedAutosaveEnable)
- ON_BN_CLICKED(IDC_AUTOSAVE_USEORIGDIR, OnBnClickedAutosaveUseorigdir)
- ON_BN_CLICKED(IDC_AUTOSAVE_USECUSTOMDIR, OnBnClickedAutosaveUseorigdir)
- ON_EN_UPDATE(IDC_AUTOSAVE_PATH, OnSettingsChanged)
- ON_EN_UPDATE(IDC_AUTOSAVE_HISTORY, OnSettingsChanged)
- ON_EN_UPDATE(IDC_AUTOSAVE_INTERVAL, OnSettingsChanged)
-END_MESSAGE_MAP()
-
-
-// CAutoSaverGUI message handlers
-
-BOOL CAutoSaverGUI::OnInitDialog()
-//--------------------------------
-{
- CPropertyPage::OnInitDialog();
-
- CheckDlgButton(IDC_AUTOSAVE_ENABLE, m_pAutoSaver->IsEnabled()?BST_CHECKED:BST_UNCHECKED);
- //SetDlgItemText(IDC_AUTOSAVE_FNTEMPLATE, m_pAutoSaver->GetFilenameTemplate());
- SetDlgItemInt(IDC_AUTOSAVE_HISTORY, m_pAutoSaver->GetHistoryDepth()); //TODO
- ::SetDlgItemTextW(m_hWnd, IDC_AUTOSAVE_PATH, m_pAutoSaver->GetPath().AsNative().c_str());
- SetDlgItemInt(IDC_AUTOSAVE_INTERVAL, m_pAutoSaver->GetSaveInterval());
- CheckDlgButton(IDC_AUTOSAVE_USEORIGDIR, m_pAutoSaver->GetUseOriginalPath()?BST_CHECKED:BST_UNCHECKED);
- CheckDlgButton(IDC_AUTOSAVE_USECUSTOMDIR, m_pAutoSaver->GetUseOriginalPath()?BST_UNCHECKED:BST_CHECKED);
-
- //enable/disable stuff as appropriate
- OnBnClickedAutosaveEnable();
- OnBnClickedAutosaveUseorigdir();
-
- return TRUE;
-}
-
-
-void CAutoSaverGUI::OnOK()
-//------------------------
-{
- WCHAR tempPath[MAX_PATH];
- m_pAutoSaver->SetEnabled(IsDlgButtonChecked(IDC_AUTOSAVE_ENABLE) != BST_UNCHECKED);
- m_pAutoSaver->SetHistoryDepth(GetDlgItemInt(IDC_AUTOSAVE_HISTORY));
- m_pAutoSaver->SetSaveInterval(GetDlgItemInt(IDC_AUTOSAVE_INTERVAL));
- m_pAutoSaver->SetUseOriginalPath(IsDlgButtonChecked(IDC_AUTOSAVE_USEORIGDIR) == BST_CHECKED);
- ::GetDlgItemTextW(m_hWnd, IDC_AUTOSAVE_PATH, tempPath, CountOf(tempPath));
- mpt::PathString path = mpt::PathString::FromNative(tempPath);
- if(!path.empty() && !path.HasTrailingSlash())
- {
- path += MPT_PATHSTRING("\\");
- }
- m_pAutoSaver->SetPath(path);
-
- CPropertyPage::OnOK();
-}
-
-void CAutoSaverGUI::OnBnClickedAutosaveBrowse()
-//---------------------------------------------
-{
- WCHAR szPath[MAX_PATH] = L"";
- ::GetDlgItemTextW(m_hWnd, IDC_AUTOSAVE_PATH, szPath, CountOf(szPath));
-
- BrowseForFolder dlg(mpt::PathString::FromNative(szPath), TEXT("Select a folder to store autosaved files in..."));
- if(dlg.Show(this))
- {
- ::SetDlgItemTextW(m_hWnd, IDC_AUTOSAVE_PATH, dlg.GetDirectory().AsNative().c_str());
- OnSettingsChanged();
- }
-}
-
-
-void CAutoSaverGUI::OnBnClickedAutosaveEnable()
-//---------------------------------------------
-{
- BOOL enabled = IsDlgButtonChecked(IDC_AUTOSAVE_ENABLE);
- GetDlgItem(IDC_AUTOSAVE_INTERVAL)->EnableWindow(enabled);
- GetDlgItem(IDC_AUTOSAVE_HISTORY)->EnableWindow(enabled);
- GetDlgItem(IDC_AUTOSAVE_USEORIGDIR)->EnableWindow(enabled);
- GetDlgItem(IDC_AUTOSAVE_USECUSTOMDIR)->EnableWindow(enabled);
- GetDlgItem(IDC_AUTOSAVE_PATH)->EnableWindow(enabled);
- GetDlgItem(IDC_AUTOSAVE_BROWSE)->EnableWindow(enabled);
- OnSettingsChanged();
- return;
-}
-
-void CAutoSaverGUI::OnBnClickedAutosaveUseorigdir()
-//-------------------------------------------------
-{
- if (IsDlgButtonChecked(IDC_AUTOSAVE_ENABLE))
- {
- BOOL enabled = IsDlgButtonChecked(IDC_AUTOSAVE_USEORIGDIR);
- GetDlgItem(IDC_AUTOSAVE_PATH)->EnableWindow(!enabled);
- GetDlgItem(IDC_AUTOSAVE_BROWSE)->EnableWindow(!enabled);
- OnSettingsChanged();
- }
- return;
-}
-
-void CAutoSaverGUI::OnSettingsChanged()
-//-------------------------------------
-{
- SetModified(TRUE);
-}
-
-BOOL CAutoSaverGUI::OnSetActive()
-//--------------------------------
-{
- CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_AUTOSAVE;
- return CPropertyPage::OnSetActive();
-}
-
-BOOL CAutoSaverGUI::OnKillActive()
-//--------------------------------
-{
- WCHAR szPath[MAX_PATH] = L"";
- ::GetDlgItemTextW(m_hWnd, IDC_AUTOSAVE_PATH, szPath, CountOf(szPath));
-
- if (!::PathIsDirectoryW(szPath) && IsDlgButtonChecked(IDC_AUTOSAVE_ENABLE) && !IsDlgButtonChecked(IDC_AUTOSAVE_USEORIGDIR))
- {
- Reporting::Error("Backup path does not exist.");
- GetDlgItem(IDC_AUTOSAVE_PATH)->SetFocus();
- return 0;
- }
-
- return CPropertyPage::OnKillActive();
-}
-
-
OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/AutoSaver.h
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.h 2015-05-25 20:12:50 UTC (rev 5183)
+++ trunk/OpenMPT/mptrack/AutoSaver.h 2015-05-25 20:24:50 UTC (rev 5184)
@@ -64,38 +64,4 @@
};
-// CAutoSaverGUI dialog
-
-class CAutoSaverGUI : public CPropertyPage
-{
- DECLARE_DYNAMIC(CAutoSaverGUI)
-
-public:
- CAutoSaverGUI(CAutoSaver* pAutoSaver);
-
-// Dialog Data
- enum { IDD = IDD_OPTIONS_AUTOSAVE };
-
-protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
-
- DECLARE_MESSAGE_MAP()
-public:
- virtual void OnOK();
- virtual BOOL OnKillActive();
-
-private:
- CAutoSaver *m_pAutoSaver;
-
-public:
- afx_msg void OnBnClickedAutosaveBrowse();
- virtual BOOL OnInitDialog();
- afx_msg void OnBnClickedAutosaveEnable();
- afx_msg void OnBnClickedAutosaveUseorigdir();
- void OnSettingsChanged();
- BOOL OnSetActive();
-
-};
-
-
OPENMPT_NAMESPACE_END
Added: trunk/OpenMPT/mptrack/ColorConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ColorConfigDlg.cpp (rev 0)
+++ trunk/OpenMPT/mptrack/ColorConfigDlg.cpp 2015-05-25 20:24:50 UTC (rev 5184)
@@ -0,0 +1,667 @@
+/*
+ * ColorConfigDlg.cpp
+ * ------------------
+ * Purpose: Implementation of the color setup dialog.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
+#include "stdafx.h"
+#include "Mainfrm.h"
+#include "ColorConfigDlg.h"
+#include "Settings.h"
+#include "FileDialog.h"
+#include "../common/StringFixer.h"
+
+
+OPENMPT_NAMESPACE_BEGIN
+
+static const struct ColorDescriptions
+{
+ const char *name;
+ int previewImage;
+ uint32 colorIndex1, colorIndex2, colorIndex3;
+ const char *descText1, *descText2, *descText3;
+} colorDefs[] =
+{
+ {"Pattern Editor", 0, MODCOLOR_BACKNORMAL, MODCOLOR_TEXTNORMAL, MODCOLOR_BACKHILIGHT, "Background:", "Foreground:", "Highlighted:"},
+ {"Active Row", 0, MODCOLOR_BACKCURROW, MODCOLOR_TEXTCURROW, 0, "Background:", "Foreground:", NULL},
+ {"Pattern Selection",0, MODCOLOR_BACKSELECTED, MODCOLOR_TEXTSELECTED, 0, "Background:", "Foreground:", NULL},
+ {"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_SEPHILITE, MODCOLOR_SEPFACE, MODCOLOR_SEPSHADOW, "Highlight:", "Face:", "Shadow:"},
+ {"Next/Prev Pattern",0, MODCOLOR_BLENDCOLOR, 0, 0, "Blend Colour:", NULL, NULL},
+ {"Sample Editor", 1, MODCOLOR_SAMPLE, MODCOLOR_BACKSAMPLE, MODCOLOR_SAMPLESELECTED, "Sample Data:", "Background:", "Selection:"},
+ {"Instrument Editor",2, MODCOLOR_ENVELOPES, MODCOLOR_BACKENV, 0, "Envelopes:", "Background:", NULL},
+ {"VU-Meters", 0, MODCOLOR_VUMETER_HI, MODCOLOR_VUMETER_MED, MODCOLOR_VUMETER_LO, "Hi:", "Med:", "Lo:"}
+};
+
+#define PREVIEWBMP_WIDTH 88
+#define PREVIEWBMP_HEIGHT 39
+
+
+BEGIN_MESSAGE_MAP(COptionsColors, CPropertyPage)
+ ON_WM_DRAWITEM()
+ ON_CBN_SELCHANGE(IDC_COMBO1, OnColorSelChanged)
+ ON_CBN_SELCHANGE(IDC_COMBO2, OnSettingsChanged)
+ 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_BUTTON9, OnChoosePatternFont)
+ ON_COMMAND(IDC_BUTTON10, OnChooseCommentFont)
+ 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)
+END_MESSAGE_MAP()
+
+
+void COptionsColors::DoDataExchange(CDataExchange* pDX)
+//-----------------------------------------------------
+{
+ CPropertyPage::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(COptionsColors)
+ DDX_Control(pDX, IDC_COMBO1, m_ComboItem);
+ DDX_Control(pDX, IDC_COMBO2, m_ComboFont);
+ DDX_Control(pDX, IDC_BUTTON1, m_BtnColor1);
+ DDX_Control(pDX, IDC_BUTTON2, m_BtnColor2);
+ DDX_Control(pDX, IDC_BUTTON3, m_BtnColor3);
+ DDX_Control(pDX, IDC_BUTTON4, m_BtnPreview);
+ DDX_Control(pDX, IDC_TEXT1, m_TxtColor1);
+ DDX_Control(pDX, IDC_TEXT2, m_TxtColor2);
+ DDX_Control(pDX, IDC_TEXT3, m_TxtColor3);
+ //}}AFX_DATA_MAP
+}
+
+
+static std::string FormatFontName(const FontSetting &font)
+//--------------------------------------------------------
+{
+ return font.name + ", " + mpt::ToString(font.size / 10);
+}
+
+
+BOOL COptionsColors::OnInitDialog()
+//---------------------------------
+{
+ CPropertyPage::OnInitDialog();
+ m_pPreviewDib = LoadDib(MAKEINTRESOURCE(IDB_COLORSETUP));
+ MemCopy(CustomColors, TrackerSettings::Instance().rgbCustomColors);
+ for (...
[truncated message content] |
