Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4535] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2014-11-02 01:18:58
|
Revision: 4535
http://sourceforge.net/p/modplug/code/4535
Author: saga-games
Date: 2014-11-02 01:18:42 +0000 (Sun, 02 Nov 2014)
Log Message:
-----------
[Imp] Add mnenomics and spin buttons to find/replace dialog.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2014-11-01 21:51:00 UTC (rev 4534)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2014-11-02 01:18:42 UTC (rev 4535)
@@ -145,16 +145,16 @@
CheckDlgButton(IDC_CHECK7, m_Flags[FindReplace::InChannels] ? MF_CHECKED : MF_UNCHECKED);
int nButton = IDC_RADIO1;
if(m_Flags[FindReplace::FullSearch])
- {
nButton = IDC_RADIO2;
- } else if(m_bPatSel)
- {
+ else if(m_bPatSel)
nButton = IDC_RADIO3;
- }
+
CheckRadioButton(IDC_RADIO1, IDC_RADIO3, nButton);
GetDlgItem(IDC_RADIO3)->EnableWindow(m_bPatSel ? TRUE : FALSE);
SetDlgItemInt(IDC_EDIT1, m_nMinChannel + 1);
SetDlgItemInt(IDC_EDIT2, m_nMaxChannel + 1);
+ static_cast<CSpinButtonCtrl *>(GetDlgItem(IDC_SPIN1))->SetRange32(1, sndFile.GetNumChannels());
+ static_cast<CSpinButtonCtrl *>(GetDlgItem(IDC_SPIN2))->SetRange32(1, sndFile.GetNumChannels());
}
// Note
if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO1)) != NULL)
@@ -350,8 +350,10 @@
if (!m_bReplace)
{
BOOL b = IsDlgButtonChecked(IDC_CHECK7);
- ::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT1), b);
- ::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT2), b);
+ GetDlgItem(IDC_EDIT1)->EnableWindow(b);
+ GetDlgItem(IDC_SPIN1)->EnableWindow(b);
+ GetDlgItem(IDC_EDIT2)->EnableWindow(b);
+ GetDlgItem(IDC_SPIN2)->EnableWindow(b);
}
}
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2014-11-01 21:51:00 UTC (rev 4534)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2014-11-02 01:18:42 UTC (rev 4535)
@@ -1188,25 +1188,27 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Search for:",IDC_STATIC,4,4,206,110
- CONTROL "Note",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,60,10
+ CONTROL "&Note",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,60,10
COMBOBOX IDC_COMBO1,12,30,59,94,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Instrument",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,18,114,10
+ CONTROL "&Instrument",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,18,114,10
COMBOBOX IDC_COMBO2,84,30,114,103,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Volume Effect",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,48,114,10
+ CONTROL "&Volume Effect",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,48,114,10
COMBOBOX IDC_COMBO3,12,60,114,77,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Volume Data",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,48,60,10
+ CONTROL "V&olume Data",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,48,60,10
COMBOBOX IDC_COMBO4,138,60,60,77,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Effect",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,78,114,10
+ CONTROL "&Effect",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,78,114,10
COMBOBOX IDC_COMBO5,12,90,113,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Effect Data",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,78,60,10
+ CONTROL "E&ffect Data",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,78,60,10
COMBOBOX IDC_COMBO6,138,90,60,68,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Find in current pattern",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,6,120,108,8
- CONTROL "Find in the whole song",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,6,144,108,8
- CONTROL "Only in channels",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,120,70,10
- EDITTEXT IDC_EDIT1,132,132,28,12,ES_AUTOHSCROLL | ES_NUMBER
- CTEXT "to",IDC_STATIC,164,134,8,8
- EDITTEXT IDC_EDIT2,176,132,28,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Find in current selection",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,6,132,108,8
+ CONTROL "Find in current &pattern",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,6,120,108,8
+ CONTROL "Find in current &selection",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,6,132,108,8
+ CONTROL "Find in the &whole song",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,6,144,108,8
+ CONTROL "Only in &channels",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,120,76,10
+ EDITTEXT IDC_EDIT1,126,132,30,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,150,138,10,14
+ CTEXT "&to",IDC_STATIC,164,134,8,8
+ EDITTEXT IDC_EDIT2,176,132,30,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,198,138,11,14
END
IDD_EDIT_REPLACE DIALOGEX 0, 0, 214, 149
@@ -1215,20 +1217,20 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "",IDC_STATIC,4,4,206,140
- CONTROL "Replace By:",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,15,63,10
- CONTROL "Note",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,30,60,10
+ CONTROL "&Replace By:",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,15,63,10
+ CONTROL "&Note",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,30,60,10
COMBOBOX IDC_COMBO1,12,42,59,93,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Instrument",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,30,114,10
+ CONTROL "&Instrument",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,30,114,10
COMBOBOX IDC_COMBO2,84,42,114,92,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Volume Effect",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,60,113,10
+ CONTROL "&Volume Effect",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,60,113,10
COMBOBOX IDC_COMBO3,12,72,114,64,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Volume Data",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,60,60,10
+ CONTROL "V&olume Data",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,60,60,10
COMBOBOX IDC_COMBO4,138,72,60,64,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Effect",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,114,10
+ CONTROL "&Effect",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,114,10
COMBOBOX IDC_COMBO5,12,102,114,70,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Effect Data",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,90,60,10
+ CONTROL "E&ffect Data",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,90,60,10
COMBOBOX IDC_COMBO6,138,102,60,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Replace All (No confirmation)",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,126,186,10
+ CONTROL "Replace &All (No confirmation)",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,126,186,10
END
IDD_PATTERN_PROPERTIES DIALOGEX 0, 0, 190, 127
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
