[ros-diffs] [dchapyshev] 32981: - Add icons for dialogs - Set title icon for Click Look dialog - Fix English resources

Author: dchapyshev
Date: Tue Apr 15 13:43:11 2008
New Revision: 32981

URL: http://svn.reactos.org/svn/reactos?rev=32981&view=rev
Log:
- Add icons for dialogs
- Set title icon for Click Look dialog
- Fix English resources

Added:
    trunk/reactos/dll/cpl/main/resources/look_key.ico   (with props)
    trunk/reactos/dll/cpl/main/resources/mouse_wheel.ico   (with props)
    trunk/reactos/dll/cpl/main/resources/repeat_delay.ico   (with props)
    trunk/reactos/dll/cpl/main/resources/repeat_rate.ico   (with props)
Modified:
    trunk/reactos/dll/cpl/main/lang/bg-BG.rc
    trunk/reactos/dll/cpl/main/lang/cs-CZ.rc
    trunk/reactos/dll/cpl/main/lang/de-DE.rc
    trunk/reactos/dll/cpl/main/lang/el-GR.rc
    trunk/reactos/dll/cpl/main/lang/en-US.rc
    trunk/reactos/dll/cpl/main/lang/es-ES.rc
    trunk/reactos/dll/cpl/main/lang/fr-FR.rc
    trunk/reactos/dll/cpl/main/lang/hu-HU.rc
    trunk/reactos/dll/cpl/main/lang/id-ID.rc
    trunk/reactos/dll/cpl/main/lang/it-IT.rc
    trunk/reactos/dll/cpl/main/lang/ja-JP.rc
    trunk/reactos/dll/cpl/main/lang/nl-NL.rc
    trunk/reactos/dll/cpl/main/lang/pl-PL.rc
    trunk/reactos/dll/cpl/main/lang/ru-RU.rc
    trunk/reactos/dll/cpl/main/lang/sk-SK.rc
    trunk/reactos/dll/cpl/main/lang/uk-UA.rc
    trunk/reactos/dll/cpl/main/main.rc
    trunk/reactos/dll/cpl/main/mouse.c
    trunk/reactos/dll/cpl/main/resource.h

Modified: trunk/reactos/dll/cpl/main/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/bg-BG.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/bg-BG.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -7,12 +7,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïîâòàðÿíå íà çíàöèòå", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Çàáàâÿíå íà ïîâòàðÿíåòî ", -1, 40, 15, 90, 10
   LTEXT "Êðàòêî", -1, 35, 30, 25, 10
   LTEXT "Äúëãî", -1, 200, 30, 25, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Ñêîðîñò íà ïîâòàðÿíå", -1, 40, 65, 110, 10
   LTEXT "Áàâíî", -1, 40, 80, 20, 10
   LTEXT "Áúðçî", -1, 200, 80, 20, 10
@@ -44,7 +44,7 @@
   PUSHBUTTON "&Äîáðå", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Îòêàç", IDCANCEL, 175, 75, 50, 15
   LTEXT "Íà&ñòðîéêà ïðîäúëæèòåëíîñòòà íà çàäúðæàíå íà öúêà íà ìèøêàòà,
íåîáõîäèìî çà äà áúäå îò÷åòåíî öúêàíåòî",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -135,7 +135,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïðåâúðòàíå", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Çàâúðòàíå íà êîëåëîòî íà åäíà ñòúïêà", -1, 60, 15, 150, 10
   RADIOBUTTON "Áðîé &ðåäîâå íàâåäíúæ", IDC_RADIO_WHEEL_SCROLL_LINES, 60,
30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Åäèí åêðàí íàâåäíúæ", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10

Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Opakování znakù", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Prodleva pøed opakováním", -1, 40, 15, 150, 10
   LTEXT "Dlouhá", -1, 40, 30, 25, 10
   LTEXT "Krátká", -1, 200, 30, 25, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Rychlost opakování", -1, 40, 70, 120, 10
   LTEXT "Malá", -1, 40, 85, 25, 10
   LTEXT "Velká", -1, 200, 85, 25, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "Storno", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Nastavte dobu, po kterou musíte držet tlaèítko myši stisknuté, než se
funkce ClickLock aktivuje.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Posouvání", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Otoèení koleèka o jeden krok posune o:", -1, 60, 15, 150, 10
   RADIOBUTTON "&tento poèet øádkù", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30,
