Skip to content

GitLab

Commit b8bdc6f6 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

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: default avatarChristian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent e6d03836
Hide whitespace changes
Inline Side-by-side
src/libs/utils/fancylineedit.cpp
View file @ b8bdc6f6
......@@ -33,6 +33,8 @@
#include "historycompleter.h"
#include "hostosinfo.h"
#include "qtcassert.h"
#include "themehelper.h"
#include "stylehelper.h"
#include <QAbstractItemView>
#include <QDebug>
......@@ -366,7 +368,10 @@ void FancyLineEdit::setFiltering(bool on)
QIcon icon = QIcon::fromTheme(layoutDirection() == Qt::LeftToRight ?
QLatin1String("edit-clear-locationbar-rtl") :
QLatin1String("edit-clear-locationbar-ltr"),
QIcon::fromTheme(QLatin1String("edit-clear"), QIcon(QLatin1String(":/core/images/editclear.png"))));
QIcon::fromTheme(QLatin1String("edit-clear"),
ThemeHelper::recoloredPixmap(
QLatin1String(":/core/images/editclear.png"),
ThemeHelper::inputfieldIconColor())));
setButtonPixmap(Right, icon.pixmap(16));
setButtonVisible(Right, true);
......
src/plugins/analyzerbase/analyzerbase.qbs
View file @ b8bdc6f6
......@@ -35,15 +35,15 @@ QtcPlugin {
"ianalyzertool.h",
"startremotedialog.cpp",
"startremotedialog.h",
"images/analyzer_category.png",
"images/analyzer_start_small.png",
"images/analyzer_stop_small.png",
"images/mode_analyze.png",
"images/mode_analyze@2x.png",
]
Group {
name: "Images"
prefix: "images/"
files: ["*.png"]
}
Export {
Depends { name: "CPlusPlus" }
}
}
src/plugins/analyzerbase/analyzerbase.qrc
View file @ b8bdc6f6
......@@ -3,7 +3,7 @@
<file>images/mode_analyze.png</file>
<file>images/mode_analyze@2x.png</file>
<file>images/analyzer_category.png</file>
<file>images/analyzer_start_small.png</file>
<file>images/analyzer_stop_small.png</file>
<file>images/analyzer_overlay_small.png</file>
<file>images/analyzer_overlay_small@2x.png</file>
</qresource>
</RCC>
src/plugins/analyzerbase/analyzerconstants.h
View file @ b8bdc6f6
......@@ -54,8 +54,7 @@ const char G_ANALYZER_REMOTE_TOOLS[] = "Menu.Group.Analyzer.RemoteTools";
const char G_ANALYZER_OPTIONS[] = "Menu.Group.Analyzer.Options";
// Manager controls.
const char ANALYZER_CONTROL_START_ICON[] = ":/images/analyzer_start_small.png";
const char ANALYZER_CONTROL_STOP_ICON[] = ":/images/analyzer_stop_small.png";
const char ANALYZER_CONTROL_START_ICON[] = ":/images/analyzer_overlay_small.png,:/core/images/run_overlay_small.png|IconsRunColor";
const char ANALYZERTASK_ID[] = "Analyzer.TaskId";
......
src/plugins/analyzerbase/analyzermanager.cpp
View file @ b8bdc6f6
......@@ -61,6 +61,7 @@
#include <utils/qtcassert.h>
#include <utils/checkablemessagebox.h>
#include <utils/statuslabel.h>
#include <utils/themehelper.h>
#include <QVariant>
#include <QDebug>
......@@ -240,14 +241,16 @@ void AnalyzerManagerPrivate::setupActions()
menubar->addMenu(mtools, m_menu);
m_startAction = new QAction(tr("Start"), m_menu);
m_startAction->setIcon(QIcon(QLatin1String(ANALYZER_CONTROL_START_ICON)));
m_startAction->setIcon(Utils::ThemeHelper::themedIcon(
QLatin1String(ANALYZER_CONTROL_START_ICON)));
ActionManager::registerAction(m_startAction, "Analyzer.Start");
connect(m_startAction, &QAction::triggered,
this, &AnalyzerManagerPrivate::startCurrentTool);
m_stopAction = new QAction(tr("Stop"), m_menu);
m_stopAction->setEnabled(false);
m_stopAction->setIcon(QIcon(QLatin1String(ANALYZER_CONTROL_STOP_ICON)));
m_stopAction->setIcon(Utils::ThemeHelper::themedIcon(
QLatin1String(ProjectExplorer::Constants::ICON_STOP_SMALL)));
command = ActionManager::registerAction(m_stopAction, "Analyzer.Stop");
m_menu->addAction(command, G_ANALYZER_CONTROL);
......
src/plugins/analyzerbase/analyzerruncontrol.cpp
View file @ b8bdc6f6
......@@ -51,7 +51,7 @@ AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp,
RunConfiguration *runConfiguration)
: RunControl(runConfiguration, sp.runMode)
{
setIcon(QLatin1String(":/images/analyzer_start_small.png"));
setIcon(QLatin1String(Constants::ANALYZER_CONTROL_START_ICON));
m_sp = sp;
......
src/plugins/android/androidbuildapkwidget.cpp
View file @ b8bdc6f6
......@@ -36,6 +36,7 @@
#include "androidmanager.h"
#include "ui_androidbuildapkwidget.h"
#include <coreplugin/coreconstants.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/project.h>
#include <projectexplorer/target.h>
......@@ -43,6 +44,7 @@
#include <utils/fancylineedit.h>
#include <utils/pathchooser.h>
#include <utils/themehelper.h>
#include <QFileDialog>
......@@ -89,8 +91,12 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
m_ui->KeystoreLocationPathChooser->setInitialBrowsePathBackup(QDir::homePath());
m_ui->KeystoreLocationPathChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)"));
m_ui->KeystoreLocationPathChooser->setPromptDialogTitle(tr("Select Keystore File"));
m_ui->signingDebugWarningIcon->setPixmap(
Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_ui->signingDebugWarningIcon->hide();
m_ui->signingDebugWarningLabel->hide();
m_ui->signingDebugDeployErrorIcon->setPixmap(
Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
signPackageCheckBoxToggled(m_step->signPackage());
m_ui->useGradleCheckBox->setChecked(m_step->useGradle());
......
src/plugins/android/androidbuildapkwidget.ui
View file @ b8bdc6f6
......@@ -65,12 +65,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
<item>
......@@ -133,12 +127,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -265,8 +253,6 @@ The APK will not be usable on any other device.</string>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<resources/>
<connections/>
</ui>
src/plugins/android/androidmanifesteditorwidget.cpp
View file @ b8bdc6f6
......@@ -50,6 +50,7 @@
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditor.h>
#include <utils/algorithm.h>
#include <utils/themehelper.h>
#include <QLineEdit>
#include <QFileInfo>
......@@ -166,7 +167,8 @@ void AndroidManifestEditorWidget::initializePage()
m_packageNameWarning->setVisible(false);
m_packageNameWarningIcon = new QLabel;
m_packageNameWarningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_packageNameWarningIcon->setPixmap(
Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_packageNameWarningIcon->setVisible(false);
m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
......
src/plugins/android/androidpotentialkit.cpp
View file @ b8bdc6f6
......@@ -33,6 +33,7 @@
#include "androidconfigurations.h"
#include <utils/detailswidget.h>
#include <utils/themehelper.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <projectexplorer/kitmanager.h>
......@@ -92,7 +93,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
: Utils::DetailsWidget(parent)
{
setSummaryText(QLatin1String("<b>Android has not been configured. Create Android kits.</b>"));
setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING)));
//detailsWidget->setState(Utils::DetailsWidget::NoSummary);
QWidget *mainWidget = new QWidget(this);
setWidget(mainWidget);
......
src/plugins/android/androidsettingswidget.cpp
View file @ b8bdc6f6
......@@ -36,9 +36,11 @@
#include "androidconstants.h"
#include "androidtoolchain.h"
#include <coreplugin/coreconstants.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/pathchooser.h>
#include <utils/themehelper.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h>
......@@ -174,6 +176,17 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
m_ui->downloadAntToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost());
m_ui->downloadOpenJDKToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost());
const QPixmap warningPixmap = Utils::ThemeHelper::themedIconPixmap(
QLatin1String(Core::Constants::ICON_WARNING));
m_ui->jdkWarningIconLabel->setPixmap(warningPixmap);
m_ui->kitWarningIconLabel->setPixmap(warningPixmap);
const QPixmap errorPixmap = Utils::ThemeHelper::themedIconPixmap(
QLatin1String(Core::Constants::ICON_ERROR));
m_ui->sdkWarningIconLabel->setPixmap(errorPixmap);
m_ui->gdbWarningIconLabel->setPixmap(errorPixmap);
m_ui->ndkWarningIconLabel->setPixmap(errorPixmap);
connect(m_ui->gdbWarningLabel, SIGNAL(linkActivated(QString)),
this, SLOT(showGdbWarningDialog()));
......
src/plugins/android/androidsettingswidget.ui
View file @ b8bdc6f6
......@@ -46,9 +46,6 @@
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
<item>
......@@ -123,9 +120,6 @@
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
<item>
......@@ -192,9 +186,6 @@
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
<item>
......@@ -228,9 +219,6 @@
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
<item>
......@@ -280,9 +268,6 @@
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
<item>
......@@ -476,7 +461,6 @@
</customwidget>
</customwidgets>
<resources>
<include location="../coreplugin/core.qrc"/>
<include location="android.qrc"/>
</resources>
<connections>
......
src/plugins/android/avddialog.cpp
View file @ b8bdc6f6
......@@ -33,6 +33,7 @@
#include <coreplugin/coreconstants.h>
#include <utils/tooltip/tooltip.h>
#include <utils/themehelper.h>
#include <QKeyEvent>
#include <QMessageBox>
......@@ -62,7 +63,8 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo
m_avdDialog.nameLineEdit->setValidator(v);
m_avdDialog.nameLineEdit->installEventFilter(this);
m_avdDialog.warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_avdDialog.warningIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
QLatin1String(Core::Constants::ICON_WARNING)));
updateApiLevelComboBox();
......
src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
View file @ b8bdc6f6
......@@ -33,6 +33,7 @@
#include <coreplugin/coreconstants.h>
#include <utils/detailswidget.h>
#include <utils/themehelper.h>
#include <QLineEdit>
#include <QFormLayout>
......@@ -90,7 +91,8 @@ void BareMetalRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout)
{
QHBoxLayout * const hl = new QHBoxLayout;
hl->addStretch();
d->disabledIcon.setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
d->disabledIcon.setPixmap(Utils::ThemeHelper::themedIconPixmap(
QLatin1String(Core::Constants::ICON_WARNING)));
hl->addWidget(&d->disabledIcon);
d->disabledReason.setVisible(false);
hl->addWidget(&d->disabledReason);
......
src/plugins/clangcodemodel/clangtextmark.cpp
View file @ b8bdc6f6
......@@ -38,6 +38,7 @@
#include <QApplication>
#include <utils/tooltip/tooltip.h>
#include <utils/themehelper.h>
namespace ClangCodeModel {
......@@ -73,8 +74,8 @@ ClangTextMark::ClangTextMark(const QString &fileName, int lineNumber, ClangBackE
void ClangTextMark::setIcon(ClangBackEnd::DiagnosticSeverity severity)
{
static const QIcon errorIcon{QLatin1String(Core::Constants::ICON_ERROR)};
static const QIcon warningIcon{QLatin1String(Core::Constants::ICON_WARNING)};
static const QIcon errorIcon{Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR))};
static const QIcon warningIcon{Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING))};
if (isWarningOrNote(severity))
TextMark::setIcon(warningIcon);
......
src/plugins/coreplugin/core.qrc
View file @ b8bdc6f6
<RCC>
<qresource prefix="/core">
<file>images/clean_pane_small.png</file>
<file>images/clean_pane_small@2x.png</file>
<file>images/clear.png</file>
<file>images/clear@2x.png</file>
<file>images/closebutton.png</file>
......@@ -26,10 +27,10 @@
<file>images/locked@2x.png</file>
<file>images/magnifier.png</file>
<file>images/magnifier@2x.png</file>
<file>images/dark_magnifier.png</file>
<file>images/dark_magnifier@2x.png</file>
<file>images/minus.png</file>
<file>images/minus@2x.png</file>
<file>images/next.png</file>
<file>images/next@2x.png</file>
<file>images/panel_button.png</file>
<file>images/panel_button@2x.png</file>
<file>images/panel_button_checked.png</file>
......@@ -41,7 +42,9 @@
<file>images/panel_button_pressed.png</file>
<file>images/panel_button_pressed@2x.png</file>
<file>images/plus.png</file>
<file>images/plus@2x.png</file>
<file>images/prev.png</file>
<file>images/prev@2x.png</file>
<file>images/pushbutton.png</file>
<file>images/pushbutton_hover.png</file>
<file>images/pushbutton_pressed.png</file>
......@@ -49,6 +52,7 @@
<file>images/replace.png</file>
<file>images/reset.png</file>
<file>images/sidebaricon.png</file>
<file>images/sidebaricon@2x.png</file>
<file>images/splitbutton_horizontal.png</file>
<file>images/splitbutton_horizontal@2x.png</file>
<file>images/statusbar.png</file>
......@@ -113,5 +117,17 @@
<file>images/dark_fileicon.png</file>
<file>images/dark_foldericon.png</file>
<file>images/Desktop.png</file>
<file>images/run_overlay_small.png</file>
<file>images/run_overlay_small@2x.png</file>
<file>images/stop_overlay_small.png</file>
<file>images/stop_overlay_small@2x.png</file>
<file>images/debugger_overlay_small.png</file>
<file>images/debugger_overlay_small@2x.png</file>
<file>images/interrupt_overlay_small.png</file>
<file>images/interrupt_overlay_small@2x.png</file>
<file>images/continue_overlay_small.png</file>
<file>images/continue_overlay_small@2x.png</file>
<file>images/zoom.png</file>
<file>images/zoom@2x.png</file>
</qresource>
</RCC>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment