Editors/Tabs: Show full path in tab tool tipHEADmaster

Change-Id: I8f4b1fbc650c7bbe3644c57afaf604dce63b9e3a
Reviewed-by: hjk <[email protected]>

5 files changed, 10 insertions, 4 deletions

diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index 433054289cf..44cf29e1b99 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp
@@ -307,7 +307,7 @@ QVariant DocumentModelPrivate::data(const QModelIndex &index, int role) const
             return pinnedIcon();
         return QVariant();
     case Qt::ToolTipRole:
-        return entry->filePath().isEmpty() ? entry->displayName() : entry->filePath().toUserOutput();
+        return entry->document->toolTip();
     case DocumentModel::FilePathRole:
         return entry->filePath().toVariant();
     default:
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index a1448352ae6..f9e3d3fcfac 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -54,6 +54,7 @@ static void updateTabText(QTabBar *tabBar, int index, IDocument *document)
     if (qtcEnvironmentVariableIsSet("QTC_DEBUG_DOCUMENTMODEL") && !data.editor)
         title += " (s)";
     tabBar->setTabText(index, title);
+    tabBar->setTabToolTip(index, document->toolTip());
 }
 
 EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent)
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index add4180fe75..2bc95dbf0b3 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -432,9 +432,7 @@ void EditorToolBar::updateDocumentStatus(IDocument *document)
     else
         d->m_dragHandle->setIcon(Utils::FileIconProvider::icon(document->filePath()));
 
-    d->m_editorList->setToolTip(document->filePath().isEmpty()
-                                ? document->displayName()
-                                : document->filePath().toUserOutput());
+    d->m_editorList->setToolTip(document->toolTip());
 }
 
 bool EditorToolBar::eventFilter(QObject *obj, QEvent *event)
diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp
index 6545dcdd590..e115463ddaf 100644
--- a/src/plugins/coreplugin/idocument.cpp
+++ b/src/plugins/coreplugin/idocument.cpp
@@ -789,4 +789,9 @@ QString IDocument::uniqueDisplayName() const
     return d->uniqueDisplayName;
 }
 
+QString IDocument::toolTip() const
+{
+    return filePath().isEmpty() ? displayName() : filePath().toUserOutput();
+}
+
 } // namespace Core
diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h
index b2c27af5476..61ae67f23e6 100644
--- a/src/plugins/coreplugin/idocument.h
+++ b/src/plugins/coreplugin/idocument.h
@@ -77,6 +77,8 @@ public:
     void setUniqueDisplayName(const QString &name);
     QString uniqueDisplayName() const;
 
+    QString toolTip() const;
+
     bool isFileReadOnly() const;
     bool isTemporary() const;
     void setTemporary(bool temporary);