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

Icons: Removing several duplicates and variations of the eye_open icon



Change-Id: I598005ac81bd847d3d5e88c3d78a0e945c8026c5
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 5c67b798
......@@ -16,7 +16,6 @@
<file>images/checkbox_tr_unchecked@2x.png</file>
<file>images/checkbox_tr_unchecked_pressed.png</file>
<file>images/checkbox_tr_unchecked_pressed@2x.png</file>
<file>images/eye_open.png</file>
<file>images/lock.png</file>
<file>images/hole.png</file>
<file>images/down_arrow.png</file>
......
......@@ -111,5 +111,9 @@
<file>images/stop_small@2x.png</file>
<file>images/boundingrect.png</file>
<file>images/boundingrect@2x.png</file>
<file>images/eye_closed.png</file>
<file>images/eye_closed@2x.png</file>
<file>images/eye_open.png</file>
<file>images/eye_open@2x.png</file>
</qresource>
</RCC>
......@@ -148,6 +148,10 @@ const Utils::Icon INTERRUPT_SMALL({
{QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}});
const Icon BOUNDING_RECT({
{QLatin1String(":/core/images/boundingrect.png"), Theme::IconsBaseColor}});
const Icon EYE_OPEN_TOOLBAR({
{QLatin1String(":/core/images/eye_open.png"), Theme::IconsBaseColor}});
const Icon EYE_CLOSED_TOOLBAR({
{QLatin1String(":/core/images/eye_closed.png"), Theme::IconsBaseColor}});
const Icon MODE_EDIT_CLASSIC(
QLatin1String(":/fancyactionbar/images/mode_Edit.png"));
......
......@@ -91,6 +91,8 @@ CORE_EXPORT extern const Utils::Icon RUN_SMALL;
CORE_EXPORT extern const Utils::Icon STOP_SMALL;
CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL;
CORE_EXPORT extern const Utils::Icon BOUNDING_RECT;
CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR;
CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR;
CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC;
CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT;
......
......@@ -25,8 +25,6 @@
<file>images/debugger_stepout_small@2x.png</file>
<file>images/debugger_stepover_small.png</file>
<file>images/debugger_stepover_small@2x.png</file>
<file>images/watchpoint.png</file>
<file>images/tracepoint.png</file>
<file>images/breakpoint.png</file>
<file>images/breakpoint@2x.png</file>
<file>images/breakpoint_disabled.png</file>
......
......@@ -40,10 +40,11 @@ const Utils::Icon BREAKPOINT_PENDING({
{QLatin1String(":/debugger/images/breakpoint_pending_overlay.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::IconStyleOptions(Utils::Icon::Tint | Utils::Icon::PunchEdges));
const Utils::Icon BREAKPOINTS(
QLatin1String(":/debugger/images/debugger_breakpoints.png"));
const Utils::Icon WATCHPOINT(
QLatin1String(":/debugger/images/watchpoint.png"));
const Utils::Icon TRACEPOINT(
QLatin1String(":/debugger/images/tracepoint.png"));
const Utils::Icon WATCHPOINT({
{QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal}}, Utils::Icon::Tint);
const Utils::Icon TRACEPOINT({
{QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal},
{QLatin1String(":/debugger/images/tracepointoverlay.png"), Utils::Theme::TextColorNormal}}, Utils::Icon::Tint | Utils::Icon::PunchEdges);
const Utils::Icon CONTINUE(
QLatin1String(":/debugger/images/debugger_continue.png"));
const Utils::Icon CONTINUE_FLAT({
......
......@@ -106,6 +106,7 @@ void ImageViewer::ctor()
d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::Icons::EYE_OPEN_TOOLBAR.icon());
// icons update - try to use system theme
updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out"));
......
<RCC>
<qresource prefix="/imageviewer">
<file>images/originalsize.png</file>
<file>images/background.png</file>
<file>ImageViewer.mimetypes.xml</file>
</qresource>
......
......@@ -69,10 +69,6 @@
<property name="toolTipBase">
<string>Original Size</string>
</property>
<property name="icon">
<iconset resource="imageviewer.qrc">
<normaloff>:/imageviewer/images/originalsize.png</normaloff>:/imageviewer/images/originalsize.png</iconset>
</property>
</widget>
</item>
<item>
......
......@@ -12,10 +12,6 @@
<file>export_checked@2x.png</file>
<file>export_unchecked.png</file>
<file>export_unchecked@2x.png</file>
<file>eye_open.png</file>
<file>eye_open@2x.png</file>
<file>eye_closed.png</file>
<file>eye_closed@2x.png</file>
<file>warning.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