Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MAIN] Fix icon identifiers and their order

Browse source 
Additionally:
- Reuse printers and fonts folder icons from shell32,
  the same way as it was done in c0dbde0436.
  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
This commit is contained in:
Stanislav Motylkov 2024-03-06 16:00:36 +03:00
parent 3a49e26f13
commit a69b0c9fd5
31 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/cpl/main/CMakeLists.txt
View file

@ -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

2
dll/cpl/main/lang/bg-BG.rc
View file

@ -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

2
dll/cpl/main/lang/cs-CZ.rc
View file

@ -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

2
dll/cpl/main/lang/de-DE.rc
View file

@ -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

2
dll/cpl/main/lang/el-GR.rc
View file

@ -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

2
dll/cpl/main/lang/en-US.rc
View file

@ -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

2
dll/cpl/main/lang/es-ES.rc
View file

@ -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

2
dll/cpl/main/lang/fr-FR.rc
View file

@ -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

2
dll/cpl/main/lang/he-IL.rc
View file

@ -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

2
dll/cpl/main/lang/hu-HU.rc
View file

@ -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

2
dll/cpl/main/lang/id-ID.rc
View file

@ -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

2
dll/cpl/main/lang/it-IT.rc
View file

@ -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

2
dll/cpl/main/lang/ja-JP.rc
View file

@ -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

2
dll/cpl/main/lang/nl-NL.rc
View file

@ -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

2
dll/cpl/main/lang/no-NO.rc
View file

@ -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

2
dll/cpl/main/lang/pl-PL.rc
View file

@ -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

2
dll/cpl/main/lang/pt-PT.rc
View file

@ -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

2
dll/cpl/main/lang/ro-RO.rc
View file

@ -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

2
dll/cpl/main/lang/ru-RU.rc
View file

@ -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

2
dll/cpl/main/lang/sk-SK.rc
View file

@ -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

2
dll/cpl/main/lang/sq-AL.rc
View file

@ -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

2
dll/cpl/main/lang/tr-TR.rc
View file

@ -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

2
dll/cpl/main/lang/uk-UA.rc
View file

@ -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

2
dll/cpl/main/lang/zh-CN.rc
View file

@ -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

2
dll/cpl/main/lang/zh-HK.rc
View file

@ -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

2
dll/cpl/main/lang/zh-TW.rc
View file

@ -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

5
dll/cpl/main/main.rc
View file

@ -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 <reactos/manifest_hosted.rc>

2
dll/cpl/main/mouse.c
View file

@ -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;

27
dll/cpl/main/resource.h
View file

@ -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

BIN
dll/cpl/main/resources/fonts_folder.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 25 KiB

0
dll/cpl/main/resources/look_key.ico → dll/cpl/main/resources/lock_key.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB