Merge #362 [stable-3.16] nmc/2025/2352-Windows_Related_Changes

Author: memurats

src/gui/accountsettings.cpp

@@ -722,10 +722,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());
     }
 
     menu->setStyleSheet(R"(

src/gui/navigationpanehelper.cpp

@@ -100,10 +100,7 @@ void NavigationPaneHelper::updateCloudStorageRegistry()
                 const QString namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr;
 
                 auto title = folder->shortGuiRemotePathOrAppName();
-                // Write the account name in the sidebar only when using more than one account.
-                if (AccountManager::instance()->accounts().size() > 1) {
-                    title = title % " - " % folder->accountState()->account()->prettyName();
-                }
+
                 const auto iconPath = QDir::toNativeSeparators(qApp->applicationFilePath());
                 const auto targetFolderPath = QDir::toNativeSeparators(folder->cleanPath());
 

src/gui/socketapi/socketapi.cpp

@@ -45,6 +45,7 @@
 #endif
 
 #include <array>
+#include <memory>
 #include <QBitArray>
 #include <QUrl>
 #include <QMetaMethod>
@@ -60,7 +61,6 @@
 #include <QInputDialog>
 #include <QFileDialog>
 
-
 #include <QAction>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -574,10 +574,19 @@ void SocketApi::processEncryptRequest(const QString &localFile)
             );
             Q_UNUSED(ret)
         } else {
-            const int ret = QMessageBox::information(nullptr,
-                                                     tr("Folder encrypted successfully").arg(fileData.folderRelativePath),
-                                                     tr("The following folder was encrypted successfully: \"%1\"").arg(fileData.folderRelativePath));
-            Q_UNUSED(ret)
+            // 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();
         }
     });
     job->setProperty(encryptJobPropertyFolder, QVariant::fromValue(folder));