From a7860bd3aba264fb6b94306d29968a34f0ed92d5 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 15 Mar 2009 13:31:41 +0000 Subject: [PATCH] Win32 - Sound dialog - more sound channel gui fixes --- src/drivers/win/res.rc | 1 + src/drivers/win/resource.h | 3 ++- src/drivers/win/sound.cpp | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 0da8574d..52ae6231 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -786,6 +786,7 @@ BEGIN CONTROL "",CTL_VOLUME_TRACKBAR_PCM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,279,150,28,83 GROUPBOX "Volume Control",IDC_STATIC,10,127,314,127 PUSHBUTTON "Restore defaults",IDC_SOUND_RESTOREDEFAULTVOL,19,238,56,11 + LTEXT "",ID_SOUND_TRITOP,76,135,38,8 END TIMINGCONFIG DIALOGEX 23, 157, 203, 60 diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 22aa8f17..f6947c28 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -404,6 +404,7 @@ #define IDC_MOVIE_AUTOBACKUP 1198 #define IDC_SOUNDS_RESTOREDEFAULTS 1199 #define BTN_CANCELED 1200 +#define ID_SOUND_TRITOP 1201 #define MENU_NETWORK 40040 #define MENU_PALETTE 40041 #define MENU_SOUND 40042 @@ -687,7 +688,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 125 #define _APS_NEXT_COMMAND_VALUE 40353 -#define _APS_NEXT_CONTROL_VALUE 1201 +#define _APS_NEXT_CONTROL_VALUE 1202 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/src/drivers/win/sound.cpp b/src/drivers/win/sound.cpp index 863e3efe..a47b20f2 100644 --- a/src/drivers/win/sound.cpp +++ b/src/drivers/win/sound.cpp @@ -722,6 +722,7 @@ void UpdateSoundChannelQualityMode(HWND hwndDlg) EnableWindow(GetDlgItem(hwndDlg,134),TRUE); EnableWindow(GetDlgItem(hwndDlg,135),TRUE); //Set text for group boxes + SetDlgItemText(hwndDlg, ID_SOUND_TRITOP, ""); //Hacky, a static text box above the group box so I have more text space SetDlgItemText(hwndDlg, 131, "Triangle"); SetDlgItemText(hwndDlg, 132, "Square 1"); SetDlgItemText(hwndDlg, 133, "Square 2"); @@ -739,7 +740,8 @@ void UpdateSoundChannelQualityMode(HWND hwndDlg) EnableWindow(GetDlgItem(hwndDlg,134),FALSE); EnableWindow(GetDlgItem(hwndDlg,135),FALSE); //Set text for group boxes - SetDlgItemText(hwndDlg, 131, "Tri/noise/pcm"); + SetDlgItemText(hwndDlg, ID_SOUND_TRITOP, "Triangle/"); //Hacky, a static text box above the group box so I have more text space + SetDlgItemText(hwndDlg, 131, "noise/pcm"); SetDlgItemText(hwndDlg, 132, "Square"); SetDlgItemText(hwndDlg, 133, "Disabled"); //Set Square 2 to disabled SetDlgItemText(hwndDlg, 134, "Disabled"); //Set Noise to disabled