diff --git a/resources/icon.icns b/resources/icon.icns old mode 100644 new mode 100755 index 7590c0fcb..56df7eb19 Binary files a/resources/icon.icns and b/resources/icon.icns differ diff --git a/resources/icon.ico b/resources/icon.ico new file mode 100644 index 000000000..eef39ce8a Binary files /dev/null and b/resources/icon.ico differ diff --git a/resources/icon/new-unused/icon.icns b/resources/icon/new-unused/icon.icns new file mode 100644 index 000000000..7590c0fcb Binary files /dev/null and b/resources/icon/new-unused/icon.icns differ diff --git a/resources/icon/icon.svg b/resources/icon/new-unused/icon.svg similarity index 100% rename from resources/icon/icon.svg rename to resources/icon/new-unused/icon.svg diff --git a/resources/icon/icon_128.png b/resources/icon/new-unused/icon_128.png similarity index 100% rename from resources/icon/icon_128.png rename to resources/icon/new-unused/icon_128.png diff --git a/resources/icon_256.ico b/resources/icon/new-unused/icon_256.ico similarity index 100% rename from resources/icon_256.ico rename to resources/icon/new-unused/icon_256.ico diff --git a/resources/icon/icon_256.png b/resources/icon/new-unused/icon_256.png similarity index 100% rename from resources/icon/icon_256.png rename to resources/icon/new-unused/icon_256.png diff --git a/resources/icon_48.ico b/resources/icon/new-unused/icon_48.ico similarity index 100% rename from resources/icon_48.ico rename to resources/icon/new-unused/icon_48.ico diff --git a/resources/icon_64.ico b/resources/icon/new-unused/icon_64.ico similarity index 100% rename from resources/icon_64.ico rename to resources/icon/new-unused/icon_64.ico diff --git a/resources/icon_96.ico b/resources/icon/new-unused/icon_96.ico similarity index 100% rename from resources/icon_96.ico rename to resources/icon/new-unused/icon_96.ico diff --git a/resources/icon/icon_circle.png b/resources/icon/new-unused/icon_circle.png similarity index 100% rename from resources/icon/icon_circle.png rename to resources/icon/new-unused/icon_circle.png diff --git a/resources/icon/icon_circle.svg b/resources/icon/new-unused/icon_circle.svg similarity index 100% rename from resources/icon/icon_circle.svg rename to resources/icon/new-unused/icon_circle.svg diff --git a/resources/icon/old/powder-16.png b/resources/icon/old/powder-16.png deleted file mode 100644 index 593424095..000000000 Binary files a/resources/icon/old/powder-16.png and /dev/null differ diff --git a/resources/icon/old/powder-24.png b/resources/icon/old/powder-24.png deleted file mode 100644 index 6c2ef692b..000000000 Binary files a/resources/icon/old/powder-24.png and /dev/null differ diff --git a/resources/icon/old/powder-256.png b/resources/icon/old/powder-256.png deleted file mode 100644 index 73b04de53..000000000 Binary files a/resources/icon/old/powder-256.png and /dev/null differ diff --git a/resources/icon/old/powder-32.png b/resources/icon/old/powder-32.png deleted file mode 100644 index bdc038ea1..000000000 Binary files a/resources/icon/old/powder-32.png and /dev/null differ diff --git a/resources/icon/old/powder.icns b/resources/icon/old/powder.icns deleted file mode 100755 index 56df7eb19..000000000 Binary files a/resources/icon/old/powder.icns and /dev/null differ diff --git a/resources/icon/old/powder.ico b/resources/icon/old/powder.ico deleted file mode 100644 index cd3f6e097..000000000 Binary files a/resources/icon/old/powder.ico and /dev/null differ diff --git a/resources/icon/powder-128.png b/resources/icon/powder-128.png new file mode 100644 index 000000000..f0d925f65 Binary files /dev/null and b/resources/icon/powder-128.png differ diff --git a/resources/icon/powder-16.png b/resources/icon/powder-16.png new file mode 100644 index 000000000..cc16ccdc7 Binary files /dev/null and b/resources/icon/powder-16.png differ diff --git a/resources/icon/powder-24.png b/resources/icon/powder-24.png new file mode 100644 index 000000000..df91652a0 Binary files /dev/null and b/resources/icon/powder-24.png differ diff --git a/resources/icon/powder-256.png b/resources/icon/powder-256.png new file mode 100644 index 000000000..693f57f83 Binary files /dev/null and b/resources/icon/powder-256.png differ diff --git a/resources/icon/powder-32.png b/resources/icon/powder-32.png new file mode 100644 index 000000000..ac03ec853 Binary files /dev/null and b/resources/icon/powder-32.png differ diff --git a/resources/icon/old/powder-48.png b/resources/icon/powder-48.png similarity index 100% rename from resources/icon/old/powder-48.png rename to resources/icon/powder-48.png diff --git a/resources/powder-res.rc b/resources/powder-res.rc index 2d1a7edaa..63c7527b2 100644 --- a/resources/powder-res.rc +++ b/resources/powder-res.rc @@ -1,8 +1,5 @@ #include "resource.h" -IDI_ICON1 ICON DISCARDABLE "icon_256.ico" -IDI_ICON2 ICON DISCARDABLE "icon_96.ico" -IDI_ICON3 ICON DISCARDABLE "icon_64.ico" -IDI_ICON4 ICON DISCARDABLE "icon_48.ico" +IDI_ICON ICON DISCARDABLE "icon.ico" IDI_DOC_ICON ICON DISCARDABLE "document.ico" IDI_EVENTCOMPAT LUASCRIPT "../src/lua/luascripts/eventcompat.lua" diff --git a/resources/resource.h b/resources/resource.h index fc142932a..fe0056183 100644 --- a/resources/resource.h +++ b/resources/resource.h @@ -1,9 +1,6 @@ #define LUASCRIPT 256 -#define IDI_ICON1 101 -#define IDI_ICON2 102 -#define IDI_ICON3 103 -#define IDI_ICON4 104 +#define IDI_ICON 101 #define IDI_DOC_ICON 110 #define IDI_TPTMP 120 #define IDI_SCRIPTMANAGER 121