diff options
author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-12-15 14:10:41 +0300 |
---|---|---|
committer | Hannah von Reth <vonreth@kde.org> | 2021-12-17 12:52:23 +0300 |
commit | 934da5b219e4774fe0f4ec422ed067437ac44e3c (patch) | |
tree | 1f3e4e622cda1847ec4fd4317f594104f59deedb | |
parent | 492a7e4b479f293edae2e11289a759cf7b47c397 (diff) |
Remove Availability menu from the ui
-rw-r--r-- | changelog/unreleased/9291 | 6 | ||||
-rw-r--r-- | src/gui/accountsettings.cpp | 23 |
2 files changed, 6 insertions, 23 deletions
diff --git a/changelog/unreleased/9291 b/changelog/unreleased/9291 new file mode 100644 index 000000000..e12db36ca --- /dev/null +++ b/changelog/unreleased/9291 @@ -0,0 +1,6 @@ +Enhancement: Remove the availability menu from the ui + +The availability options should be handled on a folder base and in the file browser. + + +https://github.com/owncloud/client/pull/9291
\ No newline at end of file diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 2ac102159..6782be3c8 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -323,29 +323,6 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos) removeFolderAction(menu); - if (folder->virtualFilesEnabled()) { - auto availabilityMenu = menu->addMenu(tr("Availability")); - auto availability = folder->vfs().availability(QString()); - if (availability) { - ac = availabilityMenu->addAction(Utility::vfsCurrentAvailabilityText(*availability)); - ac->setEnabled(false); - } - - ac = availabilityMenu->addAction(Utility::vfsPinActionText()); - ac->setEnabled(!availability || *availability != VfsItemAvailability::AlwaysLocal); - connect(ac, &QAction::triggered, this, [this]() { slotSetCurrentFolderAvailability(PinState::AlwaysLocal); }); - - ac = availabilityMenu->addAction(Utility::vfsFreeSpaceActionText()); - ac->setEnabled(!availability - || !(*availability == VfsItemAvailability::OnlineOnly - || *availability == VfsItemAvailability::AllDehydrated)); - connect(ac, &QAction::triggered, this, [this]() { slotSetCurrentFolderAvailability(PinState::OnlineOnly); }); - if (!Theme::instance()->forceVirtualFilesOption()) { - ac = menu->addAction(tr("Disable virtual file support...")); - connect(ac, &QAction::triggered, this, &AccountSettings::slotDisableVfsCurrentFolder); - } - } - if (Theme::instance()->showVirtualFilesOption() && !folder->virtualFilesEnabled() && FolderMan::instance()->checkVfsAvailability(folder->path())) { const auto mode = bestAvailableVfsMode(); |