Add default tool tips to text marks

The default tool tip should describe the general purpose
of the mark which is displayed in the UI when no tool tip
is explicitly set for the text mark.

Change-Id: I27aff26cf0f3458d454428e805a9b323191dc393
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

7 files changed, 33 insertions, 0 deletions

diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 3e80c87b679..b2c69e9e9f8 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -332,6 +332,7 @@ BookmarkManager::BookmarkManager() :
     updateActionStatus();
     Bookmark::setCategoryColor(Constants::BOOKMARKS_TEXT_MARK_CATEGORY,
                                Theme::Bookmarks_TextMarkColor);
+    Bookmark::setDefaultToolTip(Constants::BOOKMARKS_TEXT_MARK_CATEGORY, tr("Bookmark"));
 }
 
 BookmarkManager::~BookmarkManager()
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 1b435f95a85..ba1bc10376b 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -51,6 +51,12 @@ void initializeTextMarks()
                                            Utils::Theme::ClangCodeModel_Warning_TextMarkColor);
     TextEditor::TextMark::setCategoryColor(Core::Id(Constants::CLANG_ERROR),
                                            Utils::Theme::ClangCodeModel_Error_TextMarkColor);
+    TextEditor::TextMark::setDefaultToolTip(Core::Id(Constants::CLANG_WARNING),
+                                            QApplication::translate("Clang Code Model Marks",
+                                                                    "Code Model Warning"));
+    TextEditor::TextMark::setDefaultToolTip(Core::Id(Constants::CLANG_ERROR),
+                                            QApplication::translate("Clang Code Model Marks",
+                                                                    "Code Model Error"));
 }
 
 void addProjectPanelWidget()
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index d018fbe9dc5..d34e7bcd70a 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -896,6 +896,8 @@ BreakHandler::BreakHandler()
     qRegisterMetaType<BreakpointModelId>();
     TextEditor::TextMark::setCategoryColor(Constants::TEXT_MARK_CATEGORY_BREAKPOINT,
                                            Theme::Debugger_Breakpoint_TextMarkColor);
+    TextEditor::TextMark::setDefaultToolTip(Constants::TEXT_MARK_CATEGORY_BREAKPOINT,
+                                            tr("Breakpoint"));
 
 #if USE_BREAK_MODEL_TEST
     new ModelTest(this, 0);
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index beb2086b1c4..59d68ae729c 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -105,6 +105,8 @@ TaskHub::TaskHub()
                                Utils::Theme::ProjectExplorer_TaskError_TextMarkColor);
     TaskMark::setCategoryColor(Constants::TASK_MARK_WARNING,
                                Utils::Theme::ProjectExplorer_TaskWarn_TextMarkColor);
+    TaskMark::setDefaultToolTip(Constants::TASK_MARK_ERROR, tr("Error"));
+    TaskMark::setDefaultToolTip(Constants::TASK_MARK_WARNING, tr("Warning"));
 }
 
 TaskHub::~TaskHub()
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 26f16b1b390..e764b2cfa1c 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -129,6 +129,11 @@ void TextMark::setCategoryColor(Id category, Theme::Color color)
     TextEditorPlugin::baseTextMarkRegistry()->setCategoryColor(category, color);
 }
 
+void TextMark::setDefaultToolTip(Id category, const QString &toolTip)
+{
+    TextEditorPlugin::baseTextMarkRegistry()->setDefaultToolTip(category, toolTip);
+}
+
 void TextMark::updateMarker()
 {
     if (m_baseTextDocument)
@@ -259,6 +264,19 @@ void TextMarkRegistry::setCategoryColor(Id category, Theme::Color color)
     m_colors[category] = color;
 }
 
+QString TextMarkRegistry::defaultToolTip(Id category) const
+{
+    return m_defaultToolTips[category];
+}
+
+void TextMarkRegistry::setDefaultToolTip(Id category, const QString &toolTip)
+{
+    QString &defaultToolTip = m_defaultToolTips[category];
+    if (defaultToolTip == toolTip)
+        return;
+    defaultToolTip = toolTip;
+}
+
 void TextMarkRegistry::editorOpened(IEditor *editor)
 {
     auto document = qobject_cast<TextDocument *>(editor ? editor->document() : 0);
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h
index bdbf799e742..7569ddf0997 100644
--- a/src/plugins/texteditor/textmark.h
+++ b/src/plugins/texteditor/textmark.h
@@ -79,6 +79,7 @@ public:
     static Utils::Theme::Color categoryColor(Core::Id category);
     static bool categoryHasColor(Core::Id category);
     static void setCategoryColor(Core::Id category, Utils::Theme::Color color);
+    static void setDefaultToolTip(Core::Id category, const QString &toolTip);
     void setIcon(const QIcon &icon);
     // call this if the icon has changed.
     void updateMarker();
diff --git a/src/plugins/texteditor/textmarkregistry.h b/src/plugins/texteditor/textmarkregistry.h
index 33aa5edc405..a7e28f9c722 100644
--- a/src/plugins/texteditor/textmarkregistry.h
+++ b/src/plugins/texteditor/textmarkregistry.h
@@ -55,6 +55,8 @@ public:
     Utils::Theme::Color categoryColor(Core::Id category);
     bool categoryHasColor(Core::Id category);
     void setCategoryColor(Core::Id category, Utils::Theme::Color color);
+    QString defaultToolTip(Core::Id category) const;
+    void setDefaultToolTip(Core::Id category, const QString &toolTip);
 private:
     void editorOpened(Core::IEditor *editor);
     void documentRenamed(Core::IDocument *document, const QString &oldName, const QString &newName);
@@ -62,6 +64,7 @@ private:
 
     QHash<Utils::FileName, QSet<TextMark *> > m_marks;
     QHash<Core::Id, Utils::Theme::Color> m_colors;
+    QHash<Core::Id, QString> m_defaultToolTips;
 };
 
 } // namespace Internal