Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MMSYS] Fix some icons and add more appropriate ones. Brought to you by Jared Smudde. CORE-9471 for more details.

Browse source 
svn path=/trunk/; revision=67064
This commit is contained in:
Amine Khaldi 2015-04-05 16:58:46 +00:00
parent 9de3477231
commit a18fba66e3
6 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/cpl/mmsys/mmsys.rc
View file

@ -51,7 +51,7 @@ IDI_MICROPHONE_ICON ICON "resources/4378.ico"
4386 ICON "resources/4386.ico" 4386 ICON "resources/4386.ico"
4387 ICON "resources/4387.ico" 4387 ICON "resources/4387.ico"
4388 ICON "resources/4388.ico" 4388 ICON "resources/4388.ico"
4390 ICON "resources/4390.ico" IDI_NO_HW ICON "resources/4390.ico"
IDI_MUTED_ICON ICON "resources/4393.ico" IDI_MUTED_ICON ICON "resources/4393.ico"
IDI_SHUTDOWN_ICON ICON "resources/4394.ico" IDI_SHUTDOWN_ICON ICON "resources/4394.ico"

1
reactos/dll/cpl/mmsys/resource.h
View file

@ -8,6 +8,7 @@
#define IDI_JOY_ICON 4361 #define IDI_JOY_ICON 4361
#define IDI_CAMERA_ICON 4364 #define IDI_CAMERA_ICON 4364
#define IDI_SHUTDOWN_ICON 3009 #define IDI_SHUTDOWN_ICON 3009
#define IDI_NO_HW 4390
#define IDI_MUTED_ICON 4393 #define IDI_MUTED_ICON 4393
#define IDI_MICROPHONE_ICON 4378 #define IDI_MICROPHONE_ICON 4378

BIN
reactos/dll/cpl/mmsys/resources/3004.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
reactos/dll/cpl/mmsys/resources/4390.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
reactos/dll/cpl/mmsys/resources/4393.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

5
reactos/dll/cpl/mmsys/volume.c
View file

@ -26,6 +26,7 @@ typedef struct _GLOBAL_DATA
HMIXER hMixer; HMIXER hMixer;
HICON hIconMuted; HICON hIconMuted;
HICON hIconUnMuted; HICON hIconUnMuted;
HICON hIconNoHW;
LONG muteVal; LONG muteVal;
DWORD muteControlID; DWORD muteControlID;
@ -234,7 +235,7 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_SET_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_SET_BTN), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE);
SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW);
return; return;
} }
@ -333,6 +334,7 @@ VolumeDlgProc(HWND hwndDlg,
pGlobalData->hIconUnMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pGlobalData->hIconUnMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
pGlobalData->hIconMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pGlobalData->hIconMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
pGlobalData->hIconNoHW = LoadImage(hApplet, MAKEINTRESOURCE(IDI_NO_HW), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
InitImageInfo(&ImgInfo); InitImageInfo(&ImgInfo);
InitVolumeControls(hwndDlg, pGlobalData); InitVolumeControls(hwndDlg, pGlobalData);
@ -411,6 +413,7 @@ VolumeDlgProc(HWND hwndDlg,
mixerClose(pGlobalData->hMixer); mixerClose(pGlobalData->hMixer);
DestroyIcon(pGlobalData->hIconMuted); DestroyIcon(pGlobalData->hIconMuted);
DestroyIcon(pGlobalData->hIconUnMuted); DestroyIcon(pGlobalData->hIconUnMuted);
DestroyIcon(pGlobalData->hIconNoHW);
HeapFree(GetProcessHeap(), 0, pGlobalData); HeapFree(GetProcessHeap(), 0, pGlobalData);
break; break;
} }