From: <sag...@us...> - 2015-07-11 16:49:34
|
Revision: 5403 http://sourceforge.net/p/modplug/code/5403 Author: saga-games Date: 2015-07-11 16:49:28 +0000 (Sat, 11 Jul 2015) Log Message: ----------- [Imp] Some more spin buttons in the settings dialog. Modified Paths: -------------- trunk/OpenMPT/mptrack/SampleConfigDlg.cpp trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/SampleConfigDlg.cpp =================================================================== --- trunk/OpenMPT/mptrack/SampleConfigDlg.cpp 2015-07-11 16:48:13 UTC (rev 5402) +++ trunk/OpenMPT/mptrack/SampleConfigDlg.cpp 2015-07-11 16:49:28 UTC (rev 5403) @@ -47,8 +47,10 @@ //--------------------------------------- { CPropertyPage::OnInitDialog(); + SetDlgItemInt(IDC_EDIT_UNDOSIZE, TrackerSettings::Instance().m_SampleUndoBufferSize.Get().GetSizeInPercent()); SetDlgItemInt(IDC_EDIT_FINETUNE, TrackerSettings::Instance().m_nFinetuneStep); - SetDlgItemInt(IDC_EDIT_UNDOSIZE, TrackerSettings::Instance().m_SampleUndoBufferSize.Get().GetSizeInPercent()); + static_cast<CSpinButtonCtrl *>(GetDlgItem(IDC_SPIN1))->SetRange32(0, 100); + static_cast<CSpinButtonCtrl *>(GetDlgItem(IDC_SPIN2))->SetRange32(1, 200); RecalcUndoSize(); m_cbnDefaultSampleFormat.SetItemData(m_cbnDefaultSampleFormat.AddString("FLAC"), dfFLAC); Modified: trunk/OpenMPT/mptrack/mptrack.rc =================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc 2015-07-11 16:48:13 UTC (rev 5402) +++ trunk/OpenMPT/mptrack/mptrack.rc 2015-07-11 16:49:28 UTC (rev 5403) @@ -141,12 +141,13 @@ CAPTION "Samples" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Sample Editor",IDC_STATIC,6,6,276,138 - LTEXT "Sample Undo Buffer:",IDC_STATIC,12,20,78,8 + LTEXT "Sample Undo Buffer:",IDC_STATIC,12,20,102,8 EDITTEXT IDC_EDIT_UNDOSIZE,114,18,42,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,144,24,12,12 LTEXT "%",IDC_UNDOSIZE,162,20,114,16 - LTEXT "Frequency Finetune Steps:",IDC_STATIC,12,38,114,8 + LTEXT "Frequency Finetune Steps:",IDC_STATIC,12,38,102,8 EDITTEXT IDC_EDIT_FINETUNE,114,36,42,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,144,41,11,12 LTEXT "Cents",IDC_STATIC,162,38,20,8 LTEXT "Default Sample Format:",IDC_STATIC,12,56,102,8 COMBOBOX IDC_DEFAULT_FORMAT,114,54,42,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -158,15 +159,16 @@ CONTROL "On New Note",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,18,102,258,12 CONTROL "On Key Release",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,18,114,258,12 CONTROL "Press Again",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,18,126,258,12 - GROUPBOX "Instrument Editor",IDC_STATIC,6,150,276,48 CONTROL "Compress ITI Files",IDC_COMPRESS_ITI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,162,264,12 LTEXT "Default Plugin Volume Command Handling:",IDC_STATIC,12,182,150,8 COMBOBOX IDC_VOLUME_HANDLING,162,180,78,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Common",IDC_STATIC,6,204,276,48 CONTROL "Preview Samples / Instruments in File Browser",IDC_PREVIEW_SAMPLES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,217,264,12 CONTROL "Normalize 24-/32-bit Samples on Load",IDC_NORMALIZE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,234,264,12 + GROUPBOX "Sample Editor",IDC_STATIC,6,6,276,138 + GROUPBOX "Instrument Editor",IDC_STATIC,6,150,276,48 + GROUPBOX "Common",IDC_STATIC,6,204,276,48 END IDD_EDITHISTORY DIALOGEX 0, 0, 316, 185 @@ -1720,7 +1722,6 @@ CAPTION "Mixer" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - GROUPBOX "Resampling",IDC_STATIC,6,6,276,48 LTEXT "Filter:",IDC_STATIC,12,18,24,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_FILTER,54,18,96,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Window:",IDC_STATIC,156,18,30,12,SS_CENTERIMAGE @@ -1728,25 +1729,27 @@ LTEXT "Bandwidth:",IDC_STATIC,12,36,42,12,SS_CENTERIMAGE EDITTEXT IDC_WFIRCUTOFF,54,36,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER LTEXT "%",IDC_STATIC,84,36,24,12,SS_CENTERIMAGE - GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,48 + EDITTEXT IDC_RAMPING_IN,12,72,36,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "\xB5s up",IDC_STATIC,42,72,22,12,SS_CENTERIMAGE EDITTEXT IDC_RAMPING_IN,12,72,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_EDIT_VOLRAMP_SAMPLES_UP,78,72,90,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "\xB5s down",IDC_STATIC,42,92,28,11,SS_CENTERIMAGE EDITTEXT IDC_RAMPING_OUT,12,90,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_EDIT_VOLRAMP_SAMPLES_DOWN,78,90,90,12,ES_AUTOHSCROLL | ES_READONLY - GROUPBOX "Polyphony",IDC_STATIC,6,114,276,30 LTEXT "Maximum Mixed Channels:",IDC_STATIC,12,126,84,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_POLYPHONY,102,126,66,88,CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Behaviour",IDC_STATIC,6,150,276,30 LTEXT "Stereo Separation:",IDC_STATIC,12,162,62,8 CONTROL "",IDC_SLIDER_STEREOSEP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,78,162,54,12 LTEXT "100%",IDC_TEXT_STEREOSEP,132,162,36,8 - GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,276,72 CONTROL "Soft Panning",IDC_CHECK_SOFTPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,204,66,12 LTEXT "Sample Pre-Amp:",IDC_STATIC,102,204,60,12,SS_CENTERIMAGE CONTROL "",IDC_SLIDER_PREAMP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,168,198,96,24 LTEXT "Warning: Only samples are affected by these settings! Modifying them will change the balance between samples and plugins in songs with mix levels set to 1.17RC2 or earlier in the Song Properties! ",IDC_STATIC,12,222,252,30 + GROUPBOX "Resampling",IDC_STATIC,6,6,276,48 + GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,48 + GROUPBOX "Polyphony",IDC_STATIC,6,114,276,30 + GROUPBOX "Behaviour",IDC_STATIC,6,150,276,30 + GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,276,72 END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |