Merge pull request #635 from alemuntoni/master

Correct MeshLab version on MacOS app bundle, minor fixes

.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]

src/meshlab/Info.plist

@@ -5,76 +5,82 @@
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>obj</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>meshlab.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>OBJ 3D File</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>OBJ</string>
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>CFBundleTypeIconFile</key>
-			<string>meshlab.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>OBJ 3D File</string>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>obj</string>
-			</array>
 			<key>LSHandlerRank</key>
 			<string>Default</string>
 		</dict>
 		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>stl</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>meshlab.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>STL 3D File</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>STL</string>
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>CFBundleTypeIconFile</key>
-			<string>meshlab.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>STL 3D File</string>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>stl</string>
-			</array>
 			<key>LSHandlerRank</key>
 			<string>Default</string>
 		</dict>
 		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ply</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>meshlab.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>PLY 3D File</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>PLY</string>
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>CFBundleTypeIconFile</key>
-			<string>meshlab.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>PLY 3D File</string>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>ply</string>
-			</array>
 			<key>LSHandlerRank</key>
 			<string>Default</string>
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>meshlab</string>
-	<key>CFBundleGetInfoString</key>
-	<string>MeshLab VCG-ISTI-CNR</string>
 	<key>CFBundleIconFile</key>
 	<string>meshlab.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.vcg.meshlab</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2020.04</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2020.04</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.12</string>
 	<key>NOTE</key>
 	<string>This file was generated for MeshLab.</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Created by Paolo Cignoni - VCG-ISTI-CNR
+	Copyright © 2005-2020. All rights reserved.
+	</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>

src/meshlab/mainwindow_RunTime.cpp

@@ -1619,7 +1619,9 @@ void MainWindow::executeFilter(QAction *action, RichParameterSet &params, bool i
     {
         meshDoc()->setBusy(false);
         qApp->restoreOverrideCursor();
-        QMessageBox::warning(this, tr("Filter Failure"), QString("Operating system was not able to allocate the requested memory.<br><b>Failure of filter <font color=red>: '%1'</font><br>We warmly suggest you to try a 64-bit version of MeshLab.<br>").arg(action->text())+bdall.what()); // text
+        QMessageBox::warning(this, tr("Filter Failure"),
+                             QString("Operating system was not able to allocate the requested memory.<br><b>"
+                                     "Failure of filter <font color=red>: '%1'</font><br>").arg(action->text())+bdall.what()); // text
         MainWindow::globalStatusBar()->showMessage("Filter failed...",2000);
     }
     qb->reset();