Icon refresh: First step towards the new Qt Creator themes
http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
@@ -45,6 +45,7 @@
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/themehelper.h>
|
||||
|
||||
#include <QAction>
|
||||
#include <QStackedWidget>
|
||||
@@ -282,16 +283,16 @@ DiffEditor::DiffEditor()
|
||||
m_whitespaceButtonAction = m_toolBar->addAction(tr("Ignore Whitespace"));
|
||||
m_whitespaceButtonAction->setCheckable(true);
|
||||
|
||||
m_toggleDescriptionAction = m_toolBar->addAction(QIcon(QLatin1String(Constants::ICON_TOP_BAR)),
|
||||
QString());
|
||||
m_toggleDescriptionAction = m_toolBar->addAction(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_TOP_BAR)), QString());
|
||||
m_toggleDescriptionAction->setCheckable(true);
|
||||
|
||||
m_reloadAction = m_toolBar->addAction(QIcon(QLatin1String(Core::Constants::ICON_RELOAD_GRAY)),
|
||||
tr("Reload Diff"));
|
||||
m_reloadAction->setToolTip(tr("Reload Diff"));
|
||||
|
||||
m_toggleSyncAction = m_toolBar->addAction(QIcon(QLatin1String(Core::Constants::ICON_LINK)),
|
||||
QString());
|
||||
m_toggleSyncAction = m_toolBar->addAction(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_LINK)), QString());
|
||||
m_toggleSyncAction->setCheckable(true);
|
||||
|
||||
m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString());
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "sidebysidediffeditorwidget.h"
|
||||
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/themehelper.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
|
||||
@@ -96,7 +97,8 @@ void IDiffView::setSyncToolTip(const QString &text)
|
||||
UnifiedView::UnifiedView() : m_widget(0)
|
||||
{
|
||||
setId(UNIFIED_VIEW_ID);
|
||||
setIcon(QIcon(QLatin1String(":/diffeditor/images/unifieddiff.png")));
|
||||
setIcon(Utils::ThemeHelper::themedIcon(
|
||||
QLatin1String(":/diffeditor/images/unifieddiff.png")));
|
||||
setToolTip(QCoreApplication::translate("DiffEditor::UnifiedView", "Switch to Unified Diff Editor"));
|
||||
}
|
||||
|
||||
@@ -152,7 +154,8 @@ void UnifiedView::setSync(bool sync)
|
||||
SideBySideView::SideBySideView() : m_widget(0)
|
||||
{
|
||||
setId(SIDE_BY_SIDE_VIEW_ID);
|
||||
setIcon(QIcon(QLatin1String(":/diffeditor/images/sidebysidediff.png")));
|
||||
setIcon(Utils::ThemeHelper::themedIcon(
|
||||
QLatin1String(":/diffeditor/images/sidebysidediff.png")));
|
||||
setToolTip(QCoreApplication::translate("DiffEditor::SideBySideView",
|
||||
"Switch to Side By Side Diff Editor"));
|
||||
setSupportsSync(true);
|
||||
|
||||
|
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 164 B |
|
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 171 B |
|
Before Width: | Height: | Size: 125 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 104 B |
|
Before Width: | Height: | Size: 202 B After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 201 B |