From: <man...@us...> - 2014-03-29 08:39:56
|
Revision: 3993 http://sourceforge.net/p/modplug/code/3993 Author: manxorist Date: 2014-03-29 08:39:48 +0000 (Sat, 29 Mar 2014) Log Message: ----------- [Ref] Make General, Mixer and Advanced optiosn tab as big as Soundcard and DSP settings. Leave the others alone for now. [Mod] Exchange position of resampling bandwith and window function controls. Modified Paths: -------------- trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/mptrack.rc =================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc 2014-03-28 23:26:46 UTC (rev 3992) +++ trunk/OpenMPT/mptrack/mptrack.rc 2014-03-29 08:39:48 UTC (rev 3993) @@ -291,15 +291,15 @@ PUSHBUTTON "Cancel",IDCANCEL,108,42,50,14 END -IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 268, 274 +IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 286, 281 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Warning:\nChanging advanced settings might cause stability problems.\nYou should only continue if you know what you are doing.",IDC_STATIC,6,6,258,24 LTEXT "Find:",IDC_STATIC,6,38,17,8 - EDITTEXT IDC_EDIT1,30,36,234,12,ES_AUTOHSCROLL - LISTBOX IDC_LIST4,6,54,258,216,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT1,30,36,252,12,ES_AUTOHSCROLL + LISTBOX IDC_LIST4,6,54,276,222,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP END IDD_SCANPLUGINS DIALOGEX 0, 0, 316, 34 @@ -435,9 +435,9 @@ IDD_OPTIONS_ADVANCED, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 261 + RIGHTMARGIN, 279 TOPMARGIN, 7 - BOTTOMMARGIN, 267 + BOTTOMMARGIN, 274 END IDD_SCANPLUGINS, DIALOG @@ -500,7 +500,7 @@ EDITTEXT IDC_EDIT3,26,87,212,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER END -IDD_OPTIONS_PLAYER DIALOGEX 0, 0, 286, 279 +IDD_OPTIONS_PLAYER DIALOGEX 0, 0, 286, 281 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "DSP" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -1294,33 +1294,33 @@ EDITTEXT IDC_EDIT1,7,7,257,138,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END -IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 272, 279 -STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 286, 281 +STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Default Directories",IDC_STATIC,6,6,261,102 + GROUPBOX "Default Directories",IDC_STATIC,6,6,276,102 RTEXT "Songs:",IDC_STATIC_MODDIR,12,18,48,12,SS_CENTERIMAGE - EDITTEXT IDC_OPTIONS_DIR_MODS,66,18,174,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_MODDIR,246,18,12,11,NOT WS_TABSTOP + EDITTEXT IDC_OPTIONS_DIR_MODS,66,18,192,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_BUTTON_CHANGE_MODDIR,264,18,12,11,NOT WS_TABSTOP RTEXT "Samples:",IDC_STATIC_SAMPDIR,12,36,48,12,SS_CENTERIMAGE - EDITTEXT IDC_OPTIONS_DIR_SAMPS,66,36,174,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_SAMPDIR,246,36,12,11,NOT WS_TABSTOP + EDITTEXT IDC_OPTIONS_DIR_SAMPS,66,36,192,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_BUTTON_CHANGE_SAMPDIR,264,36,12,11,NOT WS_TABSTOP RTEXT "Instruments:",IDC_STATIC_INSTRDIR,12,54,48,12,SS_CENTERIMAGE - EDITTEXT IDC_OPTIONS_DIR_INSTS,66,54,174,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_INSTRDIR,246,54,12,11,NOT WS_TABSTOP + EDITTEXT IDC_OPTIONS_DIR_INSTS,66,54,192,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_BUTTON_CHANGE_INSTRDIR,264,54,12,11,NOT WS_TABSTOP RTEXT "VST Plugins:",IDC_STATIC_VSTDIR,12,72,48,12,SS_CENTERIMAGE - EDITTEXT IDC_OPTIONS_DIR_VSTS,66,72,174,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTDIR,246,72,12,11,NOT WS_TABSTOP + EDITTEXT IDC_OPTIONS_DIR_VSTS,66,72,192,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTDIR,264,72,12,11,NOT WS_TABSTOP RTEXT "VST Presets:",IDC_STATIC_VSTPRESETDIR,12,90,48,12,SS_CENTERIMAGE - EDITTEXT IDC_OPTIONS_DIR_VSTPRESETS,66,90,174,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,246,90,12,11,NOT WS_TABSTOP - GROUPBOX "Options",IDC_STATIC,4,114,261,161 - LISTBOX IDC_LIST1,9,126,129,141,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Description",IDC_TEXT1,144,126,111,138 + EDITTEXT IDC_OPTIONS_DIR_VSTPRESETS,66,90,192,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,264,90,12,11,NOT WS_TABSTOP + GROUPBOX "Options",IDC_STATIC,4,114,278,162 + LISTBOX IDC_LIST1,9,126,147,144,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LTEXT "Description",IDC_TEXT1,162,126,111,138 END -IDD_OPTIONS_SOUNDCARD DIALOGEX 0, 0, 286, 282 +IDD_OPTIONS_SOUNDCARD DIALOGEX 0, 0, 286, 281 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sound Card" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -1602,37 +1602,37 @@ CONTROL "Resize to",IDC_RADIO_RESIZETO,"Button",BS_AUTORADIOBUTTON,12,60,102,8 END -IDD_OPTIONS_MIXER DIALOGEX 0, 0, 274, 281 +IDD_OPTIONS_MIXER DIALOGEX 0, 0, 286, 281 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mixer" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - GROUPBOX "Resampling",IDC_STATIC,6,6,264,48 + GROUPBOX "Resampling",IDC_STATIC,6,6,276,48 LTEXT "Filter:",IDC_STATIC,12,18,24,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_FILTER,54,18,90,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bandwidth:",IDC_STATIC,156,18,42,12,SS_CENTERIMAGE - EDITTEXT IDC_WFIRCUTOFF,198,18,18,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER - LTEXT "%",IDC_STATIC,222,18,24,12,SS_CENTERIMAGE - LTEXT "Window:",IDC_STATIC,12,36,30,12,SS_CENTERIMAGE - COMBOBOX IDC_COMBO_FILTERWINDOW,54,36,84,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Volume Ramping",IDC_STATIC,6,60,264,48 + LTEXT "Bandwidth:",IDC_STATIC,12,36,42,12,SS_CENTERIMAGE + EDITTEXT IDC_WFIRCUTOFF,54,36,18,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + LTEXT "%",IDC_STATIC,78,36,24,12,SS_CENTERIMAGE + LTEXT "Window:",IDC_STATIC,156,18,30,12,SS_CENTERIMAGE + COMBOBOX IDC_COMBO_FILTERWINDOW,192,18,84,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,48 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,264,30 + 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,264,30 + 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,264,72 + 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,90,204,60,12,SS_CENTERIMAGE - CONTROL "",IDC_SLIDER_PREAMP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,156,198,96,24 + 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 END @@ -1657,7 +1657,7 @@ VERTGUIDE, 50 VERTGUIDE, 169 VERTGUIDE, 256 - BOTTOMMARGIN, 278 + BOTTOMMARGIN, 280 END IDD_WAVECONVERT, DIALOG @@ -1800,14 +1800,14 @@ IDD_OPTIONS_GENERAL, DIALOG BEGIN - RIGHTMARGIN, 266 - BOTTOMMARGIN, 276 + RIGHTMARGIN, 280 + BOTTOMMARGIN, 278 END IDD_OPTIONS_SOUNDCARD, DIALOG BEGIN RIGHTMARGIN, 264 - BOTTOMMARGIN, 179 + BOTTOMMARGIN, 178 END IDD_MIDIMACRO, DIALOG @@ -1903,7 +1903,7 @@ IDD_OPTIONS_MIXER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 267 + RIGHTMARGIN, 279 TOPMARGIN, 7 BOTTOMMARGIN, 274 END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |