From fa7e34e84a09ed7a2f453a35a48e71477c841e5b Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Fri, 31 May 2019 15:15:47 -0400 Subject: 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 --- src/shared/directoryentry.cpp | 5 +++++ src/shared/directoryentry.h | 1 + 2 files changed, 6 insertions(+) (limited to 'src/shared') 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 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 getFiles() const; + FileEntry::Ptr findFile(FileEntry::Index index) const; void enable(bool enabled, time_t notAfter = LONG_MAX); bool isDisabled() const { return m_Disabled; } -- cgit v1.3.1