From 0b5c780106af0dfbc9642c33c626a7bbc27e5e4a Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 30 May 2016 18:00:35 +0200 Subject: ProjectExplorer: Move icons into compilation unit of there own Follow the Core pattern and compile them only once. Change-Id: I688962250b1e8595ad27b662bd96584bf30b4a2c Reviewed-by: Alessandro Portale --- src/plugins/projectexplorer/projectexplorericons.h | 84 ++++++++-------------- 1 file changed, 28 insertions(+), 56 deletions(-) (limited to 'src/plugins/projectexplorer/projectexplorericons.h') diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index e65e5ecd96..1dd599cd4f 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -25,67 +25,39 @@ #pragma once +#include "projectexplorer_export.h" + #include namespace ProjectExplorer { namespace Icons { -const Utils::Icon BUILD( - QLatin1String(":/projectexplorer/images/build.png")); -const Utils::Icon BUILD_FLAT({ - {QLatin1String(":/projectexplorer/images/build_hammerhandle_mask.png"), Utils::Theme::IconsBuildHammerHandleColor}, - {QLatin1String(":/projectexplorer/images/build_hammerhead_mask.png"), Utils::Theme::IconsBuildHammerHeadColor}}); -const Utils::Icon BUILD_SMALL( - QLatin1String(":/projectexplorer/images/build_small.png")); -const Utils::Icon REBUILD({ - {QLatin1String(":/projectexplorer/images/rebuildhammerhandles.png"), Utils::Theme::IconsBuildHammerHandleColor}, - {QLatin1String(":/projectexplorer/images/rebuildhammerheads.png"), Utils::Theme::IconsBuildHammerHeadColor}}, Utils::Icon::Tint); -const Utils::Icon RUN( - QLatin1String(":/projectexplorer/images/run.png")); -const Utils::Icon RUN_FLAT({ - {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunToolBarColor}}); -const Utils::Icon WINDOW( - QLatin1String(":/projectexplorer/images/window.png")); -const Utils::Icon DEBUG_START( - QLatin1String(":/projectexplorer/images/debugger_start.png")); - -const Utils::Icon DEBUG_START_FLAT({ - {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunToolBarColor}, - {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}}); -const Utils::Icon DEBUG_START_SMALL({ - {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}, - {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle); -const Utils::Icon DEBUG_START_SMALL_TOOLBAR({ - {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunToolBarColor}, - {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); -const Utils::Icon ANALYZER_START_SMALL({ - {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}, - {QLatin1String(":/projectexplorer/images/analyzer_overlay_small.png"), Utils::Theme::PanelTextColorMid}}, - Utils::Icon::MenuTintedStyle); -const Utils::Icon ANALYZER_START_SMALL_TOOLBAR({ - {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunToolBarColor}, - {QLatin1String(":/projectexplorer/images/analyzer_overlay_small.png"), Utils::Theme::IconsBaseColor}}); - -const Utils::Icon BUILDSTEP_MOVEUP({ - {QLatin1String(":/projectexplorer/images/buildstepmoveup.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); -const Utils::Icon BUILDSTEP_MOVEDOWN({ - {QLatin1String(":/projectexplorer/images/buildstepmovedown.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); -const Utils::Icon BUILDSTEP_DISABLE({ - {QLatin1String(":/projectexplorer/images/buildstepdisable.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); -const Utils::Icon BUILDSTEP_REMOVE({ - {QLatin1String(":/projectexplorer/images/buildstepremove.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); - -const Utils::Icon DESKTOP_DEVICE({ - {QLatin1String(":/projectexplorer/images/desktopdevice.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon DESKTOP_DEVICE_SMALL({ - {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); - -const Utils::Icon MODE_PROJECT_CLASSIC( - QLatin1String(":/projectexplorer/images/mode_project.png")); -const Utils::Icon MODE_PROJECT_FLAT({ - {QLatin1String(":/projectexplorer/images/mode_project_mask.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon MODE_PROJECT_FLAT_ACTIVE({ - {QLatin1String(":/projectexplorer/images/mode_project_mask.png"), Utils::Theme::IconsModeProjetcsActiveColor}}); +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILD; +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILD_FLAT; +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILD_SMALL; +PROJECTEXPLORER_EXPORT extern const Utils::Icon REBUILD; +PROJECTEXPLORER_EXPORT extern const Utils::Icon RUN; +PROJECTEXPLORER_EXPORT extern const Utils::Icon RUN_FLAT; +PROJECTEXPLORER_EXPORT extern const Utils::Icon WINDOW; +PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START; + +PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_FLAT; +PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_SMALL; +PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_SMALL_TOOLBAR; +PROJECTEXPLORER_EXPORT extern const Utils::Icon ANALYZER_START_SMALL; +PROJECTEXPLORER_EXPORT extern const Utils::Icon ANALYZER_START_SMALL_TOOLBAR; + +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILDSTEP_MOVEUP; +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILDSTEP_MOVEDOWN; +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILDSTEP_DISABLE; +PROJECTEXPLORER_EXPORT extern const Utils::Icon BUILDSTEP_REMOVE; + +PROJECTEXPLORER_EXPORT extern const Utils::Icon DESKTOP_DEVICE; +PROJECTEXPLORER_EXPORT extern const Utils::Icon DESKTOP_DEVICE_SMALL; + +PROJECTEXPLORER_EXPORT extern const Utils::Icon MODE_PROJECT_CLASSIC; +PROJECTEXPLORER_EXPORT extern const Utils::Icon MODE_PROJECT_FLAT; +PROJECTEXPLORER_EXPORT extern const Utils::Icon MODE_PROJECT_FLAT_ACTIVE; } // namespace Icons } // namespace ProjectExplorer -- cgit v1.2.3