diff --git a/AUTHORS b/AUTHORS index 2008b58b21..0950addf6b 100644 --- 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 index f4fe912382..ee07228a67 100644 --- 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 index be87bc97d2..de314928b9 100644 Binary files a/src/tiled/images/14x14/hidden.png and b/src/tiled/images/14x14/hidden.png differ diff --git a/src/tiled/images/14x14/visible.png b/src/tiled/images/14x14/visible.png index 42b970f6a8..e41141cdce 100644 Binary files a/src/tiled/images/14x14/visible.png and b/src/tiled/images/14x14/visible.png differ diff --git a/src/tiled/images/16x16/hidden.png b/src/tiled/images/16x16/hidden.png new file mode 100644 index 0000000000..b623782c1e Binary files /dev/null and b/src/tiled/images/16x16/hidden.png differ diff --git a/src/tiled/images/16x16/visible.png b/src/tiled/images/16x16/visible.png new file mode 100644 index 0000000000..7a568ae180 Binary files /dev/null and b/src/tiled/images/16x16/visible.png differ diff --git a/src/tiled/images/24x24/hidden.png b/src/tiled/images/24x24/hidden.png index 7c6e93117e..7443fbba28 100644 Binary files a/src/tiled/images/24x24/hidden.png and b/src/tiled/images/24x24/hidden.png differ diff --git a/src/tiled/images/24x24/visible.png b/src/tiled/images/24x24/visible.png index 4057890768..f8465f8374 100644 Binary files a/src/tiled/images/24x24/visible.png and b/src/tiled/images/24x24/visible.png differ diff --git a/src/tiled/images/32x32/dice.png b/src/tiled/images/32x32/dice.png new file mode 100644 index 0000000000..1d05538694 Binary files /dev/null and b/src/tiled/images/32x32/dice.png differ diff --git a/src/tiled/images/24x24/dice.svg b/src/tiled/images/scalable/dice.svg similarity index 100% rename from src/tiled/images/24x24/dice.svg rename to src/tiled/images/scalable/dice.svg diff --git a/src/tiled/mapeditor.cpp b/src/tiled/mapeditor.cpp index 3484a4974d..d27b16bfda 100644 --- 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 index c5e13e73db..3e46c338b6 100644 --- a/src/tiled/tiled.qrc +++ b/src/tiled/tiled.qrc @@ -4,6 +4,8 @@ images/about-tiled-logo-white.png images/14x14/visible.png images/14x14/hidden.png + images/16x16/visible.png + images/16x16/hidden.png images/24x24/visible.png images/24x24/hidden.png images/16x16/add.png @@ -104,5 +106,6 @@ images/dock-close@2x.png images/dock-restore@2x.png images/24x24/insert-text.png + images/32x32/dice.png