Merge release branch into master

src/core/control/Control.cpp

@@ -1985,7 +1985,7 @@ auto Control::openFile(fs::path filepath, int scrollToPage, bool forceOpen) -> b
         return loadXoptTemplate(filepath);
     }
 
-    if (filepath.extension() == ".pdf") {
+    if (Util::hasPdfFileExt(filepath)) {
         return loadPdf(filepath, scrollToPage);
     }
 

src/core/control/RecentManager.cpp

@@ -49,7 +49,7 @@ void RecentManager::addRecentFileFilename(const fs::path& filepath) {
     std::array<gchar*, 2> groups = {group_name.data(), nullptr};
     std::string app_name = g_get_application_name();
     std::string app_exec = std::string(g_get_prgname()) + " %u";
-    std::string mime_type = (filepath.extension() == ".pdf") ? std::string(MIME_PDF) : std::string(MIME);
+    std::string mime_type = Util::hasPdfFileExt(filepath) ? std::string(MIME_PDF) : std::string(MIME);
 
     GtkRecentData recentData{};
     recentData.display_name = nullptr;
@@ -137,7 +137,7 @@ auto RecentManager::filterRecent(GList* items, bool xoj) -> GList* {
         if (xoj && Util::hasXournalFileExt(*p)) {
             filteredItems = g_list_prepend(filteredItems, info);
         }
-        if (!xoj && p->extension() == ".pdf") {
+        if (!xoj && Util::hasPdfFileExt(*p)) {
             filteredItems = g_list_prepend(filteredItems, info);
         }
     }

src/core/control/tools/InputHandler.cpp

@@ -43,9 +43,11 @@ void InputHandler::createStroke(Point p) {
         }
     } else if (h->getToolType() == TOOL_HIGHLIGHTER) {
         stroke->setToolType(STROKE_TOOL_HIGHLIGHTER);
+        p.z = Point::NO_PRESSURE;
     } else if (h->getToolType() == TOOL_ERASER) {
         stroke->setToolType(STROKE_TOOL_ERASER);
         stroke->setColor(Color(0xffffffU));
+        p.z = Point::NO_PRESSURE;
     }
 
     stroke->addPoint(p);

src/core/model/Document.cpp

@@ -132,8 +132,11 @@ auto Document::createSaveFilename(DocumentType type, const std::string& defaultS
     }
     if (!pdfFilepath.empty()) {
         fs::path p = pdfFilepath.filename();
-        std::string ext = this->attachPdf ? ".pdf" : "";
-        Util::clearExtensions(p, ext);
+        if (this->attachPdf) {
+            Util::clearExtensions(p, ".pdf");
+        } else {
+            Util::clearExtensions(p);
+        }
         return p;
     }
 

src/util/PathUtil.cpp

@@ -71,10 +71,14 @@ auto Util::getEscapedPath(const fs::path& path) -> std::string {
 }
 
 auto Util::hasXournalFileExt(const fs::path& path) -> bool {
-    auto extension = path.extension();
+    auto extension = StringUtils::toLowerCase(path.extension().string());
     return extension == ".xoj" || extension == ".xopp";
 }
 
+auto Util::hasPdfFileExt(const fs::path& path) -> bool {
+    return StringUtils::toLowerCase(path.extension().string()) == ".pdf";
+}
+
 auto Util::clearExtensions(fs::path& path, const std::string& ext) -> void {
     auto rm_ext = [&path](const std::string ext) {
         if (StringUtils::toLowerCase(path.extension().string()) == StringUtils::toLowerCase(ext)) {

src/util/include/util/PathUtil.h

@@ -40,10 +40,15 @@ namespace Util {
 [[maybe_unused]] [[nodiscard]] bool hasXournalFileExt(const fs::path& path);
 
 /**
- * Clear the the last known xournal extension (last .xoj, .xopp etc.)
+ * @return true if this file has a pdf extension
+ */
+bool hasPdfFileExt(const fs::path& path);
+
+/**
+ * Clear the xournal extensions ignoring case (.xoj, .xopp)
  *
  * @param ext An extension to clear additionally, eg .pdf (would also clear
- *  .pdf.xopp etc.)
+ *  .PDF.xopp etc.)
  */
 void clearExtensions(fs::path& path, const std::string& ext = "");