New icon set

CMakeLists.txt

@@ -124,15 +124,15 @@ 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(
     TARGET chessx
     APPEND PROPERTY
     RESOURCE
       mac_osx/qt_menu.nib
-      data/images/chessx.icns
+      data/icons/chessx.ico
   )
 
   # TODO: embed engines & timeseal

INSTALL.md

@@ -1,4 +1,4 @@
-![Icon](https://github.com/Isarhamster/chessx/raw/master/data/images/chessx-64.png)ChessX
+![Icon](data/icons/64x64/apps/chessx.png)ChessX
 =================================================================
 
 # 1. Description

Packages/ChessX.pkgproj

@@ -625,7 +625,7 @@
 						<key>BACKGROUND_PATH</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Users/ni/Documents/Projects/chessx/data/images/chessx.png</string>
+							<string>data/icons/128x128/apps/chessx.png</string>
 							<key>PATH_TYPE</key>
 							<integer>0</integer>
 						</dict>
@@ -643,7 +643,7 @@
 						<key>BACKGROUND_PATH</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Users/jens/Documents/Programmieren/Projects/chessx/data/images/chessx-64.png</string>
+							<string>data/icons/64x64/apps/chessx.png</string>
 							<key>PATH_TYPE</key>
 							<integer>0</integer>
 						</dict>
@@ -658,7 +658,7 @@
 				<key>BACKGROUND_PATH</key>
 				<dict>
 					<key>PATH</key>
-					<string>/Users/jens/Documents/Programmieren/Projects/chessx/data/images/chessx-64.png</string>
+					<string>data/icons/64x64/apps/chessx.png</string>
 					<key>PATH_TYPE</key>
 					<integer>0</integer>
 				</dict>

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 += \

mac_osx/Info.plist

@@ -8,7 +8,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleTypeIconFile</key>
-			<string>chessx.icns</string>
+			<string>chessx.ico</string>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>pgn</string>
@@ -20,7 +20,7 @@
 		</dict>
 	</array>
 	<key>CFBundleIconFile</key>
-	<string>chessx.icns</string>
+	<string>chessx.ico</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>

resources.qrc

@@ -22,7 +22,7 @@
         <file alias="images/black_chess.png">data/images/black_chess.png</file>
         <file alias="images/bug.png">data/images/bug_add.png</file>
         <file alias="images/camera.png">data/images/camera.png</file>
-        <file alias="images/chessx.png">data/images/chessx.png</file>
+        <file alias="images/chessx.png">data/icons/128x128/apps/chessx.png</file>
         <file alias="images/chip.png">data/images/chip.png</file>
         <file alias="images/circle_black.svg">data/images/circle_black.svg</file>
         <file alias="images/circle_blue.svg">data/images/circle_blue.svg</file>

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

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

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