summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2019-01-14 03:56:20 -0600
committerJohn Fultz <jfultz@wolfram.com>2019-01-14 03:56:20 -0600
commit0ec9a95998fddbccac464a96b457d28f30587dca (patch)
treee731a678d7064df8c07cc1dc4330697bbd8b9639
parent2c6b3b89da2a728ba6683d9f4455139372beb21b (diff)
Fix icon for Xcode >=9 macOS build.
Xcode now wants an asset catalog thing with proper .png files rather than a .icns thing. Bits shuffled accordingly. Also, higher res icon. Slightly different design. Only on Mac for now. Also, move minimum macOS to 10.9. Also fix 1.0.4 update versioning oversight.
-rw-r--r--Quackle.pngbin0 -> 1598674 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Contents.json68
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-1024.pngbin0 -> 1677232 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-128.pngbin0 -> 28802 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-16.pngbin0 -> 1895 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-256.pngbin0 -> 107228 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-32.pngbin0 -> 3524 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-512.pngbin0 -> 419949 bytes
-rw-r--r--quacker/Images.xcassets/AppIcon.appiconset/Quackle-64.pngbin0 -> 9129 bytes
-rw-r--r--quacker/Info.plist4
-rw-r--r--quacker/quacker.pro5
-rw-r--r--quackle.pro2
-rw-r--r--quackleio/quackleio.pro2
13 files changed, 74 insertions, 7 deletions
diff --git a/Quackle.png b/Quackle.png
new file mode 100644
index 0000000..0cde092
--- /dev/null
+++ b/Quackle.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Contents.json b/quacker/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..67dc6c3
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,68 @@
+{
+ "images" : [
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "Quackle-16.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "Quackle-32.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "32x32",
+ "idiom" : "mac",
+ "filename" : "Quackle-32.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "32x32",
+ "idiom" : "mac",
+ "filename" : "Quackle-64.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "128x128",
+ "idiom" : "mac",
+ "filename" : "Quackle-128.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "128x128",
+ "idiom" : "mac",
+ "filename" : "Quackle-256.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "256x256",
+ "idiom" : "mac",
+ "filename" : "Quackle-256.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "256x256",
+ "idiom" : "mac",
+ "filename" : "Quackle-512.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "512x512",
+ "idiom" : "mac",
+ "filename" : "Quackle-512.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "512x512",
+ "idiom" : "mac",
+ "filename" : "Quackle-1024.png",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+} \ No newline at end of file
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-1024.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-1024.png
new file mode 100644
index 0000000..28ba0b2
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-1024.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-128.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-128.png
new file mode 100644
index 0000000..bc4178a
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-128.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-16.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-16.png
new file mode 100644
index 0000000..236ff5d
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-16.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-256.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-256.png
new file mode 100644
index 0000000..80205bc
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-256.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-32.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-32.png
new file mode 100644
index 0000000..7dcecfd
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-32.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-512.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-512.png
new file mode 100644
index 0000000..8e3aebd
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-512.png
Binary files differ
diff --git a/quacker/Images.xcassets/AppIcon.appiconset/Quackle-64.png b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-64.png
new file mode 100644
index 0000000..0703f86
--- /dev/null
+++ b/quacker/Images.xcassets/AppIcon.appiconset/Quackle-64.png
Binary files differ
diff --git a/quacker/Info.plist b/quacker/Info.plist
index 29cb164..36110da 100644
--- a/quacker/Info.plist
+++ b/quacker/Info.plist
@@ -19,14 +19,12 @@
<string>Quackle</string>
<key>CFBundleGetInfoString</key>
<string>Created by Qt/QMake</string>
- <key>CFBundleIconFile</key>
- <string>quacker.icns</string>
<key>CFBundleIdentifier</key>
<string>com.Quackle.Quackle</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.3</string>
+ <string>1.0.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
diff --git a/quacker/quacker.pro b/quacker/quacker.pro
index ae12c34..24a7d25 100644
--- a/quacker/quacker.pro
+++ b/quacker/quacker.pro
@@ -48,10 +48,11 @@ win32 {
macx {
DEFINES += FORCE_SECONDARY_ARROW_GLYPHS=1
- ICON = quacker.icns
BUNDLEID = com.Quackle.Quackle
QMAKE_INFO_PLIST = Quackle.plist
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+ QMAKE_ASSET_CATALOGS = $$PWD/Images.xcassets
+ QMAKE_ASSET_CATALOGS_APP_ICON = "AppIcon"
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
# copy data/ directory into app bundle
APP_ALPHABETS_FILES.files = ../data/alphabets
diff --git a/quackle.pro b/quackle.pro
index 5631b6b..2b708f6 100644
--- a/quackle.pro
+++ b/quackle.pro
@@ -34,7 +34,7 @@ SOURCES -= \
macx {
CONFIG += x86
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
}
linux { # old unixes/Qt distribs running around...most notably on Travis-CI
diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro
index 215e66b..f111717 100644
--- a/quackleio/quackleio.pro
+++ b/quackleio/quackleio.pro
@@ -31,7 +31,7 @@ SOURCES += *.cpp
macx {
CONFIG += x86
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
}
unix:!macx {