150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90,
10

Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -8,12 +8,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Zeichenwiederholung", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Verzögerung:", -1, 40, 15, 50, 10
   LTEXT "Lang", -1, 40, 30, 24, 10
   LTEXT "Kurz", -1, 200, 30, 24, 10
   CONTROL "", IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Wiederholrate:", -1, 40, 70, 50, 10
   LTEXT "Niedrig", -1, 40, 85, 24, 10
   LTEXT "Hoch", -1, 200, 85, 24, 10
@@ -45,7 +45,7 @@
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Abbrechen", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Stellen Sie ein, wie lange eine Maus- oder Trackballtaste gedrückt
werden muss, bevor die KlickEinrasten-Funktion aktiviert wird.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -132,7 +132,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bildlauf", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt
um:", -1, 60, 11, 150, 16
   RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60,
30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10

Modified: trunk/reactos/dll/cpl/main/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/el-GR.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/el-GR.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "ÅðáíÜëçøç ÷áñáêôÞñá", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&ÊáèõóôÝñçóç åðáíÜëøçò:", -1, 36, 15, 100, 10
   LTEXT "ÌåãÜëç", -1, 36, 30, 25, 10
   LTEXT "ÌéêñÞ", -1, 197, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Ñõèìüò åðåíÜëçøçò:", -1, 36, 60, 70, 10
   LTEXT "Ìéêñüò", -1, 36, 75, 23, 10
   LTEXT "ÌåãÜëïò", -1, 197, 75, 28, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "¢&êõñï", IDCANCEL, 175, 75, 50, 15
   LTEXT "&ÅðéëÝîôå ðüóï ðñÝðåé íá êñáôÞóåôå ðáôçìÝíï ôï êïõìðß ôïõ ðïíôéêéïý
ìÝ÷ñé íá êëåéäùèåß",-1,60,15,170,30  
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ìåôáêßíçóç", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Ìåôáêßíçóç êáôá ôçí êýëéóç ôïõ ôñï÷ïý êáôá ìéá èÝóç:", -1, 60, 15,
150, 20
   RADIOBUTTON "&Áñéèìüò ãñáììþí ôçí öïñÜ", IDC_RADIO_WHEEL_SCROLL_LINES,
60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Ïëüêëçñç óåëßäá", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90,
10

Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/en-US.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -5,22 +5,22 @@
 CAPTION "Speed"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
-  LTEXT "Repeat &delay", -1, 40, 15, 50, 10
-  LTEXT "Long", -1, 40, 30, 20, 10
-  LTEXT "Short", -1, 200, 30, 20, 10
-  CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
-  LTEXT "&Repeat rate", -1, 40, 70, 50, 10
+  GROUPBOX "Character repeat", -1, 5, 5, 236, 135
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15
+  LTEXT "Repeat &delay:", -1, 40, 18, 100, 10
+  LTEXT "Long", -1, 40, 33, 20, 10
+  LTEXT "Short", -1, 200, 33, 20, 10
+  CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15
+  LTEXT "&Repeat rate:", -1, 40, 70, 100, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17
-  LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15,
105, 200, 10
-  EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
-  GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50
+  LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15,
105, 216, 10
+  EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP
+  GROUPBOX "Cursor &blink rate:", -1, 5, 145, 236, 50
   LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8
-  LTEXT "None", -1, 40, 165, 30, 10
+  LTEXT "None", -1, 40, 165, 25, 10
   LTEXT "Fast", -1, 200, 165, 30, 10
   CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17
 END
@@ -32,18 +32,18 @@
 BEGIN
 END
 
-IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100
+IDD_CLICK_LOCK DIALOGEX 0, 0, 240, 78
 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Click Lock"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Short", -1, 35,  50, 30, 10
-  LTEXT "Long", -1, 140, 50, 30, 10
-  CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17
-  PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
-  PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15
-  LTEXT "&Adjust how long you need to hold down a mouse or trackball button
before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  LTEXT "Short", -1, 50, 35, 27, 10
+  LTEXT "Long", -1, 157, 35, 27, 10
+  CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17
+  PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
+  PUSHBUTTON "&Cancel", IDCANCEL, 174, 59, 60, 14
+  LTEXT "&Adjust how long you need to hold down a mouse or trackball button
before your click is locked",-1,37,5,200,27
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -51,20 +51,20 @@
 CAPTION "Button"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Button configuration", -1, 5, 5, 230, 70
