[reactos] 01/01: [MSPAINT] Distinguish between icons and cursors (#5884) - Ros-diffs

4 Nov 2023

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56828b82d9fd6f92015e1…

commit 56828b82d9fd6f92015e10cd581c3f04cf6a9488
Author:     Katayama Hirofumi MZ &lt;katayama.hirofumi.mz(a)gmail.com&gt;
AuthorDate: Sat Nov 4 22:15:43 2023 +0900
Commit:     GitHub &lt;noreply(a)github.com&gt;
CommitDate: Sat Nov 4 22:15:43 2023 +0900

    [MSPAINT] Distinguish between icons and cursors (#5884)
    
    - Convert icons/*_cur.ico to the cursor files (*.cur).
    - The hot spot is (16, 16) (default).
    - Rename icons/ folder as img/.
    - Use LoadCursorW instead of LoadIconW
      for cursors.
    - Use CURSOR statements for cursor files
      instead of ICON statements in rsrc.rc.
    - I used GIMP to convert the icon files to the PNG files.
    - I used RealWorld Cursor Editor to convert the PNG files to the cursor files.
    CORE-19297
---
 base/applications/mspaint/CMakeLists.txt           |   2 +-
 base/applications/mspaint/canvas.cpp               |  10 ++++----
 base/applications/mspaint/icons/airbrush_cur.ico   | Bin 2238 -> 0 bytes
 base/applications/mspaint/icons/color_cur.ico      | Bin 2238 -> 0 bytes
 base/applications/mspaint/icons/fill_cur.ico       | Bin 2238 -> 0 bytes
 base/applications/mspaint/icons/pen_cur.ico        | Bin 2238 -> 0 bytes
 base/applications/mspaint/icons/zoom_cur.ico       | Bin 2238 -> 0 bytes
 base/applications/mspaint/img/airbrush.cur         | Bin 0 -> 766 bytes
 base/applications/mspaint/img/color.cur            | Bin 0 -> 766 bytes
 base/applications/mspaint/img/fill.cur             | Bin 0 -> 766 bytes
 .../mspaint/{icons => img}/fontstoolbar.bmp        | Bin
 .../mspaint/{icons => img}/handdrag.cur            | Bin
 .../mspaint/{icons => img}/horzskew.ico            | Bin
 .../mspaint/{icons => img}/horzstretch.ico         | Bin
 .../mspaint/{icons => img}/iconbar.bmp             | Bin
 .../mspaint/{icons => img}/nontransparent.ico      | Bin
 base/applications/mspaint/{icons => img}/paint.ico | Bin
 base/applications/mspaint/{icons => img}/paint.svg |   0
 base/applications/mspaint/img/pen.cur              | Bin 0 -> 766 bytes
 .../mspaint/{icons => img}/transparency.xcf        | Bin
 .../mspaint/{icons => img}/transparent.ico         | Bin
 .../mspaint/{icons => img}/vertskew.ico            | Bin
 .../mspaint/{icons => img}/vertstretch.ico         | Bin
 base/applications/mspaint/img/zoom.cur             | Bin 0 -> 766 bytes
 base/applications/mspaint/lang/bg-BG.rc            |   2 +-
 base/applications/mspaint/lang/cs-CZ.rc            |   2 +-
 base/applications/mspaint/lang/de-DE.rc            |   2 +-
 base/applications/mspaint/lang/en-GB.rc            |   2 +-
 base/applications/mspaint/lang/en-US.rc            |   2 +-
 base/applications/mspaint/lang/es-ES.rc            |   2 +-
 base/applications/mspaint/lang/et-EE.rc            |   2 +-
 base/applications/mspaint/lang/eu-ES.rc            |   2 +-
 base/applications/mspaint/lang/fr-FR.rc            |   2 +-
 base/applications/mspaint/lang/he-IL.rc            |   2 +-
 base/applications/mspaint/lang/hu-HU.rc            |   2 +-
 base/applications/mspaint/lang/id-ID.rc            |   2 +-
 base/applications/mspaint/lang/it-IT.rc            |   2 +-
 base/applications/mspaint/lang/ja-JP.rc            |   2 +-
 base/applications/mspaint/lang/nl-NL.rc            |   2 +-
 base/applications/mspaint/lang/no-NO.rc            |   2 +-
 base/applications/mspaint/lang/pl-PL.rc            |   2 +-
 base/applications/mspaint/lang/pt-BR.rc            |   2 +-
 base/applications/mspaint/lang/pt-PT.rc            |   2 +-
 base/applications/mspaint/lang/ro-RO.rc            |   2 +-
 base/applications/mspaint/lang/ru-RU.rc            |   2 +-
 base/applications/mspaint/lang/sk-SK.rc            |   2 +-
 base/applications/mspaint/lang/sq-AL.rc            |   2 +-
 base/applications/mspaint/lang/sv-SE.rc            |   2 +-
 base/applications/mspaint/lang/tr-TR.rc            |   2 +-
 base/applications/mspaint/lang/uk-UA.rc            |   2 +-
 base/applications/mspaint/lang/vi-VN.rc            |   2 +-
 base/applications/mspaint/lang/zh-CN.rc            |   2 +-
 base/applications/mspaint/lang/zh-HK.rc            |   2 +-
 base/applications/mspaint/lang/zh-TW.rc            |   2 +-
 base/applications/mspaint/rsrc.rc                  |  28 ++++++++++-----------
 55 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/base/applications/mspaint/CMakeLists.txt
b/base/applications/mspaint/CMakeLists.txt
index 94b8e26c680..d90fea481fd 100644
--- a/base/applications/mspaint/CMakeLists.txt
+++ b/base/applications/mspaint/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SOURCE
     winproc.cpp
     precomp.h)
 
-file(GLOB mspaint_rc_deps icons/*.*)
+file(GLOB mspaint_rc_deps img/*.*)
 add_rc_deps(rsrc.rc ${mspaint_rc_deps})
 add_executable(mspaint ${SOURCE} rsrc.rc)
 set_module_type(mspaint win32gui UNICODE)
diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp
index 87553d04400..6ebe32a48ec 100644
--- a/base/applications/mspaint/canvas.cpp
+++ b/base/applications/mspaint/canvas.cpp
@@ -659,19 +659,19 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM
lParam, BOOL
         switch (toolsModel.GetActiveTool())
         {
             case TOOL_FILL:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL)));
                 break;
             case TOOL_COLOR:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR)));
                 break;
             case TOOL_ZOOM:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM)));
                 break;
             case TOOL_PEN:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN)));
                 break;
             case TOOL_AIRBRUSH:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH)));
                 break;
             default:
                 ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_CROSS));
diff --git a/base/applications/mspaint/icons/airbrush_cur.ico
b/base/applications/mspaint/icons/airbrush_cur.ico
deleted file mode 100644
index aa1a09c5962..00000000000
Binary files a/base/applications/mspaint/icons/airbrush_cur.ico and /dev/null differ
diff --git a/base/applications/mspaint/icons/color_cur.ico
b/base/applications/mspaint/icons/color_cur.ico
deleted file mode 100644
index 49d536df9c6..00000000000
Binary files a/base/applications/mspaint/icons/color_cur.ico and /dev/null differ
diff --git a/base/applications/mspaint/icons/fill_cur.ico
b/base/applications/mspaint/icons/fill_cur.ico
deleted file mode 100644
index fa2679fe3f1..00000000000
Binary files a/base/applications/mspaint/icons/fill_cur.ico and /dev/null differ
diff --git a/base/applications/mspaint/icons/pen_cur.ico
b/base/applications/mspaint/icons/pen_cur.ico
deleted file mode 100644
index 107e55551ec..00000000000
Binary files a/base/applications/mspaint/icons/pen_cur.ico and /dev/null differ
diff --git a/base/applications/mspaint/icons/zoom_cur.ico
b/base/applications/mspaint/icons/zoom_cur.ico
deleted file mode 100644
index 072b2c3a238..00000000000
Binary files a/base/applications/mspaint/icons/zoom_cur.ico and /dev/null differ
diff --git a/base/applications/mspaint/img/airbrush.cur
b/base/applications/mspaint/img/airbrush.cur
new file mode 100644
index 00000000000..cf044906c78
Binary files /dev/null and b/base/applications/mspaint/img/airbrush.cur differ
diff --git a/base/applications/mspaint/img/color.cur
b/base/applications/mspaint/img/color.cur
new file mode 100644
index 00000000000..ac736b21b79
Binary files /dev/null and b/base/applications/mspaint/img/color.cur differ
diff --git a/base/applications/mspaint/img/fill.cur
b/base/applications/mspaint/img/fill.cur
new file mode 100644
index 00000000000..df2fbe6c1a2
Binary files /dev/null and b/base/applications/mspaint/img/fill.cur differ
diff --git a/base/applications/mspaint/icons/fontstoolbar.bmp
b/base/applications/mspaint/img/fontstoolbar.bmp
similarity index 100%
rename from base/applications/mspaint/icons/fontstoolbar.bmp
rename to base/applications/mspaint/img/fontstoolbar.bmp
diff --git a/base/applications/mspaint/icons/handdrag.cur
b/base/applications/mspaint/img/handdrag.cur
similarity index 100%
rename from base/applications/mspaint/icons/handdrag.cur
rename to base/applications/mspaint/img/handdrag.cur
diff --git a/base/applications/mspaint/icons/horzskew.ico
b/base/applications/mspaint/img/horzskew.ico
similarity index 100%
rename from base/applications/mspaint/icons/horzskew.ico
rename to base/applications/mspaint/img/horzskew.ico
diff --git a/base/applications/mspaint/icons/horzstretch.ico
b/base/applications/mspaint/img/horzstretch.ico
similarity index 100%
rename from base/applications/mspaint/icons/horzstretch.ico
rename to base/applications/mspaint/img/horzstretch.ico
diff --git a/base/applications/mspaint/icons/iconbar.bmp
b/base/applications/mspaint/img/iconbar.bmp
similarity index 100%
rename from base/applications/mspaint/icons/iconbar.bmp
rename to base/applications/mspaint/img/iconbar.bmp
diff --git a/base/applications/mspaint/icons/nontransparent.ico
b/base/applications/mspaint/img/nontransparent.ico
similarity index 100%
rename from base/applications/mspaint/icons/nontransparent.ico
rename to base/applications/mspaint/img/nontransparent.ico
diff --git a/base/applications/mspaint/icons/paint.ico
b/base/applications/mspaint/img/paint.ico
similarity index 100%
rename from base/applications/mspaint/icons/paint.ico
rename to base/applications/mspaint/img/paint.ico
diff --git a/base/applications/mspaint/icons/paint.svg
b/base/applications/mspaint/img/paint.svg
similarity index 100%
rename from base/applications/mspaint/icons/paint.svg
rename to base/applications/mspaint/img/paint.svg
diff --git a/base/applications/mspaint/img/pen.cur
b/base/applications/mspaint/img/pen.cur
new file mode 100644
index 00000000000..98f90d0388b
Binary files /dev/null and b/base/applications/mspaint/img/pen.cur differ
diff --git a/base/applications/mspaint/icons/transparency.xcf
b/base/applications/mspaint/img/transparency.xcf
similarity index 100%
rename from base/applications/mspaint/icons/transparency.xcf
rename to base/applications/mspaint/img/transparency.xcf
diff --git a/base/applications/mspaint/icons/transparent.ico
b/base/applications/mspaint/img/transparent.ico
similarity index 100%
rename from base/applications/mspaint/icons/transparent.ico
rename to base/applications/mspaint/img/transparent.ico
diff --git a/base/applications/mspaint/icons/vertskew.ico
b/base/applications/mspaint/img/vertskew.ico
similarity index 100%
rename from base/applications/mspaint/icons/vertskew.ico
rename to base/applications/mspaint/img/vertskew.ico
diff --git a/base/applications/mspaint/icons/vertstretch.ico
b/base/applications/mspaint/img/vertstretch.ico
similarity index 100%
rename from base/applications/mspaint/icons/vertstretch.ico
rename to base/applications/mspaint/img/vertstretch.ico
diff --git a/base/applications/mspaint/img/zoom.cur
b/base/applications/mspaint/img/zoom.cur
new file mode 100644
index 00000000000..23adbec2bf7
Binary files /dev/null and b/base/applications/mspaint/img/zoom.cur differ
diff --git a/base/applications/mspaint/lang/bg-BG.rc
b/base/applications/mspaint/lang/bg-BG.rc
index e880803577d..94ce4e67db4 100644
--- a/base/applications/mspaint/lang/bg-BG.rc
+++ b/base/applications/mspaint/lang/bg-BG.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-bg-BG.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-bg-BG.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/cs-CZ.rc
b/base/applications/mspaint/lang/cs-CZ.rc
index 22f2387752a..8d367b9e21f 100644
--- a/base/applications/mspaint/lang/cs-CZ.rc
+++ b/base/applications/mspaint/lang/cs-CZ.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-cs-CZ.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-cs-CZ.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/de-DE.rc
b/base/applications/mspaint/lang/de-DE.rc
index 07511f578ed..3af564c5035 100644
--- a/base/applications/mspaint/lang/de-DE.rc
+++ b/base/applications/mspaint/lang/de-DE.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-de-DE.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-de-DE.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/en-GB.rc
b/base/applications/mspaint/lang/en-GB.rc
index 29b47c1b7de..25ce4329748 100644
--- a/base/applications/mspaint/lang/en-GB.rc
+++ b/base/applications/mspaint/lang/en-GB.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-en-GB.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-en-GB.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/en-US.rc
b/base/applications/mspaint/lang/en-US.rc
index 9119010ce53..9fb7a622aa5 100644
--- a/base/applications/mspaint/lang/en-US.rc
+++ b/base/applications/mspaint/lang/en-US.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar.bmp"
+IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/es-ES.rc
b/base/applications/mspaint/lang/es-ES.rc
index 6af66999fea..805353c3968 100644
--- a/base/applications/mspaint/lang/es-ES.rc
+++ b/base/applications/mspaint/lang/es-ES.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-es-ES.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-es-ES.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/et-EE.rc
b/base/applications/mspaint/lang/et-EE.rc
index c6fef7bb171..350f1a0f90f 100644
--- a/base/applications/mspaint/lang/et-EE.rc
+++ b/base/applications/mspaint/lang/et-EE.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-et-EE.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-et-EE.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/eu-ES.rc
b/base/applications/mspaint/lang/eu-ES.rc
index fdda0e8edbd..41a8abc6a7b 100644
--- a/base/applications/mspaint/lang/eu-ES.rc
+++ b/base/applications/mspaint/lang/eu-ES.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-eu-ES.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-eu-ES.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/fr-FR.rc
b/base/applications/mspaint/lang/fr-FR.rc
index 056a79f6f8e..f37bf8a8444 100644
--- a/base/applications/mspaint/lang/fr-FR.rc
+++ b/base/applications/mspaint/lang/fr-FR.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-fr-FR.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-fr-FR.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/he-IL.rc
b/base/applications/mspaint/lang/he-IL.rc
index 853dfb9852f..acfb1c65f0f 100644
--- a/base/applications/mspaint/lang/he-IL.rc
+++ b/base/applications/mspaint/lang/he-IL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-he-IL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-he-IL.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/hu-HU.rc
b/base/applications/mspaint/lang/hu-HU.rc
index 266ab21eeb2..bb63ad06f54 100644
--- a/base/applications/mspaint/lang/hu-HU.rc
+++ b/base/applications/mspaint/lang/hu-HU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-hu-HU.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-hu-HU.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/id-ID.rc
b/base/applications/mspaint/lang/id-ID.rc
index b03210330f4..fb7dfe53482 100644
--- a/base/applications/mspaint/lang/id-ID.rc
+++ b/base/applications/mspaint/lang/id-ID.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-id-ID.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-id-ID.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/it-IT.rc
b/base/applications/mspaint/lang/it-IT.rc
index 6ef469f5923..a97c7034912 100644
--- a/base/applications/mspaint/lang/it-IT.rc
+++ b/base/applications/mspaint/lang/it-IT.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-it-IT.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-it-IT.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/ja-JP.rc
b/base/applications/mspaint/lang/ja-JP.rc
index 5c41f90053b..cb8d2f91061 100644
--- a/base/applications/mspaint/lang/ja-JP.rc
+++ b/base/applications/mspaint/lang/ja-JP.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ja-JP.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ja-JP.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/nl-NL.rc
b/base/applications/mspaint/lang/nl-NL.rc
index de8539ebfc3..972814c2cb1 100644
--- a/base/applications/mspaint/lang/nl-NL.rc
+++ b/base/applications/mspaint/lang/nl-NL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-nl-NL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-nl-NL.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/no-NO.rc
b/base/applications/mspaint/lang/no-NO.rc
index 001ca09b9f2..3e5f1a57146 100644
--- a/base/applications/mspaint/lang/no-NO.rc
+++ b/base/applications/mspaint/lang/no-NO.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-no-NO.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-no-NO.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/pl-PL.rc
b/base/applications/mspaint/lang/pl-PL.rc
index 0f9b0076a7a..9128980bc7c 100644
--- a/base/applications/mspaint/lang/pl-PL.rc
+++ b/base/applications/mspaint/lang/pl-PL.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pl-PL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pl-PL.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/pt-BR.rc
b/base/applications/mspaint/lang/pt-BR.rc
index be53b2cc1b4..f69ff23f54d 100644
--- a/base/applications/mspaint/lang/pt-BR.rc
+++ b/base/applications/mspaint/lang/pt-BR.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-BR.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pt-BR.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/pt-PT.rc
b/base/applications/mspaint/lang/pt-PT.rc
index f4b9638e03e..c698236a6c4 100644
--- a/base/applications/mspaint/lang/pt-PT.rc
+++ b/base/applications/mspaint/lang/pt-PT.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-PT.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pt-PT.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/ro-RO.rc
b/base/applications/mspaint/lang/ro-RO.rc
index 274c14a28ea..6bd7c0e3698 100644
--- a/base/applications/mspaint/lang/ro-RO.rc
+++ b/base/applications/mspaint/lang/ro-RO.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ro-RO.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ro-RO.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/ru-RU.rc
b/base/applications/mspaint/lang/ru-RU.rc
index 964453968e6..644ef61ad8a 100644
--- a/base/applications/mspaint/lang/ru-RU.rc
+++ b/base/applications/mspaint/lang/ru-RU.rc
@@ -11,7 +11,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ru-RU.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ru-RU.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/sk-SK.rc
b/base/applications/mspaint/lang/sk-SK.rc
index 5fa46a01124..e42f6ac69e0 100644
--- a/base/applications/mspaint/lang/sk-SK.rc
+++ b/base/applications/mspaint/lang/sk-SK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sk-SK.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sk-SK.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/sq-AL.rc
b/base/applications/mspaint/lang/sq-AL.rc
index 5da01332cd3..584d180bcfc 100644
--- a/base/applications/mspaint/lang/sq-AL.rc
+++ b/base/applications/mspaint/lang/sq-AL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sq-AL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sq-AL.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/sv-SE.rc
b/base/applications/mspaint/lang/sv-SE.rc
index ec2f3205a74..0c3b2907d02 100644
--- a/base/applications/mspaint/lang/sv-SE.rc
+++ b/base/applications/mspaint/lang/sv-SE.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sv-SE.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sv-SE.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/tr-TR.rc
b/base/applications/mspaint/lang/tr-TR.rc
index b7768297a36..9a5b7004afd 100644
--- a/base/applications/mspaint/lang/tr-TR.rc
+++ b/base/applications/mspaint/lang/tr-TR.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-tr-TR.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-tr-TR.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/uk-UA.rc
b/base/applications/mspaint/lang/uk-UA.rc
index e54a662e1fe..1a6a3f86fec 100644
--- a/base/applications/mspaint/lang/uk-UA.rc
+++ b/base/applications/mspaint/lang/uk-UA.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-uk-UA.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-uk-UA.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/vi-VN.rc
b/base/applications/mspaint/lang/vi-VN.rc
index cebeb1d53cc..d40302055e6 100644
--- a/base/applications/mspaint/lang/vi-VN.rc
+++ b/base/applications/mspaint/lang/vi-VN.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-vi-VN.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-vi-VN.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/zh-CN.rc
b/base/applications/mspaint/lang/zh-CN.rc
index 962479ab51f..19408aaebfc 100644
--- a/base/applications/mspaint/lang/zh-CN.rc
+++ b/base/applications/mspaint/lang/zh-CN.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-CN.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-CN.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/zh-HK.rc
b/base/applications/mspaint/lang/zh-HK.rc
index 65dd0e96eb3..5691d4d8811 100644
--- a/base/applications/mspaint/lang/zh-HK.rc
+++ b/base/applications/mspaint/lang/zh-HK.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-HK.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-HK.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/lang/zh-TW.rc
b/base/applications/mspaint/lang/zh-TW.rc
index f08299a24f1..33963d485fd 100644
--- a/base/applications/mspaint/lang/zh-TW.rc
+++ b/base/applications/mspaint/lang/zh-TW.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-TW.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-TW.bmp"
 
 ID_MENU MENU
 BEGIN
diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc
index 5798f4c9ff7..e16d27fce9e 100644
--- a/base/applications/mspaint/rsrc.rc
+++ b/base/applications/mspaint/rsrc.rc
@@ -21,24 +21,24 @@
 
 /* Icons */
 
-IDI_APPICON ICON "icons/paint.ico"
+IDI_APPICON ICON "img/paint.ico"
 
-IDB_TOOLBARICONS BITMAP "icons/iconbar.bmp"
+IDB_TOOLBARICONS BITMAP "img/iconbar.bmp"
 
-IDI_TRANSPARENT ICON "icons/transparent.ico"
-IDI_NONTRANSPARENT ICON "icons/nontransparent.ico"
+IDI_TRANSPARENT ICON "img/transparent.ico"
+IDI_NONTRANSPARENT ICON "img/nontransparent.ico"
 
-IDC_FILL ICON "icons/fill_cur.ico"
-IDC_COLOR ICON "icons/color_cur.ico"
-IDC_ZOOM ICON "icons/zoom_cur.ico"
-IDC_PEN ICON "icons/pen_cur.ico"
-IDC_AIRBRUSH ICON "icons/airbrush_cur.ico"
-IDC_HANDDRAG CURSOR "icons/handdrag.cur"
+IDC_FILL CURSOR "img/fill.cur"
+IDC_COLOR CURSOR "img/color.cur"
+IDC_ZOOM CURSOR "img/zoom.cur"
+IDC_PEN CURSOR "img/pen.cur"
+IDC_AIRBRUSH CURSOR "img/airbrush.cur"
+IDC_HANDDRAG CURSOR "img/handdrag.cur"
 
-IDI_HORZSTRETCH ICON "icons/horzstretch.ico"
-IDI_VERTSTRETCH ICON "icons/vertstretch.ico"
-IDI_HORZSKEW ICON "icons/horzskew.ico"
-IDI_VERTSKEW ICON "icons/vertskew.ico"
+IDI_HORZSTRETCH ICON "img/horzstretch.ico"
+IDI_VERTSTRETCH ICON "img/vertstretch.ico"
+IDI_HORZSKEW ICON "img/horzskew.ico"
+IDI_VERTSKEW ICON "img/vertskew.ico"
 
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mspaint.exe.manifest"
 

    