Merge branch 'master' into feature/proposeLocalDir

.github/workflows/documentation.yml

@@ -16,6 +16,12 @@ jobs:
           cd doc
           make html > build.log 2>&1
           if grep WARNING build.log; then
+              grep WARNING build.log | awk '{
+                      split($0, fields, ":");
+                      sub("/__w/desktop/desktop/", "", fields[1]);
+                      print "::warning file=" fields[1] ( length(fields[2]) ? ",line=" fields[2] : "" ) ",title=Documentation generation::" substr($0, index($0, fields[4]) + 1)
+                  }'
+
               exit 1
           else
               exit 0

admin/osx/mac-crafter/Sources/Utils/Codesign.swift

@@ -126,17 +126,31 @@ func codesignClientAppBundle(
     // We need to strip these out manually.
 
     let sparkleFrameworkPath = "\(frameworksPath)/Sparkle.framework"
-    if FileManager.default.fileExists(atPath: "\(sparkleFrameworkPath)/Resources/Autoupdate.app") {
-        print("Code-signing Sparkle autoupdater app (without entitlements)...")
-
-        try recursivelyCodesign(
-            path: "\(sparkleFrameworkPath)/Resources/Autoupdate.app",
+    if FileManager.default.fileExists(atPath: sparkleFrameworkPath) {
+        print("Code-signing Sparkle...")
+        try codesign(
             identity: codeSignIdentity,
-            options: "--timestamp --force --verbose=4 --options runtime --deep"
+            path: "\(sparkleFrameworkPath)/Versions/B/XPCServices/Installer.xpc",
+            options: "-f -o runtime"
+        )
+        try codesign(
+            identity: codeSignIdentity,
+            path: "\(sparkleFrameworkPath)/Versions/B/XPCServices/Downloader.xpc",
+            options: "-f -o runtime --preserve-metadata=entitlements"
+        )
+        try codesign(
+            identity: codeSignIdentity,
+            path: "\(sparkleFrameworkPath)/Versions/B/Autoupdate",
+            options: "-f -o runtime"
+        )
+        try codesign(
+            identity: codeSignIdentity,
+            path: "\(sparkleFrameworkPath)/Versions/B/Updater.app",
+            options: "-f -o runtime"
+        )
+        try codesign(
+            identity: codeSignIdentity, path: sparkleFrameworkPath, options: "-f -o runtime"
         )
-
-        print("Re-codesigning Sparkle library...")
-        try codesign(identity: codeSignIdentity, path: "\(sparkleFrameworkPath)/Sparkle")
     } else {
         print("Build does not have Sparkle, skipping.")
     }

admin/osx/mac-crafter/Sources/main.swift

@@ -60,7 +60,7 @@ struct Build: ParsableCommand {
 
     @Option(name: [.long], help: "Sparkle download URL.")
     var sparkleDownloadUrl =
-        "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz"
+        "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz"
 
     @Option(name: [.long], help: "Git clone command; include options such as depth.")
     var gitCloneCommand = "git clone --depth=1"

doc/macosvfs.rst

@@ -6,7 +6,7 @@ macOS Virtual Files
 
 .. index:: macosvfs
 
-macOS Vitual Files client
+macOS Virtual Files client
 ============
 
 Virtual file-based synchronisation for Nextcloud desktop users is now

resources.qrc

@@ -5,7 +5,6 @@
         <file>src/gui/EmojiPicker.qml</file>
         <file>src/gui/UserStatusSelectorButton.qml</file>
         <file>src/gui/PredefinedStatusButton.qml</file>
-        <file>src/gui/BasicComboBox.qml</file>
         <file>src/gui/ErrorBox.qml</file>
         <file>src/gui/filedetails/FileActivityView.qml</file>
         <file>src/gui/filedetails/FileDetailsPage.qml</file>

src/gui/UserStatusSelector.qml

@@ -293,7 +293,7 @@ ColumnLayout {
                 wrapMode: Text.Wrap
             }
 
-            BasicComboBox {
+            ComboBox {
                 id: clearComboBox
 
                 Layout.fillWidth: true

src/gui/filedetails/ShareDetailsPage.qml

@@ -466,7 +466,7 @@ Page {
 
                 checkable: true
                 checked: root.passwordProtectEnabled
-                text: qsTr("Password protect")
+                text: qsTr("Password protection")
                 visible: root.shareSupportsPassword
                 enabled: visible && 
                          !root.waitingForPasswordProtectEnabledChange && 

src/gui/owncloudgui.cpp

@@ -319,6 +319,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
             if (!Mac::FileProviderSettingsController::instance()->vfsEnabledForAccount(accountFpId)) {
                 continue;
             }
+            allPaused = false;
             const auto fileProvider = Mac::FileProvider::instance();
 
             if (!fileProvider->xpc()->fileProviderExtReachable(accountFpId)) {

src/gui/systray.cpp

@@ -588,11 +588,18 @@ void Systray::setSyncIsPaused(const bool syncIsPaused)
 
 void Systray::positionWindowAtTray(QQuickWindow *window) const
 {
-    if (!useNormalWindow()) {
-        window->setScreen(currentScreen());
-        const auto position = computeWindowPosition(window->width(), window->height());
-        window->setPosition(position);
+    if (useNormalWindow()) {
+        return;
     }
+
+    // need to store the current window size before moving the window to another screen,
+    // otherwise it is being incorrectly resized by the OS or Qt when switching to a screen
+    // with a different DPI setting
+    const auto initialSize = window->size();
+    const auto position = computeWindowPosition(initialSize.width(), initialSize.height());
+    window->setPosition(position);
+    window->setScreen(currentScreen());
+    window->resize(initialSize);
 }
 
 void Systray::positionWindowAtScreenCenter(QQuickWindow *window) const