From 162c68cb797ab7fdb9d8e6f9d266e65f81a95d91 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Fri, 10 Jul 2020 18:44:18 +0900 Subject: [PATCH] Change prev/next icons on toolbars to up/down arrows Because issues, search results and others on output pane are listed vertically, up/down arrows are better than left/right arrows. Change-Id: If73ec0270e6b448d2487173707ff839f52f35caf Reviewed-by: hjk Reviewed-by: Alessandro Portale --- src/libs/utils/utilsicons.cpp | 4 ++++ src/libs/utils/utilsicons.h | 2 ++ src/plugins/coreplugin/outputpanemanager.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index cb93709f6ea..8bec380a23f 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -139,8 +139,12 @@ const Icon RESET_TOOLBAR({ const Icon ARROW_UP({ {":/utils/images/arrowup.png", Theme::IconsBaseColor}}); +const Icon ARROW_UP_TOOLBAR({ + {":/utils/images/arrowup.png", Theme::IconsNavigationArrowsColor}}); const Icon ARROW_DOWN({ {":/utils/images/arrowdown.png", Theme::IconsBaseColor}}); +const Icon ARROW_DOWN_TOOLBAR({ + {":/utils/images/arrowdown.png", Theme::IconsNavigationArrowsColor}}); const Icon MINUS({ {":/utils/images/minus.png", Theme::IconsBaseColor}}); const Icon PLUS_TOOLBAR({ diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 6f955cd1a37..9e70d8b88c0 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -86,7 +86,9 @@ QTCREATOR_UTILS_EXPORT extern const Icon RESET; QTCREATOR_UTILS_EXPORT extern const Icon RESET_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon ARROW_UP; +QTCREATOR_UTILS_EXPORT extern const Icon ARROW_UP_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon ARROW_DOWN; +QTCREATOR_UTILS_EXPORT extern const Icon ARROW_DOWN_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon MINUS; QTCREATOR_UTILS_EXPORT extern const Icon PLUS_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon PLUS; diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 7222e371686..6ae58c88b28 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -341,12 +341,12 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage); m_nextAction = new QAction(this); - m_nextAction->setIcon(Utils::Icons::NEXT.icon()); + m_nextAction->setIcon(Utils::Icons::ARROW_DOWN_TOOLBAR.icon()); m_nextAction->setText(tr("Next Item")); connect(m_nextAction, &QAction::triggered, this, &OutputPaneManager::slotNext); m_prevAction = new QAction(this); - m_prevAction->setIcon(Utils::Icons::PREV.icon()); + m_prevAction->setIcon(Utils::Icons::ARROW_UP_TOOLBAR.icon()); m_prevAction->setText(tr("Previous Item")); connect(m_prevAction, &QAction::triggered, this, &OutputPaneManager::slotPrev); @@ -410,12 +410,12 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : cmd = ActionManager::registerAction(m_prevAction, "Coreplugin.OutputPane.previtem"); cmd->setDefaultKeySequence(QKeySequence(tr("Shift+F6"))); m_prevToolButton->setDefaultAction( - ProxyAction::proxyActionWithIcon(m_prevAction, Utils::Icons::PREV_TOOLBAR.icon())); + ProxyAction::proxyActionWithIcon(m_prevAction, Utils::Icons::ARROW_UP_TOOLBAR.icon())); mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup"); cmd = ActionManager::registerAction(m_nextAction, "Coreplugin.OutputPane.nextitem"); m_nextToolButton->setDefaultAction( - ProxyAction::proxyActionWithIcon(m_nextAction, Utils::Icons::NEXT_TOOLBAR.icon())); + ProxyAction::proxyActionWithIcon(m_nextAction, Utils::Icons::ARROW_DOWN_TOOLBAR.icon())); cmd->setDefaultKeySequence(QKeySequence(tr("F6"))); mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup");