Skip to content

[master] 2352-Windows_Related_Changes #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
memurats wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[master] 2352-Windows_Related_Changes #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be7af1b
windows related changes
memurats Oct 24, 2025
70498d0
solved merge conflict
memurats Oct 27, 2025
dccf5f0
solve merge conflict
memurats Oct 27, 2025
5028b1d
solved merge conflict
memurats Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/gui/accountsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/navigationpanehelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
16 changes: 16 additions & 0 deletions src/gui/socketapi/socketapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#endif

#include <array>
#include <memory>
#include <QBitArray>
#include <QUrl>
#include <QMetaMethod>
Expand Down Expand Up @@ -567,10 +568,25 @@ 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").arg(fileData.folderRelativePath),
tr("The following folder was encrypted successfully: \"%1\"").arg(fileData.folderRelativePath));
Q_UNUSED(ret)
*/
}
});
job->setProperty(encryptJobPropertyFolder, QVariant::fromValue(folder));
Expand Down