Merge branch 'marlam:main' into main

ThreeDeeJay · Oct 19, 2024 · 73cf874 · 73cf874
2 parents d381614 + 3efd910
commit 73cf874
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/i18n/bino_de.ts b/i18n/bino_de.ts
@@ -266,7 +266,7 @@
     <message>
         <location filename="../src/gui.cpp" line="77"/>
         <source>&amp;Open File(s)...</source>
-        <translation>Datei(en) &amp;amp;öffnen...</translation>
+        <translation>Datei(en) &amp;öffnen...</translation>
     </message>
     <message>
         <location filename="../src/gui.cpp" line="84"/>

diff --git a/res/org.bino3d.bino.metainfo.xml b/res/org.bino3d.bino.metainfo.xml
@@ -34,6 +34,11 @@
   <url type="homepage">https://bino3d.org</url>
 
   <releases>
+    <release version="2.3" date="2024-10-06">
+      <description>
+        <p>Added support for slideshow mode and improved compatibility with ARM platforms. Fixed various bugs.</p>
+      </description>
+    </release>
     <release version="2.2" date="2024-06-02">
       <description>
         <p>Added support for capturing screens and windows and for HDMI frame packing output. Fixed various bugs.</p>

diff --git a/src/digestiblemedia.cpp b/src/digestiblemedia.cpp
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QStandardPaths>
 #include <QDir>
 #include <QTemporaryFile>
 #include <QSharedPointer>
@@ -108,7 +109,13 @@ QUrl digestibleMediaUrl(const QUrl& url)
             }
         }
 
-        QString tmpl = QDir::tempPath() + '/' + QString("bino-XXXXXX") + QString(".ppm");
+        QString cacheDirName = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+        QDir cacheDir(cacheDirName);
+        if (!cacheDir.mkpath(cacheDirName)) {
+            LOG_DEBUG("%s", qPrintable(QString("digestibleMediaUrl: %1: cannot create cache directory %2").arg(url.toString()).arg(cacheDirName)));
+            return url;
+        }
+        QString tmpl = cacheDirName + '/' + QString("bino-XXXXXX") + QString(".ppm");
         tempFile.reset(new QTemporaryFile(tmpl));
         if (!img.save(tempFile.get(), "PPM")) {
             LOG_DEBUG("%s", qPrintable(QString("digestibleMediaUrl: %1: cannot save to %2").arg(url.toString()).arg(tempFile->fileName())));

diff --git a/src/version.hpp b/src/version.hpp
@@ -1 +1 @@
-#define BINO_VERSION "2.2"
+#define BINO_VERSION "2.3"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BINO_VERSION "2.2"
		#define BINO_VERSION "2.3"