diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2016-10-10 16:16:27 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2016-10-11 07:09:12 +0000 |
| commit | 22d40f4dc6e647d9e87a3316943d924d58c6b2ab (patch) | |
| tree | 19305f4f8ca91369b0ff74c371e6407bdaed5513 /src/shared | |
| parent | 60e4cec473174dfa113797af85d0bfaf9b018671 (diff) | |
Utils: Unify the different Bookmark icons
The variant in Bookmarks was left aligned, which is obsolete due to the
textmark overview tooltip. Bookmarks and Help now use the same icon which
is in Utils.
Change-Id: I0f7899de2f7a8803aa8493659d2991ac13739144
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/help/bookmarkmanager.cpp | 4 | ||||
| -rw-r--r-- | src/shared/help/helpicons.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index f4fe18446e..4d17c9f8ec 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "bookmarkmanager.h" -#include "helpicons.h" #include <localhelpmanager.h> @@ -32,6 +31,7 @@ #include <utils/fancylineedit.h> #include <utils/styledbar.h> +#include <utils/utilsicons.h> #include <QMenu> #include <QIcon> @@ -566,7 +566,7 @@ Qt::ItemFlags BookmarkModel::flags(const QModelIndex &index) const BookmarkManager::BookmarkManager() : m_folderIcon(QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)) - , m_bookmarkIcon(Help::Icons::BOOKMARK.icon()) + , m_bookmarkIcon(Utils::Icons::BOOKMARK.icon()) , treeModel(new BookmarkModel(0, 1, this)) , listModel(new BookmarkModel(0, 1, this)) { diff --git a/src/shared/help/helpicons.h b/src/shared/help/helpicons.h index 4c6b0aa726..f9429a2815 100644 --- a/src/shared/help/helpicons.h +++ b/src/shared/help/helpicons.h @@ -30,10 +30,6 @@ namespace Help { namespace Icons { -const Utils::Icon BOOKMARK({ - {QLatin1String(":/help/images/bookmark.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); -const Utils::Icon BOOKMARK_TOOLBAR({ - {QLatin1String(":/help/images/bookmark.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon HOME_TOOLBAR({ {QLatin1String(":/help/images/home.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon MODE_HELP_CLASSIC( |