Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[935] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-07-28 22:07:21
|
Revision: 935
http://modplug.svn.sourceforge.net/modplug/?rev=935&view=rev
Author: saga-games
Date: 2011-07-28 22:07:15 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
[Imp] Templates: Edit history / Made with versions are now reset when loading a template.
[New] Default mod type can now be set in mptrack.ini by setting DefaultModType in the [Misc] section (f.e. "DefaultModType=mptm") - see http://forum.openmpt.org/index.php?topic=4411.0
[Fix] All numeric input fields in the instrument editor are now scrollable.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/TrackerSettings.h
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2011-07-28 21:40:15 UTC (rev 934)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2011-07-28 22:07:15 UTC (rev 935)
@@ -2169,6 +2169,7 @@
void CMainFrame::OpenMenuItemFile(const UINT nId, const bool bTemplateFile)
+//-------------------------------------------------------------------------
{
const UINT nIdBegin = (bTemplateFile) ? ID_FILE_OPENTEMPLATE : ID_EXAMPLE_MODULES;
const std::vector<CString>& vecFilePaths = (bTemplateFile) ? s_TemplateModulePaths : s_ExampleModulePaths;
@@ -2188,6 +2189,9 @@
pModDoc->ClearFilePath(); // Clear path so that saving will not take place in templates/examples folder.
if (bTemplateFile)
{
+ pModDoc->GetFileHistory()->empty(); // Reset edit history for template files
+ pModDoc->GetSoundFile()->m_dwCreatedWithVersion = MptVersion::num;
+ pModDoc->GetSoundFile()->m_dwLastSavedWithVersion = 0;
theApp.RemoveMruItem(0);
}
}
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2011-07-28 21:40:15 UTC (rev 934)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2011-07-28 22:07:15 UTC (rev 935)
@@ -165,6 +165,8 @@
}
}
+ defaultModType = MOD_TYPE_IT;
+
gnPlugWindowX = 243;
gnPlugWindowY = 273;
gnPlugWindowWidth = 370;
@@ -369,6 +371,8 @@
m_nSampleUndoMaxBuffer = CMainFrame::GetPrivateProfileLong("Sample Editor" , "UndoBufferSize", m_nSampleUndoMaxBuffer >> 20, iniFile);
m_nSampleUndoMaxBuffer = max(1, m_nSampleUndoMaxBuffer) << 20;
+
+ // Default Paths
TCHAR szPath[_MAX_PATH] = "";
for(size_t i = 0; i < NUM_DIRS; i++)
{
@@ -383,6 +387,8 @@
GetPrivateProfileString("Paths", "Key_Config_File", m_szKbdFile, m_szKbdFile, INIBUFFERSIZE, iniFile);
theApp.RelativePathToAbsolute(m_szKbdFile);
+
+ // Effects Settings
CSoundFile::m_nXBassDepth = CMainFrame::GetPrivateProfileLong("Effects", "XBassDepth", CSoundFile::m_nXBassDepth, iniFile);
CSoundFile::m_nXBassRange = CMainFrame::GetPrivateProfileLong("Effects", "XBassRange", CSoundFile::m_nXBassRange, iniFile);
CSoundFile::m_nReverbDepth = CMainFrame::GetPrivateProfileLong("Effects", "ReverbDepth", CSoundFile::m_nReverbDepth, iniFile);
@@ -390,6 +396,8 @@
CSoundFile::m_nProLogicDepth = CMainFrame::GetPrivateProfileLong("Effects", "ProLogicDepth", CSoundFile::m_nProLogicDepth, iniFile);
CSoundFile::m_nProLogicDelay = CMainFrame::GetPrivateProfileLong("Effects", "ProLogicDelay", CSoundFile::m_nProLogicDelay, iniFile);
+
+ // EQ Settings
GetPrivateProfileStruct("Effects", "EQ_Settings", &m_EqSettings, sizeof(EQPRESET), iniFile);
GetPrivateProfileStruct("Effects", "EQ_User1", &CEQSetupDlg::gUserPresets[0], sizeof(EQPRESET), iniFile);
GetPrivateProfileStruct("Effects", "EQ_User2", &CEQSetupDlg::gUserPresets[1], sizeof(EQPRESET), iniFile);
@@ -397,6 +405,7 @@
GetPrivateProfileStruct("Effects", "EQ_User4", &CEQSetupDlg::gUserPresets[3], sizeof(EQPRESET), iniFile);
+ // Auto saver settings
CMainFrame::m_pAutoSaver = new CAutoSaver();
if(CMainFrame::GetPrivateProfileLong("AutoSave", "Enabled", true, iniFile))
{
@@ -413,15 +422,14 @@
CMainFrame::m_pAutoSaver->SetPath(szPath);
CMainFrame::m_pAutoSaver->SetFilenameTemplate(CMainFrame::GetPrivateProfileCString("AutoSave", "FileNameTemplate", "", iniFile));
- GetPrivateProfileString("Misc", "DefaultModType", defaultModType->fileExtension, szPath, INIBUFFERSIZE, iniFile);
- // for(size_t i = 0; i < CountOf(ModSpecs::Collection); i++)
- // {
- // if(!strcmp(szPath, ModSpecs::Collection[i]->fileExtension))
- // {
- // gdefaultModType = ModSpecs::Collection[i];
- // break;
- // }
- // }
+
+ // Default mod type when using the "New" button
+ const MODTYPE oldDefault = defaultModType;
+ defaultModType = CModSpecifications::ExtensionToType(CMainFrame::GetPrivateProfileCString("Misc", "DefaultModType", CSoundFile::GetModSpecifications(defaultModType).fileExtension, iniFile));
+ if(defaultModType == MOD_TYPE_NONE)
+ {
+ defaultModType = oldDefault;
+ }
}
@@ -755,6 +763,8 @@
if (!WritePrivateProfileString("Zxx Macros", snam, macros.szMidiZXXExt[izxx], iniFile)) break;
}
+ WritePrivateProfileString("Misc", "DefaultModType", CSoundFile::GetModSpecifications(defaultModType).fileExtension, iniFile);
+
CMainFrame::GetMainFrame()->SaveBarState("Toolbars");
}
Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h 2011-07-28 21:40:15 UTC (rev 934)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h 2011-07-28 22:07:15 UTC (rev 935)
@@ -43,7 +43,7 @@
glInstrumentWindowHeight, glCommentsWindowHeight, glGraphWindowHeight; //rewbs.varWindowSize
CString gcsPreviousVersion;
CString gcsInstallGUID;
- CModSpecifications const *defaultModType;
+ MODTYPE defaultModType;
// Audio Setup
DWORD m_dwSoundSetup, m_dwRate, m_dwQuality, m_nSrcMode, m_nBitsPerSample, m_nPreAmp, gbLoopSong, m_nChannels;
LONG m_nWaveDevice; // use the SNDDEV_GET_NUMBER and SNDDEV_GET_TYPE macros to decode
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2011-07-28 21:40:15 UTC (rev 934)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2011-07-28 22:07:15 UTC (rev 935)
@@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
+// Deutsch (Deutschland) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
#ifdef _WIN32
@@ -707,14 +707,14 @@
CONTROL "Spin1",IDC_SPIN_INSTRUMENT,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | WS_TABSTOP,111,8,11,11
EDITTEXT IDC_SAMPLE_NAME,131,6,151,12,ES_AUTOHSCROLL
EDITTEXT IDC_SAMPLE_FILENAME,324,6,105,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT8,84,36,37,12,ES_NUMBER
+ EDITTEXT IDC_EDIT8,84,36,37,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN8,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,40,8,10
EDITTEXT IDC_EDIT7,84,53,37,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SPIN7,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,57,8,10
CONTROL "Set Pan",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,42,72,42,10
- EDITTEXT IDC_EDIT9,84,70,37,12,ES_NUMBER
+ EDITTEXT IDC_EDIT9,84,70,37,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,74,8,11
- EDITTEXT IDC_EDIT15,33,99,27,13
+ EDITTEXT IDC_EDIT15,33,99,27,13,ES_AUTOHSCROLL
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
@@ -736,9 +736,9 @@
COMBOBOX IDC_COMBO6,246,99,72,127,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Editor",IDC_INSVIEWPLG,321,99,37,13,0,WS_EX_STATICEDGE
COMBOBOX IDC_COMBO5,321,116,37,169,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_EDIT10,321,134,37,12
+ EDITTEXT IDC_EDIT10,321,134,37,12,ES_AUTOHSCROLL
CONTROL "Spin1",IDC_SPIN10,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,349,135,8,11
- EDITTEXT IDC_EDIT11,321,152,37,12
+ EDITTEXT IDC_EDIT11,321,152,37,12,ES_AUTOHSCROLL
CONTROL "",IDC_SPIN11,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,351,153,8,11
COMBOBOX IDC_PLUGIN_VELOCITYSTYLE,367,115,83,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_PLUGIN_VOLUMESTYLE,367,148,83,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -752,7 +752,7 @@
CTEXT "MIDI Bank",IDC_STATIC,245,152,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
CTEXT "Fade Out",IDC_STATIC,8,53,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
CTEXT "Global Volume",IDC_STATIC,8,36,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
- CTEXT "File",IDC_STATIC,289,6,36,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
+ CTEXT "File",IDC_STATIC,289,6,35,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
CTEXT "Sep",IDC_STATIC,8,99,25,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
CTEXT "Centre",IDC_STATIC,69,99,26,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
GROUPBOX "Random Variation",IDC_STATIC,131,88,104,80
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
