diff --git a/cmake/packaging/LAMMPS_DMG_Background.png b/cmake/packaging/LAMMPS_DMG_Background.png index 5ceb55c5e7..978b7d1987 100644 Binary files a/cmake/packaging/LAMMPS_DMG_Background.png and b/cmake/packaging/LAMMPS_DMG_Background.png differ diff --git a/cmake/packaging/MacOSXBundleInfo.plist.in b/cmake/packaging/MacOSXBundleInfo.plist.in index 33ce5a602b..bc08591e97 100644 --- a/cmake/packaging/MacOSXBundleInfo.plist.in +++ b/cmake/packaging/MacOSXBundleInfo.plist.in @@ -17,7 +17,7 @@ CFBundleLongVersionString ${MACOSX_BUNDLE_LONG_VERSION_STRING} CFBundleName - LAMMPS + LAMMPS_GUI CFBundlePackageType APPL CFBundleShortVersionString diff --git a/cmake/packaging/README.macos b/cmake/packaging/README.macos index 0325045983..d7583e7034 100644 --- a/cmake/packaging/README.macos +++ b/cmake/packaging/README.macos @@ -9,7 +9,7 @@ of the available packages. The following individual commands are included: binary2txt lammps-gui lmp msi2lmp phana stl_bin2txt -After copying the lammps-gui folder into your Applications folder, please follow +After copying the LAMMPS_GUI folder into your Applications folder, please follow these steps: 1. Open the Terminal app @@ -23,7 +23,7 @@ these steps: 3. Add the following lines to the end of the file, save it, and close the editor - LAMMPS_INSTALL_DIR=/Applications/LAMMPS.app/Contents + LAMMPS_INSTALL_DIR=/Applications/LAMMPS_GUI.app/Contents LAMMPS_POTENTIALS=${LAMMPS_INSTALL_DIR}/share/lammps/potentials LAMMPS_BENCH_DIR=${LAMMPS_INSTALL_DIR}/share/lammps/bench MSI2LMP_LIBRARY=${LAMMPS_INSTALL_DIR}/share/lammps/frc_files @@ -38,9 +38,9 @@ these steps: the changes from .zprofile automatically. Note: the above assumes you use the default shell (zsh) that comes with - MacOS. If you customized MacOS to use a different shell, you'll need to modify - that shell's init file (.cshrc, .bashrc, etc.) instead with appropiate commands - to modify the same environment variables. + MacOS. If you customized MacOS to use a different shell, you'll need to + modify that shell's init file (.cshrc, .bashrc, etc.) instead with + appropiate commands to modify the same environment variables. 5. Try running LAMMPS (which might fail, see step 7) @@ -50,10 +50,10 @@ these steps: lammps-gui ${LAMMPS_BENCH_DIR}/in.rhodo - Depending on the size and resolution of your screen, the fonts may - be too small to read. This can be adjusted by setting the environment - variable QT_FONT_DPI. The default value would be 72, so to increase - the fonts by a third one can add to the .zprofile file the line + Depending on the size and resolution of your screen, the fonts may be too + small to read. This can be adjusted by setting the environment variable + QT_FONT_DPI. The default value would be 72, so to increase the fonts by a + third, one can add to the .zprofile file the line export QT_FONT_DPI=96 @@ -61,9 +61,9 @@ these steps: 7. Give permission to execute the commands (lmp, lammps-gui, msi2lmp, binary2txt, phana, stl_bin2txt) - MacOS will likely block the initial run of the executables, since they - were downloaded from the internet and are missing a known signature from an - identified developer. Go to "Settings" and search for "Security settings". It - should display a message that an executable like "lmp" was blocked. Press + MacOS will likely block the initial run of the executables, since they were + downloaded from the internet and are missing a known signature from an + identified developer. Go to "Settings" and search for "Security settings". + It should display a message that an executable like "lmp" was blocked. Press "Open anyway", which might prompt you for your admin credentials. Afterwards "lmp" and the other executables should work as expected. diff --git a/cmake/packaging/build_macos_dmg.sh b/cmake/packaging/build_macos_dmg.sh index 5204e519c2..7078de0504 100755 --- a/cmake/packaging/build_macos_dmg.sh +++ b/cmake/packaging/build_macos_dmg.sh @@ -75,7 +75,7 @@ echo ' set statusbar visible to false set toolbar visible to false set the bounds to { 100, 40, 868, 640 } - set position of item "'LAMMPS'.app" to { 190, 216 } + set position of item "'LAMMPS_GUI'.app" to { 190, 216 } set position of item "Applications" to { 576, 216 } set position of item "README.txt" to { 190, 400 } end tell diff --git a/tools/lammps-gui/slideshow.cpp b/tools/lammps-gui/slideshow.cpp index 71ae76d70f..85d2db7b40 100644 --- a/tools/lammps-gui/slideshow.cpp +++ b/tools/lammps-gui/slideshow.cpp @@ -149,8 +149,6 @@ void SlideShow::loadImage(int idx) do { QImageReader reader(imagefiles[idx]); reader.setAutoTransform(true); - if (!reader.canRead()) - fprintf(stderr, "cannot read file %s\n", imagefiles[idx].toStdString().c_str()); const QImage newImage = reader.read(); // There was an error reading the image file. Try reading the previous image instead.