feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Icons: Removing several duplicates and variations of the eye_open icon

Browse Source 
Change-Id: I598005ac81bd847d3d5e88c3d78a0e945c8026c5
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-04-10 20:32:28 +02:00
parent 5c67b798da
commit a84fe0b762
28 changed files with 78 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/libs/qmleditorwidgets/images/eye_open.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 593 B

1
src/libs/qmleditorwidgets/resources.qrc
View File

@@ -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>

4
src/plugins/coreplugin/core.qrc
View 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>

4
src/plugins/coreplugin/coreicons.cpp
View File

@@ -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"));

2
src/plugins/coreplugin/coreicons.h
View File

@@ -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;

0
src/plugins/qmldesigner/components/navigator/eye_closed.png → src/plugins/coreplugin/images/eye_closed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 117 B

0
src/plugins/qmldesigner/components/navigator/eye_closed@2x.png → src/plugins/coreplugin/images/eye_closed@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
src/plugins/qmldesigner/components/navigator/eye_open.png → src/plugins/coreplugin/images/eye_open.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 165 B

0
src/plugins/qmldesigner/components/navigator/eye_open@2x.png → src/plugins/coreplugin/images/eye_open@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

2
src/plugins/debugger/debugger.qrc
View File

@@ -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>

9
src/plugins/debugger/debuggericons.h
View 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({

BIN
src/plugins/debugger/images/tracepoint.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 309 B

BIN
src/plugins/debugger/images/tracepointoverlay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 96 B

BIN
src/plugins/debugger/images/tracepointoverlay@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 B

BIN
src/plugins/debugger/images/watchpoint.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 593 B

BIN
src/plugins/imageviewer/images/originalsize.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 593 B

1
src/plugins/imageviewer/imageviewer.cpp
View File

@@ -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"));

1
src/plugins/imageviewer/imageviewer.qrc
View File

@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/imageviewer">
<file>images/originalsize.png</file>
<file>images/background.png</file>
<file>ImageViewer.mimetypes.xml</file>
</qresource>

4
src/plugins/imageviewer/imageviewertoolbar.ui
View File

@@ -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>

4
src/plugins/qmldesigner/components/navigator/navigator.qrc
View File

@@ -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>

5
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View File

@@ -33,6 +33,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/coreicons.h>
#include <utils/icon.h>
@@ -86,8 +87,8 @@ NavigatorView::NavigatorView(QObject* parent) :
m_treeModel.data());
IconCheckboxItemDelegate *showDelegate =
new IconCheckboxItemDelegate(this,
Icons::EYE_OPEN.pixmap(),
Icons::EYE_CLOSED.pixmap(),
Core::Icons::EYE_OPEN_TOOLBAR.pixmap(),
Core::Icons::EYE_CLOSED_TOOLBAR.pixmap(),
m_treeModel.data());
IconCheckboxItemDelegate *exportDelegate =

4
src/plugins/qmldesigner/qmldesignericons.h
View File

@@ -39,10 +39,6 @@ const Utils::Icon ARROW_DOWN({
{QLatin1String(":/navigator/icon/arrowdown.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon ARROW_LEFT({
{QLatin1String(":/navigator/icon/arrowleft.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon EYE_OPEN({
{QLatin1String(":/navigator/icon/eye_open.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon EYE_CLOSED({
{QLatin1String(":/navigator/icon/eye_closed.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon EXPORT_CHECKED({
{QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon EXPORT_UNCHECKED({

BIN
src/plugins/valgrind/images/eye_crossed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 731 B

BIN
src/plugins/valgrind/images/suppressoverlay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 B

BIN
src/plugins/valgrind/images/suppressoverlay@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 260 B

8
src/plugins/valgrind/memcheckerrorview.cpp
View File

@@ -41,6 +41,8 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <utils/qtcassert.h>
#include <utils/icon.h>
#include <utils/theme/theme.h>
#include <QAction>
@@ -55,7 +57,11 @@ MemcheckErrorView::MemcheckErrorView(QWidget *parent)
{
m_suppressAction = new QAction(this);
m_suppressAction->setText(tr("Suppress Error"));
m_suppressAction->setIcon(QIcon(QLatin1String(":/valgrind/images/eye_crossed.png")));
const QIcon icon = Utils::Icon({
{QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal},
{QLatin1String(":/valgrind/images/suppressoverlay.png"), Utils::Theme::IconsErrorColor}},
Utils::Icon::Tint | Utils::Icon::PunchEdges).icon();
m_suppressAction->setIcon(icon);
m_suppressAction->setShortcut(QKeySequence(Qt::Key_Delete));
m_suppressAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
connect(m_suppressAction, &QAction::triggered, this, &MemcheckErrorView::suppressError);

3
src/plugins/valgrind/valgrind.qrc
View File

@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/valgrind">
<file>images/eye_crossed.png</file>
<file>images/suppressoverlay.png</file>
<file>images/suppressoverlay@2x.png</file>
</qresource>
</RCC>

52
src/tools/icons/qtcreatoricons.svg
View File

@@ -2215,6 +2215,54 @@
width="100%"
height="100%" />
</g>
<g
style="display:inline"
transform="translate(176,0)"
id="src/plugins/debugger/images/tracepointoverlay">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
x="265"
y="568"
width="16"
height="16"
id="rect4810-1-2" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 273,571 8,0"
id="path4877"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 277,572 0,7"
id="path4879"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
<g
style="display:inline"
transform="translate(192,0)"
id="src/plugins/valgrind/images/suppressoverlay">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
x="265"
y="568"
width="16"
height="16"
id="rect4810-1-2-2" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 272.5,582.5 7,-7"
id="path4907"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 272.5,575.5 7,7"
id="path4909"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
<g
id="src/plugins/projectexplorer/images/debugger_overlay_small"
transform="translate(16,0)">
@@ -2439,7 +2487,7 @@
<g
transform="translate(297,268)"
style="display:inline"
id="src/plugins/qmldesigner/components/navigator/eye_open">
id="src/plugins/coreplugin/images/eye_open">
<rect
id="rect6782-9"
height="16"
@@ -2461,7 +2509,7 @@
</g>
<g
transform="translate(263,268)"
id="src/plugins/qmldesigner/components/navigator/eye_closed">
id="src/plugins/coreplugin/images/eye_closed">
<rect
id="rect6790-1"
height="16"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 170 KiB