Merge #403 [stable-4.0] [master] 2352-Windows_Related_Changes

Author: memurats

src/gui/accountsettings.cpp

@@ -719,10 +719,6 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
 
         ac = availabilityMenu->addAction(Utility::vfsFreeSpaceActionText());
         connect(ac, &QAction::triggered, this, [this]() { slotSetCurrentFolderAvailability(PinState::OnlineOnly); });
-
-        ac = menu->addAction(tr("Disable virtual file support …"));
-        connect(ac, &QAction::triggered, this, &AccountSettings::slotDisableVfsCurrentFolder);
-        ac->setDisabled(Theme::instance()->enforceVirtualFilesSyncFolder());
     }
 
     if (const auto mode = bestAvailableVfsMode();

src/gui/navigationpanehelper.cpp

@@ -93,7 +93,7 @@ void NavigationPaneHelper::updateCloudStorageRegistry()
                 const QString clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr;
                 const QString namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr;
                 const auto title = folder->sidebarDisplayName();
-                qCDebug(lcNavPane) << "Folder" << folder->cleanPath() << "will use shortcutname" << title;
+                // qCDebug(lcNavPane) << "Folder" << folder->cleanPath() << "will use shortcutname" << title;
 
                 const auto iconPath = QDir::toNativeSeparators(qApp->applicationFilePath());
                 const auto targetFolderPath = QDir::toNativeSeparators(folder->cleanPath());

src/gui/socketapi/socketapi.cpp

@@ -564,11 +564,26 @@ void SocketApi::processEncryptRequest(const QString &localFile)
             );
             Q_UNUSED(ret)
         } else {
+            // NMC customization
+            auto messageBox = std::make_unique<QMessageBox>();
+            messageBox->setAttribute(Qt::WA_DeleteOnClose);
+            messageBox->setWindowTitle(tr("Folder encrypted successfully"));
+            messageBox->setText(tr("The following folder was encrypted successfully: \"%1\"").arg(fileData.folderRelativePath));
+
+            const QIcon avatarIcon = QIcon::fromTheme("iconPath", QIcon(":/client/theme/lock.svg"));
+            QPixmap pixmap = avatarIcon.pixmap(QSize(24, 24));
+            messageBox->setIconPixmap(pixmap);
+
+            // Set default button (prevents empty UI)
+            messageBox->addButton(QMessageBox::Ok);
+            messageBox->show();
+/*
             const int ret = QMessageBox::information(nullptr,
                          tr("Folder encrypted successfully"),
                          tr("The following folder was encrypted successfully: \"%1\"")
                              .arg(fileData.folderRelativePath));
             Q_UNUSED(ret)
+*/
         }
     });
     job->setProperty(encryptJobPropertyFolder, QVariant::fromValue(folder));
@@ -1722,4 +1737,4 @@ void SocketApiJobV2::doFinish(const QJsonObject &obj) const
 
 } // namespace OCC
 
-#include "socketapi.moc"
+#include "socketapi.moc"