feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

utils: Let the link icon have a LINK and a LINK_TOOLBAR version

Browse Source 
Change-Id: I910d491f7f5ac47c55c966f687b004c0e0793c5f
Change-Id: I910d491f7f5ac47c55c966f687b004c0e0793c5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2018-01-07 21:39:39 +01:00
committed by Eike Ziller
parent 0c11cee246
commit 807c7c6380
6 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/utilsicons.cpp
View File

@@ -171,6 +171,8 @@ const Icon CLOSE_SPLIT_RIGHT({
const Icon FILTER({ const Icon FILTER({
{QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}}); {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}});
const Icon LINK({ const Icon LINK({
{QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint);
const Icon LINK_TOOLBAR({
{QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}}); {QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}});
const Icon WARNING({ const Icon WARNING({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},

1
src/libs/utils/utilsicons.h
View File

@@ -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 CLOSE_SPLIT_RIGHT;
QTCREATOR_UTILS_EXPORT extern const Icon FILTER; QTCREATOR_UTILS_EXPORT extern const Icon FILTER;
QTCREATOR_UTILS_EXPORT extern const Icon LINK; 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;
QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR;

2
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -276,7 +276,7 @@ DiffEditor::DiffEditor()
m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD.icon(), tr("Reload Diff")); m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD.icon(), tr("Reload Diff"));
m_reloadAction->setToolTip(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_toggleSyncAction->setCheckable(true);
m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString()); m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString());

2
src/plugins/modeleditor/actionhandler.cpp
View File

@@ -188,7 +188,7 @@ void ActionHandler::createActions()
Constants::ACTION_SYNC_BROWSER, nullptr, Core::Context(), Constants::ACTION_SYNC_BROWSER, nullptr, Core::Context(),
tr("Synchronize Browser and Diagram") + "<br><i><small>" tr("Synchronize Browser and Diagram") + "<br><i><small>"
+ tr("Press && Hold for Options") + "</small></i>", QKeySequence(), + tr("Press && Hold for Options") + "</small></i>", QKeySequence(),
Utils::Icons::LINK.icon())->action(); Utils::Icons::LINK_TOOLBAR.icon())->action();
d->synchronizeBrowserAction->setCheckable(true); d->synchronizeBrowserAction->setCheckable(true);
auto editPropertiesAction = new QAction(tr("Edit Element Properties"), Core::ICore::mainWindow()); auto editPropertiesAction = new QAction(tr("Edit Element Properties"), Core::ICore::mainWindow());

2
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -278,7 +278,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent)
m_model, &FlatModel::onCollapsed); m_model, &FlatModel::onCollapsed);
m_toggleSync = new QToolButton; m_toggleSync = new QToolButton;
m_toggleSync->setIcon(Icons::LINK.icon()); m_toggleSync->setIcon(Icons::LINK_TOOLBAR.icon());
m_toggleSync->setCheckable(true); m_toggleSync->setCheckable(true);
m_toggleSync->setChecked(autoSynchronization()); m_toggleSync->setChecked(autoSynchronization());
m_toggleSync->setToolTip(tr("Synchronize with Editor")); m_toggleSync->setToolTip(tr("Synchronize with Editor"));

2
src/plugins/texteditor/outlinefactory.cpp
View File

@@ -68,7 +68,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) :
addWidget(label); addWidget(label);
m_toggleSync = new QToolButton; 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->setCheckable(true);
m_toggleSync->setChecked(true); m_toggleSync->setChecked(true);
m_toggleSync->setToolTip(tr("Synchronize with Editor")); m_toggleSync->setToolTip(tr("Synchronize with Editor"));