https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb34029fde3f4eb97ec083489694b102166c90f9
commit fb34029fde3f4eb97ec083489694b102166c90f9 Author: Eric Kohl <[email protected]> AuthorDate: Sun Feb 24 15:35:36 2019 +0100 Commit: Eric Kohl <[email protected]> CommitDate: Sun Feb 24 15:36:08 2019 +0100 [MMSYS] Disable the 'Low' and 'High' text of the volume trackbar and the 'Place volume icon in the taskbar' checkbox when no sound device is available. --- dll/cpl/mmsys/lang/bg-BG.rc | 4 +-- dll/cpl/mmsys/lang/cs-CZ.rc | 4 +-- dll/cpl/mmsys/lang/de-DE.rc | 4 +-- dll/cpl/mmsys/lang/el-GR.rc | 4 +-- dll/cpl/mmsys/lang/en-US.rc | 4 +-- dll/cpl/mmsys/lang/es-ES.rc | 4 +-- dll/cpl/mmsys/lang/fr-FR.rc | 4 +-- dll/cpl/mmsys/lang/he-IL.rc | 4 +-- dll/cpl/mmsys/lang/id-ID.rc | 4 +-- dll/cpl/mmsys/lang/it-IT.rc | 4 +-- dll/cpl/mmsys/lang/ja-JP.rc | 4 +-- dll/cpl/mmsys/lang/nl-NL.rc | 4 +-- dll/cpl/mmsys/lang/no-NO.rc | 4 +-- dll/cpl/mmsys/lang/pl-PL.rc | 4 +-- dll/cpl/mmsys/lang/pt-BR.rc | 4 +-- dll/cpl/mmsys/lang/ro-RO.rc | 4 +-- dll/cpl/mmsys/lang/ru-RU.rc | 4 +-- dll/cpl/mmsys/lang/sk-SK.rc | 4 +-- dll/cpl/mmsys/lang/sq-AL.rc | 4 +-- dll/cpl/mmsys/lang/tr-TR.rc | 4 +-- dll/cpl/mmsys/lang/uk-UA.rc | 4 +-- dll/cpl/mmsys/lang/zh-CN.rc | 4 +-- dll/cpl/mmsys/lang/zh-TW.rc | 4 +-- dll/cpl/mmsys/resource.h | 66 +++++++++++++++++++++++---------------------- dll/cpl/mmsys/volume.c | 11 +++++--- 25 files changed, 87 insertions(+), 82 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index c7017f8bc5..8403619f29 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Сила на устройството", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Слабо", -1, 62, 66, 30, 17 - LTEXT "Силно", -1, 195, 66, 30, 17 + LTEXT "Слабо", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Силно", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "За&глушено", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Поставяне на &значе за звука в задачната лента", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "Разш&ирени...", IDC_ADVANCED_BTN, 154, 105, 80, 15 diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index 118e05a85e..eaee474fda 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -15,8 +15,8 @@ BEGIN GROUPBOX "Hlasitost zařízení", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Nízká", -1, 62, 66, 30, 17 - LTEXT "Vysoká", -1, 195, 66, 30, 17 + LTEXT "Nízká", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Vysoká", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Ztlumit", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umístit &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Upřesnit...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index 50e9f76a34..627a0a8669 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Gerätelautstärke", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Niedrig", -1, 62, 66, 30, 17 - LTEXT "Hoch", -1, 195, 66, 30, 17 + LTEXT "Niedrig", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Hoch", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "Stu&mm schalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index 1daa5ee295..35f18a846c 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index a0aa0d70e0..5c002c117a 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index 6bc31ec353..9701f22184 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volumen del dispositivo ", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Bajo", -1, 62, 66, 30, 17 - LTEXT "Alto", -1, 195, 66, 30, 17 + LTEXT "Bajo", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Alto", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Silencio", IDC_MUTE_CHECKBOX, 30, 78, 140, 10 AUTOCHECKBOX "Colocar un icono de volumen en la &barra de tareas", IDC_ICON_IN_TASKBAR, 30, 92, 180, 10 PUSHBUTTON "Propiedades avan&zadas...", IDC_ADVANCED_BTN, 140, 105, 88, 15 diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 101d756664..0c1d87dcd4 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volume du périphérique", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Faible", -1, 62, 66, 30, 17 - LTEXT "Élevé", -1, 195, 66, 30, 17 + LTEXT "Faible", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Élevé", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Placer une icône du volume dans la barre de tâches", IDC_ICON_IN_TASKBAR, 50, 92, 175, 10 PUSHBUTTON "A&vancé...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index 60415bd885..aa39dc015c 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -12,8 +12,8 @@ BEGIN GROUPBOX "עוצמת התקן", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "נמוך", -1, 62, 66, 30, 9 - LTEXT "גבוה", -1, 195, 66, 30, 9 + LTEXT "נמוך", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "גבוה", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "השתק", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "שים סמל עוצמה בשורת המשימות", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "מתקדם...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index d25e780f29..39c0ba6099 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index e4d7b300ef..beba5fb350 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volume del dispositivo", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Basso", -1, 62, 66, 30, 17 - LTEXT "Alto", -1, 195, 66, 30, 17 + LTEXT "Basso", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Alto", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Mettere l'icona del &volume nella barra dei task", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Avanzate...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index dcd71bb0f9..a3751cf377 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "デバイスの音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "低", -1, 62, 66, 30, 9 - LTEXT "高", -1, 195, 66, 30, 9 + LTEXT "低", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "高", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "ミュート(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "タスクバーに音量アイコンを置く(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "上級者向け(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index 984bd00f91..dff1d14542 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Laag", -1, 62, 62, 30, 17 - LTEXT "Hoog", -1, 195, 62, 30, 17 + LTEXT "Laag", IDC_VOLUME_LOW, 62, 62, 30, 17 + LTEXT "Hoog", IDC_VOLUME_HIGH, 195, 62, 30, 17 AUTOCHECKBOX "&Dempen", IDC_MUTE_CHECKBOX, 25, 78, 190, 10 AUTOCHECKBOX "P&ictogram voor het volume in het systeemvak plaatsen", IDC_ICON_IN_TASKBAR, 25, 92, 190, 10 PUSHBUTTON "Ge&avanceerd...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index adf79f292e..2c380bf07b 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Enhets volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Lavt", -1, 62, 66, 30, 17 - LTEXT "Høyt", -1, 195, 66, 30, 17 + LTEXT "Lavt", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Høyt", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Demp", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Plasser volum &ikon i oppgavelinjen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vansert...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 1d28cacf29..f90b8c977b 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -23,8 +23,8 @@ BEGIN GROUPBOX "Głośność urządzenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Mała", -1, 62, 66, 30, 17 - LTEXT "Duża", -1, 195, 66, 30, 17 + LTEXT "Mała", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Duża", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Wycisz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umieść &ikonę głośności w zasobniku systemowym", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "&Zaawansowane...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index b315614767..ba60ab0bdf 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index aa7ecb0bbb..34f881d6cd 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -15,8 +15,8 @@ BEGIN GROUPBOX "Volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Redus", -1, 62, 66, 30, 17 - LTEXT "Ridicat", -1, 195, 66, 30, 17 + LTEXT "Redus", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Ridicat", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "A&muțește tot", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Afișează pictogramă în &zona de notificare", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "A&vansate…", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index cc9c8f1ff4..ec6aee8943 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Громкость микшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "ниже", -1, 62, 66, 30, 9 - LTEXT "выше", -1, 195, 66, 30, 9 + LTEXT "ниже", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "выше", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "В&ыключить звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Отображать &значок на панели задач", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Дополнительно...", IDC_ADVANCED_BTN, 155, 110, 75, 15 diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index c5d72f5cb0..9bc914dde8 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -15,8 +15,8 @@ BEGIN GROUPBOX "Hlasitosť zariadenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "nízka", -1, 62, 66, 30, 17 - LTEXT "vysoká", -1, 195, 66, 30, 17 + LTEXT "nízka", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "vysoká", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "S&tlmiť", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umiestniť &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Spresniť...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index af13ec1c20..6f1d9b079f 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -14,8 +14,8 @@ BEGIN GROUPBOX "Volumi Pjesës", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Poshtë", -1, 62, 66, 30, 9 - LTEXT "Lart", -1, 195, 66, 30, 9 + LTEXT "Poshtë", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "Lart", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Vendos &ikonen volumit në tabele", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 9c2095e5a1..715f2905ad 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -12,8 +12,8 @@ BEGIN GROUPBOX "Aygıt Ses Düzeyi", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Düşük", -1, 62, 66, 30, 9 - LTEXT "Yüksek", -1, 195, 66, 30, 9 + LTEXT "Düşük", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "Yüksek", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Sessiz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "&Görev Çubuğunda Ses Düzeyi Simgesini Yerleştir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "G&elişmiş...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index bbb15e8bab..71c739ef66 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -18,8 +18,8 @@ BEGIN GROUPBOX "Гучність мікшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "нижче", -1, 62, 66, 30, 17 - LTEXT "вище", -1, 195, 66, 30, 17 + LTEXT "нижче", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "вище", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Вимкнути звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Пока&зувати значок гучності на панелі завдань", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Додатково...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 6a89bf8d2d..508bf20d1f 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -18,8 +18,8 @@ BEGIN GROUPBOX "设备音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "低", -1, 62, 66, 30, 17 - LTEXT "高", -1, 195, 66, 30, 17 + LTEXT "低", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "高", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "静音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "将音量图标放入任务栏(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高级(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index 6f84319978..ae9c5c0e69 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -16,8 +16,8 @@ BEGIN GROUPBOX "裝置音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "低", -1, 62, 66, 30, 17 - LTEXT "高", -1, 195, 66, 30, 17 + LTEXT "低", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "高", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "靜音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "將音量圖示放入工作列(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高階(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/resource.h b/dll/cpl/mmsys/resource.h index d1a85a59b6..bdd843f65c 100644 --- a/dll/cpl/mmsys/resource.h +++ b/dll/cpl/mmsys/resource.h @@ -31,38 +31,40 @@ /* Controls */ #define IDC_VOLUME_TRACKBAR 5000 -#define IDC_MUTE_CHECKBOX 5001 -#define IDC_ICON_IN_TASKBAR 5002 -#define IDC_SOUND_SCHEME 5003 -#define IDC_SCHEME_LIST 5004 -#define IDC_SOUND_LIST 5005 -#define IDC_DEFAULT_DEV_CHECKBOX 5006 -#define IDC_DEVICE_PLAY_LIST 5007 -#define IDC_DEVICE_REC_LIST 5008 -#define IDC_DEVICE_MIDI_LIST 5009 -#define IDC_DEVICE_VOICE_LIST 5010 -#define IDC_DEVICE_VOICE_REC_LIST 5011 -#define IDC_TEXT_SOUND 5012 -#define IDC_PLAY_SOUND 5013 -#define IDC_BROWSE_SOUND 5014 -#define IDC_DEVICE_NAME 5015 -#define IDC_ADVANCED_BTN 5016 -#define IDC_SPEAKER_SET_BTN 5017 -#define IDC_SPEAKER_VOL_BTN 5018 -#define IDC_ADVANCED2_BTN 5019 -#define IDC_VOLUME1_BTN 5020 -#define IDC_ADV2_BTN 5021 -#define IDC_VOLUME2_BTN 5022 -#define IDC_ADV1_BTN 5023 -#define IDC_VOLUME3_BTN 5024 -#define IDC_ADV3_BTN 5025 -#define IDC_VOLUME4_BTN 5026 -#define IDC_ADV4_BTN 5027 -#define IDC_VOLUME5_BTN 5028 -#define IDC_ADV5_BTN 5029 -#define IDC_TEST_HARDWARE 5030 -#define IDC_SAVEAS_BTN 5031 -#define IDC_DELETE_BTN 5032 +#define IDC_VOLUME_LOW 5001 +#define IDC_VOLUME_HIGH 5002 +#define IDC_MUTE_CHECKBOX 5003 +#define IDC_ICON_IN_TASKBAR 5004 +#define IDC_SOUND_SCHEME 5005 +#define IDC_SCHEME_LIST 5006 +#define IDC_SOUND_LIST 5007 +#define IDC_DEFAULT_DEV_CHECKBOX 5008 +#define IDC_DEVICE_PLAY_LIST 5009 +#define IDC_DEVICE_REC_LIST 5010 +#define IDC_DEVICE_MIDI_LIST 5011 +#define IDC_DEVICE_VOICE_LIST 5012 +#define IDC_DEVICE_VOICE_REC_LIST 5013 +#define IDC_TEXT_SOUND 5014 +#define IDC_PLAY_SOUND 5015 +#define IDC_BROWSE_SOUND 5016 +#define IDC_DEVICE_NAME 5017 +#define IDC_ADVANCED_BTN 5018 +#define IDC_SPEAKER_SET_BTN 5019 +#define IDC_SPEAKER_VOL_BTN 5020 +#define IDC_ADVANCED2_BTN 5021 +#define IDC_VOLUME1_BTN 5022 +#define IDC_ADV2_BTN 5023 +#define IDC_VOLUME2_BTN 5024 +#define IDC_ADV1_BTN 5025 +#define IDC_VOLUME3_BTN 5026 +#define IDC_ADV3_BTN 5027 +#define IDC_VOLUME4_BTN 5028 +#define IDC_ADV4_BTN 5029 +#define IDC_VOLUME5_BTN 5030 +#define IDC_ADV5_BTN 5031 +#define IDC_TEST_HARDWARE 5032 +#define IDC_SAVEAS_BTN 5033 +#define IDC_DELETE_BTN 5034 #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index 10f61f8222..a64642f862 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -299,17 +299,16 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) MIXERCAPS mxc; TCHAR szNoDevices[256]; - CheckDlgButton(hwndDlg, - IDC_ICON_IN_TASKBAR, - GetSystrayVolumeIconState() ? BST_CHECKED : BST_UNCHECKED); - LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices)); NumMixers = mixerGetNumDevs(); if (!NumMixers) { EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_LOW), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_HIGH), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_MUTE_CHECKBOX), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_ICON_IN_TASKBAR), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); @@ -331,6 +330,10 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) return; } + CheckDlgButton(hwndDlg, + IDC_ICON_IN_TASKBAR, + GetSystrayVolumeIconState() ? BST_CHECKED : BST_UNCHECKED); + GetMuteControl(pGlobalData); GetMuteState(pGlobalData); if (pGlobalData->muteVal)
