Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1070] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-10-01 00:30:12
|
Revision: 1070
http://modplug.svn.sourceforge.net/modplug/?rev=1070&view=rev
Author: saga-games
Date: 2011-10-01 00:30:05 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
[Mod] Song Properties: "Test Version" is appended to version number strings when a song was created / saved with a test version.
[Mod] Revamped MIDI Mapping dialog a bit.
[Imp] Keyboard Settings: Error boxes are now modal to the keyboard settings dialog, so they cannot be overlooked (which effectively means that entering new shortcuts doesn't work).
Modified Paths:
--------------
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/dlg_misc.h
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2011-09-30 22:51:44 UTC (rev 1069)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2011-10-01 00:30:05 UTC (rev 1070)
@@ -530,8 +530,7 @@
if (cmd<0 || m_nCurKeyChoice<0 || m_nCurKeyChoice>=ih->GetKeyListSize(cmd))
{
// Annoying message box is annoying.
- //CString error = "Nothing to restore for this slot.";
- //Reporting::Error(error, "Invalid key data");
+ //Reporting::Error("Nothing to restore for this slot.", "Invalid key data", this);
return;
}
@@ -552,8 +551,7 @@
if (m_nCurHotKey<0 || m_nCurKeyChoice<0 || m_nCurKeyChoice>=plocalCmdSet->GetKeyListSize(cmd))
{
// Annoying message box is annoying.
- //CString error = "No key currently set for this slot.";
- //Reporting::Warning(error, "Invalid key data");
+ //Reporting::Warning("No key currently set for this slot.", "Invalid key data", this);
return;
}
@@ -574,7 +572,7 @@
if (cmd<0)
{
CString error = "Invalid slot.";
- Reporting::Warning(error, "Invalid key data");
+ Reporting::Warning(error, "Invalid key data", this);
return;
}
@@ -590,7 +588,7 @@
if (!kc.code)
{
CString error = "You need to say to which key you'd like to map this command to.";
- Reporting::Warning(error, "Invalid key data");
+ Reporting::Warning(error, "Invalid key data", this);
return;
}
if (!kc.event)
@@ -604,12 +602,12 @@
//process valid input
plocalCmdSet->Remove(m_nCurKeyChoice, cmd);
- report=plocalCmdSet->Add(kc, cmd, true, m_nCurKeyChoice);
+ report = plocalCmdSet->Add(kc, cmd, true, m_nCurKeyChoice);
//Update log
m_eReport.GetWindowText(reportHistory);
//reportHistory = reportHistory.Mid(6,reportHistory.GetLength()-1);
- m_eReport.SetWindowText(report+reportHistory);
+ m_eReport.SetWindowText(report + reportHistory);
ForceUpdateGUI();
m_bModified=false;
@@ -707,7 +705,7 @@
void COptionsKeyboard::OnRestoreDefaultKeymap()
//---------------------------------------------
{
- if(Reporting::Confirm("Discard all custom changes and restore default key configuration?") == cnfYes)
+ if(Reporting::Confirm("Discard all custom changes and restore default key configuration?", false, true, this) == cnfYes)
{
plocalCmdSet->LoadDefaultKeymap();
ForceUpdateGUI();
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-09-30 22:51:44 UTC (rev 1069)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-10-01 00:30:05 UTC (rev 1070)
@@ -94,8 +94,6 @@
default: m_TypeBox.SetCurSel(0); break;
}
- UpdateChannelCBox();
-
// Don't show new tempo modes for XM/IT, unless they are currently used
const bool showNewTempoModes = (m_pSndFile->GetType() == MOD_TYPE_MPT || (m_pSndFile->m_dwSongFlags & SONG_ITPROJECT) != 0);
@@ -121,7 +119,7 @@
m_PlugMixBox.SetItemData(m_PlugMixBox.AddString("OpenMPT 1.17RC1"), mixLevels_117RC1);
m_PlugMixBox.SetItemData(m_PlugMixBox.AddString("Original (MPT 1.16)"), mixLevels_original);
m_PlugMixBox.SetItemData(m_PlugMixBox.AddString("Compatible"), mixLevels_compatible);
- //m_PlugMixBox.SetItemData(m_PlugMixBox.AddString("Test"), mixLevels_Test);
+
m_PlugMixBox.SetCurSel(0);
for(int i = m_PlugMixBox.GetCount(); i > 0; i--)
{
@@ -135,8 +133,8 @@
SetDlgItemText(IDC_TEXT_CREATEDWITH, "Created with:");
SetDlgItemText(IDC_TEXT_SAVEDWITH, "Last saved with:");
- SetDlgItemText(IDC_EDIT_CREATEDWITH, MptVersion::ToStr(m_pSndFile->m_dwCreatedWithVersion));
- SetDlgItemText(IDC_EDIT_SAVEDWITH, MptVersion::ToStr(m_pSndFile->m_dwLastSavedWithVersion));
+ SetDlgItemText(IDC_EDIT_CREATEDWITH, FormatVersionNumber(m_pSndFile->m_dwCreatedWithVersion));
+ SetDlgItemText(IDC_EDIT_SAVEDWITH, FormatVersionNumber(m_pSndFile->m_dwLastSavedWithVersion));
UpdateDialog();
@@ -145,6 +143,13 @@
}
+CString CModTypeDlg::FormatVersionNumber(DWORD version)
+//-----------------------------------------------------
+{
+ return MptVersion::ToStr(version) + (MptVersion::IsTestBuild(version) ? " (Test Build)" : "");
+}
+
+
void CModTypeDlg::UpdateChannelCBox()
//-----------------------------------
{
@@ -1838,7 +1843,7 @@
void AppendNotesToControl(CComboBox& combobox, const MODCOMMAND::NOTE noteStart, const MODCOMMAND::NOTE noteEnd)
//------------------------------------------------------------------------------------------------------------------
{
- const MODCOMMAND::NOTE upperLimit = min(ARRAYELEMCOUNT(szDefaultNoteNames)-1, noteEnd);
+ const MODCOMMAND::NOTE upperLimit = min(ARRAYELEMCOUNT(szDefaultNoteNames) - 1, noteEnd);
for(MODCOMMAND::NOTE note = noteStart; note <= upperLimit; ++note)
combobox.SetItemData(combobox.AddString(szDefaultNoteNames[note]), note);
}
@@ -1847,16 +1852,16 @@
void AppendNotesToControlEx(CComboBox& combobox, const CSoundFile* const pSndFile /* = nullptr*/, const INSTRUMENTINDEX nInstr/* = MAX_INSTRUMENTS*/)
//----------------------------------------------------------------------------------------------------------------------------------
{
- const MODCOMMAND::NOTE noteStart = (pSndFile != nullptr) ? pSndFile->GetModSpecifications().noteMin : 1;
+ const MODCOMMAND::NOTE noteStart = (pSndFile != nullptr) ? pSndFile->GetModSpecifications().noteMin : NOTE_MIN;
const MODCOMMAND::NOTE noteEnd = (pSndFile != nullptr) ? pSndFile->GetModSpecifications().noteMax : NOTE_MAX;
for(MODCOMMAND::NOTE nNote = noteStart; nNote <= noteEnd; nNote++)
{
if(pSndFile != nullptr && nInstr != MAX_INSTRUMENTS)
combobox.SetItemData(combobox.AddString(pSndFile->GetNoteName(nNote, nInstr).c_str()), nNote);
else
- combobox.SetItemData(combobox.AddString(szDefaultNoteNames[nNote-1]), nNote);
+ combobox.SetItemData(combobox.AddString(szDefaultNoteNames[nNote - 1]), nNote);
}
- for(MODCOMMAND::NOTE nNote = NOTE_MIN_SPECIAL-1; nNote++ < NOTE_MAX_SPECIAL;)
+ for(MODCOMMAND::NOTE nNote = NOTE_MIN_SPECIAL - 1; nNote++ < NOTE_MAX_SPECIAL;)
{
if(pSndFile == nullptr || pSndFile->GetModSpecifications().HasNote(nNote) == true)
combobox.SetItemData(combobox.AddString(szSpecialNoteNames[nNote-NOTE_MIN_SPECIAL]), nNote);
Modified: trunk/OpenMPT/mptrack/dlg_misc.h
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.h 2011-09-30 22:51:44 UTC (rev 1069)
+++ trunk/OpenMPT/mptrack/dlg_misc.h 2011-10-01 00:30:05 UTC (rev 1070)
@@ -27,8 +27,9 @@
bool VerifyData();
void UpdateDialog();
-private:
+protected:
void UpdateChannelCBox();
+ CString FormatVersionNumber(DWORD version);
protected:
//{{AFX_VIRTUAL(CModTypeDlg)
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2011-09-30 22:51:44 UTC (rev 1069)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2011-10-01 00:30:05 UTC (rev 1070)
@@ -1022,8 +1022,8 @@
CONTROL "Override &song signature:",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,48,174,12
EDITTEXT IDC_EDIT_ROWSPERBEAT,18,66,30,12,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_EDIT_ROWSPERMEASURE,18,84,30,12,ES_AUTOHSCROLL | ES_NUMBER
- DEFPUSHBUTTON "OK",IDOK,132,6,50,14
- PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+ DEFPUSHBUTTON "&OK",IDOK,132,6,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,132,24,50,14
LTEXT "Rows:",IDC_STATIC,6,6,108,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,42,174,1
LTEXT "Rows per beat",IDC_STATIC,54,68,126,8
@@ -2128,7 +2128,7 @@
MENUITEM "&Copy envelope", ID_EDIT_COPY
MENUITEM "&Paste envelope", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "Scale points...", ID_ENVELOPE_SCALEPOINTS
+ MENUITEM "Scale Envelope Points...", ID_ENVELOPE_SCALEPOINTS
END
END
@@ -2575,10 +2575,10 @@
LTEXT "Static",IDC_MESSAGETEXT,7,7,172,40
END
-IDD_MIDIPARAMCONTROL DIALOGEX 0, 0, 392, 202
+IDD_MIDIPARAMCONTROL DIALOGEX 0, 0, 340, 223
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "MIDI mapping"
+CAPTION "MIDI Mapping"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Current mapping",IDC_STATIC,5,5,325,105
@@ -2598,11 +2598,11 @@
PUSHBUTTON "Add",IDC_BUTTON_ADD,175,90,45,12
PUSHBUTTON "Replace",IDC_BUTTON_REPLACE,225,90,45,12
PUSHBUTTON "Remove",IDC_BUTTON_REMOVE,275,90,45,12
- LISTBOX IDC_LIST1,5,115,325,82,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- CONTROL "",IDC_SPINMOVEMAPPING,"msctls_updown32",0x0,330,115,11,80
- CONTROL "MIDI learn",IDC_CHECK_MIDILEARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,30,47,11
- DEFPUSHBUTTON "Close",IDOK,335,10,50,14
- CONTROL "Pattern record",IDC_CHECK_PATRECORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,20,63,10
+ LISTBOX IDC_LIST1,5,115,313,82,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "",IDC_SPINMOVEMAPPING,"msctls_updown32",0x0,318,115,11,82
+ CONTROL "MIDI Learn",IDC_CHECK_MIDILEARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,276,18,47,11
+ DEFPUSHBUTTON "Close",IDOK,276,204,50,14
+ CONTROL "Pattern Record",IDC_CHECK_PATRECORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,20,65,10
END
IDD_TUNING DIALOGEX 0, 0, 512, 240
@@ -2748,9 +2748,9 @@
IDD_MIDIPARAMCONTROL, DIALOG
BEGIN
- RIGHTMARGIN, 388
+ RIGHTMARGIN, 336
TOPMARGIN, 2
- BOTTOMMARGIN, 201
+ BOTTOMMARGIN, 222
END
IDD_TUNING, DIALOG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
