diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c3830b94..4a04ca9f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ if (CMAKE_HOST_APPLE)
target_sources(chessx PRIVATE
mac_osx/Info.plist
mac_osx/qt_menu.nib
- data/images/chessx.icns
+ data/icons/chessx.ico
)
set_property(
@@ -132,7 +132,7 @@ if (CMAKE_HOST_APPLE)
APPEND PROPERTY
RESOURCE
mac_osx/qt_menu.nib
- data/images/chessx.icns
+ data/icons/chessx.ico
)
# TODO: embed engines & timeseal
diff --git a/INSTALL.md b/INSTALL.md
index 6217dae8c..729919767 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-ChessX
+ChessX
=================================================================
# 1. Description
diff --git a/Packages/ChessX.pkgproj b/Packages/ChessX.pkgproj
index 3b37f0bca..f228eea67 100644
--- a/Packages/ChessX.pkgproj
+++ b/Packages/ChessX.pkgproj
@@ -625,7 +625,7 @@
BACKGROUND_PATH
PATH
- /Users/ni/Documents/Projects/chessx/data/images/chessx.png
+ data/icons/128x128/apps/chessx.png
PATH_TYPE
0
@@ -643,7 +643,7 @@
BACKGROUND_PATH
PATH
- /Users/jens/Documents/Programmieren/Projects/chessx/data/images/chessx-64.png
+ data/icons/64x64/apps/chessx.png
PATH_TYPE
0
@@ -658,7 +658,7 @@
BACKGROUND_PATH
PATH
- /Users/jens/Documents/Programmieren/Projects/chessx/data/images/chessx-64.png
+ data/icons/64x64/apps/chessx.png
PATH_TYPE
0
diff --git a/chessx.pro b/chessx.pro
index 9613c52b8..4b3fd8946 100644
--- a/chessx.pro
+++ b/chessx.pro
@@ -62,17 +62,27 @@ unix|!macx {
BINDIR = $$PREFIX/bin
DATADIR = $$PREFIX/share
- INSTALLS += appdata desktop icons binfiles
+ INSTALLS += appdata desktop icons256 icons128 icons64 icons48 icons32 icons24 icons16 binfiles
appdata.files = unix/io.sourceforge.ChessX.metainfo.xml
appdata.path = $$DATADIR/metainfo
desktop.files = unix/chessx.desktop
desktop.path = $$DATADIR/applications
- icons.path = $$DATADIR/icons/hicolor
- icons.commands = install -Dm644 data/images/chessx.png $${icons.path}/128x128/apps/chessx.png; \
- install -Dm644 data/images/chessx-32.png $${icons.path}/32x32/apps/chessx.png; \
- install -Dm644 data/images/chessx-64.png $${icons.path}/64x64/apps/chessx.png;
+ icons256.path = $$DATADIR/icons/hicolor/256x256/apps
+ icons256.files = data/icons/256x256/apps/chessx.png
+ icons128.path = $$DATADIR/icons/hicolor/128x128/apps
+ icons128.files = data/icons/128x128/apps/chessx.png
+ icons64.path = $$DATADIR/icons/hicolor/64x64/apps
+ icons64.files = data/icons/64x64/apps/chessx.png
+ icons48.path = $$DATADIR/icons/hicolor/48x48/apps
+ icons48.files = data/icons/48x48/apps/chessx.png
+ icons32.path = $$DATADIR/icons/hicolor/32x32/apps
+ icons32.files = data/icons/32x32/apps/chessx.png
+ icons24.path = $$DATADIR/icons/hicolor/24x24/apps
+ icons24.files = data/icons/24x24/apps/chessx.png
+ icons16.path = $$DATADIR/icons/hicolor/16x16/apps
+ icons16.files = data/icons/16x16/apps/chessx.png
binfiles.files = release/chessx
binfiles.path = $$BINDIR
@@ -548,7 +558,7 @@ CONFIG(release, debug|release) {
TARGET = chessx
-ICON = data/images/chessx.icns
+ICON = data/icons/chessx.ico
RC_FILE = src/chessx.rc
macx {
@@ -628,7 +638,7 @@ macx {
win32 {
OTHER_FILES += \
src/chessx.rc \
- src/chessx.ico
+ data/icons/chessx.ico
}
DISTFILES += \
diff --git a/data/icons/128x128/apps/chessx.png b/data/icons/128x128/apps/chessx.png
new file mode 100644
index 000000000..4962e93ed
Binary files /dev/null and b/data/icons/128x128/apps/chessx.png differ
diff --git a/data/icons/16x16/apps/chessx.png b/data/icons/16x16/apps/chessx.png
new file mode 100644
index 000000000..c5c1e5915
Binary files /dev/null and b/data/icons/16x16/apps/chessx.png differ
diff --git a/data/icons/24x24/apps/chessx.png b/data/icons/24x24/apps/chessx.png
new file mode 100644
index 000000000..cbf96c7c1
Binary files /dev/null and b/data/icons/24x24/apps/chessx.png differ
diff --git a/data/icons/256x256/apps/chessx.png b/data/icons/256x256/apps/chessx.png
new file mode 100644
index 000000000..4345010b7
Binary files /dev/null and b/data/icons/256x256/apps/chessx.png differ
diff --git a/data/icons/32x32/apps/chessx.png b/data/icons/32x32/apps/chessx.png
new file mode 100644
index 000000000..d16a6e083
Binary files /dev/null and b/data/icons/32x32/apps/chessx.png differ
diff --git a/data/icons/48x48/apps/chessx.png b/data/icons/48x48/apps/chessx.png
new file mode 100644
index 000000000..2d95524ec
Binary files /dev/null and b/data/icons/48x48/apps/chessx.png differ
diff --git a/data/icons/64x64/apps/chessx.png b/data/icons/64x64/apps/chessx.png
new file mode 100644
index 000000000..9daa19648
Binary files /dev/null and b/data/icons/64x64/apps/chessx.png differ
diff --git a/data/icons/chessx.ico b/data/icons/chessx.ico
new file mode 100644
index 000000000..2b032649c
Binary files /dev/null and b/data/icons/chessx.ico differ
diff --git a/data/icons/scalable/apps/chessx.svg b/data/icons/scalable/apps/chessx.svg
new file mode 100644
index 000000000..8f11de0b7
--- /dev/null
+++ b/data/icons/scalable/apps/chessx.svg
@@ -0,0 +1,1136 @@
+
+
diff --git a/data/images/chessx-32.png b/data/images/chessx-32.png
deleted file mode 100644
index 713c3ea97..000000000
Binary files a/data/images/chessx-32.png and /dev/null differ
diff --git a/data/images/chessx-64.png b/data/images/chessx-64.png
deleted file mode 100644
index 635b5cc4a..000000000
Binary files a/data/images/chessx-64.png and /dev/null differ
diff --git a/data/images/chessx.icns b/data/images/chessx.icns
deleted file mode 100644
index e91c16e33..000000000
Binary files a/data/images/chessx.icns and /dev/null differ
diff --git a/data/images/chessx.png b/data/images/chessx.png
deleted file mode 100644
index d9b92111a..000000000
Binary files a/data/images/chessx.png and /dev/null differ
diff --git a/data/images/chessx.xcf b/data/images/chessx.xcf
deleted file mode 100644
index be63c17da..000000000
Binary files a/data/images/chessx.xcf and /dev/null differ
diff --git a/mac_osx/Info.plist b/mac_osx/Info.plist
index e675c3aff..30a1f23cd 100644
--- a/mac_osx/Info.plist
+++ b/mac_osx/Info.plist
@@ -8,7 +8,7 @@
CFBundleTypeRole
Editor
CFBundleTypeIconFile
- chessx.icns
+ chessx.ico
CFBundleTypeExtensions
pgn
@@ -20,7 +20,7 @@
CFBundleIconFile
- chessx.icns
+ chessx.ico
CFBundlePackageType
APPL
CFBundleGetInfoString
diff --git a/resources.qrc b/resources.qrc
index 9f9d550bd..72d3c2c4d 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -22,7 +22,7 @@
data/images/black_chess.png
data/images/bug_add.png
data/images/camera.png
- data/images/chessx.png
+ data/icons/128x128/apps/chessx.png
data/images/chip.png
data/images/circle_black.svg
data/images/circle_blue.svg
diff --git a/setup7-32.iss b/setup7-32.iss
index eeb9220fe..d8ec82318 100644
--- a/setup7-32.iss
+++ b/setup7-32.iss
@@ -26,7 +26,7 @@ AllowNoIcons=yes
LicenseFile=.\COPYING
InfoAfterFile=.\ChangeLog.txt
OutputBaseFilename=setup-chessx7-32
-SetupIconFile=.\src\chessx.ico
+SetupIconFile=.\data\icons\chessx.ico
Compression=lzma
SolidCompression=yes
ChangesAssociations = yes
diff --git a/setup7-64.iss b/setup7-64.iss
index 69a767d58..19f1b2b0e 100644
--- a/setup7-64.iss
+++ b/setup7-64.iss
@@ -26,7 +26,7 @@ AllowNoIcons=yes
LicenseFile=.\COPYING
InfoAfterFile=.\ChangeLog.txt
OutputBaseFilename=setup-chessx7-64
-SetupIconFile=.\src\chessx.ico
+SetupIconFile=.\data\icons\chessx.ico
Compression=lzma
SolidCompression=yes
ChangesAssociations = yes
diff --git a/setup7-64m.iss b/setup7-64m.iss
index d1e5ca2e7..a56c8e200 100644
--- a/setup7-64m.iss
+++ b/setup7-64m.iss
@@ -26,7 +26,7 @@ AllowNoIcons=yes
LicenseFile=.\COPYING
InfoAfterFile=.\ChangeLog.txt
OutputBaseFilename=setup-chessx7-64
-SetupIconFile=.\src\chessx.ico
+SetupIconFile=.\data\icons\chessx.ico
Compression=lzma
SolidCompression=yes
ChangesAssociations = yes
diff --git a/src/chessx.ico b/src/chessx.ico
deleted file mode 100644
index e8708cb72..000000000
Binary files a/src/chessx.ico and /dev/null differ