01/01: [SNDVOL32] Fix the layout of the normal master dialog - Fix the layout of the normal master dialog layout. - Change the name of the normal and tray master dialogs. - Add the WS_EX_LAYOUTRTL style to the hebrew dialogs.
11 Mar
2018
11 Mar
'18
12:18 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f2feac70a7e744c8eafd…
commit 6f2feac70a7e744c8eafdfd6f2c8c5306f185553
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Mar 11 01:13:22 2018 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Mar 11 01:13:22 2018 +0100
[SNDVOL32] Fix the layout of the normal master dialog
- Fix the layout of the normal master dialog layout.
- Change the name of the normal and tray master dialogs.
- Add the WS_EX_LAYOUTRTL style to the hebrew dialogs.
---
base/applications/sndvol32/dialog.c | 2 +-
base/applications/sndvol32/lang/bg-BG.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/cs-CZ.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/de-DE.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/el-GR.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/en-US.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/es-ES.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/fr-FR.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/he-IL.rc | 23 ++++++++++++-----------
base/applications/sndvol32/lang/hu-HU.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/id-ID.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/it-IT.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/ja-JP.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/ko-KR.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/lt-LT.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/nl-NL.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/no-NO.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/pl-PL.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/pt-BR.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/ro-RO.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/ru-RU.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/sk-SK.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/sq-AL.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/sv-SE.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/th-TH.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/tr-TR.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/uk-UA.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/zh-CN.rc | 20 ++++++++++----------
base/applications/sndvol32/lang/zh-TW.rc | 20 ++++++++++----------
base/applications/sndvol32/resources.h | 6 +++---
base/applications/sndvol32/sndvol32.c | 2 +-
31 files changed, 287 insertions(+), 286 deletions(-)
diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c
index 08fd6d197e..e736f4bb0a 100644
--- a/base/applications/sndvol32/dialog.c
+++ b/base/applications/sndvol32/dialog.c
@@ -404,7 +404,7 @@ EnumConnectionsCallback(
/* is it selected */
if (Flags != 0x4)
{
- int dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ?
IDD_SMALL_MASTER : IDD_VOLUME_CTRL;
+ int dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ?
IDD_SMALL_MASTER : IDD_NORMAL_MASTER;
/* load dialog resource */
LoadDialog(hAppInstance, PrefContext->MixerWindow,
MAKEINTRESOURCE(dlgId), PrefContext->Count);
diff --git a/base/applications/sndvol32/lang/bg-BG.rc
b/base/applications/sndvol32/lang/bg-BG.rc
index 2b09b3f943..6205be305e 100644
--- a/base/applications/sndvol32/lang/bg-BG.rc
+++ b/base/applications/sndvol32/lang/bg-BG.rc
@@ -45,18 +45,18 @@ BEGIN
PUSHBUTTON "Отказ", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Обща", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Ляво/Дясно", -1, 10, 35, 80, 42
- LTEXT "Сила", -1, 30, 100, 45, 20
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 190, 110, 16,
BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Обща", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Ляво/Дясно", -1, 10, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Сила", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -70,7 +70,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/cs-CZ.rc
b/base/applications/sndvol32/lang/cs-CZ.rc
index 77f4fef0b9..8681417b7d 100644
--- a/base/applications/sndvol32/lang/cs-CZ.rc
+++ b/base/applications/sndvol32/lang/cs-CZ.rc
@@ -47,18 +47,18 @@ BEGIN
PUSHBUTTON "Storno", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Vyvážení", -1, 4, 35, 80, 42
- LTEXT "Hlasitost", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Vyvážení", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Hlasitost", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -72,7 +72,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/de-DE.rc
b/base/applications/sndvol32/lang/de-DE.rc
index 86520936a8..42343d4121 100644
--- a/base/applications/sndvol32/lang/de-DE.rc
+++ b/base/applications/sndvol32/lang/de-DE.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Abbrechen", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Lautstärke", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Lautstärke", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/el-GR.rc
b/base/applications/sndvol32/lang/el-GR.rc
index 3fb6485dc8..5178745afa 100644
--- a/base/applications/sndvol32/lang/el-GR.rc
+++ b/base/applications/sndvol32/lang/el-GR.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Άκυρο", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 19, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/en-US.rc
b/base/applications/sndvol32/lang/en-US.rc
index 1bd3703c40..afacaa96b6 100644
--- a/base/applications/sndvol32/lang/en-US.rc
+++ b/base/applications/sndvol32/lang/en-US.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/es-ES.rc
b/base/applications/sndvol32/lang/es-ES.rc
index 8672678eb7..5c696ac5bc 100644
--- a/base/applications/sndvol32/lang/es-ES.rc
+++ b/base/applications/sndvol32/lang/es-ES.rc
@@ -44,18 +44,18 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Principal", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volumen", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 190, 90, 12,
BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Principal", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volumen", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -69,7 +69,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/fr-FR.rc
b/base/applications/sndvol32/lang/fr-FR.rc
index a2fbf49aab..821e947b91 100644
--- a/base/applications/sndvol32/lang/fr-FR.rc
+++ b/base/applications/sndvol32/lang/fr-FR.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Annuler", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/he-IL.rc
b/base/applications/sndvol32/lang/he-IL.rc
index 6aa0e89c9f..1951b41711 100644
--- a/base/applications/sndvol32/lang/he-IL.rc
+++ b/base/applications/sndvol32/lang/he-IL.rc
@@ -42,23 +42,24 @@ BEGIN
PUSHBUTTON "ביטול", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
EXSTYLE WS_EX_LAYOUTRTL
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "ראשי", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "איזון", -1, 4, 35, 80, 42
- LTEXT "עוצמה", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "השתק", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "ראשי", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "איזון", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "עוצמה", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
STYLE WS_POPUP | WS_BORDER
+EXSTYLE WS_EX_LAYOUTRTL
FONT 8, "MS Shell Dlg"
BEGIN
CTEXT "ראשי", IDC_LINE_NAME, 3, 3, 39, 8
@@ -68,9 +69,9 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
-EXSTYLE WS_EX_TOOLWINDOW
+EXSTYLE WS_EX_TOOLWINDOW | WS_EX_LAYOUTRTL
FONT 8, "MS Shell Dlg"
BEGIN
CTEXT "עוצמה", -1, 0, 4, 50, 8
diff --git a/base/applications/sndvol32/lang/hu-HU.rc
b/base/applications/sndvol32/lang/hu-HU.rc
index d89e4aea2b..3119f2c157 100644
--- a/base/applications/sndvol32/lang/hu-HU.rc
+++ b/base/applications/sndvol32/lang/hu-HU.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "Mégse", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/id-ID.rc
b/base/applications/sndvol32/lang/id-ID.rc
index 81ca6a3603..318d1cce1f 100644
--- a/base/applications/sndvol32/lang/id-ID.rc
+++ b/base/applications/sndvol32/lang/id-ID.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Batal", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/it-IT.rc
b/base/applications/sndvol32/lang/it-IT.rc
index af90f32edb..c93f33c4dc 100644
--- a/base/applications/sndvol32/lang/it-IT.rc
+++ b/base/applications/sndvol32/lang/it-IT.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Annulla", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Bilanciamento", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 190, 90, 12,
BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Bilanciamento", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/ja-JP.rc
b/base/applications/sndvol32/lang/ja-JP.rc
index 8cbf97fae0..83bb9a8b2d 100644
--- a/base/applications/sndvol32/lang/ja-JP.rc
+++ b/base/applications/sndvol32/lang/ja-JP.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "キャンセル", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 9, "MS UI Gothic"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 9, "MS UI Gothic"
diff --git a/base/applications/sndvol32/lang/ko-KR.rc
b/base/applications/sndvol32/lang/ko-KR.rc
index 03c4976fa0..66e019d9c7 100644
--- a/base/applications/sndvol32/lang/ko-KR.rc
+++ b/base/applications/sndvol32/lang/ko-KR.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "취소", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 9, "굴림"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 9, "굴림"
diff --git a/base/applications/sndvol32/lang/lt-LT.rc
b/base/applications/sndvol32/lang/lt-LT.rc
index 4ad2530513..3dc8897aff 100644
--- a/base/applications/sndvol32/lang/lt-LT.rc
+++ b/base/applications/sndvol32/lang/lt-LT.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "Atsisakyti", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/nl-NL.rc
b/base/applications/sndvol32/lang/nl-NL.rc
index f0de0b6a18..55b6db4532 100644
--- a/base/applications/sndvol32/lang/nl-NL.rc
+++ b/base/applications/sndvol32/lang/nl-NL.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Annuleren", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/no-NO.rc
b/base/applications/sndvol32/lang/no-NO.rc
index d34821f074..d806fba7b6 100644
--- a/base/applications/sndvol32/lang/no-NO.rc
+++ b/base/applications/sndvol32/lang/no-NO.rc
@@ -41,18 +41,18 @@ BEGIN
PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -66,7 +66,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/pl-PL.rc
b/base/applications/sndvol32/lang/pl-PL.rc
index 93095e8eab..c15526a596 100644
--- a/base/applications/sndvol32/lang/pl-PL.rc
+++ b/base/applications/sndvol32/lang/pl-PL.rc
@@ -49,18 +49,18 @@ BEGIN
PUSHBUTTON "Anuluj", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Kanał główny", IDC_LINE_NAME, 4, 6, 150, 21
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balans:", -1, 4, 35, 80, 42
- LTEXT "Głośność:", -1, 4, 90, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 16, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Kanał główny", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balans:", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Głośność:", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -74,7 +74,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/pt-BR.rc
b/base/applications/sndvol32/lang/pt-BR.rc
index 6e70068144..04a2b483b5 100644
--- a/base/applications/sndvol32/lang/pt-BR.rc
+++ b/base/applications/sndvol32/lang/pt-BR.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balanço", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balanço", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/ro-RO.rc
b/base/applications/sndvol32/lang/ro-RO.rc
index 12b1bd2243..78f231ab8c 100644
--- a/base/applications/sndvol32/lang/ro-RO.rc
+++ b/base/applications/sndvol32/lang/ro-RO.rc
@@ -42,18 +42,18 @@ BEGIN
PUSHBUTTON "A&nulează", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Volum general", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balans", -1, 4, 35, 80, 42
- LTEXT "Volum", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 190, 90, 12,
BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Volum general", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balans", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volum", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -67,7 +67,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/ru-RU.rc
b/base/applications/sndvol32/lang/ru-RU.rc
index 5d5ffec888..9239fb94aa 100644
--- a/base/applications/sndvol32/lang/ru-RU.rc
+++ b/base/applications/sndvol32/lang/ru-RU.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "Отмена", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Главная", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Баланс", -1, 4, 35, 80, 42
- LTEXT "Громкость", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 190, 90, 12,
BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Главная", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Баланс", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Громкость", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/sk-SK.rc
b/base/applications/sndvol32/lang/sk-SK.rc
index 2737442928..5f0c54be26 100644
--- a/base/applications/sndvol32/lang/sk-SK.rc
+++ b/base/applications/sndvol32/lang/sk-SK.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "Zrušiť", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/sq-AL.rc
b/base/applications/sndvol32/lang/sq-AL.rc
index 8d94ed8bc2..af12369e14 100644
--- a/base/applications/sndvol32/lang/sq-AL.rc
+++ b/base/applications/sndvol32/lang/sq-AL.rc
@@ -45,18 +45,18 @@ BEGIN
PUSHBUTTON "Anulo", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balanca", -1, 4, 35, 80, 42
- LTEXT "Volumi", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balanca", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volumi", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -70,7 +70,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/sv-SE.rc
b/base/applications/sndvol32/lang/sv-SE.rc
index 3b58c81f6a..774d83af4d 100644
--- a/base/applications/sndvol32/lang/sv-SE.rc
+++ b/base/applications/sndvol32/lang/sv-SE.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Huvud", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balanse", -1, 4, 35, 80, 42
- LTEXT "Volyme", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Huvud", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balanse", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volyme", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/th-TH.rc
b/base/applications/sndvol32/lang/th-TH.rc
index 686e217751..4d622dc3fe 100644
--- a/base/applications/sndvol32/lang/th-TH.rc
+++ b/base/applications/sndvol32/lang/th-TH.rc
@@ -49,18 +49,18 @@ BEGIN
PUSHBUTTON "ยกเลิก", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Balance", -1, 4, 35, 80, 42
- LTEXT "Volume", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Balance", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Volume", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -74,7 +74,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/tr-TR.rc
b/base/applications/sndvol32/lang/tr-TR.rc
index b159804d90..43aa0e4c6d 100644
--- a/base/applications/sndvol32/lang/tr-TR.rc
+++ b/base/applications/sndvol32/lang/tr-TR.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "İptal", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Ana", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Denge", -1, 4, 35, 80, 42
- LTEXT "Ses Düzeyi", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Ana", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Denge", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Ses Düzeyi", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/uk-UA.rc
b/base/applications/sndvol32/lang/uk-UA.rc
index 75d65f405b..3c03eb5404 100644
--- a/base/applications/sndvol32/lang/uk-UA.rc
+++ b/base/applications/sndvol32/lang/uk-UA.rc
@@ -49,18 +49,18 @@ BEGIN
PUSHBUTTON "Скасувати", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Головна", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "Баланс", -1, 4, 35, 80, 42
- LTEXT "Гучність", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "Головна", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "Баланс", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "Гучність", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -74,7 +74,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg"
diff --git a/base/applications/sndvol32/lang/zh-CN.rc
b/base/applications/sndvol32/lang/zh-CN.rc
index d313046fa8..94b4c56533 100644
--- a/base/applications/sndvol32/lang/zh-CN.rc
+++ b/base/applications/sndvol32/lang/zh-CN.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 9, "宋体"
BEGIN
- LTEXT "主要", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "平衡", -1, 4, 35, 80, 42
- LTEXT "音量", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "主要", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "平衡", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "音量", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 9, "宋体"
diff --git a/base/applications/sndvol32/lang/zh-TW.rc
b/base/applications/sndvol32/lang/zh-TW.rc
index 0b4d765040..ccd381ad1f 100644
--- a/base/applications/sndvol32/lang/zh-TW.rc
+++ b/base/applications/sndvol32/lang/zh-TW.rc
@@ -43,18 +43,18 @@ BEGIN
PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14
END
-IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150
STYLE WS_POPUP | WS_BORDER
FONT 9, "新細明體"
BEGIN
- LTEXT "主要", IDC_LINE_NAME, 4, 7, 100, 15
- CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 30, 82, 1
- LTEXT "平衡", -1, 4, 35, 80, 42
- LTEXT "音量", -1, 4, 100, 77, 108
- CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
- CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115,
30, 70
- CHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
- CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 130, 7, 1, 200
+ LTEXT "主要", IDC_LINE_NAME, 4, 7, 78, 8
+ CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE,
4, 19, 82, 1
+ LTEXT "平衡", -1, 4, 25, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ |
TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17
+ LTEXT "音量", -1, 4, 58, 80, 8
+ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT |
TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67,
30, 56
+ AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12
+ CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 90, 1, 1, 150
END
IDD_SMALL_MASTER DIALOG 0, 0, 45, 100
@@ -68,7 +68,7 @@ BEGIN
CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD |
WS_VISIBLE, 45, 1, 1, 100
END
-IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80
+IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80
STYLE DS_MODALFRAME | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 9, "新細明體"
diff --git a/base/applications/sndvol32/resources.h
b/base/applications/sndvol32/resources.h
index 69aab744e3..58c2089912 100644
--- a/base/applications/sndvol32/resources.h
+++ b/base/applications/sndvol32/resources.h
@@ -26,7 +26,7 @@
#define IDS_SNDVOL32 100
#define IDS_NOMIXERDEVICES 101
-#define IDD_VOLUME_CTRL 200
-#define IDD_SMALL_MASTER 202
-#define IDD_TRAY_CTRL 204
+#define IDD_NORMAL_MASTER 200
+#define IDD_SMALL_MASTER 202
+#define IDD_TRAY_MASTER 204
#define IDD_PREFERENCES 205
diff --git a/base/applications/sndvol32/sndvol32.c
b/base/applications/sndvol32/sndvol32.c
index 29ae69aa4f..26b5ba99e7 100644
--- a/base/applications/sndvol32/sndvol32.c
+++ b/base/applications/sndvol32/sndvol32.c
@@ -1248,7 +1248,7 @@ _tWinMain(HINSTANCE hInstance,
if (WindowMode == TRAY_MODE)
{
DialogBoxParam(hAppInstance,
- MAKEINTRESOURCE(IDD_TRAY_CTRL),
+ MAKEINTRESOURCE(IDD_TRAY_MASTER),
NULL,
TrayDlgProc,
0);
2483
days inactive
2483
days old
0 comments
1 participants
participants (1)
-
Eric Kohl