forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include "actionmanager/command.h"
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/themehelper.h>
|
||||
|
||||
#include <QSettings>
|
||||
#include <QPointer>
|
||||
@@ -204,7 +205,8 @@ SideBarItem *SideBar::item(const QString &id)
|
||||
Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QString &id)
|
||||
{
|
||||
if (!d->m_widgets.isEmpty())
|
||||
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
|
||||
d->m_widgets.at(0)->setCloseIcon(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
|
||||
|
||||
Internal::SideBarWidget *item = new Internal::SideBarWidget(this, id);
|
||||
connect(item, SIGNAL(splitMe()), this, SLOT(splitSubWidget()));
|
||||
@@ -213,9 +215,11 @@ Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QStrin
|
||||
insertWidget(position, item);
|
||||
d->m_widgets.insert(position, item);
|
||||
if (d->m_widgets.size() == 1)
|
||||
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
|
||||
d->m_widgets.at(0)->setCloseIcon(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
|
||||
else
|
||||
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
|
||||
d->m_widgets.at(0)->setCloseIcon(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
|
||||
updateWidgets();
|
||||
return item;
|
||||
}
|
||||
@@ -245,9 +249,11 @@ void SideBar::closeSubWidget()
|
||||
removeSideBarWidget(widget);
|
||||
// update close button of top item
|
||||
if (d->m_widgets.size() == 1)
|
||||
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
|
||||
d->m_widgets.at(0)->setCloseIcon(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
|
||||
else
|
||||
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
|
||||
d->m_widgets.at(0)->setCloseIcon(
|
||||
Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
|
||||
updateWidgets();
|
||||
} else {
|
||||
if (d->m_closeWhenEmpty) {
|
||||
|
||||
Reference in New Issue
Block a user