Merge 1e953f0f71 into 7c36bec110

Signed-off-by: Alex Zolotov <blackslayer4@gmail.com>

VERSION.cmake

@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 3 )
 set( MIRALL_VERSION_MINOR 12 )
-set( MIRALL_VERSION_PATCH 3 )
+set( MIRALL_VERSION_PATCH 4 )
 set( MIRALL_VERSION_YEAR  2024 )
 set( MIRALL_SOVERSION 0 )
 

doc/conf.py

@@ -50,7 +50,7 @@ copyright = u'2013-2024, The Nextcloud developers'
 # The short X.Y version.
 version = '3.12'
 # The full version, including alpha/beta/rc tags.
-release = '3.12.3'
+release = '3.12.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/gui/ConflictItemFileInfo.qml

@@ -31,6 +31,24 @@ Item {
     CheckBox {
         id: selectItem
 
+        palette {
+            text: Style.ncTextColor
+            windowText: Style.ncTextColor
+            buttonText: Style.ncTextColor
+            brightText: Style.ncTextBrightColor
+            highlight: Style.lightHover
+            highlightedText: Style.ncTextColor
+            light: Style.lightHover
+            midlight: Style.ncSecondaryTextColor
+            mid: Style.darkerHover
+            dark: Style.menuBorder
+            button: Style.buttonBackgroundColor
+            window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+            base: Style.backgroundColor
+            toolTipBase: Style.backgroundColor
+            toolTipText: Style.ncTextColor
+        }
+
         anchors.left: parent.left
         anchors.verticalCenter: parent.verticalCenter
 

src/gui/ResolveConflictsDialog.qml

@@ -94,6 +94,24 @@ ApplicationWindow {
 
                 Layout.fillWidth: true
 
+                palette {
+                    text: Style.ncTextColor
+                    windowText: Style.ncTextColor
+                    buttonText: Style.ncTextColor
+                    brightText: Style.ncTextBrightColor
+                    highlight: Style.lightHover
+                    highlightedText: Style.ncTextColor
+                    light: Style.lightHover
+                    midlight: Style.ncSecondaryTextColor
+                    mid: Style.darkerHover
+                    dark: Style.menuBorder
+                    button: Style.buttonBackgroundColor
+                    window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+                    base: Style.backgroundColor
+                    toolTipBase: Style.backgroundColor
+                    toolTipText: Style.ncTextColor
+                }
+
                 text: qsTr('All local versions')
 
                 leftPadding: 0
@@ -112,6 +130,24 @@ ApplicationWindow {
 
                 Layout.fillWidth: true
 
+                palette {
+                    text: Style.ncTextColor
+                    windowText: Style.ncTextColor
+                    buttonText: Style.ncTextColor
+                    brightText: Style.ncTextBrightColor
+                    highlight: Style.lightHover
+                    highlightedText: Style.ncTextColor
+                    light: Style.lightHover
+                    midlight: Style.ncSecondaryTextColor
+                    mid: Style.darkerHover
+                    dark: Style.menuBorder
+                    button: Style.buttonBackgroundColor
+                    window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+                    base: Style.backgroundColor
+                    toolTipBase: Style.backgroundColor
+                    toolTipText: Style.ncTextColor
+                }
+
                 text: qsTr('All server versions')
 
                 leftPadding: 0

src/gui/generalsettings.cpp

@@ -107,8 +107,19 @@ QVector<ZipEntry> createDebugArchiveFileList()
     return list;
 }
 
-void createDebugArchive(const QString &filename)
+bool createDebugArchive(const QString &filename)
 {
+    const auto fileInfo = QFileInfo(filename);
+    const auto dirInfo = QFileInfo(fileInfo.dir().absolutePath());
+    if (!dirInfo.isWritable()) {
+        QMessageBox::critical(
+            nullptr,
+            QObject::tr("Failed to create debug archive"),
+            QObject::tr("Could not create debug archive in selected location!")
+        );
+        return false;
+    }
+
     const auto entries = createDebugArchiveFileList();
 
     KZip zip(filename);
@@ -127,7 +138,9 @@ void createDebugArchive(const QString &filename)
     zip.prepareWriting("__nextcloud_client_buildinfo.txt", {}, {}, buildInfo.size());
     zip.writeData(buildInfo, buildInfo.size());
     zip.finishWriting(buildInfo.size());
+    return true;
 }
+
 }
 
 namespace OCC {
@@ -498,13 +511,24 @@ void GeneralSettings::slotIgnoreFilesEditor()
 
 void GeneralSettings::slotCreateDebugArchive()
 {
-    const auto filename = QFileDialog::getSaveFileName(this, tr("Create Debug Archive"), QString(), tr("Zip Archives") + " (*.zip)");
+    const auto filename = QFileDialog::getSaveFileName(
+        this,
+        tr("Create Debug Archive"),
+        QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
+        tr("Zip Archives") + " (*.zip)"
+    );
+
     if (filename.isEmpty()) {
         return;
     }
 
-    createDebugArchive(filename);
-    QMessageBox::information(this, tr("Debug Archive Created"), tr("Debug archive is created at %1").arg(filename));
+    if (createDebugArchive(filename)) {
+        QMessageBox::information(
+            this,
+            tr("Debug Archive Created"),
+            tr("Debug archive is created at %1").arg(filename)
+        );
+    }
 }
 
 void GeneralSettings::slotShowLegalNotice()

src/gui/tray/SyncStatus.qml

@@ -34,7 +34,7 @@ RowLayout {
         padding: 0
 
         imageSource: syncStatus.syncIcon
-        running: syncStatus.syncing
+        running: false // hotfix for download speed slowdown when tray is open
     }
 
     ColumnLayout {

src/gui/userstatusselectormodel.h

@@ -93,7 +93,7 @@ public:
 
     Q_REQUIRED_RESULT QVariantList clearStageTypes() const;
     Q_REQUIRED_RESULT QString clearAtDisplayString() const;
-    Q_INVOKABLE [[nodiscard]] QString clearAtReadable(const OCC::UserStatus &status) const;
+    [[nodiscard]] Q_INVOKABLE QString clearAtReadable(const OCC::UserStatus &status) const;
 
     Q_REQUIRED_RESULT QString errorMessage() const;