diff --git a/bazaar/fileviewbazaarplugin.h b/bazaar/fileviewbazaarplugin.h --- a/bazaar/fileviewbazaarplugin.h +++ b/bazaar/fileviewbazaarplugin.h @@ -44,7 +44,8 @@ bool beginRetrieval(const QString& directory) Q_DECL_OVERRIDE; void endRetrieval() Q_DECL_OVERRIDE; KVersionControlPlugin::ItemVersion itemVersion(const KFileItem& item) const Q_DECL_OVERRIDE; - QList actions(const KFileItemList& items) const Q_DECL_OVERRIDE; + QList versionControlActions(const KFileItemList& items) const override; + QList outOfVersionControlActions(const KFileItemList& items) const override; diff --git a/bazaar/fileviewbazaarplugin.cpp b/bazaar/fileviewbazaarplugin.cpp --- a/bazaar/fileviewbazaarplugin.cpp +++ b/bazaar/fileviewbazaarplugin.cpp @@ -254,7 +254,7 @@ return NormalVersion; } -QList FileViewBazaarPlugin::actions(const KFileItemList &items) const +QList FileViewBazaarPlugin::versionControlActions(const KFileItemList &items) const { if (items.count() == 1 && items.first().isDir()) { QString directory = items.first().localPath(); @@ -272,6 +272,13 @@ } } +QList FileViewBazaarPlugin::outOfVersionControlActions(const KFileItemList& items) const +{ + Q_UNUSED(items) + + return {}; +} + QList FileViewBazaarPlugin::contextMenuFilesActions(const KFileItemList& items) const { Q_ASSERT(!items.isEmpty()); diff --git a/dropbox/fileviewdropboxplugin.h b/dropbox/fileviewdropboxplugin.h --- a/dropbox/fileviewdropboxplugin.h +++ b/dropbox/fileviewdropboxplugin.h @@ -63,7 +63,8 @@ KVersionControlPlugin::ItemVersion itemVersion(const KFileItem& item) const override; void endRetrieval() override; - QList actions(const KFileItemList& items) const override; + QList versionControlActions(const KFileItemList& items) const override; + QList outOfVersionControlActions(const KFileItemList& items) const override; private slots: void handleContextAction(QAction* action); diff --git a/dropbox/fileviewdropboxplugin.cpp b/dropbox/fileviewdropboxplugin.cpp --- a/dropbox/fileviewdropboxplugin.cpp +++ b/dropbox/fileviewdropboxplugin.cpp @@ -132,7 +132,7 @@ delete d->itemStateSocket; } -QList FileViewDropboxPlugin::actions(const KFileItemList& items) const +QList FileViewDropboxPlugin::versionControlActions(const KFileItemList &items) const { Q_ASSERT(!items.isEmpty()); @@ -170,6 +170,13 @@ return d->contextActions->actions(); } +QList FileViewDropboxPlugin::outOfVersionControlActions(const KFileItemList& items) const +{ + Q_UNUSED(items) + + return {}; +} + void FileViewDropboxPlugin::handleContextAction(QAction* action) { sendCommand("icon_overlay_context_action\nverb\t" % action->objectName() % "\npaths\t", d->contextFilePaths, d->controlSocket); diff --git a/git/fileviewgitplugin.h b/git/fileviewgitplugin.h --- a/git/fileviewgitplugin.h +++ b/git/fileviewgitplugin.h @@ -44,7 +44,8 @@ bool beginRetrieval(const QString& directory) override; void endRetrieval() override; ItemVersion itemVersion(const KFileItem& item) const override; - QList actions(const KFileItemList &items) const override; + QList versionControlActions(const KFileItemList& items) const override; + QList outOfVersionControlActions(const KFileItemList& items) const override; private slots: void addFiles(); diff --git a/git/fileviewgitplugin.cpp b/git/fileviewgitplugin.cpp --- a/git/fileviewgitplugin.cpp +++ b/git/fileviewgitplugin.cpp @@ -276,7 +276,7 @@ } } -QList FileViewGitPlugin::actions(const KFileItemList &items) const +QList FileViewGitPlugin::versionControlActions(const KFileItemList& items) const { if (items.count() == 1 && items.first().isDir()) { QString directory = items.first().localPath(); @@ -294,6 +294,13 @@ } } +QList FileViewGitPlugin::outOfVersionControlActions(const KFileItemList& items) const +{ + Q_UNUSED(items) + + return {}; +} + QList FileViewGitPlugin::contextMenuFilesActions(const KFileItemList& items) const { Q_ASSERT(!items.isEmpty()); diff --git a/hg/fileviewhgplugin.h b/hg/fileviewhgplugin.h --- a/hg/fileviewhgplugin.h +++ b/hg/fileviewhgplugin.h @@ -42,7 +42,8 @@ bool beginRetrieval(const QString& directory) override; void endRetrieval() override; KVersionControlPlugin::ItemVersion itemVersion(const KFileItem& item) const override; - QList actions(const KFileItemList &items) const override; + QList versionControlActions(const KFileItemList& items) const override; + virtual QList outOfVersionControlActions(const KFileItemList& items) const override; private: diff --git a/hg/fileviewhgplugin.cpp b/hg/fileviewhgplugin.cpp --- a/hg/fileviewhgplugin.cpp +++ b/hg/fileviewhgplugin.cpp @@ -380,7 +380,7 @@ return NormalVersion; } -QList FileViewHgPlugin::actions(const KFileItemList &items) const +QList FileViewHgPlugin::versionControlActions(const KFileItemList &items) const { //TODO: Make it work with universal context menu when implemented // in dolphin @@ -394,6 +394,13 @@ return QList(); } +QList FileViewHgPlugin::outOfVersionControlActions(const KFileItemList &items) const +{ + Q_UNUSED(items) + + return {}; +} + QList FileViewHgPlugin::universalContextMenuActions(const QString &directory) const { QList result; diff --git a/svn/fileviewsvnplugin.h b/svn/fileviewsvnplugin.h --- a/svn/fileviewsvnplugin.h +++ b/svn/fileviewsvnplugin.h @@ -42,7 +42,8 @@ bool beginRetrieval(const QString& directory) override; void endRetrieval() override; ItemVersion itemVersion(const KFileItem& item) const override; - QList actions(const KFileItemList& items) const override; + QList versionControlActions(const KFileItemList& items) const override; + QList outOfVersionControlActions(const KFileItemList& items) const override; signals: /// Invokes m_showUpdatesAction->setChecked(checked) on the UI thread. diff --git a/svn/fileviewsvnplugin.cpp b/svn/fileviewsvnplugin.cpp --- a/svn/fileviewsvnplugin.cpp +++ b/svn/fileviewsvnplugin.cpp @@ -257,7 +257,7 @@ return NormalVersion; } -QList FileViewSvnPlugin::actions(const KFileItemList& items) const +QList FileViewSvnPlugin::versionControlActions(const KFileItemList& items) const { // Special case: if any item is in unversioned directory we shouldn't add any actions because // we can do nothing with this item. @@ -322,6 +322,12 @@ return actions; } +QList FileViewSvnPlugin::outOfVersionControlActions(const KFileItemList& items) const +{ + Q_UNUSED(items) + + return {}; +} void FileViewSvnPlugin::updateFiles() {