-  CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS,
10, 18, 140, 10
-  CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON |
SS_CENTERIMAGE | WS_VISIBLE, 165, 14, 65, 57, WS_EX_STATICEDGE
-  LTEXT "Select this checkbox to make the right mouse button the one used for
primary functions such as selecting and dragging.", -1, 10, 36, 150, 30
-  GROUPBOX "Double-click speed", -1, 5, 78, 230, 70
-  LTEXT "Double-click the folder to test your settings. If the folder does not open
or close, try using a slower setting.", -1, 10, 90, 150, 28
+  GROUPBOX "Button configuration", -1, 5, 5, 236, 70
+  CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS,
10, 18, 156, 10
+  CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON |
SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE
+  LTEXT "Select this checkbox to make the right mouse button the one used for
primary functions such as selecting and dragging.", -1, 10, 36, 156, 30
+  GROUPBOX "Double-click speed", -1, 5, 78, 236, 70
+  LTEXT "Double-click the folder to test your settings. If the folder does not open
or close, try using a slower setting.", -1, 10, 90, 156, 28
   LTEXT "Spee&d:   Slow", -1, 10, 123, 50, 10
   LTEXT "Fast", -1, 136, 123, 24, 10
   CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17
-  CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON |
SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 87, 65, 57, WS_EX_STATICEDGE
-  GROUPBOX "ClickLock", -1, 5, 150, 230, 70
+  CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON |
SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE
+  GROUPBOX "ClickLock", -1, 5, 150, 236, 70
   CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20
-  PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 166, 161, 60, 14
-  LTEXT "Enables you to highlight or drag without holding down the mouse button. To
set, briefly press the mouse button. To release, click the mouse button again.", -1,
10, 180, 216, 30
+  PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14
+  LTEXT "Enables you to highlight or drag without holding down the mouse button. To
set, briefly press the mouse button. To release, click the mouse button again.", -1,
10, 180, 224, 30
 END
 
 IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228
@@ -84,15 +84,15 @@
   PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14
 END
 
-IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75
+IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53
 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10
+  LTEXT "Save this cursor scheme as:", -1, 5, 5, 181, 10
   EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
-  PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15
-  PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15
+  PUSHBUTTON "&OK", IDOK, 63, 35, 60, 14
+  PUSHBUTTON "&Cancel", IDCANCEL, 126, 35, 60, 14
 END
 
 
@@ -131,9 +131,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Scrolling", -1, 5, 5, 236, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
-  RADIOBUTTON "The following &number of lines at a time",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
+  RADIOBUTTON "The following &number of lines at a time:",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10
   EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP
| WS_TABSTOP
   CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12

Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Repetición de caracteres", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Retra&so de la repetición", -1, 40, 15, 50, 10
   LTEXT "Largo", -1, 40, 30, 20, 10
   LTEXT "Corto", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "Velocidad de &repetición", -1, 40, 70, 50, 10
   LTEXT "Lenta", -1, 40, 85, 20, 10
   LTEXT "Rápida", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&Aceptar", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Cancelar", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Ajustar el tiempo que debe mantenerse presionado un botón del ratón o
de la bola de seguimiento antes de que el clic se bloquee.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Desplazamiento", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Girar la rueda una posición para desplazar", -1, 60, 15, 150, 10
   RADIOBUTTON "&El siguiente número de líneas a la vez",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Una pantalla a la vez", IDC_RADIO_WHEEL_SCROLL_PAGE, 60,
65, 90, 10

Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Répétition des caractères", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Délai de répétition", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Court", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Délai de répétition", -1, 40, 70, 50, 10
   LTEXT "Lent", -1, 40, 85, 20, 10
   LTEXT "Rapide", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Annuler", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Ajuste le temps nécessaire pendant lequel vous devez cliquer avant de
verrouiller le clic.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Défilement", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Bouger la roulette pour défiler", -1, 60, 15, 150, 10
   RADIOBUTTON "Le nombre suivant de &lignes à la fois",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Une page à la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10

Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Repeat &delay", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Short", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Repeat rate", -1, 40, 70, 50, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button
before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Scrolling", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
   RADIOBUTTON "The following &number of lines at a time",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10

Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/id-ID.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Pengulangan karakter", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Ten&ggang pengulangan", -1, 40, 15, 50, 10
   LTEXT "Panjang", -1, 40, 30, 20, 10
   LTEXT "Pendek", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "Rata-rata &Pengulangan", -1, 40, 70, 50, 10
   LTEXT "Lambat", -1, 40, 85, 20, 10
   LTEXT "Cepat", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Batal", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Sesuaikan berapa lama anda perlu menekan mouse atau tombol trackball
