diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-01-07 21:39:39 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-02 10:32:47 +0000 |
commit | 807c7c63803a2938864c1ae01e4403b129de3627 (patch) | |
tree | cef58080e88aef23c6385289ccd277c2071e1447 | |
parent | 0c11cee246bdc8fea400493b9b8e1a4a9eaf346f (diff) |
utils: Let the link icon have a LINK and a LINK_TOOLBAR version
Change-Id: I910d491f7f5ac47c55c966f687b004c0e0793c5f
Change-Id: I910d491f7f5ac47c55c966f687b004c0e0793c5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | src/libs/utils/utilsicons.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/utilsicons.h | 1 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffeditor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/modeleditor/actionhandler.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projecttreewidget.cpp | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/outlinefactory.cpp | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 2a60270538..11d6a117fd 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -171,6 +171,8 @@ const Icon CLOSE_SPLIT_RIGHT({ const Icon FILTER({ {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}}); const Icon LINK({ + {QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon LINK_TOOLBAR({ {QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}}); const Icon WARNING({ {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index c836cd3bc3..67ef87434a 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -101,6 +101,7 @@ QTCREATOR_UTILS_EXPORT extern const Icon CLOSE_SPLIT_LEFT; QTCREATOR_UTILS_EXPORT extern const Icon CLOSE_SPLIT_RIGHT; QTCREATOR_UTILS_EXPORT extern const Icon FILTER; QTCREATOR_UTILS_EXPORT extern const Icon LINK; +QTCREATOR_UTILS_EXPORT extern const Icon LINK_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon INFO; QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR; diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index c054622389..d3654d5439 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -276,7 +276,7 @@ DiffEditor::DiffEditor() m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD.icon(), tr("Reload Diff")); m_reloadAction->setToolTip(tr("Reload Diff")); - m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK.icon(), QString()); + m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK_TOOLBAR.icon(), QString()); m_toggleSyncAction->setCheckable(true); m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString()); diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp index 34417d64f2..0c60f89375 100644 --- a/src/plugins/modeleditor/actionhandler.cpp +++ b/src/plugins/modeleditor/actionhandler.cpp @@ -188,7 +188,7 @@ void ActionHandler::createActions() Constants::ACTION_SYNC_BROWSER, nullptr, Core::Context(), tr("Synchronize Browser and Diagram") + "<br><i><small>" + tr("Press && Hold for Options") + "</small></i>", QKeySequence(), - Utils::Icons::LINK.icon())->action(); + Utils::Icons::LINK_TOOLBAR.icon())->action(); d->synchronizeBrowserAction->setCheckable(true); auto editPropertiesAction = new QAction(tr("Edit Element Properties"), Core::ICore::mainWindow()); diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index f310cd1468..1db41b1e8e 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -278,7 +278,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent) m_model, &FlatModel::onCollapsed); m_toggleSync = new QToolButton; - m_toggleSync->setIcon(Icons::LINK.icon()); + m_toggleSync->setIcon(Icons::LINK_TOOLBAR.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(autoSynchronization()); m_toggleSync->setToolTip(tr("Synchronize with Editor")); diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 76dd86717e..6c04f74b68 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -68,7 +68,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) : addWidget(label); m_toggleSync = new QToolButton; - m_toggleSync->setIcon(Utils::Icons::LINK.icon()); + m_toggleSync->setIcon(Utils::Icons::LINK_TOOLBAR.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(true); m_toggleSync->setToolTip(tr("Synchronize with Editor")); |