Permalink
Browse files

Merge pull request #821 from scribblemaniac/iconupdate

Update Toolbar Icons
  • Loading branch information...
chchwy committed Dec 6, 2017
2 parents c9dfc34 + 12b82c5 commit 2adad0878a96583c69ab69b56d8392ef8a908b8b
View
@@ -45,41 +45,41 @@ void ToolBoxWidget::initUI()
{
QGridLayout* layout = new QGridLayout();
pencilButton = newToolButton( QIcon( ":icons/pencil2.png" ),
pencilButton = newToolButton( QIcon( ":icons/new/svg/pencil_detailed.svg" ),
tr( "Pencil Tool (%1): Sketch with pencil" )
.arg( GetToolTips( CMD_TOOL_PENCIL ) ) );
selectButton = newToolButton( QIcon( ":icons/select.png" ),
selectButton = newToolButton( QIcon( ":icons/new/svg/selection.svg" ),
tr( "Select Tool (%1): Select an object" )
.arg( GetToolTips( CMD_TOOL_SELECT ) ) );
moveButton = newToolButton( QIcon( ":icons/arrow.png" ),
moveButton = newToolButton( QIcon( ":icons/new/svg/arrow.svg" ),
tr( "Move Tool (%1): Move an object" )
.arg( GetToolTips( CMD_TOOL_MOVE ) ) );
handButton = newToolButton( QIcon( ":icons/hand.png" ),
handButton = newToolButton( QIcon( ":icons/new/svg/hand_detailed.svg" ),
tr( "Hand Tool (%1): Move the canvas" )
.arg( GetToolTips( CMD_TOOL_HAND ) ) );
penButton = newToolButton( QIcon( ":icons/pen.png" ),
penButton = newToolButton( QIcon( ":icons/new/svg/pen_detailed.svg" ),
tr( "Pen Tool (%1): Sketch with pen" )
.arg( GetToolTips( CMD_TOOL_PEN ) ) );
eraserButton = newToolButton( QIcon( ":icons/eraser.png" ),
eraserButton = newToolButton( QIcon( ":icons/new/svg/eraser_detailed.svg" ),
tr( "Eraser Tool (%1): Erase" )
.arg( GetToolTips( CMD_TOOL_ERASER ) ) );
polylineButton = newToolButton( QIcon( ":icons/polyline.png" ),
polylineButton = newToolButton( QIcon( ":icons/new/svg/line.svg" ),
tr( "Polyline Tool (%1): Create line/curves" )
.arg( GetToolTips( CMD_TOOL_POLYLINE ) ) );
bucketButton = newToolButton( QIcon( ":icons/bucket.png" ),
bucketButton = newToolButton( QIcon( ":icons/new/svg/bucket_detailed.svg" ),
tr( "Paint Bucket Tool (%1): Fill selected area with a color" )
.arg( GetToolTips( CMD_TOOL_BUCKET ) ) );
colouringButton = newToolButton( QIcon( ":icons/brush.png" ),
colouringButton = newToolButton( QIcon( ":icons/new/svg/brush_detailed.svg" ),
tr( "Brush Tool (%1): Paint smooth stroke with a brush" )
.arg( GetToolTips( CMD_TOOL_BRUSH ) ) );
eyedropperButton = newToolButton( QIcon( ":icons/eyedropper.png" ),
eyedropperButton = newToolButton( QIcon( ":icons/new/svg/eyedropper_detailed.svg" ),
tr( "Eyedropper Tool (%1): "
"Set color from the stage<br>[ALT] for instant access" )
.arg( GetToolTips( CMD_TOOL_EYEDROPPER ) ) );
clearButton = newToolButton( QIcon( ":icons/clear.png" ),
clearButton = newToolButton( QIcon( ":icons/new/svg/trash_detailed.svg" ),
tr( "Clear Frame (%1): Erases content of selected frame" )
.arg( GetToolTips( CMD_CLEAR_FRAME ) ) );
smudgeButton = newToolButton( QIcon( ":icons/smudge.png" ),
smudgeButton = newToolButton( QIcon( ":icons/new/svg/smudge_detailed.svg" ),
tr( "Smudge Tool (%1):<br>Edit polyline/curves<br>"
"Liquify bitmap pixels<br> (%1)+[Alt]: Smooth" )
.arg( GetToolTips( CMD_TOOL_SMUDGE ) ) );
View
@@ -583,7 +583,7 @@
<action name="actionMove">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/move.png</normaloff>:/icons/move.png</iconset>
<normaloff>:/icons/new/svg/arrow.svg</normaloff>:/icons/new/svg/arrow.svg</iconset>
</property>
<property name="text">
<string>Move</string>
@@ -601,7 +601,7 @@
<action name="actionSelect">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/select.png</normaloff>:/icons/select.png</iconset>
<normaloff>:/icons/new/svg/selection.svg</normaloff>:/icons/new/svg/selection.svg</iconset>
</property>
<property name="text">
<string>Select</string>
@@ -610,7 +610,7 @@
<action name="actionBrush">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/brush.png</normaloff>:/icons/brush.png</iconset>
<normaloff>:/icons/new/svg/brush_detailed.svg</normaloff>:/icons/new/svg/brush_detailed.svg</iconset>
</property>
<property name="text">
<string>Brush</string>
@@ -619,7 +619,7 @@
<action name="actionPolyline">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/polyline.png</normaloff>:/icons/polyline.png</iconset>
<normaloff>:/icons/new/svg/line.svg</normaloff>:/icons/new/svg/line.svg</iconset>
</property>
<property name="text">
<string>Polyline</string>
@@ -628,7 +628,7 @@
<action name="actionSmudge">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/smudge.png</normaloff>:/icons/smudge.png</iconset>
<normaloff>:/icons/new/svg/smudge_detailed.svg</normaloff>:/icons/new/svg/smudge_detailed.svg</iconset>
</property>
<property name="text">
<string>Smudge</string>
@@ -637,7 +637,7 @@
<action name="actionPen">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/pen.png</normaloff>:/icons/pen.png</iconset>
<normaloff>:/icons/new/svg/pen_detailed.svg</normaloff>:/icons/new/svg/pen_detailed.svg</iconset>
</property>
<property name="text">
<string>Pen</string>
@@ -646,7 +646,7 @@
<action name="actionHand">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/hand.png</normaloff>:/icons/hand.png</iconset>
<normaloff>:/icons/new/svg/hand_detailed.svg</normaloff>:/icons/new/svg/hand_detailed.svg</iconset>
</property>
<property name="text">
<string>Hand</string>
@@ -655,7 +655,7 @@
<action name="actionPencil">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/pencil2.png</normaloff>:/icons/pencil2.png</iconset>
<normaloff>:/icons/new/svg/pencil_detailed.svg</normaloff>:/icons/new/svg/pencil_detailed.svg</iconset>
</property>
<property name="text">
<string>Pencil</string>
@@ -664,7 +664,7 @@
<action name="actionBucket">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/bucket.png</normaloff>:/icons/bucket.png</iconset>
<normaloff>:/icons/new/svg/bucket_detailed.svg</normaloff>:/icons/new/svg/bucket_detailed.svg</iconset>
</property>
<property name="text">
<string>Bucket</string>
@@ -673,7 +673,7 @@
<action name="actionEyedropper">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/eyedropper.png</normaloff>:/icons/eyedropper.png</iconset>
<normaloff>:/icons/new/svg/eyedropper_detailed.svg</normaloff>:/icons/new/svg/eyedropper_detailed.svg</iconset>
</property>
<property name="text">
<string>Eyedropper</string>
@@ -682,7 +682,7 @@
<action name="actionEraser">
<property name="icon">
<iconset resource="../../pencil.qrc">
<normaloff>:/icons/eraser.png</normaloff>:/icons/eraser.png</iconset>
<normaloff>:/icons/new/svg/eraser_detailed.svg</normaloff>:/icons/new/svg/eraser_detailed.svg</iconset>
</property>
<property name="text">
<string>Eraser</string>
@@ -875,9 +875,9 @@
</action>
</widget>
<resources>
<include location="../resource/app.qrc"/>
<include location="../../pencil.qrc"/>
<include location="../../pencil.qrc"/>
<include location="../resource/app.qrc"/>
</resources>
<connections/>
</ui>
File renamed without changes.
View
@@ -1,31 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
<g transform="matrix(1,0,0,1,-298,-94)">
<g id="Arrow" transform="matrix(1,0,0,1,60,40.9959)">
<rect x="238" y="53" width="24" height="24" style="fill:none;"/>
<g>
<g transform="matrix(1,0,0,1,-60,-40.9959)">
<g>
<path d="M309,111.996L305,114.996L305,96.996L317,109.996L312.333,109.996L314,113.996L310,115.996L309,111.996Z" style="fill:url(#_Linear1);"/>
</g>
</g>
<g transform="matrix(1.33333,0,0,1.33333,-159.333,-72.6667)">
<path d="M307,97.248L304.752,97.248L304.752,95L303.248,95L303.248,97.248L301,97.248L301,98.752L303.248,98.752L303.248,101L304.752,101L304.752,98.752L307,98.752L307,97.248Z" style="fill:url(#_Linear2);"/>
</g>
<g transform="matrix(0.941892,0,0,1.00645,17.5899,4.09413)">
<g transform="matrix(1.15677,0,0,1.15677,-97.5903,-13.3964)">
<path d="M294,57.883L302.262,66.472L298.59,66.472L297.299,67.68L294,69.908L294,57.883Z"/>
</g>
<g transform="matrix(-0.514118,0.296826,0.480095,0.831549,370.553,-78.4246)">
<path d="M301.564,60.636L297.637,60.854L299.678,69.673L303.612,69.464L301.564,60.636Z"/>
</g>
</g>
</g>
</g>
</g>
<defs>
<linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-12,-34,34,-12,318,122)"><stop offset="0%" style="stop-color:rgb(0,162,255);stop-opacity:1"/><stop offset="100%" style="stop-color:rgb(0,96,161);stop-opacity:1"/></linearGradient>
<linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-9,-25.5,25.5,-9,313,115.253)"><stop offset="0%" style="stop-color:rgb(0,162,255);stop-opacity:1"/><stop offset="100%" style="stop-color:rgb(0,96,161);stop-opacity:1"/></linearGradient>
</defs>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" baseProfile="tiny"><path fill="none" d="M0-.004h24v24H0z"/><path d="M309 111.996l-4 3v-18l12 13h-4.667l1.667 4-4 2-1-4z" fill="url(#_Linear1)" transform="translate(-298 -94)"/><path d="M307 97.248h-2.248V95h-1.504v2.248H301v1.504h2.248V101h1.504v-2.248H307v-1.504z" fill="url(#_Linear2)" transform="translate(-397.333 -125.67) scale(1.33333)"/><path d="M7.999 4.996l9.002 10H13l-1.407 1.406L8 18.996v-14z"/><path d="M10 12.996l2-.99 3 7.99-2 1-3-8z"/><defs><linearGradient id="_Linear1" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-12 -34 34 -12 318 122)"><stop offset="0" stop-color="#00a2ff"/><stop offset="1" stop-color="#0060a1"/></linearGradient><linearGradient id="_Linear2" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-9 -25.5 25.5 -9 313 115.253)"><stop offset="0" stop-color="#00a2ff"/><stop offset="1" stop-color="#0060a1"/></linearGradient></defs></svg>
Oops, something went wrong.

0 comments on commit 2adad08

Please sign in to comment.