sebelum klik anda dikunci",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Menggulung", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Putar roda satu derajat untuk menggulung", -1, 60, 15, 150, 10
   RADIOBUTTON "&Jumlah baris berikut sekali waktu",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Satu layar sekali waktu", IDC_RADIO_WHEEL_SCROLL_PAGE, 60,
65, 90, 10

Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/it-IT.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -8,12 +8,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ripetizione caratteri", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Ritardo della ripetizione", -1, 40, 15, 150, 10
   LTEXT "Lungo", -1, 40, 30, 20, 10
   LTEXT "Corto", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Frequenza ripetizione", -1, 40, 60, 150, 10
   LTEXT "Lenta", -1, 40, 75, 20, 10
   LTEXT "Veloce", -1, 200, 75, 20, 10
@@ -45,7 +45,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Annulla", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Regola per quanto deve rimanere premuto il tasto di un mouse o una
trackball prima che il clic sia rilevato",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -133,7 +133,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Scorrimento", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Gira la rotella una tacca per scorrere", -1, 60, 15, 150, 10
   RADIOBUTTON "Il seguente numero di linee per volta",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, 60,
65, 90, 10

Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 9, "MS UI Gothic"
 BEGIN
   GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Repeat &delay", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Short", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Repeat rate", -1, 40, 70, 50, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button
before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 9, "MS UI Gothic"
 BEGIN
   GROUPBOX "Scrolling", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
   RADIOBUTTON "The following &number of lines at a time",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10

Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -7,12 +7,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Tekenherhaling", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Herhaalvertraging:", -1, 40, 15, 50, 10
   LTEXT "Lang", -1, 40, 30, 20, 10
   LTEXT "Kort", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "Herhaal&snelheid:", -1, 40, 70, 50, 10
   LTEXT "Langzaam", -1, 40, 85, 20, 10
   LTEXT "Snel", -1, 200, 85, 20, 10
@@ -44,7 +44,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Annuleren", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Stel in hoe lang de muisknop ingedrukt moet worden voordat de klik
vergrendeld is.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -132,7 +132,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Schuiven", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Bij elke rolbeweging van het bladerwieltje:", -1, 60, 15, 150, 10
   RADIOBUTTON "Dit &aantal regels verschuiven:",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Een scherm tegelijk verschuiven",
IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10

Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -12,12 +12,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Powtarzanie znaku", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&OpóŸnienie powtarzania:", -1, 40, 15, 50, 10
   LTEXT "Du¿e", -1, 40, 30, 20, 10
   LTEXT "Ma³e", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Czêstotliwoœæ powtarzania", -1, 40, 70, 50, 10
   LTEXT "Ma³a", -1, 40, 85, 20, 10
   LTEXT "Du¿a", -1, 200, 85, 20, 10
@@ -49,7 +49,7 @@
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Anuluj", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Dopasuj czas potrzebny do przytrzymania wciœniêtego przycisku myszy
lub urz¹dzenia wskazuj¹cego przed „zablokowaniem” klikniêcia.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -137,7 +137,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Przewijanie", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Obrócenie kó³kiem o jeden skok powoduje przewiniêcie:", -1, 60, 15,
150, 10
   RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30,
150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90,
10

Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -6,12 +6,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïîâòîð ââîäèìîãî ñèìâîëà", -1, 5, 5, 230, 150
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Çàäåðæêà ïåðåä íà÷àëîì ïîâòîðà:", -1, 40, 15, 160, 10
   LTEXT "Äëèííåå", -1, 25, 30, 28, 10
   LTEXT "Êîðî÷å", -1, 200, 30, 25, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Ñêîðîñòü ïîâòîðà:", -1, 40, 70, 100, 10
   LTEXT "Íèæå", -1, 40, 85, 20, 10
   LTEXT "Âûøå", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Îòìåíà", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button
before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Ïîâîðîò êîëåñèêà íà îäèí ùåë÷îê ñëóæèò äëÿ ïðîêðóòêè:", -1, 20, 15,
212, 10
   RADIOBUTTON "íà óêàçàííîå êîëè÷åñòâî &ñòðîê:",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "íà îäèí &ýêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90,
