Menu
▾
▴
[OMPT-svn-commit] OpenMPT r22329 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-11-27 22:32:54
|
Author: sagamusix Date: Wed Nov 27 23:32:40 2024 New Revision: 22329 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22329 Log: [Mod] Increase size of settings dialog to allow for new settings to be added (https://bugs.openmpt.org/view.php?id=816). Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp trunk/OpenMPT/mptrack/KeyConfigDlg.cpp trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Wed Nov 27 23:18:46 2024 (r22328) +++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Wed Nov 27 23:32:40 2024 (r22329) @@ -70,20 +70,20 @@ { static constexpr ListCtrl::Header headers[] = { - { _T("Setting"), 150, LVCFMT_LEFT }, + { _T("Setting"), 170, LVCFMT_LEFT }, { _T("Type"), 40, LVCFMT_LEFT }, - { _T("Value"), 140, LVCFMT_LEFT }, - { _T("Default"), 62, LVCFMT_LEFT }, + { _T("Value"), 160, LVCFMT_LEFT }, + { _T("Default"), 76, LVCFMT_LEFT }, }; m_List.SetHeaders(headers); } else { static constexpr ListCtrl::Header headers[] = { - { _T("Setting"), 200, LVCFMT_LEFT }, + { _T("Setting"), 220, LVCFMT_LEFT }, { _T("Type"), 40, LVCFMT_LEFT }, - { _T("Value"), 100, LVCFMT_LEFT }, - { _T("Default"), 52, LVCFMT_LEFT }, + { _T("Value"), 120, LVCFMT_LEFT }, + { _T("Default"), 66, LVCFMT_LEFT }, }; m_List.SetHeaders(headers); } Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Wed Nov 27 23:18:46 2024 (r22328) +++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Wed Nov 27 23:32:40 2024 (r22329) @@ -127,8 +127,8 @@ static constexpr CListCtrlEx::Header KeyListHeaders[] = { - {_T("Shortcut"), 276, LVCFMT_LEFT}, - {_T("Assigned Keys"), 116, LVCFMT_LEFT}, + {_T("Shortcut"), 274, LVCFMT_LEFT}, + {_T("Assigned Keys"), 174, LVCFMT_LEFT}, }; BEGIN_MESSAGE_MAP(COptionsKeyboard, CPropertyPage) Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Wed Nov 27 23:18:46 2024 (r22328) +++ trunk/OpenMPT/mptrack/mptrack.rc Wed Nov 27 23:32:40 2024 (r22329) @@ -159,12 +159,12 @@ LTEXT "samples",IDC_STATIC,150,45,42,8 END -IDD_OPTIONS_SAMPLEEDITOR DIALOGEX 0, 0, 287, 273 +IDD_OPTIONS_SAMPLEEDITOR DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Samples" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Sample Editor",IDC_STATIC,6,6,276,138 + GROUPBOX "Sample Editor",IDC_STATIC,6,6,312,138 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 | UDS_NOTHOUSANDS,144,24,12,12 @@ -187,11 +187,11 @@ CONTROL "Do not follow Pla&y Cursor",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,144,102,126,12 CONTROL "Follo&w Play Cursor",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,144,114,126,12 CONTROL "Follow Play Cursor c&entered",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,144,126,126,12 - GROUPBOX "Instrument Editor",IDC_STATIC,6,150,276,48 + GROUPBOX "Instrument Editor",IDC_STATIC,6,150,312,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,66 + GROUPBOX "Common",IDC_STATIC,6,204,312,66 CONTROL "Pre&view Samples / Instruments in File Browser",IDC_PREVIEW_SAMPLES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,217,264,12 CONTROL "N&ormalize 24-/32-bit Samples on Load",IDC_NORMALIZE, @@ -243,27 +243,27 @@ CONTROL "&Post-loop fade",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,61,180,12 END -IDD_OPTIONS_UPDATE DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_UPDATE DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Update" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Enable Online &Update Check",IDC_CHECK_UPDATEENABLED, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,6,106,10 - GROUPBOX "Check for Updates",IDC_STATIC_UPDATECHECK,6,24,276,66 + GROUPBOX "Check for Updates",IDC_STATIC_UPDATECHECK,6,24,312,66 CONTROL "&Install Updates automatically",IDC_CHECK_UPDATEINSTALLAUTOMATICALLY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,36,264,12 LTEXT "Automatically check on program &start:",IDC_STATIC_UPDATEFREQUENCY,12,54,132,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_UPDATEFREQUENCY,146,54,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Check now...",IDC_BUTTON1,216,54,60,12 LTEXT "",IDC_LASTUPDATE,12,73,264,12 - GROUPBOX "Privacy Settings",IDC_STATIC_UPDATEPRIVACY,6,96,276,84 + GROUPBOX "Privacy Settings",IDC_STATIC_UPDATEPRIVACY,6,96,312,84 CONTROL "&Allow OpenMPT to collect basic statistics about your system configuration",IDC_CHECK1, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,108,264,12 - LTEXT "",IDC_STATIC_UPDATEPRIVACYTEXT,12,120,264,36 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,108,294,12 + LTEXT "",IDC_STATIC_UPDATEPRIVACYTEXT,12,120,294,36 CONTROL "<a>Show which information would be transmitted to OpenMPT...</a>",IDC_SYSLINK1, - "SysLink",WS_TABSTOP,12,162,264,12 - GROUPBOX "Update Channel",IDC_STATIC_UDATECHANNEL,6,192,276,52 + "SysLink",WS_TABSTOP,12,162,294,12 + GROUPBOX "Update Channel",IDC_STATIC_UDATECHANNEL,6,192,312,52 CONTROL "&Release: Official stable released versions only (recommended)",IDC_RADIO1, "Button",BS_AUTORADIOBUTTON,12,204,264,10 CONTROL "&Next: Previews of the next official stable release",IDC_RADIO2, @@ -350,16 +350,16 @@ PUSHBUTTON "Cancel",IDCANCEL,108,42,50,14 END -IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 327, 314 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,204,24 + LTEXT "Warning:\nChanging advanced settings might cause stability problems.\nYou should only continue if you know what you are doing.",IDC_STATIC,6,6,252,24 LTEXT "&Find:",IDC_STATIC,6,38,17,8 - EDITTEXT IDC_EDIT1,30,36,252,12,ES_AUTOHSCROLL - CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,54,276,222 - PUSHBUTTON "&Save now",IDC_BUTTON1,228,12,50,14 + EDITTEXT IDC_EDIT1,30,36,288,12,ES_AUTOHSCROLL + CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,54,312,252 + PUSHBUTTON "&Save now",IDC_BUTTON1,264,12,50,14 END IDD_SCANPLUGINS DIALOGEX 0, 0, 316, 34 @@ -497,20 +497,20 @@ CONTROL "Send timing messages",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,66,120,12 END -IDD_OPTIONS_WINE DIALOGEX 0, 0, 286, 278 +IDD_OPTIONS_WINE DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wine" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Enable Wine native host support (requires restarting OpenMPT)",IDC_CHECK_WINE_ENABLE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,273,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,275,10 LTEXT "P&ortAudio:",IDC_STATIC_WINE_PORTAUDIO,18,42,42,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_WINE_PORTAUDIO,66,42,48,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&PulseAudio:",IDC_STATIC_WINE_PULSEAUDIO,18,24,42,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_WINE_PULSEAUDIO,66,24,48,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&RtAudio:",IDC_STATIC_WINE_RTAUDIO,18,60,42,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_WINE_RTAUDIO,66,60,48,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Support for native host system audio output is EXPERIMENTAL. Consult the OpenMPT manual for more information.",IDC_STATIC,6,84,238,23 + LTEXT "Support for native host system audio output is EXPERIMENTAL. Consult the OpenMPT manual for more information.",IDC_STATIC,6,84,306,23 END IDD_LFOPLUGIN DIALOGEX 0, 0, 303, 201 @@ -712,9 +712,8 @@ IDD_OPTIONS_SAMPLEEDITOR, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 280 + RIGHTMARGIN, 318 TOPMARGIN, 7 - BOTTOMMARGIN, 266 END IDD_EDITHISTORY, DIALOG @@ -744,9 +743,9 @@ IDD_OPTIONS_UPDATE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 318 TOPMARGIN, 7 - BOTTOMMARGIN, 274 + BOTTOMMARGIN, 307 END IDD_CLOSEDOCUMENTS, DIALOG @@ -792,7 +791,7 @@ IDD_OPTIONS_ADVANCED, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 318 TOPMARGIN, 7 BOTTOMMARGIN, 274 END @@ -864,9 +863,9 @@ IDD_OPTIONS_WINE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 319 TOPMARGIN, 7 - BOTTOMMARGIN, 271 + BOTTOMMARGIN, 304 END IDD_LFOPLUGIN, DIALOG @@ -1112,12 +1111,12 @@ EDITTEXT IDC_EDITABOUT,12,114,318,138,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL END -IDD_OPTIONS_PLAYER DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_PLAYER DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "DSP" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "",IDC_STATIC,6,6,276,150 + GROUPBOX "",IDC_STATIC,6,6,312,150 CONTROL "&Enable Graphic Equalizer",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,6,94,10 LTEXT "+12dB",IDC_STATIC,12,21,22,8 LTEXT "+0dB",IDC_STATIC,16,49,18,8 @@ -1135,38 +1134,38 @@ CTEXT "10kHz",IDC_TEXT6,210,87,22,8 CONTROL "",IDC_SLIDER12,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,206,18,24,68 CTEXT "Right-click on a band to change its center frequency",IDC_STATIC,36,102,200,8 - PUSHBUTTON "User1",IDC_BUTTON1,240,18,36,12 - PUSHBUTTON "User2",IDC_BUTTON2,240,36,36,12 - PUSHBUTTON "User3",IDC_BUTTON3,240,54,36,12 - PUSHBUTTON "User4",IDC_BUTTON4,240,72,36,12 - PUSHBUTTON "&Save...",IDC_BUTTON5,240,90,36,12 - LTEXT "EQ Warning Message",IDC_EQ_WARNING,12,114,264,36,0,WS_EX_TRANSPARENT - GROUPBOX "",IDC_STATIC,6,156,276,120 - CONTROL "&Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,164,97,10 - CONTROL "&Bit Crush",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,164,48,10 - CONTROL "",IDC_SLIDER4,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS | WS_TABSTOP,162,162,62,15 - CONTROL "&Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,178,81,10 - CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,191,62,15 - LTEXT "Low",IDC_STATIC,17,193,14,8 - LTEXT "High",IDC_STATIC,95,193,16,8 - LTEXT "Range:",IDC_STATIC,169,178,24,8 - CONTROL "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,149,190,62,15 - LTEXT "10Hz",IDC_STATIC,131,193,18,8 - LTEXT "100Hz",IDC_STATIC,211,191,23,8 - CONTROL "&Reverb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,210,62,10 - CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,222,62,15 - LTEXT "Low",IDC_STATIC,17,226,14,8 - LTEXT "High",IDC_STATIC,95,226,16,8 - CTEXT "Reverb Preset:",IDC_STATIC,150,210,62,8 - COMBOBOX IDC_COMBO2,135,223,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "&Pro-Logic Surround",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,242,99,10 - CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,255,62,15 - LTEXT "Low",IDC_STATIC,17,258,14,8 - LTEXT "High",IDC_STATIC,95,258,16,8 - CTEXT "Front/Rear Delay:",IDC_STATIC,147,244,65,8 - CONTROL "Slider2",IDC_SLIDER6,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,149,254,62,15 - LTEXT "5ms",IDC_STATIC,131,257,18,8 - LTEXT "50ms",IDC_STATIC,211,257,23,8 + PUSHBUTTON "User1",IDC_BUTTON1,258,18,54,12 + PUSHBUTTON "User2",IDC_BUTTON2,258,36,54,12 + PUSHBUTTON "User3",IDC_BUTTON3,258,54,54,12 + PUSHBUTTON "User4",IDC_BUTTON4,258,72,54,12 + PUSHBUTTON "&Save...",IDC_BUTTON5,258,90,54,12 + LTEXT "EQ Warning Message",IDC_EQ_WARNING,12,114,300,36,0,WS_EX_TRANSPARENT + GROUPBOX "",IDC_STATIC,6,162,312,144 + CONTROL "&Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,171,97,10 + CONTROL "&Bit Crush",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,171,48,10 + CONTROL "",IDC_SLIDER4,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS | WS_TABSTOP,192,168,62,15 + CONTROL "&Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,192,81,10 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,206,62,15 + LTEXT "Low",IDC_STATIC,14,208,14,8 + LTEXT "High",IDC_STATIC,92,208,16,8 + LTEXT "Range:",IDC_STATIC,181,192,24,8 + CONTROL "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,161,206,62,15 + LTEXT "10Hz",IDC_STATIC,143,208,18,8 + LTEXT "100Hz",IDC_STATIC,223,206,23,8 + CONTROL "&Reverb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,228,62,10 + CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,242,62,15 + LTEXT "Low",IDC_STATIC,14,244,14,8 + LTEXT "High",IDC_STATIC,92,244,16,8 + CTEXT "Reverb Preset:",IDC_STATIC,162,228,62,8 + COMBOBOX IDC_COMBO2,147,241,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "&Pro-Logic Surround",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,264,99,10 + CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,278,62,15 + LTEXT "Low",IDC_STATIC,14,280,14,8 + LTEXT "High",IDC_STATIC,92,280,16,8 + CTEXT "Front/Rear Delay:",IDC_STATIC,159,267,65,8 + CONTROL "Slider2",IDC_SLIDER6,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,161,278,62,15 + LTEXT "5ms",IDC_STATIC,143,280,18,8 + LTEXT "50ms",IDC_STATIC,223,280,23,8 END IDD_WAVECONVERT DIALOGEX 0, 0, 389, 284 @@ -1244,51 +1243,51 @@ CTEXT "Writing file...",IDC_TEXT1,4,4,212,9 END -IDD_OPTIONS_KEYBOARD DIALOGEX 0, 0, 286, 282 +IDD_OPTIONS_KEYBOARD DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Keyboard" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Select c&ategory:",IDC_STATIC,7,8,83,8 - COMBOBOX IDC_KEYCATEGORY,90,6,192,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COMMAND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,24,277,126 - LTEXT "&Find by Name:",IDC_STATIC,6,158,54,8 - EDITTEXT IDC_FIND,60,156,102,12,ES_AUTOHSCROLL - PUSHBUTTON "Find by Hotkey...",IDC_BUTTON2,168,156,66,13 - LTEXT "Key:",IDC_FINDHOTKEY_LABEL,174,158,17,8,NOT WS_VISIBLE - EDITTEXT IDC_FINDHOTKEY,192,156,42,12,ES_AUTOHSCROLL | NOT WS_VISIBLE - PUSHBUTTON "C&lear",IDC_BUTTON3,240,156,44,12 - GROUPBOX "&Key setup for selected command",IDC_GROUPBOX_KEYSETUP,6,174,276,66 - COMBOBOX IDC_CHOICECOMBO,12,186,84,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Key:",IDC_STATIC,102,188,16,8 - EDITTEXT IDC_CUSTHOTKEY,120,186,72,13,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Set",IDC_BUTTON1,198,186,37,13 - PUSHBUTTON "&Restore",IDC_RESTORE,240,186,37,13 - PUSHBUTTON "&Delete Choice",IDC_DELETE,198,204,79,13 - CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,206,66,8 - CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,206,60,8 - CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,206,54,8 - ICON "",IDC_STATIC1,12,223,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE - LTEXT "No conflicts found.",IDC_KEYREPORT,26,224,254,13 - CONTROL "Repeat Note Keys on Hold",IDC_NOTESREPEAT,"Button",BS_3STATE | WS_TABSTOP,6,246,144,12 - LTEXT "Chord detect interval (ms):",IDC_STATIC,156,248,94,8 - EDITTEXT IDC_CHORDDETECTWAITTIME,252,246,30,12,ES_AUTOHSCROLL | ES_NUMBER - PUSHBUTTON "&Import Key Map...",IDC_LOAD,6,264,72,13 - PUSHBUTTON "&Export Key Map...",IDC_SAVE,84,264,72,13 - PUSHBUTTON "Restore default &configuration",IDC_RESTORE_KEYMAP,162,264,120,12 + COMBOBOX IDC_KEYCATEGORY,90,6,228,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COMMAND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,24,313,150 + LTEXT "&Find by Name:",IDC_STATIC,6,182,54,8 + EDITTEXT IDC_FIND,60,180,138,12,ES_AUTOHSCROLL + PUSHBUTTON "Find by Hotkey...",IDC_BUTTON2,204,180,66,13 + LTEXT "Key:",IDC_FINDHOTKEY_LABEL,210,182,17,8,NOT WS_VISIBLE + EDITTEXT IDC_FINDHOTKEY,228,180,42,12,ES_AUTOHSCROLL | NOT WS_VISIBLE + PUSHBUTTON "C&lear",IDC_BUTTON3,276,180,44,12 + GROUPBOX "&Key setup for selected command",IDC_GROUPBOX_KEYSETUP,6,198,312,66 + COMBOBOX IDC_CHOICECOMBO,12,210,84,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Key:",IDC_STATIC,102,212,16,8 + EDITTEXT IDC_CUSTHOTKEY,120,210,72,13,ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Set",IDC_BUTTON1,198,210,37,13 + PUSHBUTTON "&Restore",IDC_RESTORE,240,210,37,13 + PUSHBUTTON "&Delete Choice",IDC_DELETE,198,228,79,13 + CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,230,66,8 + CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,230,60,8 + CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,230,54,8 + ICON "",IDC_STATIC1,12,247,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE + LTEXT "No conflicts found.",IDC_KEYREPORT,26,248,286,13 + CONTROL "Repeat Note Keys on Hold",IDC_NOTESREPEAT,"Button",BS_3STATE | WS_TABSTOP,6,270,144,12 + LTEXT "Chord detect interval (ms):",IDC_STATIC,156,272,126,8 + EDITTEXT IDC_CHORDDETECTWAITTIME,288,270,30,12,ES_AUTOHSCROLL | ES_NUMBER + PUSHBUTTON "&Import Key Map...",IDC_LOAD,6,288,84,16 + PUSHBUTTON "&Export Key Map...",IDC_SAVE,96,288,84,16 + PUSHBUTTON "Restore default &configuration",IDC_RESTORE_KEYMAP,186,288,132,16 END -IDD_OPTIONS_COLORS DIALOGEX 0, 0, 286, 282 +IDD_OPTIONS_COLORS DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Display" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "",IDC_STATIC,6,6,276,162 + GROUPBOX "",IDC_STATIC,6,6,312,192 LTEXT "Pattern &Font:",IDC_STATIC,18,20,54,8 - COMBOBOX IDC_COMBO2,72,18,144,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Custom...",IDC_BUTTON9,222,18,50,12 + COMBOBOX IDC_COMBO2,72,18,180,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Custom...",IDC_BUTTON9,258,18,50,12 LTEXT "Comments f&ont:",IDC_STATIC,18,38,52,8 - PUSHBUTTON "Font",IDC_BUTTON10,72,36,144,12 + PUSHBUTTON "Font",IDC_BUTTON10,72,36,180,12 LTEXT "Display accidentals as:",IDC_STATIC,18,53,78,12,SS_CENTERIMAGE CONTROL "&Sharps (#)",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,102,54,66,12 CONTROL "Flats (&b)",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,168,54,108,12 @@ -1307,32 +1306,32 @@ EDITTEXT IDC_SECONDARYHILITE,102,137,24,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Rows per beat (default)",IDC_STATIC,132,140,144,8 LTEXT "Note: Songs' time signatures will override the default highlight values",IDC_STATIC,18,153,258,8 - GROUPBOX "Colours",IDC_STATIC,6,174,276,105 - LTEXT "Select colo&ur for:",IDC_STATIC,18,188,63,8 - CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,84,186,11,12 - COMBOBOX IDC_COMBO1,96,186,114,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,18,204,120,48 - LTEXT "C1",IDC_TEXT1,144,207,72,8 - CONTROL "Change &1",IDC_BUTTON1,"Button",BS_OWNERDRAW,216,204,51,12 - LTEXT "C2",IDC_TEXT2,144,224,72,8 - CONTROL "Change &2",IDC_BUTTON2,"Button",BS_OWNERDRAW,216,223,51,12 - LTEXT "C3",IDC_TEXT3,144,242,72,8 - CONTROL "Change &3",IDC_BUTTON3,"Button",BS_OWNERDRAW,216,240,51,12 - LTEXT "Presets:",IDC_STATIC,18,261,36,8 - PUSHBUTTON "&Load...",IDC_LOAD_COLORSCHEME,54,258,42,15 - PUSHBUTTON "S&ave...",IDC_SAVE_COLORSCHEME,102,258,42,15 - COMBOBOX IDC_COMBO3,150,259,126,203,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Colours",IDC_STATIC,6,204,312,102 + LTEXT "Select colo&ur for:",IDC_STATIC,18,218,63,8 + CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,84,216,11,12 + COMBOBOX IDC_COMBO1,96,216,156,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,18,234,120,48 + LTEXT "C1",IDC_TEXT1,144,237,108,8 + CONTROL "Change &1",IDC_BUTTON1,"Button",BS_OWNERDRAW,258,234,51,12 + LTEXT "C2",IDC_TEXT2,144,254,108,8 + CONTROL "Change &2",IDC_BUTTON2,"Button",BS_OWNERDRAW,258,252,51,12 + LTEXT "C3",IDC_TEXT3,144,272,108,8 + CONTROL "Change &3",IDC_BUTTON3,"Button",BS_OWNERDRAW,258,270,51,12 + LTEXT "Presets:",IDC_STATIC,18,291,36,8 + PUSHBUTTON "&Load...",IDC_LOAD_COLORSCHEME,54,288,42,15 + PUSHBUTTON "S&ave...",IDC_SAVE_COLORSCHEME,102,288,42,15 + COMBOBOX IDC_COMBO3,150,289,156,203,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_OPTIONS_MIDI DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_MIDI DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "MIDI" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "MIDI Recording",IDC_STATIC,6,6,276,108 + GROUPBOX "MIDI Recording",IDC_STATIC,6,6,312,108 LTEXT "MIDI &Input Device:",IDC_STATIC,18,18,67,8 - COMBOBOX IDC_COMBO1,18,30,198,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Re&name",IDC_BUTTON1,222,30,50,14 + COMBOBOX IDC_COMBO1,18,30,234,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Re&name",IDC_BUTTON1,258,30,50,14 CONTROL "&Apply Octave Transpose to incoming MIDI Notes",IDC_CHECK4, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,48,237,12 CONTROL "&Respond to Play / Continue / Stop Song messages",IDC_MIDIPLAYCONTROL, @@ -1343,7 +1342,7 @@ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,84,237,12 CONTROL "&Enable MIDI recording when launching OpenMPT",IDC_CHECK3, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,97,240,12 - GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,276,114 + GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,312,114 CONTROL "Record Note &Off",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,138,237,8 CONTROL "Record MIDI Note &Velocity, amplify by",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,150,144,8 @@ -1360,7 +1359,7 @@ EDITTEXT IDC_EDIT4,138,198,132,12,ES_AUTOHSCROLL LTEXT "Record A&ftertouch Messages",IDC_STATIC,30,216,108,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO2,138,216,132,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "MIDI File Import",IDC_STATIC,6,240,276,36 + GROUPBOX "MIDI File Import",IDC_STATIC,6,240,312,36 LTEXT "&Quantize:",IDC_STATIC,12,258,32,8 COMBOBOX IDC_COMBO3,48,256,60,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Tic&ks / Row:",IDC_STATIC,114,258,42,8 @@ -1929,65 +1928,65 @@ EDITTEXT IDC_EDIT1,6,6,260,143,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP,WS_EX_STATICEDGE END -IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Default &Artist Name:",IDC_STATIC,12,20,78,8 - EDITTEXT IDC_EDIT1,90,18,186,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT1,90,18,222,12,ES_AUTOHSCROLL LTEXT "Newly created files default to:",IDC_STATIC,12,36,264,12 CONTROL "&Fixed format:",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,49,59,10 COMBOBOX IDC_COMBO1,90,48,84,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Same format as currently open file",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,12,66,264,10 CONTROL "Fixed &template:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,12,85,66,10 COMBOBOX IDC_COMBO2,90,84,168,12,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_BUTTON1,264,84,12,11 - 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 - GROUPBOX "Miscellaneous Options",IDC_STATIC,4,114,278,162 - GROUPBOX "Defaults",IDC_STATIC,6,6,276,96 + PUSHBUTTON "Browse...",IDC_BUTTON1,264,84,48,12 + LISTBOX IDC_LIST1,9,126,159,180,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LTEXT "Description",IDC_TEXT1,180,126,129,180 + GROUPBOX "Miscellaneous Options",IDC_STATIC,4,114,314,198 + GROUPBOX "Defaults",IDC_STATIC,6,6,312,96 END -IDD_OPTIONS_SOUNDCARD DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_SOUNDCARD DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sound Card" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "&Device",IDC_STATIC,6,6,276,156 - CONTROL "",IDC_COMBO1,"ComboBoxEx32",CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP,12,18,264,96 + GROUPBOX "&Device",IDC_STATIC,6,6,312,156 + CONTROL "",IDC_COMBO1,"ComboBoxEx32",CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP,12,18,300,96 PUSHBUTTON "&Setup device ...",IDC_BUTTON2,24,36,72,12 CONTROL "Show deprecated devices",IDC_CHECK_SOUNDCARD_SHOWALL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,36,96,12 - PUSHBUTTON "&Rescan device list",IDC_BUTTON1,204,36,72,12 + PUSHBUTTON "&Rescan device list",IDC_BUTTON1,240,36,72,12 LTEXT "&Latency:",IDC_STATIC_LATENCY,12,54,30,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO2,48,54,54,83,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "&Period:",IDC_STATIC_UPDATEINTERVAL,12,72,30,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_UPDATEINTERVAL,48,72,54,83,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "&Format:",IDC_STATIC_FORMAT,12,90,30,12,SS_CENTERIMAGE - COMBOBOX IDC_COMBO3,48,90,54,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO5,108,90,42,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO6,156,90,54,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO10,216,90,60,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO3,48,90,60,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO5,114,90,48,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO6,168,90,66,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO10,240,90,72,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Use device &exclusively",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,54,90,12 CONTROL "&Boost thread priority",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,72,90,12 CONTROL "&Hardware timing",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,72,72,12 LTEXT "&Mapping:",IDC_STATIC_CHANNELMAPPING,12,108,30,12,SS_CENTERIMAGE CTEXT "Front",IDC_STATIC_CHANNEL_FRONT,48,108,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - COMBOBOX IDC_COMBO_CHANNEL_FRONTLEFT,78,108,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_CHANNEL_FRONTRIGHT,180,108,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_FRONTLEFT,78,108,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_FRONTRIGHT,198,108,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CTEXT "Rear",IDC_STATIC_CHANNEL_REAR,48,126,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - COMBOBOX IDC_COMBO_CHANNEL_REARLEFT,78,126,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_CHANNEL_REARRIGHT,180,126,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_REARLEFT,78,126,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_REARRIGHT,198,126,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Record:",IDC_STATIC_RECORDING,12,144,36,12,SS_CENTERIMAGE - COMBOBOX IDC_COMBO_RECORDING_CHANNELS,48,144,42,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_RECORDING_SOURCE,96,144,180,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "General",IDC_STATIC,6,186,276,30 + COMBOBOX IDC_COMBO_RECORDING_CHANNELS,48,144,66,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_RECORDING_SOURCE,120,144,192,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "General",IDC_STATIC,6,186,312,30 LTEXT "&When playback is stopped:",IDC_STATIC,12,198,90,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO11,108,198,60,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Open device at startup",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,198,90,12 - GROUPBOX "Stat&istics",IDC_STATIC,6,222,276,55 - EDITTEXT IDC_EDIT_STATISTICS,12,233,264,38,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + GROUPBOX "Stat&istics",IDC_STATIC,6,222,312,84 + EDITTEXT IDC_EDIT_STATISTICS,12,233,300,67,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP END IDD_MIDIMACRO DIALOGEX 0, 0, 369, 335 @@ -2184,26 +2183,26 @@ GROUPBOX "Length in Rows at Middle-C",IDC_STATIC,6,55,171,45 END -IDD_OPTIONS_AUTOSAVE DIALOGEX 0, 0, 286, 279 +IDD_OPTIONS_AUTOSAVE DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paths / Auto Save" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN RTEXT "Songs:",IDC_STATIC_MODDIR,12,18,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_MODS,66,18,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_MODDIR,264,18,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_MODDIR,264,18,48,11 RTEXT "Samples:",IDC_STATIC_SAMPDIR,12,36,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_SAMPS,66,36,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_SAMPDIR,264,36,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_SAMPDIR,264,36,48,11 RTEXT "Instruments:",IDC_STATIC_INSTRDIR,12,54,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_INSTS,66,54,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_INSTRDIR,264,54,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_INSTRDIR,264,54,48,11 RTEXT "VST Plugins:",IDC_STATIC_VSTDIR,12,72,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_VSTS,66,72,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTDIR,264,72,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_VSTDIR,264,72,48,11 RTEXT "VST Presets:",IDC_STATIC_VSTPRESETDIR,12,90,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_VSTPRESETS,66,90,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,264,90,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,264,90,48,11 CONTROL "Create &backup copy (*.bak) when saving module files",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,135,258,12 CONTROL "&Enable Auto Save",IDC_AUTOSAVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,154,237,10 @@ -2219,12 +2218,12 @@ "Button",BS_AUTORADIOBUTTON,18,202,218,10 CONTROL "S&tore in:",IDC_AUTOSAVE_USECUSTOMDIR,"Button",BS_AUTORADIOBUTTON,18,218,43,10 EDITTEXT IDC_AUTOSAVE_PATH,72,216,186,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_AUTOSAVE_BROWSE,264,216,12,11 + PUSHBUTTON "Browse...",IDC_AUTOSAVE_BROWSE,264,216,48,11 LTEXT "Filename:",IDC_STATIC,30,240,36,12,SS_CENTERIMAGE - LTEXT "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,72,240,186,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE - LTEXT "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,72,258,186,12,SS_CENTERIMAGE - GROUPBOX "Backup and Auto Save",IDC_STATIC,6,120,278,157 - GROUPBOX "Default Directories",IDC_STATIC,6,6,276,102 + LTEXT "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,72,240,240,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE + LTEXT "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,72,258,240,12,SS_CENTERIMAGE + GROUPBOX "Backup and Auto Save",IDC_STATIC,6,120,312,186 + GROUPBOX "Default Directories",IDC_STATIC,6,6,312,102 END IDD_EDIT_GOTO DIALOGEX 0, 0, 123, 122 @@ -2272,18 +2271,18 @@ PUSHBUTTON "&Cancel",IDCANCEL,138,30,50,14 END -IDD_OPTIONS_MIXER DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_MIXER DIALOGEX 0, 0, 327, 314 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,276,48 + GROUPBOX "Resampling",IDC_STATIC,6,6,312,48 LTEXT "&Filter:",IDC_STATIC,12,18,24,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_FILTER,36,18,102,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Use &Amiga resampler for Amiga modules",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,36,144,12 COMBOBOX IDC_COMBO_AMIGA_TYPE,162,36,102,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,72 + GROUPBOX "Volume Ramping",IDC_STATIC,6,60,312,72 EDITTEXT IDC_RAMPING_IN,12,72,36,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,42,66,11,14 LTEXT "s &up",IDC_STATIC,54,72,22,12,SS_CENTERIMAGE @@ -2293,15 +2292,15 @@ LTEXT "s &down",IDC_STATIC,54,92,28,11,SS_CENTERIMAGE EDITTEXT IDC_EDIT_VOLRAMP_SAMPLES_DOWN,90,90,90,12,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Reset to Defaults",IDC_BUTTON1,12,110,72,14 - GROUPBOX "Behaviour",IDC_STATIC,6,150,276,30 - LTEXT "&Stereo Separation:",IDC_STATIC,12,162,72,8 - CONTROL "",IDC_SLIDER_STEREOSEP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,86,162,54,12 - LTEXT "100%",IDC_TEXT_STEREOSEP,140,162,36,8 - GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,276,72 + GROUPBOX "Behaviour",IDC_STATIC,6,144,312,30 + LTEXT "&Stereo Separation:",IDC_STATIC,12,156,72,8 + CONTROL "",IDC_SLIDER_STEREOSEP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,86,156,54,12 + LTEXT "100%",IDC_TEXT_STEREOSEP,140,156,36,8 + GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,312,72 CONTROL "Soft &Panning",IDC_CHECK_SOFTPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,204,66,12 LTEXT "Sample Pre-A&mp:",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 + 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,300,30 END IDD_QUICKSTART DIALOGEX 0, 0, 332, 211 @@ -2335,11 +2334,10 @@ IDD_OPTIONS_PLAYER, DIALOG BEGIN - RIGHTMARGIN, 280 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 VERTGUIDE, 50 VERTGUIDE, 169 - VERTGUIDE, 256 - BOTTOMMARGIN, 280 END IDD_WAVECONVERT, DIALOG @@ -2355,21 +2353,23 @@ IDD_OPTIONS_KEYBOARD, DIALOG BEGIN - RIGHTMARGIN, 280 + LEFTMARGIN, 5 + RIGHTMARGIN, 320 TOPMARGIN, 5 - BOTTOMMARGIN, 278 END IDD_OPTIONS_COLORS, DIALOG BEGIN - RIGHTMARGIN, 261 - BOTTOMMARGIN, 202 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 + TOPMARGIN, 6 END IDD_OPTIONS_MIDI, DIALOG BEGIN - RIGHTMARGIN, 254 - BOTTOMMARGIN, 278 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 + TOPMARGIN, 6 END IDD_LOADRAWSAMPLE, DIALOG @@ -2472,14 +2472,18 @@ IDD_OPTIONS_GENERAL, DIALOG BEGIN - RIGHTMARGIN, 280 - BOTTOMMARGIN, 278 + LEFTMARGIN, 4 + RIGHTMARGIN, 318 + TOPMARGIN, 6 + BOTTOMMARGIN, 313 END IDD_OPTIONS_SOUNDCARD, DIALOG BEGIN - RIGHTMARGIN, 264 - BOTTOMMARGIN, 178 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 + TOPMARGIN, 6 + BOTTOMMARGIN, 306 END IDD_MIDIMACRO, DIALOG @@ -2554,8 +2558,10 @@ IDD_OPTIONS_AUTOSAVE, DIALOG BEGIN - RIGHTMARGIN, 280 - BOTTOMMARGIN, 276 + LEFTMARGIN, 6 + RIGHTMARGIN, 319 + TOPMARGIN, 6 + BOTTOMMARGIN, 306 END IDD_EDIT_GOTO, DIALOG @@ -2577,9 +2583,8 @@ IDD_OPTIONS_MIXER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 318 TOPMARGIN, 7 - BOTTOMMARGIN, 274 END IDD_QUICKSTART, DIALOG @@ -2757,6 +2762,26 @@ 100, 100, 0, 0 END +IDD_OPTIONS_SOUNDCARD AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_AUTOSAVE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_GENERAL AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_PLAYER AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// |
