Merge pull request nextcloud#10209 from nextcloud/backport/10205/stable-34.0

[stable-34.0] Relabel "virtual files" as "File Provider"

Author: nilsding

src/gui/accountsettings.cpp

@@ -1898,7 +1898,7 @@ QAction *AccountSettings::addActionToEncryptionMessage(const QString &actionTitl
 void AccountSettings::setupE2eEncryptionMessage()
 {
 #ifdef BUILD_FILE_PROVIDER_MODULE
-    const auto encryptionMessage = tr("This account supports end-to-end encryption, but it needs to be set up first.") + QStringLiteral(" ") + tr("The virtual files integration does not support end-to-end encryption yet.");
+    const auto encryptionMessage = tr("This account supports end-to-end encryption, but it needs to be set up first.") + QStringLiteral(" ") + tr("The File Provider extension does not support end-to-end encryption yet.");
 #else
     const auto encryptionMessage = tr("This account supports end-to-end encryption, but it needs to be set up first.");
 #endif

src/gui/accountsettings.ui

@@ -156,7 +156,7 @@
          </font>
         </property>
         <property name="text">
-         <string>Virtual files</string>
+         <string>File Provider</string>
         </property>
        </widget>
       </item>

src/gui/macOS/fileprovidersettingscontroller_mac.mm

@@ -400,8 +400,8 @@ void disableFileProviderForAllEnabledAccountsOnUnsupportedOS()
 
                 if (setEnabled && showInformationDialog) {
                     QMessageBox::information(nullptr,
-                                             controller->tr("Virtual files enabled"),
-                                             controller->tr("Virtual files have been enabled for this account.\n\n"
+                                             controller->tr("File Provider enabled"),
+                                             controller->tr("File Provider has been enabled for this account.\n\n"
                                                             "Your files are now accessible in Finder under the \"Locations\" section."));
                 }
             }

src/gui/macOS/ui/FileProviderSettings.qml

@@ -20,7 +20,7 @@ Page {
     property var controller: FileProviderSettingsController
     property string accountUserIdAtHost: ""
 
-    title: qsTr("Virtual files settings")
+    title: qsTr("File provider settings")
 
     background: Rectangle {
         color: palette.light
@@ -54,7 +54,7 @@ Page {
                 Layout.preferredWidth: Math.max(0, virtualFilesLayout.width - vfsEnabledCheckBox.width - virtualFilesLayout.spacing)
                 horizontalAlignment: Text.AlignLeft
                 wrapMode: Text.WordWrap
-                text: qsTr("Virtual files appear like regular files, but they do not use local storage space. The content downloads automatically when you open the file. Virtual files and classic sync can not be used at the same time.")
+                text: qsTr("File Provider items appear like regular files, but they do not use local storage space. The content downloads automatically when you open the file. It is not possible to have a File Provider and classic sync Finder integration enabled simultaneously.")
             }
             Switch {
                 id: vfsEnabledCheckBox

src/gui/wizard/accountwizardcontroller.cpp

@@ -306,6 +306,15 @@ bool AccountWizardController::canUseVirtualFiles() const
 #endif
 }
 
+bool AccountWizardController::isUsingFileProvider() const
+{
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    return Mac::FileProvider::available();
+#else
+    return false;
+#endif
+}
+
 bool AccountWizardController::canUseClassicSync() const
 {
     return !Theme::instance()->enforceVirtualFilesSyncFolder() || !canUseVirtualFiles();

src/gui/wizard/accountwizardcontroller.h

@@ -61,6 +61,7 @@ class AccountWizardController : public QObject
     Q_PROPERTY(SyncMode syncMode READ syncMode NOTIFY syncModeChanged)
     Q_PROPERTY(bool canFinish READ canFinish NOTIFY canFinishChanged)
     Q_PROPERTY(bool canUseVirtualFiles READ canUseVirtualFiles CONSTANT)
+    Q_PROPERTY(bool isUsingFileProvider READ isUsingFileProvider CONSTANT)
     Q_PROPERTY(bool canUseClassicSync READ canUseClassicSync CONSTANT)
     Q_PROPERTY(bool needsSyncOptions READ needsSyncOptions NOTIFY needsSyncOptionsChanged)
     Q_PROPERTY(bool canSkipFolderConfiguration READ canSkipFolderConfiguration CONSTANT)
@@ -137,6 +138,7 @@ class AccountWizardController : public QObject
     [[nodiscard]] SyncMode syncMode() const;
     [[nodiscard]] bool canFinish() const;
     [[nodiscard]] bool canUseVirtualFiles() const;
+    [[nodiscard]] bool isUsingFileProvider() const;
     [[nodiscard]] bool canUseClassicSync() const;
     [[nodiscard]] bool needsSyncOptions() const;
     [[nodiscard]] bool canSkipFolderConfiguration() const;

src/gui/wizard/qml/SyncOptionsPage.qml

@@ -87,7 +87,7 @@ Item {
             OptionRow {
                 Layout.fillWidth: true
                 visible: root.controller.canUseVirtualFiles
-                title: qsTr("Virtual files")
+                title: root.controller.isUsingFileProvider ? qsTr("File Provider") : qsTr("Virtual files")
                 description: qsTr("Download files on-demand")
                 selected: root.controller.syncMode === AccountWizardController.VirtualFiles
                 onClicked: root.controller.setSyncMode(AccountWizardController.VirtualFiles)