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

Timeline: Use the existing [un]locked icons

Browse Source 
..and remove the own ones.

Change-Id: I513bb78f07d405aa9699157db292085a847adbe7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2016-08-11 20:12:21 +02:00
parent 743cf871c2
commit 845501b780
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/libs/timeline/qml/lock_closed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 147 B

BIN
src/libs/timeline/qml/lock_open.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 139 B

2
src/libs/timeline/qml/timeline.qrc
View File

@@ -6,8 +6,6 @@
<file>RangeDetails.qml</file> <file>RangeDetails.qml</file>
<file>RangeMover.qml</file> <file>RangeMover.qml</file>
<file>TimeDisplay.qml</file> <file>TimeDisplay.qml</file>
<file>lock_closed.png</file>
<file>lock_open.png</file>
<file>ico_edit.png</file> <file>ico_edit.png</file>
<file>TimeMarks.qml</file> <file>TimeMarks.qml</file>
<file>Overview.qml</file> <file>Overview.qml</file>

6
src/libs/timeline/timelinetheme.cpp
View File

@@ -78,11 +78,9 @@ public:
icon = Utils::Icon({{QLatin1String(":/timeline/ico_edit.png"), icon = Utils::Icon({{QLatin1String(":/timeline/ico_edit.png"),
Utils::Theme::IconsBaseColor}}); Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("lock_open")) else if (iconName == QLatin1String("lock_open"))
icon = Utils::Icon({{QLatin1String(":/timeline/lock_open.png"), icon = Utils::Icons::UNLOCKED_TOOLBAR;
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("lock_closed")) else if (iconName == QLatin1String("lock_closed"))
icon = Utils::Icon({{QLatin1String(":/timeline/lock_closed.png"), icon = Utils::Icons::LOCKED_TOOLBAR;
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("range_handle")) else if (iconName == QLatin1String("range_handle"))
icon = Utils::Icon({{QLatin1String(":/timeline/range_handle.png"), icon = Utils::Icon({{QLatin1String(":/timeline/range_handle.png"),
Utils::Theme::IconsBaseColor}}); Utils::Theme::IconsBaseColor}});