conflict lists:

 - the file index is now stored in the row data
 - the alternate origins are now added to the context menu in a "go to" submenu
 - context menu items are now visually disabled instead of omitted from the menu

2 files changed, 6 insertions, 0 deletions

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 1179110a..bde515a9 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -220,6 +220,11 @@ std::vector<FileEntry::Ptr> FilesOrigin::getFiles() const
   return result;

 }

 

+FileEntry::Ptr FilesOrigin::findFile(FileEntry::Index index) const

+{

+  return m_FileRegister.lock()->getFile(index);

+}

+

 bool FilesOrigin::containsArchive(std::wstring archiveName)

 {

   for (FileEntry::Index fileIdx : m_Files)

diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index e7af1ae7..785c3ff6 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -135,6 +135,7 @@ public:
   const std::wstring &getPath() const { return m_Path; }

 

   std::vector<FileEntry::Ptr> getFiles() const;

+  FileEntry::Ptr findFile(FileEntry::Index index) const;

 

   void enable(bool enabled, time_t notAfter = LONG_MAX);

   bool isDisabled() const { return m_Disabled; }