From c0a20c39c274be551e6c480c16cc987b8d357d29 Mon Sep 17 00:00:00 2001 From: memurats Date: Fri, 24 Oct 2025 16:15:49 +0200 Subject: [PATCH 1/5] 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 171c850e79c90..ab005a4da8c06 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -714,10 +714,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 3ffbfd377be53..cfa7950f68c89 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -34,6 +34,7 @@ #endif #include +#include #include #include #include @@ -544,10 +545,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 5a52a3c6780eaf29e437a6717c4f9e49b4577533 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:31:46 +0100 Subject: [PATCH 2/5] 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 cfa7950f68c89..84f35be3187db 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -545,6 +545,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 df1cb9d86d148ecaf6280c421593ba99936f1ed7 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:38:22 +0100 Subject: [PATCH 3/5] 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 84f35be3187db..0829436381fbf 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -545,10 +545,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 c9843e79bc40a3ed22981d2025059d795ab3f704 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:44:45 +0100 Subject: [PATCH 4/5] solved merge conflict --- src/gui/socketapi/socketapi.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 0829436381fbf..2f7102a6e83d6 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -34,7 +34,6 @@ #endif #include -#include #include #include #include @@ -545,12 +544,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); @@ -564,6 +557,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)); @@ -1675,4 +1674,4 @@ void SocketApiJob::reject(const QString &response) } // namespace OCC -#include "socketapi.moc" +#include "socketapi.moc" \ No newline at end of file From e9a1177bb20a3398b505d91617262713ee504eb4 Mon Sep 17 00:00:00 2001 From: memurats Date: Mon, 27 Oct 2025 16:49:57 +0100 Subject: [PATCH 5/5] solved merge conflict --- src/gui/socketapi/socketapi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 2f7102a6e83d6..435b2332d8520 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -34,6 +34,7 @@ #endif #include +#include #include #include #include @@ -1674,4 +1675,4 @@ void SocketApiJob::reject(const QString &response) } // namespace OCC -#include "socketapi.moc" \ No newline at end of file +#include "socketapi.moc"