Seems to be working well.

gvansickle · Dec 15, 2017 · a2efa91 · a2efa91
1 parent 15fd511
commit a2efa91
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/gui/CollectionDockWidget.h b/gui/CollectionDockWidget.h
@@ -72,7 +72,6 @@ class PlaylistItem: public QStandardItem
 public:
 	PlaylistItem(MDIPlaylistView* view)
 	{
-		//playlist_model: PlaylistModel = model;
 		playlist_view = view;
 
 		setData(QIcon::fromTheme("folder"), Qt::DecorationRole);
@@ -83,7 +82,7 @@ class PlaylistItem: public QStandardItem
 		// Get the data we need from the model we're connected to
 		if(role == Qt::EditRole || role == Qt::DisplayRole)
 		{
-			return QVariant(playlist_view->userFriendlyCurrentFile());
+			return QVariant(playlist_view->getDisplayName());
 		}
 		else if(role == Qt::ToolTipRole)
 		{

diff --git a/gui/MDINowPlayingView.cpp b/gui/MDINowPlayingView.cpp
@@ -23,3 +23,8 @@ MDINowPlayingView::MDINowPlayingView(QWidget *parent) : MDIPlaylistView(parent)
 {
 
 }
+
+QString MDINowPlayingView::getDisplayName() const
+{
+	return "Now Playing";
+}
diff --git a/gui/MDINowPlayingView.h b/gui/MDINowPlayingView.h
@@ -29,6 +29,8 @@ class MDINowPlayingView : public MDIPlaylistView
 
 public:
 	MDINowPlayingView(QWidget *parent);
+
+	QString getDisplayName() const override;
 };
 
 

diff --git a/gui/MDITreeViewBase.cpp b/gui/MDITreeViewBase.cpp
@@ -92,8 +92,8 @@ static qint64 sequenceNumber = 0;
 	m_current_url = QUrl(getNewFilenameTemplate().arg(sequenceNumber));
 	sequenceNumber += 1;
 
-	// Set the window title to the default filename, plus the Qt "is modified" placeholder.
-	setWindowTitle(userFriendlyCurrentFile() + "[*]");
+	// Set the window title to the Display Name, which defaults to the filename, plus the Qt "is modified" placeholder.
+	setWindowTitle(getDisplayName() + "[*]");
 
 	/// @todo Connect a contentsChanged signal to a docWasModified slot here?
 }
@@ -196,7 +196,12 @@ void MDITreeViewBase::setCurrentFile(QUrl url)
 	m_isUntitled = false;
 	setWindowFilePath(url.toString());
 	setWindowModified(false);
-	setWindowTitle(userFriendlyCurrentFile() + "[*]");
+	setWindowTitle(getDisplayName() + "[*]");
+}
+
+QString MDITreeViewBase::getDisplayName() const
+{
+	return userFriendlyCurrentFile();
 }
 
 void MDITreeViewBase::closeEvent(QCloseEvent* event)

diff --git a/gui/MDITreeViewBase.h b/gui/MDITreeViewBase.h
@@ -51,6 +51,10 @@ class MDITreeViewBase : public QTreeView
 	/// Returns the full URL of this window's backing file.
 	QUrl getCurrentUrl() const;
 
+	/// Returns the name to be displayed as this view's windowTitle(), e.g. in tabs.
+	/// Default implementation returns userFriendlyCurrentFile().
+	virtual QString getDisplayName() const;
+
 protected:
 
 	QUrl m_current_url;
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     }
+    QString MDINowPlayingView::getDisplayName() const
+    {
+    	return "Now Playing";
+    }