10

Modified: trunk/reactos/dll/cpl/main/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/sk-SK.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -12,12 +12,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Repeat &delay", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Short", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Repeat rate", -1, 40, 70, 50, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
@@ -49,7 +49,7 @@
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Zruši", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button
before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -137,7 +137,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Rolovanie", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
   RADIOBUTTON "The following &number of lines at a time",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65,
90, 10

Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc…
==============================================================================
--- trunk/reactos/dll/cpl/main/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -14,12 +14,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïîâòîð ñèìâîëó, ùî ââîäèòüñÿ", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Çàòðèìêà ïåðåä ïî÷àòêîì ïîâòîðó ñèìâîëó", -1, 40, 15, 50, 10
   LTEXT "Äîâøå", -1, 40, 30, 20, 10
   LTEXT "Êîðîòøå", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Øâèäê³ñòü ïîâòîðó", -1, 40, 70, 50, 10
   LTEXT "ꏾ֌", -1, 40, 85, 20, 10
   LTEXT "Âèùå", -1, 200, 85, 20, 10
@@ -51,7 +51,7 @@
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Âèáåð³òü, ÿê äîâãî ñë³ä óòðèìóâàòè íàòèñíóòó êíîïêó ìèø³ àáî òðåêáîëà
ïåðåä ñïðàöüîâóâàííÿì çàë³ïàí³ÿ",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -139,7 +139,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Ïîâîðîò êîëèñ÷àòêà íà îäíå êëàöàííÿ ïðîêðó÷óº", -1, 60, 15, 150, 10
   RADIOBUTTON "Íà âêàçàíó ê³ëüê³ñòü &ðÿäê³â:",
IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "Íà îäèí &åêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90,
10

Modified: trunk/reactos/dll/cpl/main/main.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=3…
==============================================================================
--- trunk/reactos/dll/cpl/main/main.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/main.rc [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -21,5 +21,9 @@
 IDI_MOUSE_BUTTON    ICON "resources/mouse_button.ico"
 IDI_MOUSE_TRAILS    ICON "resources/mouse_trails.ico"
 IDI_MOUSE_POINTER   ICON "resources/mouse_pointer.ico"
+IDI_MOUSE_WHEEL     ICON "resources/mouse_wheel.ico"
+IDI_REPEAT_RATE     ICON "resources/repeat_rate.ico"
+IDI_REPEAT_DELAY    ICON "resources/repeat_delay.ico"
+IDI_LOOK_KEY        ICON "resources/look_key.ico"
 
 #include "rsrc.rc"

Modified: trunk/reactos/dll/cpl/main/mouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=3…
==============================================================================
--- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -201,6 +201,7 @@
 {
     HWND hDlgCtrl;
     int pos;
+    static HICON hIcon;
 
     PBUTTON_DATA pButtonData;
 
@@ -216,6 +217,10 @@
             SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10));
             pos = (pButtonData->g_ClickLockTime - 200) / 200;
             SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos);
+
+            hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOOK_KEY),
+                              IMAGE_ICON, 16, 16, 0);
+            SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
             return TRUE;
 
         case WM_COMMAND:

Modified: trunk/reactos/dll/cpl/main/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/main/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/resource.h [iso-8859-1] Tue Apr 15 13:43:11 2008
@@ -13,6 +13,10 @@
 #define IDI_MOUSE_BUTTON                    206
 #define IDI_MOUSE_TRAILS                    207
 #define IDI_MOUSE_POINTER                   208
+#define IDI_MOUSE_WHEEL                     209
+#define IDI_REPEAT_RATE                     210
+#define IDI_REPEAT_DELAY                    211
+#define IDI_LOOK_KEY                        212
 
 #define IDD_PAGE_BUTTON                     101
 #define IDD_PAGE_POINTER                    102

Added: trunk/reactos/dll/cpl/main/resources/look_key.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/loo…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/cpl/main/resources/look_key.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/cpl/main/resources/mouse_wheel.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/cpl/main/resources/mouse_wheel.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/cpl/main/resources/repeat_delay.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/rep…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/cpl/main/resources/repeat_delay.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/cpl/main/resources/repeat_rate.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/rep…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/cpl/main/resources/repeat_rate.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream