Merge branch 'dev' of github.com:ovilab/atomify-lammps into dev

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

atomify-lammps/images.qrc

@@ -75,7 +75,6 @@
         <file>images/ic_file_download_white_36dp.png</file>
         <file>images/ic_file_download_white_48dp.png</file>
         <file>images/atomify_logo.png</file>
-        <file>images/atomify_logo.icns</file>
         <file>images/atomify_logo_inapp.png</file>
     </qresource>
 </RCC>

atomify-lammps/info.plist

@@ -9,21 +9,23 @@
         <key>CFBundleIconFile</key>
         <string>@ICON@</string>
         <key>CFBundleIdentifier</key>
-        <string>atomify.ovilab.net</string>
+        <string>net.ovilab.atomify</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleName</key>
         <string>Atomify</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
+        <string>2.0</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
         <string>1</string>
+        <key>LSApplicationCategoryType</key>
+        <string>public.app-category.education</string>
         <key>LSMinimumSystemVersion</key>
-        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+        <string>10.12.0</string>
         <key>NSHumanReadableCopyright</key>
         <string>Copyright © 2017 Ovilab. All rights reserved.</string>
         <key>NSMainNibFile</key>

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: "
 <style>
 h2 { text-align: center; }
 a { font-weight: bold; color: #56b1b4; text-decoration: none; }
 p { color: white; }
 </style>
+<p>Atomify is developed by Anders Hafreager and Svenn-Arne Dragly.</p>
 <p>Please report bugs <a href=\"reportBug\">here</a>.</p>
 "
             onLinkActivated: {

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