Changed the eye icon again

Found this more stylistic version at https://github.com/gnome-design-team/gnome-icons/tree/master/inkscape-symbolic Made the eye background white because it works better on dark themes. Also added a slightly bigger version of the dice icon.
willt · Mar 7, 2017 · 388bd94 · 388bd94
1 parent 11f1ef9
commit 388bd94
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -211,9 +211,11 @@ See http://p.yusukekamiyamane.com/
 The dice icon is based on an SVG by Steaphan Greene that I found on Wikipedia:
 http://en.wikipedia.org/wiki/File:2-Dice-Icon.svg
 
-Icons by Inkscape Developers (GPL 2.0):
+Inkscape icons by Barbara Muraus, Jakub Steiner and Josh Andler (CC-BY-SA 3.0)
 * src/tiled/images/14x14/hidden.png
 * src/tiled/images/14x14/visible.png
+* src/tiled/images/16x16/hidden.png
+* src/tiled/images/16x16/visible.png
 * src/tiled/images/24x24/hidden.png
 * src/tiled/images/24x24/visible.png
 

diff --git a/src/tiled/eyevisibilitydelegate.cpp b/src/tiled/eyevisibilitydelegate.cpp
@@ -30,7 +30,10 @@ EyeVisibilityDelegate::EyeVisibilityDelegate(QObject *parent):
     mVisibleIcon(QLatin1String(":/images/14x14/visible.png")),
     mHiddenIcon(QLatin1String(":/images/14x14/hidden.png"))
 {
+    mVisibleIcon.addFile(QLatin1String(":/images/16x16/visible.png"));
     mVisibleIcon.addFile(QLatin1String(":/images/24x24/visible.png"));
+
+    mHiddenIcon.addFile(QLatin1String(":/images/16x16/hidden.png"));
     mHiddenIcon.addFile(QLatin1String(":/images/24x24/hidden.png"));
 }
 

diff --git a/src/tiled/images/14x14/hidden.png b/src/tiled/images/14x14/hidden.png
diff --git a/src/tiled/images/14x14/visible.png b/src/tiled/images/14x14/visible.png
diff --git a/src/tiled/images/16x16/hidden.png b/src/tiled/images/16x16/hidden.png
diff --git a/src/tiled/images/16x16/visible.png b/src/tiled/images/16x16/visible.png
diff --git a/src/tiled/images/24x24/hidden.png b/src/tiled/images/24x24/hidden.png
diff --git a/src/tiled/images/24x24/visible.png b/src/tiled/images/24x24/visible.png
diff --git a/src/tiled/images/32x32/dice.png b/src/tiled/images/32x32/dice.png
diff --git a/src/tiled/images/24x24/dice.svg → src/tiled/images/scalable/dice.svg b/src/tiled/images/24x24/dice.svg → src/tiled/images/scalable/dice.svg
diff --git a/src/tiled/mapeditor.cpp b/src/tiled/mapeditor.cpp
@@ -143,8 +143,11 @@ MapEditor::MapEditor(QObject *parent)
     mMainWindow->setDockNestingEnabled(true);
     mMainWindow->setCentralWidget(mWidgetStack);
 
+    QIcon diceIcon(QLatin1String(":images/24x24/dice.png"));
+    diceIcon.addFile(QLatin1String(":images/32x32/dice.png"));
+
     mRandomButton = new QToolButton(mMainToolBar);
-    mRandomButton->setIcon(QIcon(QLatin1String(":images/24x24/dice.png")));
+    mRandomButton->setIcon(diceIcon);
     mRandomButton->setCheckable(true);
     mMainToolBar->addWidget(mRandomButton);
 

diff --git a/src/tiled/tiled.qrc b/src/tiled/tiled.qrc
@@ -4,6 +4,8 @@
         <file>images/about-tiled-logo-white.png</file>
         <file>images/14x14/visible.png</file>
         <file>images/14x14/hidden.png</file>
+        <file>images/16x16/visible.png</file>
+        <file>images/16x16/hidden.png</file>
         <file>images/24x24/visible.png</file>
         <file>images/24x24/hidden.png</file>
         <file>images/16x16/add.png</file>
@@ -104,5 +106,6 @@
         <file>images/[email protected]</file>
         <file>images/[email protected]</file>
         <file>images/24x24/insert-text.png</file>
+        <file>images/32x32/dice.png</file>
     </qresource>
 </RCC>