[OMPT-svn-commit] SF.net SVN: modplug:[3883] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 3883
          http://sourceforge.net/p/modplug/code/3883
Author:   saga-games
Date:     2014-03-14 14:21:57 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
[Fix] Mnemonics in sound card dialog where not unique.
[Mod] Instead of hiding DSP controls if some DSP feature is turned off, disable them. This looks much better.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-03-14 12:55:35 UTC (rev 3882)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-03-14 14:21:57 UTC (rev 3883)
@@ -1205,25 +1205,24 @@
 
 	if (dwQuality & SNDDSP_EQ) CheckDlgButton(IDC_CHECK3, MF_CHECKED);
 #else
-	GetDlgItem(IDC_CHECK3)->ShowWindow(SW_HIDE);
-	::EnableWindow(::GetDlgItem(m_hWnd, IDC_CHECK3), FALSE);
+	GetDlgItem(IDC_CHECK3)->EnableWindow(FALSE);
 #endif
 
 	// Effects
 #ifndef NO_DSP
 	if (dwQuality & SNDDSP_MEGABASS) CheckDlgButton(IDC_CHECK1, MF_CHECKED);
 #else
-	GetDlgItem(IDC_CHECK1)->ShowWindow(SW_HIDE);
+	GetDlgItem(IDC_CHECK1)->EnableWindow(FALSE);
 #endif
 #ifndef NO_AGC
 	if (dwQuality & SNDDSP_AGC) CheckDlgButton(IDC_CHECK2, MF_CHECKED);
 #else
-	GetDlgItem(IDC_CHECK2)->ShowWindow(SW_HIDE);
+	GetDlgItem(IDC_CHECK2)->EnableWindow(FALSE);
 #endif
 #ifndef NO_DSP
 	if (dwQuality & SNDDSP_SURROUND) CheckDlgButton(IDC_CHECK4, MF_CHECKED);
 #else
-	GetDlgItem(IDC_CHECK4)->ShowWindow(SW_HIDE);
+	GetDlgItem(IDC_CHECK4)->EnableWindow(FALSE);
 #endif
 
 #ifndef NO_DSP
@@ -1233,8 +1232,8 @@
 	m_SbXBassRange.SetRange(0,4);
 	m_SbXBassRange.SetPos(4 - (TrackerSettings::Instance().m_DSPSettings.m_nXBassRange - 1) / 5);
 #else
-	m_SbXBassDepth.ShowWindow(SW_HIDE);
-	m_SbXBassRange.ShowWindow(SW_HIDE);
+	m_SbXBassDepth.EnableWindow(FALSE);
+	m_SbXBassRange.EnableWindow(FALSE);
 #endif
 
 #ifndef NO_REVERB
@@ -1255,7 +1254,7 @@
 	m_CbnReverbPreset.SetCurSel(nSel);
 	if(!(GetProcSupport() & PROCSUPPORT_MMX))
 	{
-		::EnableWindow(::GetDlgItem(m_hWnd, IDC_CHECK6), FALSE);
+		GetDlgItem(IDC_CHECK6)->EnableWindow(FALSE);
 		m_SbReverbDepth.EnableWindow(FALSE);
 		m_CbnReverbPreset.EnableWindow(FALSE);
 	} else
@@ -1263,9 +1262,9 @@
 		if (dwQuality & SNDDSP_REVERB) CheckDlgButton(IDC_CHECK6, MF_CHECKED);
 	}
 #else
-	GetDlgItem(IDC_CHECK6)->ShowWindow(SW_HIDE);
-	m_SbReverbDepth.ShowWindow(SW_HIDE);
-	m_CbnReverbPreset.ShowWindow(SW_HIDE);
+	GetDlgItem(IDC_CHECK6)->EnableWindow(FALSE);
+	m_SbReverbDepth.EnableWindow(FALSE);
+	m_CbnReverbPreset.EnableWindow(FALSE);
 #endif
 
 #ifndef NO_DSP
@@ -1280,8 +1279,8 @@
 		m_SbSurroundDelay.SetPos((TrackerSettings::Instance().m_DSPSettings.m_nProLogicDelay-5)/5);
 	}
 #else
-	m_SbSurroundDepth.ShowWindow(SW_HIDE);
-	m_SbSurroundDelay.ShowWindow(SW_HIDE);
+	m_SbSurroundDepth.EnableWindow(FALSE);
+	m_SbSurroundDelay.EnableWindow(FALSE);
 #endif
 
 	return TRUE;

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2014-03-14 12:55:35 UTC (rev 3882)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2014-03-14 14:21:57 UTC (rev 3883)
@@ -1306,9 +1306,9 @@
     COMBOBOX        IDC_COMBO5,108,90,42,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO6,156,90,42,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO10,204,90,72,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Use device exclusively",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,54,84,12
+    CONTROL         "Use device &exclusively",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,54,84,12
     CONTROL         "&Boost thread priority",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,72,84,12
-    CONTROL         "Hardware timing",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,198,72,66,12
+    CONTROL         "&Hardware timing",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,198,72,66,12
     LTEXT           "Channel &Mapping:",IDC_STATIC,12,108,60,12,SS_CENTERIMAGE
     CTEXT           "Front Left",IDC_STATIC_CHANNEL_FRONTLEFT,78,108,48,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
     COMBOBOX        IDC_COMBO_CHANNEL_FRONTLEFT,132,108,144,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1320,10 +1320,10 @@
     COMBOBOX        IDC_COMBO_CHANNEL_REARRIGHT,132,162,144,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "General",IDC_STATIC,6,186,276,30
     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
+    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
-    LTEXT           "When playback is &stoppped:",IDC_STATIC,12,198,90,12,SS_CENTERIMAGE
+    LTEXT           "&When playback is stoppped:",IDC_STATIC,12,198,90,12,SS_CENTERIMAGE
 END
 
 IDD_MIDIMACRO DIALOGEX 0, 0, 358, 354

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.