From 4b4cfa0980e1761acd3a7617ee2c113c98495e8b Mon Sep 17 00:00:00 2001 From: memurats Date: Fri, 24 Oct 2025 16:15:49 +0200 Subject: [PATCH 1/4] windows related changes --- src/gui/accountsettings.cpp | 4 ---- src/gui/navigationpanehelper.cpp | 2 +- src/gui/socketapi/socketapi.cpp | 18 ++++++++++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 0c0c62dbc9f90..8fedcc1b2c475 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -712,10 +712,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(); diff --git a/src/gui/navigationpanehelper.cpp b/src/gui/navigationpanehelper.cpp index 2aab0ec22a19e..444d1273f6aac 100644 --- a/src/gui/navigationpanehelper.cpp +++ b/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()); diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index c2d2120944b07..653d39b440e28 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -34,6 +34,7 @@ #endif #include +#include #include #include #include @@ -550,10 +551,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(); + 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)); From f1fac4fbb253dc948b39c3e817b151a6d88afdd3 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:32:29 +0100 Subject: [PATCH 2/4] solved merge conflict --- src/gui/socketapi/socketapi.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 653d39b440e28..8c9a651bdf268 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -551,6 +551,11 @@ 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(); messageBox->setAttribute(Qt::WA_DeleteOnClose); From 9a92c9214362790b0a024d98b68cc721126de8e0 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:37:51 +0100 Subject: [PATCH 3/4] solve merge conflict --- src/gui/socketapi/socketapi.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 8c9a651bdf268..f9354eb77c654 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -551,10 +551,11 @@ 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) + // const int ret = QMessageBox::information(nullptr, + // tr("Folder encrypted successfully"), + // tr("The following folder was encrypted successfully: \"%1\"") + // .arg(fileData.folderRelativePath)); + // Q_UNUSED(ret) // NMC customization auto messageBox = std::make_unique(); From 50f80caf85616c441404d1151fd4fbc6dceb3ce8 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:50:17 +0100 Subject: [PATCH 4/4] solved merge conflict --- src/gui/socketapi/socketapi.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index f9354eb77c654..8a3e7e4268432 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -551,12 +551,6 @@ void SocketApi::processEncryptRequest(const QString &localFile) ); Q_UNUSED(ret) } else { - // const int ret = QMessageBox::information(nullptr, - // tr("Folder encrypted successfully"), - // tr("The following folder was encrypted successfully: \"%1\"") - // .arg(fileData.folderRelativePath)); - // Q_UNUSED(ret) - // NMC customization auto messageBox = std::make_unique(); messageBox->setAttribute(Qt::WA_DeleteOnClose); @@ -570,6 +564,12 @@ void SocketApi::processEncryptRequest(const QString &localFile) // Set default button (prevents empty UI) messageBox->addButton(QMessageBox::Ok); messageBox->show(); +/* + 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) +*/ } }); job->setProperty(encryptJobPropertyFolder, QVariant::fromValue(folder));