diff --git a/atomify-lammps/atomify-lammps.pro b/atomify-lammps/atomify-lammps.pro
index 117aa63c..fd6d81f0 100644
--- a/atomify-lammps/atomify-lammps.pro
+++ b/atomify-lammps/atomify-lammps.pro
@@ -1,5 +1,6 @@
TEMPLATE = app
CONFIG += c++11
+CONFIG += appstore
DEFINES += LAMMPS_GZIP
QT += qml quick widgets opengl openglextensions svg charts datavisualization
@@ -9,6 +10,12 @@ QT += qml quick widgets opengl openglextensions svg charts datavisualization
LIBS += -fopenmp
#}
+unix:macx {
+ #APPCERT = "3rd Party Mac Developer Application: Anders Hafreager"
+ #INSTALLERCERT = "3rd Party Mac Developer Installer: Anders Hafreager"
+ #BUNDLEID = net.ovilab.atomify
+}
+
CONFIG += warn_off
DEFINES += LAMMPS_EXCEPTIONS LAMMPS_GZIP LAMMPS_MEMALIGN=64
# lammps.pri includes the path and libs to lammps
@@ -149,7 +156,7 @@ HEADERS += \
# Temporary use of quickcontrols2 without install
RC_ICONS = atomify_lammps/images/atomify_logo.ico
-macx:ICON = images/atomify_logo.icns
+macx:ICON = images/icon.icns
macx:QMAKE_INFO_PLIST = info.plist
DISTFILES += \
diff --git a/atomify-lammps/images.qrc b/atomify-lammps/images.qrc
index e3328db0..a7f68dbd 100644
--- a/atomify-lammps/images.qrc
+++ b/atomify-lammps/images.qrc
@@ -75,7 +75,6 @@
images/ic_file_download_white_36dp.png
images/ic_file_download_white_48dp.png
images/atomify_logo.png
- images/atomify_logo.icns
images/atomify_logo_inapp.png
diff --git a/atomify-lammps/images/atomify_logo.icns b/atomify-lammps/images/atomify_logo.icns
deleted file mode 100644
index b7324598..00000000
Binary files a/atomify-lammps/images/atomify_logo.icns and /dev/null differ
diff --git a/atomify-lammps/images/icon.icns b/atomify-lammps/images/icon.icns
new file mode 100644
index 00000000..b8f16f42
Binary files /dev/null and b/atomify-lammps/images/icon.icns differ
diff --git a/atomify-lammps/images/icon.iconset/icon_128x128.png b/atomify-lammps/images/icon.iconset/icon_128x128.png
new file mode 100644
index 00000000..bdbf23c7
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_128x128.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_128x128@2x.png b/atomify-lammps/images/icon.iconset/icon_128x128@2x.png
new file mode 100644
index 00000000..0e7a2973
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_128x128@2x.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_16x16.png b/atomify-lammps/images/icon.iconset/icon_16x16.png
new file mode 100644
index 00000000..97d4f77d
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_16x16.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_16x16@2x.png b/atomify-lammps/images/icon.iconset/icon_16x16@2x.png
new file mode 100644
index 00000000..c7edec9b
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_16x16@2x.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_256x256.png b/atomify-lammps/images/icon.iconset/icon_256x256.png
new file mode 100644
index 00000000..0e7a2973
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_256x256.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_256x256@2x.png b/atomify-lammps/images/icon.iconset/icon_256x256@2x.png
new file mode 100644
index 00000000..17efa342
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_256x256@2x.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_32x32.png b/atomify-lammps/images/icon.iconset/icon_32x32.png
new file mode 100644
index 00000000..c7edec9b
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_32x32.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_32x32@2x.png b/atomify-lammps/images/icon.iconset/icon_32x32@2x.png
new file mode 100644
index 00000000..6bc005f5
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_32x32@2x.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_512x512.png b/atomify-lammps/images/icon.iconset/icon_512x512.png
new file mode 100644
index 00000000..17efa342
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_512x512.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_512x512@2x.png b/atomify-lammps/images/icon.iconset/icon_512x512@2x.png
new file mode 100644
index 00000000..22ec4193
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_512x512@2x.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_64x64.png b/atomify-lammps/images/icon.iconset/icon_64x64.png
new file mode 100644
index 00000000..6bc005f5
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_64x64.png differ
diff --git a/atomify-lammps/images/icon.iconset/icon_64x64@2x.png b/atomify-lammps/images/icon.iconset/icon_64x64@2x.png
new file mode 100644
index 00000000..bdbf23c7
Binary files /dev/null and b/atomify-lammps/images/icon.iconset/icon_64x64@2x.png differ
diff --git a/atomify-lammps/info.plist b/atomify-lammps/info.plist
index 5f564ce9..6aa75085 100644
--- a/atomify-lammps/info.plist
+++ b/atomify-lammps/info.plist
@@ -9,7 +9,7 @@
CFBundleIconFile
@ICON@
CFBundleIdentifier
- atomify.ovilab.net
+ net.ovilab.atomify
CFBundleInfoDictionaryVersion
6.0
CFBundleName
@@ -17,13 +17,15 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0
+ 2.0
CFBundleSignature
????
CFBundleVersion
1
+ LSApplicationCategoryType
+ public.app-category.education
LSMinimumSystemVersion
- ${MACOSX_DEPLOYMENT_TARGET}
+ 10.12.0
NSHumanReadableCopyright
Copyright © 2017 Ovilab. All rights reserved.
NSMainNibFile
diff --git a/atomify-lammps/qml/desktop/RightBar/RightBar.qml b/atomify-lammps/qml/desktop/RightBar/RightBar.qml
index 03db4cfe..6f9e8d2c 100644
--- a/atomify-lammps/qml/desktop/RightBar/RightBar.qml
+++ b/atomify-lammps/qml/desktop/RightBar/RightBar.qml
@@ -55,7 +55,7 @@ Page {
}
footer: Item {
- height: 50
+ height: 150
width: parent.width
Text {
anchors.left: parent.left
@@ -65,13 +65,14 @@ Page {
anchors.margins: 10
textFormat: TextEdit.RichText
font.family: "DejaVu Sans Mono"
- font.pixelSize: 16
+ font.pixelSize: 12
text: "
+
Atomify is developed by Anders Hafreager and Svenn-Arne Dragly.
Please report bugs here.
"
onLinkActivated: {
diff --git a/deploymac.sh b/deploymac.sh
new file mode 100755
index 00000000..20275242
--- /dev/null
+++ b/deploymac.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# http://thegreyblog.blogspot.no/2014/06/os-x-creating-packages-from-command_2.html
+# http://blog.qt.io/blog/2012/04/03/how-to-publish-qt-applications-in-the-mac-app-store-2/
+# http://wiki.phisys.com/index.php/How-To_Qt5.3_Mac_AppStore#Entitlements
+# Create icons with
+# iconutil -c icns icon.iconset
+# sudo installer -store -pkg Atomify.pkg -target /
+rm -r Atomify.app
+cp -r atomify-lammps.app Atomify.app
+xattr -cr Atomify.app
+~/Qt/5.9/clang_64/bin/macdeployqt Atomify.app -qmldir=/projects/atomify/editor/atomify-lammps/atomify-lammps/qml -codesign="3rd Party Mac Developer Application: Anders Hafreager" -appstore-compliant
+cd "Atomify.app"
+find . -name *.dSYM | xargs -I $ rm -R $
+cd ..
+cp atomify-lammps.app/Contents/MacOS/atomify-lammps Atomify.app/Contents/MacOS/
+codesign -s "3rd Party Mac Developer Application: Anders Hafreager" --entitlements /projects/atomify/editor/atomify-lammps/atomify-lammps/entitlements.plist Atomify.app
+productbuild --component Atomify.app /Applications --sign "3rd Party Mac Developer Installer: Anders Hafreager" Atomify.pkg
+~/Qt/5.9/clang_64/bin/macdeployqt Atomify.app -qmldir=/projects/atomify/editor/atomify-lammps/atomify-lammps/qml -codesign="3rd Party Mac Developer Application: Anders Hafreager" -appstore-compliant
+productbuild --component Atomify.app /Applications --sign "3rd Party Mac Developer Installer: Anders Hafreager" Atomify.pkg
\ No newline at end of file