From a69b0c9fd51df076a06a8df4d4e944fcbd432d3b Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Wed, 6 Mar 2024 16:00:36 +0300 Subject: [PATCH] [MAIN] Fix icon identifiers and their order Additionally: - Reuse printers and fonts folder icons from shell32, the same way as it was done in c0dbde04365. The printers folder icon was missing here though. - Fix "look_key" => "lock_key" typos. This fixes Administrative Tools and Fonts Folder icons in Control Panel when being restored to defaults with Stardock IconPackager 5.1. CORE-19471 --- dll/cpl/main/CMakeLists.txt | 3 +- dll/cpl/main/lang/bg-BG.rc | 2 +- dll/cpl/main/lang/cs-CZ.rc | 2 +- dll/cpl/main/lang/de-DE.rc | 2 +- dll/cpl/main/lang/el-GR.rc | 2 +- dll/cpl/main/lang/en-US.rc | 2 +- dll/cpl/main/lang/es-ES.rc | 2 +- dll/cpl/main/lang/fr-FR.rc | 2 +- dll/cpl/main/lang/he-IL.rc | 2 +- dll/cpl/main/lang/hu-HU.rc | 2 +- dll/cpl/main/lang/id-ID.rc | 2 +- dll/cpl/main/lang/it-IT.rc | 2 +- dll/cpl/main/lang/ja-JP.rc | 2 +- dll/cpl/main/lang/nl-NL.rc | 2 +- dll/cpl/main/lang/no-NO.rc | 2 +- dll/cpl/main/lang/pl-PL.rc | 2 +- dll/cpl/main/lang/pt-PT.rc | 2 +- dll/cpl/main/lang/ro-RO.rc | 2 +- dll/cpl/main/lang/ru-RU.rc | 2 +- dll/cpl/main/lang/sk-SK.rc | 2 +- dll/cpl/main/lang/sq-AL.rc | 2 +- dll/cpl/main/lang/tr-TR.rc | 2 +- dll/cpl/main/lang/uk-UA.rc | 2 +- dll/cpl/main/lang/zh-CN.rc | 2 +- dll/cpl/main/lang/zh-HK.rc | 2 +- dll/cpl/main/lang/zh-TW.rc | 2 +- dll/cpl/main/main.rc | 5 ++-- dll/cpl/main/mouse.c | 2 +- dll/cpl/main/resource.h | 27 +++++++++--------- dll/cpl/main/resources/fonts_folder.ico | Bin 25214 -> 0 bytes .../resources/{look_key.ico => lock_key.ico} | Bin 31 files changed, 45 insertions(+), 42 deletions(-) delete mode 100644 dll/cpl/main/resources/fonts_folder.ico rename dll/cpl/main/resources/{look_key.ico => lock_key.ico} (100%) diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt index 9746795a7fd..c6a5cdf5f65 100644 --- a/dll/cpl/main/CMakeLists.txt +++ b/dll/cpl/main/CMakeLists.txt @@ -7,7 +7,8 @@ list(APPEND SOURCE mouse.c main.h) -file(GLOB main_rc_deps resources/*.*) +set(ICONS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../win32/shell32/res/icons) +file(GLOB main_rc_deps resources/*.* ${ICONS_DIR}/38.ico ${ICONS_DIR}/39.ico) add_rc_deps(main.rc ${main_rc_deps}) add_library(main MODULE diff --git a/dll/cpl/main/lang/bg-BG.rc b/dll/cpl/main/lang/bg-BG.rc index 9ef7d2e17e1..9f3ae82e16f 100644 --- a/dll/cpl/main/lang/bg-BG.rc +++ b/dll/cpl/main/lang/bg-BG.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&Добре", IDOK, 120, 75, 50, 15 PUSHBUTTON "&Отказ", IDCANCEL, 175, 75, 50, 15 LTEXT "На&стройка продължителността на задържане на цъка на мишката, необходимо за да бъде отчетено цъкането", -1, 60, 15, 170, 30 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/cs-CZ.rc b/dll/cpl/main/lang/cs-CZ.rc index 207afb38c5f..a86bb826aca 100644 --- a/dll/cpl/main/lang/cs-CZ.rc +++ b/dll/cpl/main/lang/cs-CZ.rc @@ -49,7 +49,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/de-DE.rc b/dll/cpl/main/lang/de-DE.rc index e858533cb95..46b2cbae25e 100644 --- a/dll/cpl/main/lang/de-DE.rc +++ b/dll/cpl/main/lang/de-DE.rc @@ -45,7 +45,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/el-GR.rc b/dll/cpl/main/lang/el-GR.rc index d4ca1e4d796..a7eeb9b5749 100644 --- a/dll/cpl/main/lang/el-GR.rc +++ b/dll/cpl/main/lang/el-GR.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 PUSHBUTTON "Ά&κυρο", IDCANCEL, 175, 75, 50, 15 LTEXT "&Επιλέξτε πόσο πρέπει να κρατήσετε πατημένο το κουμπί του ποντικιού μέχρι να κλειδωθεί", -1, 60, 15, 170, 30 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/en-US.rc b/dll/cpl/main/lang/en-US.rc index 033b265e4af..0e165d4df54 100644 --- a/dll/cpl/main/lang/en-US.rc +++ b/dll/cpl/main/lang/en-US.rc @@ -43,7 +43,7 @@ BEGIN 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 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/es-ES.rc b/dll/cpl/main/lang/es-ES.rc index 4434f07abd2..3f33320c5b7 100644 --- a/dll/cpl/main/lang/es-ES.rc +++ b/dll/cpl/main/lang/es-ES.rc @@ -43,7 +43,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/fr-FR.rc b/dll/cpl/main/lang/fr-FR.rc index c523ebfcee8..1a09f402d1a 100644 --- a/dll/cpl/main/lang/fr-FR.rc +++ b/dll/cpl/main/lang/fr-FR.rc @@ -43,7 +43,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/he-IL.rc b/dll/cpl/main/lang/he-IL.rc index 7b03f3b4df3..80ec90bdf5f 100644 --- a/dll/cpl/main/lang/he-IL.rc +++ b/dll/cpl/main/lang/he-IL.rc @@ -45,7 +45,7 @@ BEGIN PUSHBUTTON "אישור", IDOK, 110, 59, 60, 14 PUSHBUTTON "ביטול", 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 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/hu-HU.rc b/dll/cpl/main/lang/hu-HU.rc index 680d92d2dfa..da5433dd099 100644 --- a/dll/cpl/main/lang/hu-HU.rc +++ b/dll/cpl/main/lang/hu-HU.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 PUSHBUTTON "&Mégse", IDCANCEL, 174, 59, 60, 14 LTEXT "&Beállíthatja milyen hosszan kell lenyomva tartania az egér vagy hanyattegér gombját, mielőtt megmarkolná\naz elemet.", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/id-ID.rc b/dll/cpl/main/lang/id-ID.rc index c47eafe12a0..57e327ffe9d 100644 --- a/dll/cpl/main/lang/id-ID.rc +++ b/dll/cpl/main/lang/id-ID.rc @@ -43,7 +43,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/it-IT.rc b/dll/cpl/main/lang/it-IT.rc index d042575cc27..c1e128e3d1c 100644 --- a/dll/cpl/main/lang/it-IT.rc +++ b/dll/cpl/main/lang/it-IT.rc @@ -45,7 +45,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/ja-JP.rc b/dll/cpl/main/lang/ja-JP.rc index 6b84aa1d8f4..6f094c9a4a9 100644 --- a/dll/cpl/main/lang/ja-JP.rc +++ b/dll/cpl/main/lang/ja-JP.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 PUSHBUTTON "キャンセル(&C)", IDCANCEL, 174, 59, 60, 14 LTEXT "クリックする前にマウスかトラックボールのボタンをどの程度押し続けるかを補正する(&A)", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/nl-NL.rc b/dll/cpl/main/lang/nl-NL.rc index 69b93ab3fdf..f1b20ac203e 100644 --- a/dll/cpl/main/lang/nl-NL.rc +++ b/dll/cpl/main/lang/nl-NL.rc @@ -43,7 +43,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/no-NO.rc b/dll/cpl/main/lang/no-NO.rc index c7566905289..e774e93c04a 100644 --- a/dll/cpl/main/lang/no-NO.rc +++ b/dll/cpl/main/lang/no-NO.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 PUSHBUTTON "&Avbryt", IDCANCEL, 174, 59, 60, 14 LTEXT "&Juster hvor lenge du må holde mus eller styrekuleknappen nede før klikket er låst.", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/pl-PL.rc b/dll/cpl/main/lang/pl-PL.rc index d1c49a5a706..c8c4d7dd5a0 100644 --- a/dll/cpl/main/lang/pl-PL.rc +++ b/dll/cpl/main/lang/pl-PL.rc @@ -51,7 +51,7 @@ BEGIN 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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc index 4646b79fce4..ce463172d58 100644 --- a/dll/cpl/main/lang/pt-PT.rc +++ b/dll/cpl/main/lang/pt-PT.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 PUSHBUTTON "&Cancelar", IDCANCEL, 174, 59, 60, 14 LTEXT "&Ajuste por quanto tempo precisa manter pressionado o botão do rato ou do trackball antes que o clique seja bloqueado", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/ro-RO.rc b/dll/cpl/main/lang/ro-RO.rc index e8d137731c2..ac4feae62bc 100644 --- a/dll/cpl/main/lang/ro-RO.rc +++ b/dll/cpl/main/lang/ro-RO.rc @@ -52,7 +52,7 @@ BEGIN PUSHBUTTON "Con&firmă", IDOK, 110, 59, 60, 14 PUSHBUTTON "A&nulează", IDCANCEL, 174, 59, 60, 14 LTEXT "Sp&ecificați perioada de menținere apăsată a unui buton pentru a-l imobiliza.", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/ru-RU.rc b/dll/cpl/main/lang/ru-RU.rc index b583ac990eb..69c24083725 100644 --- a/dll/cpl/main/lang/ru-RU.rc +++ b/dll/cpl/main/lang/ru-RU.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 120, 79, 50, 15 PUSHBUTTON "&Отмена", IDCANCEL, 177, 79, 50, 15 LTEXT "&Выберите, как долго следует удерживать нажатой кнопку мыши или трекбола для того, чтобы сработало залипание.", -1, 60, 15, 170, 30 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/sk-SK.rc b/dll/cpl/main/lang/sk-SK.rc index 0a8288e0695..3b0ac318392 100644 --- a/dll/cpl/main/lang/sk-SK.rc +++ b/dll/cpl/main/lang/sk-SK.rc @@ -48,7 +48,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 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, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/sq-AL.rc b/dll/cpl/main/lang/sq-AL.rc index f57d11b2a80..7ac5d6258e6 100644 --- a/dll/cpl/main/lang/sq-AL.rc +++ b/dll/cpl/main/lang/sq-AL.rc @@ -47,7 +47,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 PUSHBUTTON "&Anulo", IDCANCEL, 174, 59, 60, 14 LTEXT "&Rregullo se sa kohë ju duhet të mbani të shtypur një buton të miut para klikimi juaj është mbyllur", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/tr-TR.rc b/dll/cpl/main/lang/tr-TR.rc index a205c1e92e2..bd96a07d5ab 100644 --- a/dll/cpl/main/lang/tr-TR.rc +++ b/dll/cpl/main/lang/tr-TR.rc @@ -45,7 +45,7 @@ BEGIN PUSHBUTTON "Tamam", IDOK, 110, 59, 60, 14 PUSHBUTTON "İptal", IDCANCEL, 174, 59, 60, 14 LTEXT "&Tıklamanız kilitlenmeden önce bir fare ya da iztopu düğmesine ne kadar basılı tutmanız gerektiğini ayarlayınız:", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/uk-UA.rc b/dll/cpl/main/lang/uk-UA.rc index 49ecf2e27e5..980cb899bbf 100644 --- a/dll/cpl/main/lang/uk-UA.rc +++ b/dll/cpl/main/lang/uk-UA.rc @@ -51,7 +51,7 @@ BEGIN PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15 PUSHBUTTON "&Скасувати", IDCANCEL, 175, 75, 50, 15 LTEXT "&Виберіть, як довго слід утримувати натиснуту кнопку миші або трекбола перед спрацьовуванням залипання", -1, 60, 15, 170, 30 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/zh-CN.rc b/dll/cpl/main/lang/zh-CN.rc index aaa5eecefaa..6e16755f67d 100644 --- a/dll/cpl/main/lang/zh-CN.rc +++ b/dll/cpl/main/lang/zh-CN.rc @@ -50,7 +50,7 @@ BEGIN PUSHBUTTON "确定(&O)", IDOK, 110, 59, 60, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 174, 59, 60, 14 LTEXT "调整您需要按下鼠标或轨迹球按钮多久单击才能被“锁定”(&A)。", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/zh-HK.rc b/dll/cpl/main/lang/zh-HK.rc index 01f4c3c9b1a..bf72bd56a9a 100644 --- a/dll/cpl/main/lang/zh-HK.rc +++ b/dll/cpl/main/lang/zh-HK.rc @@ -51,7 +51,7 @@ BEGIN PUSHBUTTON "確定(&O)", IDOK, 110, 59, 60, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 174, 59, 60, 14 LTEXT "調整您按住滑鼠或軌跡球按鈕時所需要的時間(&A)", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/lang/zh-TW.rc b/dll/cpl/main/lang/zh-TW.rc index fd8e83b6245..a3153a2fe20 100644 --- a/dll/cpl/main/lang/zh-TW.rc +++ b/dll/cpl/main/lang/zh-TW.rc @@ -51,7 +51,7 @@ BEGIN PUSHBUTTON "確定(&O)", IDOK, 110, 59, 60, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 174, 59, 60, 14 LTEXT "調整您按住滑鼠或軌跡球按鈕時所需要的時間(&A)", -1, 37, 5, 200, 27 - ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 + ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/main/main.rc b/dll/cpl/main/main.rc index 92dfeef9e21..54045896bec 100644 --- a/dll/cpl/main/main.rc +++ b/dll/cpl/main/main.rc @@ -22,13 +22,14 @@ IDI_MOUSE_SPEED ICON "resources/mouse_speed.ico" IDI_MOUSE_BUTTON ICON "resources/mouse_button.ico" IDI_MOUSE_TRAILS ICON "resources/mouse_trails.ico" IDI_MOUSE_HIDE ICON "resources/mouse_hide.ico" -IDI_FONTS_FOLDER ICON "resources/fonts_folder.ico" +IDI_PRINTERS_FOLDER ICON "../../win32/shell32/res/icons/38.ico" // IDI_SHELL_PRINTERS_FOLDER +IDI_FONTS_FOLDER ICON "../../win32/shell32/res/icons/39.ico" // IDI_SHELL_FONTS_FOLDER IDI_ADMIN_TOOLS_FOLDER ICON "resources/admintools_folder.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" +IDI_LOCK_KEY ICON "resources/lock_key.ico" #include diff --git a/dll/cpl/main/mouse.c b/dll/cpl/main/mouse.c index 28ca28f3590..8290a0541ce 100644 --- a/dll/cpl/main/mouse.c +++ b/dll/cpl/main/mouse.c @@ -204,7 +204,7 @@ ClickLockProc(IN HWND hwndDlg, pos = (pButtonData->g_ClickLockTime - 200) / 200; SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos); - hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOOK_KEY), + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCK_KEY), IMAGE_ICON, 16, 16, 0); SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); return TRUE; diff --git a/dll/cpl/main/resource.h b/dll/cpl/main/resource.h index 9bff0b95d1e..b0708ad5a45 100644 --- a/dll/cpl/main/resource.h +++ b/dll/cpl/main/resource.h @@ -5,21 +5,22 @@ #define IDC_CPLICON_1 100 #define IDC_CPLICON_2 200 -#define IDI_FOLDER_OPEN 201 -#define IDI_FOLDER_CLOSED 202 -#define IDI_MOUSE_LEFT 203 -#define IDI_MOUSE_RIGHT 204 -#define IDI_MOUSE_SPEED 205 -#define IDI_MOUSE_BUTTON 206 -#define IDI_MOUSE_TRAILS 207 -#define IDI_MOUSE_HIDE 208 +#define IDI_MOUSE_SPEED 104 +#define IDI_REPEAT_DELAY 105 +#define IDI_REPEAT_RATE 106 +#define IDI_MOUSE_BUTTON 108 +#define IDI_MOUSE_LEFT 109 +#define IDI_MOUSE_RIGHT 110 +#define IDI_PRINTERS_FOLDER 300 #define IDI_FONTS_FOLDER 400 #define IDI_ADMIN_TOOLS_FOLDER 500 -#define IDI_MOUSE_POINTER 600 -#define IDI_MOUSE_WHEEL 601 -#define IDI_REPEAT_RATE 602 -#define IDI_REPEAT_DELAY 603 -#define IDI_LOOK_KEY 604 +#define IDI_MOUSE_TRAILS 600 +#define IDI_MOUSE_HIDE 601 +#define IDI_MOUSE_POINTER 602 +#define IDI_MOUSE_WHEEL 603 +#define IDI_FOLDER_CLOSED 605 +#define IDI_FOLDER_OPEN 606 +#define IDI_LOCK_KEY 607 #define IDD_PAGE_BUTTON 101 #define IDD_PAGE_POINTER 102 diff --git a/dll/cpl/main/resources/fonts_folder.ico b/dll/cpl/main/resources/fonts_folder.ico deleted file mode 100644 index f7b94af2e7c0c26ad457e9626230de94df0c8fae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25214 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