Improve container-aware display names in projects.

2 files changed, 10 insertions, 4 deletions

diff --git a/ui/uicontext.h b/ui/uicontext.h
index 5ca5a4e5..fcb77479 100644
--- a/ui/uicontext.h
+++ b/ui/uicontext.h
@@ -561,10 +561,10 @@ public:
 	virtual ProjectRef getProject();
 	virtual ProjectStatusWidget* getProjectStatusWidget();
 
-	virtual bool openFilename(const QString& path, bool openOptions = false);
+	virtual bool openFilename(const QString& path, bool openOptions = false, bool forceContainerBrowser = false);
 	virtual ProjectRef openProject(const QString& path);
 	virtual ViewFrame* openFileContext(FileContext* file, const QString& forcedView = "", bool addTab = true);
-	virtual bool openProjectFile(ProjectFileRef file, ExternalLocationRef loc = nullptr, bool openWithOptions = false);
+	virtual bool openProjectFile(ProjectFileRef file, ExternalLocationRef loc = nullptr, bool openWithOptions = false, bool forceContainerBrowser = false);
 	virtual bool openUrl(const QUrl& url, bool openWithOptions = false);
 	virtual void recreateViewFrames(FileContext* file) = 0;
 	virtual void refreshCurrentViewContents();
@@ -629,6 +629,12 @@ public:
 	    \return Name to display for this path
 	 */
 	QString GetNameForPath(const QString& path);
+	/*!
+	    Get the displayed name for a file, resolving container entries within projects
+	    \param metadata FileMetadata whose displayed name you want
+	    \return Name to display for this file
+	 */
+	QString GetNameForPath(FileMetadataRef metadata);
 
 	virtual QWidget* fileContentsLockStatusWidget() = 0;
 
diff --git a/ui/uitypes.h b/ui/uitypes.h
index 40b46570..f01ed988 100644
--- a/ui/uitypes.h
+++ b/ui/uitypes.h
@@ -6,14 +6,14 @@
 // there are changes to the API that affect linking, including new functions,
 // new types, modifications to existing functions or types, or new versions
 // of the Qt libraries.
-#define BN_CURRENT_UI_ABI_VERSION 12
+#define BN_CURRENT_UI_ABI_VERSION 13
 
 // Minimum ABI version that is supported for loading of plugins. Plugins that
 // are linked to an ABI version less than this will not be able to load and
 // will require rebuilding. The minimum version is increased when there are
 // incompatible changes that break binary compatibility, such as changes to
 // existing types or functions, or a new version of Qt.
-#define BN_MINIMUM_UI_ABI_VERSION 12
+#define BN_MINIMUM_UI_ABI_VERSION 13
 
 #ifdef __GNUC__
 	#ifdef BINARYNINJAUI_LIBRARY