diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml
index a25021dda..23c0cfedb 100755
--- a/.github/workflows/CompileAndRelease.yml
+++ b/.github/workflows/CompileAndRelease.yml
@@ -7,8 +7,8 @@ on:
jobs:
update_ml_version:
- name: Update ML_VERSION
- runs-on: ubuntu-latest
+ name: Update ML_VERSION and Info.plist
+ runs-on: macos
steps:
- uses: actions/checkout@v2
- name: Checkout submodules
@@ -24,10 +24,14 @@ jobs:
- name: Update MeshLab version
run : |
echo ${{steps.envs.outputs.date}} | tr -d '\n'> ML_VERSION
- - name: commit ML_VERSION change
+ - name: Update Info.plist
+ run: |
+ /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist
+ /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist
+ - name: commit ML_VERSION and Info.plist change
uses: stefanzweifel/git-auto-commit-action@v4.1.1
with:
- commit_message: Apply automatic ML_VERSION change
+ commit_message: Apply automatic ML_VERSION and Info.plist change
ubuntu_build:
needs: [update_ml_version]
diff --git a/src/meshlab/Info.plist b/src/meshlab/Info.plist
index f92b0f272..a8940ad0e 100644
--- a/src/meshlab/Info.plist
+++ b/src/meshlab/Info.plist
@@ -5,76 +5,82 @@
CFBundleDocumentTypes
+ CFBundleTypeExtensions
+
+ obj
+
+ CFBundleTypeIconFile
+ meshlab.icns
+ CFBundleTypeName
+ OBJ 3D File
CFBundleTypeOSTypes
OBJ
CFBundleTypeRole
Editor
- CFBundleTypeIconFile
- meshlab.icns
- CFBundleTypeName
- OBJ 3D File
- CFBundleTypeExtensions
-
- obj
-
LSHandlerRank
Default
+ CFBundleTypeExtensions
+
+ stl
+
+ CFBundleTypeIconFile
+ meshlab.icns
+ CFBundleTypeName
+ STL 3D File
CFBundleTypeOSTypes
STL
CFBundleTypeRole
Editor
- CFBundleTypeIconFile
- meshlab.icns
- CFBundleTypeName
- STL 3D File
- CFBundleTypeExtensions
-
- stl
-
LSHandlerRank
Default
+ CFBundleTypeExtensions
+
+ ply
+
+ CFBundleTypeIconFile
+ meshlab.icns
+ CFBundleTypeName
+ PLY 3D File
CFBundleTypeOSTypes
PLY
CFBundleTypeRole
Editor
- CFBundleTypeIconFile
- meshlab.icns
- CFBundleTypeName
- PLY 3D File
- CFBundleTypeExtensions
-
- ply
-
LSHandlerRank
Default
CFBundleExecutable
meshlab
- CFBundleGetInfoString
- MeshLab VCG-ISTI-CNR
CFBundleIconFile
meshlab.icns
CFBundleIdentifier
com.vcg.meshlab
CFBundlePackageType
APPL
+ CFBundleShortVersionString
+ 2020.04
CFBundleSignature
????
+ CFBundleVersion
+ 2020.04
LSMinimumSystemVersion
10.12
NOTE
This file was generated for MeshLab.
+ NSHumanReadableCopyright
+ Created by Paolo Cignoni - VCG-ISTI-CNR
+ Copyright © 2005-2020. All rights reserved.
+
NSPrincipalClass
NSApplication
NSSupportsAutomaticGraphicsSwitching
diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp
index d95585586..c47bf816b 100644
--- a/src/meshlab/mainwindow_RunTime.cpp
+++ b/src/meshlab/mainwindow_RunTime.cpp
@@ -1619,7 +1619,9 @@ void MainWindow::executeFilter(QAction *action, RichParameterSet ¶ms, bool i
{
meshDoc()->setBusy(false);
qApp->restoreOverrideCursor();
- QMessageBox::warning(this, tr("Filter Failure"), QString("Operating system was not able to allocate the requested memory.
Failure of filter : '%1'
We warmly suggest you to try a 64-bit version of MeshLab.
").arg(action->text())+bdall.what()); // text
+ QMessageBox::warning(this, tr("Filter Failure"),
+ QString("Operating system was not able to allocate the requested memory.
"
+ "Failure of filter : '%1'
").arg(action->text())+bdall.what()); // text
MainWindow::globalStatusBar()->showMessage("Filter failed...",2000);
}
qb->reset();