[Win] Remove legacy setting for sidebar entries

We get this for free from the CfApi, and enabling this with winvfs
results in duplicate entries.

Fixes: #10788

changelog/unreleased/10788

@@ -0,0 +1,6 @@
+Change: Remove support for sidebar entries for non-vfs setups on Windows
+
+For vfs setups, this is handled by Windows itself.
+
+https://github.com/owncloud/client/issues/10788
+https://github.com/owncloud/client/pull/10910

src/gui/CMakeLists.txt

@@ -130,8 +130,7 @@ IF( APPLE )
 elseif( WIN32 )
     target_sources(owncloudCore PRIVATE
             guiutility_win.cpp
-            folderwatcher_win.cpp
-            navigationpanehelper.cpp)
+            folderwatcher_win.cpp)
 elseif(UNIX AND NOT APPLE)
     ## handle DBUS for Fdo notifications
     if (TARGET Qt::DBus)

src/gui/accountsettings.cpp

@@ -502,11 +502,6 @@ void AccountSettings::slotEnableVfsCurrentFolder()
             return;
         }
 
-#ifdef Q_OS_WIN
-        // we might need to add or remove the panel entry as cfapi brings this feature out of the box
-        FolderMan::instance()->navigationPaneHelper().scheduleUpdateCloudStorageRegistry();
-#endif
-
         // It is unsafe to switch on vfs while a sync is running - wait if necessary.
         auto connection = std::make_shared<QMetaObject::Connection>();
         auto switchVfsOn = [folder, connection, this]() {
@@ -581,11 +576,6 @@ void AccountSettings::slotDisableVfsCurrentFolder()
         if (msgBox->clickedButton() != acceptButton|| !folder)
             return;
 
-#ifdef Q_OS_WIN
-         // we might need to add or remove the panel entry as cfapi brings this feature out of the box
-        FolderMan::instance()->navigationPaneHelper().scheduleUpdateCloudStorageRegistry();
-#endif
-
         // It is unsafe to switch off vfs while a sync is running - wait if necessary.
         auto connection = std::make_shared<QMetaObject::Connection>();
         auto switchVfsOff = [folder, connection, this]() {

src/gui/folder.cpp

@@ -1406,12 +1406,6 @@ void FolderDefinition::save(QSettings &settings, const FolderDefinition &folder)
 
     // Prevent loading of profiles in old clients
     settings.setValue(versionC(), maxSettingsVersion());
-
-    // Happens only on Windows when the explorer integration is enabled.
-    if (!folder.navigationPaneClsid.isNull())
-        settings.setValue(QStringLiteral("navigationPaneClsid"), folder.navigationPaneClsid);
-    else
-        settings.remove(QStringLiteral("navigationPaneClsid"));
 }
 
 FolderDefinition FolderDefinition::load(QSettings &settings, const QByteArray &id)
@@ -1422,7 +1416,6 @@ FolderDefinition FolderDefinition::load(QSettings &settings, const QByteArray &i
     folder.setTargetPath(settings.value(QStringLiteral("targetPath")).toString());
     folder.paused = settings.value(QStringLiteral("paused")).toBool();
     folder.ignoreHiddenFiles = settings.value(QStringLiteral("ignoreHiddenFiles"), QVariant(true)).toBool();
-    folder.navigationPaneClsid = settings.value(QStringLiteral("navigationPaneClsid")).toUuid();
     folder._deployed = settings.value(deployedC(), false).toBool();
     folder._priority = settings.value(priorityC(), 0).toInt();
 
@@ -1504,12 +1497,6 @@ bool Folder::groupInSidebar() const
     return false;
 }
 
-void Folder::setNavigationPaneClsid(const QUuid &clsid)
-{
-    _definition.navigationPaneClsid = clsid;
-    saveToSettings();
-}
-
 bool FolderDefinition::isDeployed() const
 {
     return _deployed;

src/gui/folder.h

@@ -65,8 +65,6 @@ class FolderDefinition
     bool ignoreHiddenFiles = true;
     /// Which virtual files setting the folder uses
     Vfs::Mode virtualFilesMode = Vfs::Off;
-    /// The CLSID where this folder appears in registry for the Explorer navigation pane entry.
-    QUuid navigationPaneClsid;
 
     /// Whether the vfs mode shall silently be updated if possible
     bool upgradeVfsMode = false;
@@ -213,9 +211,6 @@ class Folder : public QObject
      */
     QString remotePathTrailingSlash() const;
 
-    void setNavigationPaneClsid(const QUuid &clsid);
-    QUuid navigationPaneClsid() const { return _definition.navigationPaneClsid; }
-
     /**
      * remote folder path with server url
      */

src/gui/folderman.cpp

@@ -106,9 +106,6 @@ FolderMan::FolderMan(QObject *parent)
     , _currentSyncFolder(nullptr)
     , _syncEnabled(true)
     , _lockWatcher(new LockWatcher)
-#ifdef Q_OS_WIN
-    , _navigationPaneHelper(this)
-#endif
     , _appRestartRequired(false)
 {
     OC_ASSERT(!_instance);
@@ -964,9 +961,6 @@ void FolderMan::removeFolder(Folder *f)
     unloadFolder(f);
     f->deleteLater();
 
-#ifdef Q_OS_WIN
-    _navigationPaneHelper.scheduleUpdateCloudStorageRegistry();
-#endif
     Q_EMIT folderRemoved(f);
     emit folderListChanged();
     QTimer::singleShot(0, this, &FolderMan::startScheduledSyncSoon);
@@ -1266,13 +1260,6 @@ Folder *FolderMan::addFolderFromWizard(const AccountStatePtr &accountStatePtr, c
         // With spaces we only handle the main folder
         if (!newFolder->groupInSidebar()) {
             Utility::setupFavLink(localFolder);
-#ifdef Q_OS_WIN
-            if (_navigationPaneHelper.showInExplorerNavigationPane()) {
-                newFolder->setNavigationPaneClsid(QUuid::createUuid());
-                // we might need to add or remove the panel entry as cfapi brings this feature out of the box
-                FolderMan::instance()->navigationPaneHelper().scheduleUpdateCloudStorageRegistry();
-            }
-#endif
         }
         if (!ConfigFile().newBigFolderSizeLimit().first) {
             // The user already accepted the selective sync dialog. everything is in the white list

src/gui/folderman.h

@@ -21,8 +21,6 @@
 #include <QList>
 
 #include "folder.h"
-#include "navigationpanehelper.h"
-
 #include "folderwizard/folderwizard.h"
 
 class TestFolderMigration;
@@ -171,9 +169,6 @@ class FolderMan : public QObject
     static TrayOverallStatusResult trayOverallStatus(const QVector<Folder *> &folders);
 
     SocketApi *socketApi();
-#ifdef Q_OS_WIN
-    NavigationPaneHelper &navigationPaneHelper() { return _navigationPaneHelper; }
-#endif
 
     /**
      * Check if @a path is a valid path for a new folder considering the already sync'ed items.
@@ -373,9 +368,6 @@ private slots:
     QTimer _startScheduledSyncTimer;
 
     QScopedPointer<SocketApi> _socketApi;
-#ifdef Q_OS_WIN
-    NavigationPaneHelper _navigationPaneHelper;
-#endif
 
     bool _appRestartRequired;
 

src/gui/generalsettings.cpp

@@ -52,9 +52,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)
     _ui->setupUi(this);
 
     connect(_ui->desktopNotificationsCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotToggleOptionalDesktopNotifications);
-#ifdef Q_OS_WIN
-    connect(_ui->showInExplorerNavigationPaneCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotShowInExplorerNavigationPane);
-#endif
 
     reloadConfig();
     loadMiscSettings();
@@ -85,10 +82,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)
     _ui->crashreporterCheckBox->setVisible(false);
 #endif
 
-    // Hide on non-Windows, or WindowsVersion < 10.
-    // The condition should match the default value of ConfigFile::showInExplorerNavigationPane.
-    _ui->showInExplorerNavigationPaneCheckBox->setVisible(QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10);
-
     /* Set the left contents margin of the layout to zero to make the checkboxes
      * align properly vertically , fixes bug #3758
      */
@@ -177,7 +170,6 @@ void GeneralSettings::loadMiscSettings()
     ConfigFile cfgFile;
     _ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
     _ui->desktopNotificationsCheckBox->setChecked(cfgFile.optionalDesktopNotifications());
-    _ui->showInExplorerNavigationPaneCheckBox->setChecked(cfgFile.showInExplorerNavigationPane());
     _ui->crashreporterCheckBox->setChecked(cfgFile.crashReporter());
     auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
     _ui->newFolderLimitCheckBox->setChecked(newFolderLimit.first);
@@ -285,16 +277,6 @@ void GeneralSettings::slotToggleOptionalDesktopNotifications(bool enable)
     cfgFile.setOptionalDesktopNotifications(enable);
 }
 
-#ifdef Q_OS_WIN
-void GeneralSettings::slotShowInExplorerNavigationPane(bool checked)
-{
-    ConfigFile cfgFile;
-    cfgFile.setShowInExplorerNavigationPane(checked);
-    // Now update the registry with the change.
-    FolderMan::instance()->navigationPaneHelper().setShowInExplorerNavigationPane(checked);
-}
-#endif
-
 void GeneralSettings::slotIgnoreFilesEditor()
 {
     if (_ignoreEditor.isNull()) {

src/gui/generalsettings.h

@@ -46,9 +46,6 @@ private slots:
     void saveMiscSettings();
     void slotToggleLaunchOnStartup(bool);
     void slotToggleOptionalDesktopNotifications(bool);
-#ifdef Q_OS_WIN
-    void slotShowInExplorerNavigationPane(bool);
-#endif
     void slotUpdateChannelChanged(int index);
     void slotIgnoreFilesEditor();
     void loadMiscSettings();

src/gui/generalsettings.ui

@@ -24,8 +24,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>771</width>
-        <height>637</height>
+        <width>765</width>
+        <height>618</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -100,13 +100,6 @@
          <layout class="QHBoxLayout" name="horizontalLayout_5">
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_6">
-            <item>
-             <widget class="QCheckBox" name="showInExplorerNavigationPaneCheckBox">
-              <property name="text">
-               <string>Show sync folders in &amp;Explorer's Navigation Pane</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="QCheckBox" name="syncHiddenFilesCheckBox">
               <property name="text">
@@ -378,7 +371,6 @@
   <tabstop>autostartCheckBox</tabstop>
   <tabstop>desktopNotificationsCheckBox</tabstop>
   <tabstop>monoIconsCheckBox</tabstop>
-  <tabstop>showInExplorerNavigationPaneCheckBox</tabstop>
   <tabstop>syncHiddenFilesCheckBox</tabstop>
   <tabstop>crashreporterCheckBox</tabstop>
   <tabstop>ignoredFilesButton</tabstop>