From 22d40f4dc6e647d9e87a3316943d924d58c6b2ab Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 10 Oct 2016 16:16:27 +0200 Subject: [PATCH] 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 --- .../help => libs/utils}/images/bookmark.png | Bin .../utils}/images/bookmark@2x.png | Bin src/libs/utils/utils.qrc | 2 ++ src/libs/utils/utilsicons.cpp | 6 +++++ src/libs/utils/utilsicons.h | 3 +++ src/plugins/bookmarks/bookmarkmanager.cpp | 4 ++-- src/plugins/bookmarks/bookmarks.pro | 2 -- src/plugins/bookmarks/bookmarks.qrc | 6 ----- src/plugins/bookmarks/images/bookmark.png | Bin 131 -> 0 bytes src/plugins/bookmarks/images/bookmark@2x.png | Bin 162 -> 0 bytes src/plugins/help/help.qrc | 2 -- src/plugins/help/helpindexfilter.cpp | 3 ++- src/plugins/help/helpwidget.cpp | 2 +- src/plugins/help/xbelsupport.cpp | 5 +++-- src/shared/help/bookmarkmanager.cpp | 4 ++-- src/shared/help/helpicons.h | 4 ---- src/tools/icons/qtcreatoricons.svg | 21 +----------------- 17 files changed, 22 insertions(+), 42 deletions(-) rename src/{plugins/help => libs/utils}/images/bookmark.png (100%) rename src/{plugins/help => libs/utils}/images/bookmark@2x.png (100%) delete mode 100644 src/plugins/bookmarks/bookmarks.qrc delete mode 100644 src/plugins/bookmarks/images/bookmark.png delete mode 100644 src/plugins/bookmarks/images/bookmark@2x.png diff --git a/src/plugins/help/images/bookmark.png b/src/libs/utils/images/bookmark.png similarity index 100% rename from src/plugins/help/images/bookmark.png rename to src/libs/utils/images/bookmark.png diff --git a/src/plugins/help/images/bookmark@2x.png b/src/libs/utils/images/bookmark@2x.png similarity index 100% rename from src/plugins/help/images/bookmark@2x.png rename to src/libs/utils/images/bookmark@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 45b2b2d7989..a3a77284462 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -150,5 +150,7 @@ images/iconoverlay_warning@2x.png images/iconoverlay_warning_background.png images/iconoverlay_warning_background@2x.png + images/bookmark.png + images/bookmark@2x.png diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 44ce6c35e2c..513e6f298e3 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -57,6 +57,12 @@ const Icon BROKEN({ const Icon ERROR({ {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, {QLatin1String(":/utils/images/error.png"), Theme::IconsErrorColor}}, Icon::Tint); +const Icon BOOKMARK({ + {QLatin1String(":/utils/images/bookmark.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon BOOKMARK_TOOLBAR({ + {QLatin1String(":/utils/images/bookmark.png"), Theme::IconsBaseColor}}); +const Icon BOOKMARK_TEXTEDITOR({ + {QLatin1String(":/utils/images/bookmark.png"), Theme::Bookmarks_TextMarkColor}}, Icon::Tint); const Icon NEWFILE( QLatin1String(":/utils/images/filenew.png")); diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 2ab02e2e422..24c99bfb2bd 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -45,6 +45,9 @@ QTCREATOR_UTILS_EXPORT extern const Icon OK; QTCREATOR_UTILS_EXPORT extern const Icon NOTLOADED; QTCREATOR_UTILS_EXPORT extern const Icon BROKEN; QTCREATOR_UTILS_EXPORT extern const Icon ERROR; +QTCREATOR_UTILS_EXPORT extern const Icon BOOKMARK; +QTCREATOR_UTILS_EXPORT extern const Icon BOOKMARK_TOOLBAR; +QTCREATOR_UTILS_EXPORT extern const Icon BOOKMARK_TEXTEDITOR; QTCREATOR_UTILS_EXPORT extern const Icon NEWFILE; QTCREATOR_UTILS_EXPORT extern const Icon OPENFILE; diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index b2c69e9e9f8..e2464fd2408 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -319,8 +320,7 @@ void BookmarkView::gotoBookmark(const QModelIndex &index) //// BookmarkManager::BookmarkManager() : - m_bookmarkIcon(Utils::Icon({{QLatin1String(":/bookmarks/images/bookmark.png"), - Theme::Bookmarks_TextMarkColor}}, Icon::Tint).pixmap()), + m_bookmarkIcon(Utils::Icons::BOOKMARK_TEXTEDITOR.pixmap()), m_selectionModel(new QItemSelectionModel(this, this)) { connect(ICore::instance(), &ICore::contextChanged, diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro index f6d176aeecf..1445aa9fa78 100644 --- a/src/plugins/bookmarks/bookmarks.pro +++ b/src/plugins/bookmarks/bookmarks.pro @@ -8,5 +8,3 @@ HEADERS += bookmarksplugin.h \ SOURCES += bookmarksplugin.cpp \ bookmark.cpp \ bookmarkmanager.cpp - -RESOURCES += bookmarks.qrc diff --git a/src/plugins/bookmarks/bookmarks.qrc b/src/plugins/bookmarks/bookmarks.qrc deleted file mode 100644 index 764b398555c..00000000000 --- a/src/plugins/bookmarks/bookmarks.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - images/bookmark.png - images/bookmark@2x.png - - diff --git a/src/plugins/bookmarks/images/bookmark.png b/src/plugins/bookmarks/images/bookmark.png deleted file mode 100644 index 05f4eec54138f041fbe49a8375119aa6ec34a948..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#O&@xwW*k5)u;T z&!2zg%9Sr)zWo3HUu%0r3FVdQ&MBb@0QCAM-v9sr diff --git a/src/plugins/bookmarks/images/bookmark@2x.png b/src/plugins/bookmarks/images/bookmark@2x.png deleted file mode 100644 index 903acddbd8a25fd93199fc417f9616ff46f287ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT85&=FTt_%ze+}zw+T3QJS z3G?UAzjEcumoH!b|NpPGJtBsIfx*?&#W6(Ve6of+GfxVqLBqin3{DL<8GIddIYS!^ z_k=LGHZ0w9htc)Go;`acA{#XK?%CtR=;images/book.png images/home.png images/home@2x.png - images/bookmark.png - images/bookmark@2x.png images/category_help.png images/mode_help.png images/mode_help@2x.png diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index a21dfb8caa8..8f12c34fb4d 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -54,7 +55,7 @@ HelpIndexFilter::HelpIndexFilter() setIncludedByDefault(false); setShortcutString(QString(QLatin1Char('?'))); - m_icon = Icons::BOOKMARK.icon(); + m_icon = Utils::Icons::BOOKMARK.icon(); connect(HelpManager::instance(), &HelpManager::setupFinished, this, &HelpIndexFilter::invalidateCache); connect(HelpManager::instance(), &HelpManager::documentationChanged, diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 51686552c3b..0750910d81b 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -180,7 +180,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget button->setPopupMode(QToolButton::DelayedPopup); layout->addWidget(button); - m_addBookmarkAction = new QAction(Icons::BOOKMARK_TOOLBAR.icon(), tr("Add Bookmark"), this); + m_addBookmarkAction = new QAction(Utils::Icons::BOOKMARK_TOOLBAR.icon(), tr("Add Bookmark"), this); cmd = Core::ActionManager::registerAction(m_addBookmarkAction, Constants::HELP_ADDBOOKMARK, context); cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+M") : tr("Ctrl+M"))); connect(m_addBookmarkAction, &QAction::triggered, this, &HelpWidget::addBookmark); diff --git a/src/plugins/help/xbelsupport.cpp b/src/plugins/help/xbelsupport.cpp index 21d5a9a6c7f..ab9db674ad8 100644 --- a/src/plugins/help/xbelsupport.cpp +++ b/src/plugins/help/xbelsupport.cpp @@ -24,10 +24,11 @@ ****************************************************************************/ #include "xbelsupport.h" -#include "helpicons.h" #include +#include + #include using namespace Help::Internal; @@ -97,7 +98,7 @@ XbelReader::XbelReader(BookmarkModel *tree, BookmarkModel *list) , treeModel(tree) , listModel(list) { - bookmarkIcon = Icons::BOOKMARK.icon(); + bookmarkIcon = Utils::Icons::BOOKMARK.icon(); folderIcon = QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon); } diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index f4fe18446e7..4d17c9f8eca 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "bookmarkmanager.h" -#include "helpicons.h" #include @@ -32,6 +31,7 @@ #include #include +#include #include #include @@ -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 4c6b0aa7260..f9429a28150 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( diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 13cc2bd62b5..e4149743035 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3001,7 +3001,7 @@ transform="translate(336,208)" /> + id="src/libs/utils/images/bookmark"> - - - -