diff --git a/app/data/app.qrc b/app/data/app.qrc index 1c78e052b8..00c7fb59ae 100644 --- a/app/data/app.qrc +++ b/app/data/app.qrc @@ -1,91 +1,98 @@ - icons/remove.png - icons/add.png - icons/magnify.png - icons/layer-vector.png - icons/layer-bitmap.png - icons/layer-sound.png - icons/layer-camera.png - icons/controls/play.png - icons/controls/loop.png - icons/controls/sound.png - icons/prefspencil.png - icons/prefstimeline.png - icons/prefs-files.png + background/checkerboard.png + icons/logo.png + icons/icon.png background/weave.jpg background/dots.png background/grid.jpg - icons/logo.png - icons/icon.png - icons/open.png - icons/copy.png - icons/paste.png - icons/next.png - icons/prev.png - icons/save.png - icons/saveas.png - icons/undo.png - icons/redo.png - icons/new.png - icons/controls/endplay.png - icons/controls/startplay.png - icons/controls/duplicate.png - icons/exit.png - icons/cut.png - icons/prefs-shortcuts.png - icons/grid.png - icons/zoom-in.png - icons/zoom-out.png - icons/zoom-reset.png - background/checkerboard.png - icons/controls/stop.png - icons/controls/sound-disabled.png - icons/new/svg/arrow.svg - icons/new/svg/brush_detailed.svg - icons/new/svg/bucket_detailed.svg - icons/new/svg/eraser_detailed.svg - icons/new/svg/eyedropper_detailed.svg - icons/new/svg/hand_detailed.svg - icons/new/svg/line.svg - icons/new/svg/pen_detailed.svg - icons/new/svg/pencil_detailed.svg - icons/new/svg/selection.svg - icons/new/svg/smudge_detailed.svg - icons/new/svg/trash_detailed.svg - icons/new/checkerboard_smaller.png - icons/overlayCenter.png - icons/overlayGoldenRatio.png - icons/overlaySafe.png - icons/overlayThirds.png - icons/overlayPerspective1.png - icons/overlayPerspective2.png - icons/overlayPerspective3.png - icons/overlayAngle.png - icons/controls/soundscrub.png - icons/controls/soundscrub-disabled.png - icons/new/svg/cursor-rotate.svg - icons/new/svg/cursor-diagonal-left.svg - icons/new/svg/cursor-diagonal-right.svg - icons/new/svg/cursor-horizontal.svg - icons/new/svg/cursor-move.svg - icons/new/svg/cursor-vertical.svg - icons/new/svg/camera-move.svg - icons/new/svg/camera-rotate.svg - icons/new/svg/camera-scale.svg + icons/themes/playful/timeline/frame-add.svg + icons/themes/playful/timeline/frame-duplicate.svg + icons/themes/playful/timeline/frame-remove.svg + icons/themes/playful/timeline/layer-add.svg + icons/themes/playful/timeline/layer-remove.svg + icons/themes/playful/dialog-error.svg + icons/themes/playful/display/perspective-angle.svg + icons/themes/playful/display/perspective-onepoint.svg + icons/themes/playful/display/perspective-threepoints.svg + icons/themes/playful/display/perspective-twopoints.svg + icons/themes/playful/display/lines-invisible.svg + icons/themes/playful/display/lines-outline.svg + icons/themes/playful/display/mirror-horizontal.svg + icons/themes/playful/display/mirror-vertical.svg + icons/themes/playful/display/overlay-center.svg + icons/themes/playful/display/overlay-thirds.svg + icons/themes/playful/menubar/copy.svg + icons/themes/playful/menubar/cut.svg + icons/themes/playful/menubar/new.svg + icons/themes/playful/menubar/open.svg + icons/themes/playful/menubar/paste.svg + icons/themes/playful/menubar/redo.svg + icons/themes/playful/menubar/save.svg + icons/themes/playful/menubar/undo.svg + icons/themes/playful/preferences/preferences-general.svg + icons/themes/playful/preferences/preferences-timeline.svg + icons/themes/playful/preferences/preferences-files.svg + icons/themes/playful/preferences/preferences-shortcuts.svg + icons/themes/playful/preferences/preferences-tools.svg + icons/general/checkerboard_smaller.png + icons/general/cross.png + icons/themes/playful/display/overlay-grid.svg + icons/general/cursor-diagonal-left.svg + icons/general/cursor-diagonal-right.svg + icons/general/cursor-horizontal.svg + icons/general/cursor-move.svg + icons/general/cursor-rotate.svg + icons/general/cursor-vertical.svg + icons/themes/playful/menubar/zoom-in.svg + icons/themes/playful/menubar/zoom-out.svg + icons/themes/playful/menubar/zoom-select.svg + icons/themes/playful/menubar/view-reset.svg + icons/themes/playful/misc/color-dialog.svg + icons/themes/playful/misc/add-color.svg + icons/themes/playful/misc/remove-color.svg + icons/themes/playful/controls/control-play.svg + icons/themes/playful/controls/control-stop.svg + icons/themes/playful/controls/control-loop.svg + icons/themes/playful/controls/control-sound-enable.svg + icons/themes/playful/controls/control-sound-scrub.svg + icons/themes/playful/timeline/cell-bitmap.svg + icons/themes/playful/timeline/cell-camera.svg + icons/themes/playful/timeline/cell-sound.svg + icons/themes/playful/timeline/cell-vector.svg + icons/themes/playful/menubar/clear-canvas.svg + icons/general/cursor-bucket.svg + icons/general/cursor-eyedropper.svg + icons/general/cursor-smudge.svg + icons/general/cursor-pen.svg + icons/general/cursor-brush.svg + icons/general/cursor-pencil.svg + icons/general/cursor-smudge-liquify.svg + icons/themes/playful/display/overlay-golden-ratio.svg + icons/themes/playful/display/overlay-safe.svg + icons/themes/playful/controls/control-play-start.svg + icons/themes/playful/controls/control-play-end.svg + icons/themes/playful/misc/more-options.svg + icons/themes/playful/onion/onionskin-blue.svg + icons/themes/playful/onion/onionskin-red.svg + icons/themes/playful/onion/onionskin-enable.svg + icons/themes/playful/tools/tool-smudge.svg + icons/themes/playful/tools/tool-pencil.svg + icons/themes/playful/tools/tool-bucket.svg + icons/themes/playful/tools/tool-hand.svg + icons/themes/playful/tools/tool-move.svg + icons/themes/playful/tools/tool-brush.svg + icons/themes/playful/tools/tool-eraser.svg + icons/themes/playful/tools/tool-eyedropper.svg + icons/themes/playful/tools/tool-polyline.svg + icons/themes/playful/tools/tool-pen.svg + icons/themes/playful/tools/tool-select.svg + icons/themes/playful/tools/tool-camera-rotate.svg + icons/themes/playful/tools/tool-camera-scale.svg + icons/themes/playful/tools/tool-camera-move.svg + icons/themes/playful/timeline/layer-duplicate.svg - icons/onion-blue.png - icons/onion-red.png - icons/onionNext.png - icons/onionPrev.png - icons/thinlines5.png - icons/outlines5.png - icons/mirror.png - icons/mirrorV.png - icons/dialog-error.svg pencil2d_quick_guide.pdf - icons/new/svg/color-dialog.svg - icons/new/svg/more_options.svg diff --git a/app/data/icons/add.png b/app/data/icons/add.png deleted file mode 100644 index 9ab6832958..0000000000 Binary files a/app/data/icons/add.png and /dev/null differ diff --git a/app/data/icons/controls/duplicate.png b/app/data/icons/controls/duplicate.png deleted file mode 100644 index dc2285a0c7..0000000000 Binary files a/app/data/icons/controls/duplicate.png and /dev/null differ diff --git a/app/data/icons/controls/endplay.png b/app/data/icons/controls/endplay.png deleted file mode 100644 index 0743793d4a..0000000000 Binary files a/app/data/icons/controls/endplay.png and /dev/null differ diff --git a/app/data/icons/controls/loop.png b/app/data/icons/controls/loop.png deleted file mode 100644 index 188cfeb40b..0000000000 Binary files a/app/data/icons/controls/loop.png and /dev/null differ diff --git a/app/data/icons/controls/play.png b/app/data/icons/controls/play.png deleted file mode 100644 index 4377798c48..0000000000 Binary files a/app/data/icons/controls/play.png and /dev/null differ diff --git a/app/data/icons/controls/sound-disabled.png b/app/data/icons/controls/sound-disabled.png deleted file mode 100644 index 90d536ce6a..0000000000 Binary files a/app/data/icons/controls/sound-disabled.png and /dev/null differ diff --git a/app/data/icons/controls/sound.png b/app/data/icons/controls/sound.png deleted file mode 100644 index ba6a452165..0000000000 Binary files a/app/data/icons/controls/sound.png and /dev/null differ diff --git a/app/data/icons/controls/soundscrub-disabled.png b/app/data/icons/controls/soundscrub-disabled.png deleted file mode 100644 index 01aad7c7b6..0000000000 Binary files a/app/data/icons/controls/soundscrub-disabled.png and /dev/null differ diff --git a/app/data/icons/controls/soundscrub.png b/app/data/icons/controls/soundscrub.png deleted file mode 100644 index 51e1c1bf06..0000000000 Binary files a/app/data/icons/controls/soundscrub.png and /dev/null differ diff --git a/app/data/icons/controls/startplay.png b/app/data/icons/controls/startplay.png deleted file mode 100644 index a060f6c0bb..0000000000 Binary files a/app/data/icons/controls/startplay.png and /dev/null differ diff --git a/app/data/icons/controls/stop.png b/app/data/icons/controls/stop.png deleted file mode 100644 index 0fcc166a66..0000000000 Binary files a/app/data/icons/controls/stop.png and /dev/null differ diff --git a/app/data/icons/copy.png b/app/data/icons/copy.png deleted file mode 100644 index 4d60db641f..0000000000 Binary files a/app/data/icons/copy.png and /dev/null differ diff --git a/app/data/icons/cut.png b/app/data/icons/cut.png deleted file mode 100644 index 4222da9688..0000000000 Binary files a/app/data/icons/cut.png and /dev/null differ diff --git a/app/data/icons/dialog-error.svg b/app/data/icons/dialog-error.svg deleted file mode 100644 index c5e13b529e..0000000000 --- a/app/data/icons/dialog-error.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - Dialog Warning - - - - dialog - warning - - - - - Open Clip Art Library, Source: Tango Icon Library, Source: Tango Icon Library, Source: Tango Icon Library, Source: Tango Icon Library - - - - - Andreas Nilsson - - - - - Andreas Nilsson - - - 2005-10-14 - image/svg+xml - - - en - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/exit.png b/app/data/icons/exit.png deleted file mode 100644 index 0e21816019..0000000000 Binary files a/app/data/icons/exit.png and /dev/null differ diff --git a/app/data/icons/new/checkerboard_smaller.png b/app/data/icons/general/checkerboard_smaller.png similarity index 100% rename from app/data/icons/new/checkerboard_smaller.png rename to app/data/icons/general/checkerboard_smaller.png diff --git a/core_lib/data/icons/cross.png b/app/data/icons/general/cross.png similarity index 100% rename from core_lib/data/icons/cross.png rename to app/data/icons/general/cross.png diff --git a/app/data/icons/general/cursor-brush.svg b/app/data/icons/general/cursor-brush.svg new file mode 100644 index 0000000000..908dc2b97f --- /dev/null +++ b/app/data/icons/general/cursor-brush.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/general/cursor-bucket.svg b/app/data/icons/general/cursor-bucket.svg new file mode 100644 index 0000000000..4b9c9cf3a0 --- /dev/null +++ b/app/data/icons/general/cursor-bucket.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/new/svg/cursor-diagonal-left.svg b/app/data/icons/general/cursor-diagonal-left.svg similarity index 100% rename from app/data/icons/new/svg/cursor-diagonal-left.svg rename to app/data/icons/general/cursor-diagonal-left.svg diff --git a/app/data/icons/new/svg/cursor-diagonal-right.svg b/app/data/icons/general/cursor-diagonal-right.svg similarity index 100% rename from app/data/icons/new/svg/cursor-diagonal-right.svg rename to app/data/icons/general/cursor-diagonal-right.svg diff --git a/app/data/icons/general/cursor-eyedropper.svg b/app/data/icons/general/cursor-eyedropper.svg new file mode 100644 index 0000000000..522ac4e42d --- /dev/null +++ b/app/data/icons/general/cursor-eyedropper.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/new/svg/cursor-horizontal.svg b/app/data/icons/general/cursor-horizontal.svg similarity index 100% rename from app/data/icons/new/svg/cursor-horizontal.svg rename to app/data/icons/general/cursor-horizontal.svg diff --git a/app/data/icons/new/svg/cursor-move.svg b/app/data/icons/general/cursor-move.svg similarity index 100% rename from app/data/icons/new/svg/cursor-move.svg rename to app/data/icons/general/cursor-move.svg diff --git a/app/data/icons/general/cursor-pen.svg b/app/data/icons/general/cursor-pen.svg new file mode 100644 index 0000000000..59753b35c9 --- /dev/null +++ b/app/data/icons/general/cursor-pen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/general/cursor-pencil.svg b/app/data/icons/general/cursor-pencil.svg new file mode 100644 index 0000000000..002b17d465 --- /dev/null +++ b/app/data/icons/general/cursor-pencil.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/new/svg/cursor-rotate.svg b/app/data/icons/general/cursor-rotate.svg similarity index 100% rename from app/data/icons/new/svg/cursor-rotate.svg rename to app/data/icons/general/cursor-rotate.svg diff --git a/app/data/icons/general/cursor-smudge-liquify.svg b/app/data/icons/general/cursor-smudge-liquify.svg new file mode 100644 index 0000000000..24e96799a9 --- /dev/null +++ b/app/data/icons/general/cursor-smudge-liquify.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/general/cursor-smudge.svg b/app/data/icons/general/cursor-smudge.svg new file mode 100644 index 0000000000..d8f4c56af1 --- /dev/null +++ b/app/data/icons/general/cursor-smudge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/new/svg/cursor-vertical.svg b/app/data/icons/general/cursor-vertical.svg similarity index 100% rename from app/data/icons/new/svg/cursor-vertical.svg rename to app/data/icons/general/cursor-vertical.svg diff --git a/app/data/icons/grid.png b/app/data/icons/grid.png deleted file mode 100644 index f44227b9be..0000000000 Binary files a/app/data/icons/grid.png and /dev/null differ diff --git a/app/data/icons/layer-bitmap.png b/app/data/icons/layer-bitmap.png deleted file mode 100644 index f955813ea7..0000000000 Binary files a/app/data/icons/layer-bitmap.png and /dev/null differ diff --git a/app/data/icons/layer-camera.png b/app/data/icons/layer-camera.png deleted file mode 100644 index 2003f60ecc..0000000000 Binary files a/app/data/icons/layer-camera.png and /dev/null differ diff --git a/app/data/icons/layer-sound.png b/app/data/icons/layer-sound.png deleted file mode 100644 index c9c9c95a67..0000000000 Binary files a/app/data/icons/layer-sound.png and /dev/null differ diff --git a/app/data/icons/layer-vector.png b/app/data/icons/layer-vector.png deleted file mode 100644 index d264d8c53f..0000000000 Binary files a/app/data/icons/layer-vector.png and /dev/null differ diff --git a/app/data/icons/magnify.png b/app/data/icons/magnify.png deleted file mode 100644 index 3ee87bc0dc..0000000000 Binary files a/app/data/icons/magnify.png and /dev/null differ diff --git a/app/data/icons/mirror.png b/app/data/icons/mirror.png deleted file mode 100644 index 54af26766e..0000000000 Binary files a/app/data/icons/mirror.png and /dev/null differ diff --git a/app/data/icons/mirrorV.png b/app/data/icons/mirrorV.png deleted file mode 100644 index dfe0c01bd9..0000000000 Binary files a/app/data/icons/mirrorV.png and /dev/null differ diff --git a/app/data/icons/new.png b/app/data/icons/new.png deleted file mode 100644 index 6bd01bb238..0000000000 Binary files a/app/data/icons/new.png and /dev/null differ diff --git a/app/data/icons/new/arrow.png b/app/data/icons/new/arrow.png deleted file mode 100644 index c3192963f5..0000000000 Binary files a/app/data/icons/new/arrow.png and /dev/null differ diff --git a/app/data/icons/new/brush_detailed.png b/app/data/icons/new/brush_detailed.png deleted file mode 100644 index 677a2f0bfd..0000000000 Binary files a/app/data/icons/new/brush_detailed.png and /dev/null differ diff --git a/app/data/icons/new/brush_flat_outlined.png b/app/data/icons/new/brush_flat_outlined.png deleted file mode 100644 index f8ad7c56a3..0000000000 Binary files a/app/data/icons/new/brush_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/bucket_detailed.png b/app/data/icons/new/bucket_detailed.png deleted file mode 100644 index c8a664e628..0000000000 Binary files a/app/data/icons/new/bucket_detailed.png and /dev/null differ diff --git a/app/data/icons/new/bucket_flat_outlined.png b/app/data/icons/new/bucket_flat_outlined.png deleted file mode 100644 index b18abef14a..0000000000 Binary files a/app/data/icons/new/bucket_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/eraser_detailed.png b/app/data/icons/new/eraser_detailed.png deleted file mode 100644 index acb6e5f692..0000000000 Binary files a/app/data/icons/new/eraser_detailed.png and /dev/null differ diff --git a/app/data/icons/new/eraser_flat_outlined.png b/app/data/icons/new/eraser_flat_outlined.png deleted file mode 100644 index c80869e8f5..0000000000 Binary files a/app/data/icons/new/eraser_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/eyedropper_detailed.png b/app/data/icons/new/eyedropper_detailed.png deleted file mode 100644 index 7077bad199..0000000000 Binary files a/app/data/icons/new/eyedropper_detailed.png and /dev/null differ diff --git a/app/data/icons/new/eyedropper_flat_outlined.png b/app/data/icons/new/eyedropper_flat_outlined.png deleted file mode 100644 index 11c398feb4..0000000000 Binary files a/app/data/icons/new/eyedropper_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/hand_detailed.png b/app/data/icons/new/hand_detailed.png deleted file mode 100644 index f1bb467c1c..0000000000 Binary files a/app/data/icons/new/hand_detailed.png and /dev/null differ diff --git a/app/data/icons/new/hand_flat_outlined.png b/app/data/icons/new/hand_flat_outlined.png deleted file mode 100644 index c9702db012..0000000000 Binary files a/app/data/icons/new/hand_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/line.png b/app/data/icons/new/line.png deleted file mode 100644 index bd2049e0ef..0000000000 Binary files a/app/data/icons/new/line.png and /dev/null differ diff --git a/app/data/icons/new/pen_detailed.png b/app/data/icons/new/pen_detailed.png deleted file mode 100644 index aef9720720..0000000000 Binary files a/app/data/icons/new/pen_detailed.png and /dev/null differ diff --git a/app/data/icons/new/pen_flat_outlined.png b/app/data/icons/new/pen_flat_outlined.png deleted file mode 100644 index fac8320e34..0000000000 Binary files a/app/data/icons/new/pen_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/pencil_detailed.png b/app/data/icons/new/pencil_detailed.png deleted file mode 100644 index 9517a1398d..0000000000 Binary files a/app/data/icons/new/pencil_detailed.png and /dev/null differ diff --git a/app/data/icons/new/pencil_flat_outlined.png b/app/data/icons/new/pencil_flat_outlined.png deleted file mode 100644 index 3c9f2404b9..0000000000 Binary files a/app/data/icons/new/pencil_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/selection.png b/app/data/icons/new/selection.png deleted file mode 100644 index 426ed090f2..0000000000 Binary files a/app/data/icons/new/selection.png and /dev/null differ diff --git a/app/data/icons/new/smudge_detailed.png b/app/data/icons/new/smudge_detailed.png deleted file mode 100644 index c5fe1ba47a..0000000000 Binary files a/app/data/icons/new/smudge_detailed.png and /dev/null differ diff --git a/app/data/icons/new/smudge_flat_outlined.png b/app/data/icons/new/smudge_flat_outlined.png deleted file mode 100644 index 5defd1232a..0000000000 Binary files a/app/data/icons/new/smudge_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/new/svg/arrow.svg b/app/data/icons/new/svg/arrow.svg deleted file mode 100644 index dccb22fbad..0000000000 --- a/app/data/icons/new/svg/arrow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/brush_detailed.svg b/app/data/icons/new/svg/brush_detailed.svg deleted file mode 100644 index 3439863142..0000000000 --- a/app/data/icons/new/svg/brush_detailed.svg +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/brush_flat_outlined.svg b/app/data/icons/new/svg/brush_flat_outlined.svg deleted file mode 100644 index 2cc465649c..0000000000 --- a/app/data/icons/new/svg/brush_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/bucket_detailed.svg b/app/data/icons/new/svg/bucket_detailed.svg deleted file mode 100644 index 2451c4f20b..0000000000 --- a/app/data/icons/new/svg/bucket_detailed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/bucket_flat_outlined.svg b/app/data/icons/new/svg/bucket_flat_outlined.svg deleted file mode 100644 index 28ac13c64e..0000000000 --- a/app/data/icons/new/svg/bucket_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/camera-move.svg b/app/data/icons/new/svg/camera-move.svg deleted file mode 100644 index 3de5227242..0000000000 --- a/app/data/icons/new/svg/camera-move.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/camera-rotate.svg b/app/data/icons/new/svg/camera-rotate.svg deleted file mode 100644 index a99b2392ab..0000000000 --- a/app/data/icons/new/svg/camera-rotate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/camera-scale.svg b/app/data/icons/new/svg/camera-scale.svg deleted file mode 100644 index fdf95dff99..0000000000 --- a/app/data/icons/new/svg/camera-scale.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/color-dialog.svg b/app/data/icons/new/svg/color-dialog.svg deleted file mode 100644 index 4a79d4bc75..0000000000 --- a/app/data/icons/new/svg/color-dialog.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/eraser_detailed.svg b/app/data/icons/new/svg/eraser_detailed.svg deleted file mode 100644 index f981f4d059..0000000000 --- a/app/data/icons/new/svg/eraser_detailed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/eraser_flat_outlined.svg b/app/data/icons/new/svg/eraser_flat_outlined.svg deleted file mode 100644 index 24735cd0a9..0000000000 --- a/app/data/icons/new/svg/eraser_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/eyedropper_detailed.svg b/app/data/icons/new/svg/eyedropper_detailed.svg deleted file mode 100644 index ae223140c0..0000000000 --- a/app/data/icons/new/svg/eyedropper_detailed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/eyedropper_flat_outlined.svg b/app/data/icons/new/svg/eyedropper_flat_outlined.svg deleted file mode 100644 index 16a19438a4..0000000000 --- a/app/data/icons/new/svg/eyedropper_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/hand_detailed.svg b/app/data/icons/new/svg/hand_detailed.svg deleted file mode 100644 index b1dc80d364..0000000000 --- a/app/data/icons/new/svg/hand_detailed.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/hand_flat_outlined.svg b/app/data/icons/new/svg/hand_flat_outlined.svg deleted file mode 100644 index 3c320cfc47..0000000000 --- a/app/data/icons/new/svg/hand_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/line.svg b/app/data/icons/new/svg/line.svg deleted file mode 100644 index c727549f2c..0000000000 --- a/app/data/icons/new/svg/line.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/more_options.svg b/app/data/icons/new/svg/more_options.svg deleted file mode 100644 index 07f79b30fd..0000000000 --- a/app/data/icons/new/svg/more_options.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/pen_detailed.svg b/app/data/icons/new/svg/pen_detailed.svg deleted file mode 100644 index be8238920b..0000000000 --- a/app/data/icons/new/svg/pen_detailed.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/pen_flat_outlined.svg b/app/data/icons/new/svg/pen_flat_outlined.svg deleted file mode 100644 index a2588d50df..0000000000 --- a/app/data/icons/new/svg/pen_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/pen_pattern_detailed.svg b/app/data/icons/new/svg/pen_pattern_detailed.svg deleted file mode 100644 index 931fcb1ab9..0000000000 --- a/app/data/icons/new/svg/pen_pattern_detailed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/pencil_detailed.svg b/app/data/icons/new/svg/pencil_detailed.svg deleted file mode 100644 index 3f611b6ac2..0000000000 --- a/app/data/icons/new/svg/pencil_detailed.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/pencil_flat_outlined.svg b/app/data/icons/new/svg/pencil_flat_outlined.svg deleted file mode 100644 index 2e32816869..0000000000 --- a/app/data/icons/new/svg/pencil_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/selection.svg b/app/data/icons/new/svg/selection.svg deleted file mode 100644 index d93ec28657..0000000000 --- a/app/data/icons/new/svg/selection.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/smudge_detailed.svg b/app/data/icons/new/svg/smudge_detailed.svg deleted file mode 100644 index 172a92c75a..0000000000 --- a/app/data/icons/new/svg/smudge_detailed.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/smudge_flat_outlined.svg b/app/data/icons/new/svg/smudge_flat_outlined.svg deleted file mode 100644 index 4ef010bbbc..0000000000 --- a/app/data/icons/new/svg/smudge_flat_outlined.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/data/icons/new/svg/trash_detailed.svg b/app/data/icons/new/svg/trash_detailed.svg deleted file mode 100644 index 6fb77c6297..0000000000 --- a/app/data/icons/new/svg/trash_detailed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/svg/trash_flat_outlined.svg b/app/data/icons/new/svg/trash_flat_outlined.svg deleted file mode 100644 index 070e36d853..0000000000 --- a/app/data/icons/new/svg/trash_flat_outlined.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/data/icons/new/trash_detailed.png b/app/data/icons/new/trash_detailed.png deleted file mode 100644 index f3ef881348..0000000000 Binary files a/app/data/icons/new/trash_detailed.png and /dev/null differ diff --git a/app/data/icons/new/trash_flat_outlined.png b/app/data/icons/new/trash_flat_outlined.png deleted file mode 100644 index 848f0a8243..0000000000 Binary files a/app/data/icons/new/trash_flat_outlined.png and /dev/null differ diff --git a/app/data/icons/next.png b/app/data/icons/next.png deleted file mode 100644 index 625adbb2c5..0000000000 Binary files a/app/data/icons/next.png and /dev/null differ diff --git a/app/data/icons/onion-blue.png b/app/data/icons/onion-blue.png deleted file mode 100644 index ad3520ef21..0000000000 Binary files a/app/data/icons/onion-blue.png and /dev/null differ diff --git a/app/data/icons/onion-red.png b/app/data/icons/onion-red.png deleted file mode 100644 index c05086a945..0000000000 Binary files a/app/data/icons/onion-red.png and /dev/null differ diff --git a/app/data/icons/onionNext.png b/app/data/icons/onionNext.png deleted file mode 100644 index 45bb9d0136..0000000000 Binary files a/app/data/icons/onionNext.png and /dev/null differ diff --git a/app/data/icons/onionPrev.png b/app/data/icons/onionPrev.png deleted file mode 100644 index 09f529e55c..0000000000 Binary files a/app/data/icons/onionPrev.png and /dev/null differ diff --git a/app/data/icons/open.png b/app/data/icons/open.png deleted file mode 100644 index a79982ea1f..0000000000 Binary files a/app/data/icons/open.png and /dev/null differ diff --git a/app/data/icons/outlines5.png b/app/data/icons/outlines5.png deleted file mode 100644 index c466bb8ec6..0000000000 Binary files a/app/data/icons/outlines5.png and /dev/null differ diff --git a/app/data/icons/overlayAngle.png b/app/data/icons/overlayAngle.png deleted file mode 100644 index 244ac3264e..0000000000 Binary files a/app/data/icons/overlayAngle.png and /dev/null differ diff --git a/app/data/icons/overlayCenter.png b/app/data/icons/overlayCenter.png deleted file mode 100644 index 78c1f7b73f..0000000000 Binary files a/app/data/icons/overlayCenter.png and /dev/null differ diff --git a/app/data/icons/overlayGoldenRatio.png b/app/data/icons/overlayGoldenRatio.png deleted file mode 100644 index a207587b29..0000000000 Binary files a/app/data/icons/overlayGoldenRatio.png and /dev/null differ diff --git a/app/data/icons/overlayPerspective1.png b/app/data/icons/overlayPerspective1.png deleted file mode 100644 index 981cf33dfa..0000000000 Binary files a/app/data/icons/overlayPerspective1.png and /dev/null differ diff --git a/app/data/icons/overlayPerspective2.png b/app/data/icons/overlayPerspective2.png deleted file mode 100644 index 1ee0bb396e..0000000000 Binary files a/app/data/icons/overlayPerspective2.png and /dev/null differ diff --git a/app/data/icons/overlayPerspective3.png b/app/data/icons/overlayPerspective3.png deleted file mode 100644 index e06848d05a..0000000000 Binary files a/app/data/icons/overlayPerspective3.png and /dev/null differ diff --git a/app/data/icons/overlaySafe.png b/app/data/icons/overlaySafe.png deleted file mode 100644 index d0563e97cb..0000000000 Binary files a/app/data/icons/overlaySafe.png and /dev/null differ diff --git a/app/data/icons/overlayThirds.png b/app/data/icons/overlayThirds.png deleted file mode 100644 index ccf9d026de..0000000000 Binary files a/app/data/icons/overlayThirds.png and /dev/null differ diff --git a/app/data/icons/paste.png b/app/data/icons/paste.png deleted file mode 100644 index 5e60ba794c..0000000000 Binary files a/app/data/icons/paste.png and /dev/null differ diff --git a/app/data/icons/prefs-files.png b/app/data/icons/prefs-files.png deleted file mode 100644 index 85bc16e0ef..0000000000 Binary files a/app/data/icons/prefs-files.png and /dev/null differ diff --git a/app/data/icons/prefs-shortcuts.png b/app/data/icons/prefs-shortcuts.png deleted file mode 100644 index 1fd7bd0135..0000000000 Binary files a/app/data/icons/prefs-shortcuts.png and /dev/null differ diff --git a/app/data/icons/prefspencil.png b/app/data/icons/prefspencil.png deleted file mode 100644 index 84d69a7041..0000000000 Binary files a/app/data/icons/prefspencil.png and /dev/null differ diff --git a/app/data/icons/prefstimeline.png b/app/data/icons/prefstimeline.png deleted file mode 100644 index fb00fc9630..0000000000 Binary files a/app/data/icons/prefstimeline.png and /dev/null differ diff --git a/app/data/icons/prev.png b/app/data/icons/prev.png deleted file mode 100644 index e3a64d5276..0000000000 Binary files a/app/data/icons/prev.png and /dev/null differ diff --git a/app/data/icons/redo.png b/app/data/icons/redo.png deleted file mode 100644 index 8a4c817d01..0000000000 Binary files a/app/data/icons/redo.png and /dev/null differ diff --git a/app/data/icons/remove.png b/app/data/icons/remove.png deleted file mode 100644 index 7b7d407eb4..0000000000 Binary files a/app/data/icons/remove.png and /dev/null differ diff --git a/app/data/icons/save.png b/app/data/icons/save.png deleted file mode 100644 index 47d8f201f8..0000000000 Binary files a/app/data/icons/save.png and /dev/null differ diff --git a/app/data/icons/saveas.png b/app/data/icons/saveas.png deleted file mode 100644 index 7e478ebb6d..0000000000 Binary files a/app/data/icons/saveas.png and /dev/null differ diff --git a/app/data/icons/themes/playful/controls/control-loop.svg b/app/data/icons/themes/playful/controls/control-loop.svg new file mode 100644 index 0000000000..accd68b0eb --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-loop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/controls/control-play-end.svg b/app/data/icons/themes/playful/controls/control-play-end.svg new file mode 100644 index 0000000000..4d9464ee48 --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-play-end.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/controls/control-play-start.svg b/app/data/icons/themes/playful/controls/control-play-start.svg new file mode 100644 index 0000000000..06b7b58ca2 --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-play-start.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/controls/control-play.svg b/app/data/icons/themes/playful/controls/control-play.svg new file mode 100644 index 0000000000..1bc0aa42d2 --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/controls/control-sound-enable.svg b/app/data/icons/themes/playful/controls/control-sound-enable.svg new file mode 100644 index 0000000000..6bf0efd276 --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-sound-enable.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/controls/control-sound-scrub.svg b/app/data/icons/themes/playful/controls/control-sound-scrub.svg new file mode 100644 index 0000000000..af430cbaa1 --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-sound-scrub.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/controls/control-stop.svg b/app/data/icons/themes/playful/controls/control-stop.svg new file mode 100644 index 0000000000..8407d60b4f --- /dev/null +++ b/app/data/icons/themes/playful/controls/control-stop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/dialog-error.svg b/app/data/icons/themes/playful/dialog-error.svg new file mode 100644 index 0000000000..865a31e319 --- /dev/null +++ b/app/data/icons/themes/playful/dialog-error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/lines-invisible.svg b/app/data/icons/themes/playful/display/lines-invisible.svg new file mode 100644 index 0000000000..1960855348 --- /dev/null +++ b/app/data/icons/themes/playful/display/lines-invisible.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/lines-outline.svg b/app/data/icons/themes/playful/display/lines-outline.svg new file mode 100644 index 0000000000..06203759a0 --- /dev/null +++ b/app/data/icons/themes/playful/display/lines-outline.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/mirror-horizontal.svg b/app/data/icons/themes/playful/display/mirror-horizontal.svg new file mode 100644 index 0000000000..f8af0aa110 --- /dev/null +++ b/app/data/icons/themes/playful/display/mirror-horizontal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/mirror-vertical.svg b/app/data/icons/themes/playful/display/mirror-vertical.svg new file mode 100644 index 0000000000..cebd5b7a79 --- /dev/null +++ b/app/data/icons/themes/playful/display/mirror-vertical.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/overlay-center.svg b/app/data/icons/themes/playful/display/overlay-center.svg new file mode 100644 index 0000000000..322a746ad8 --- /dev/null +++ b/app/data/icons/themes/playful/display/overlay-center.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/overlay-golden-ratio.svg b/app/data/icons/themes/playful/display/overlay-golden-ratio.svg new file mode 100644 index 0000000000..c1d1c2e1a3 --- /dev/null +++ b/app/data/icons/themes/playful/display/overlay-golden-ratio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/overlay-grid.svg b/app/data/icons/themes/playful/display/overlay-grid.svg new file mode 100644 index 0000000000..cf629212cb --- /dev/null +++ b/app/data/icons/themes/playful/display/overlay-grid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/overlay-safe.svg b/app/data/icons/themes/playful/display/overlay-safe.svg new file mode 100644 index 0000000000..34ece24a7f --- /dev/null +++ b/app/data/icons/themes/playful/display/overlay-safe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/overlay-thirds.svg b/app/data/icons/themes/playful/display/overlay-thirds.svg new file mode 100644 index 0000000000..b03b5a0740 --- /dev/null +++ b/app/data/icons/themes/playful/display/overlay-thirds.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/perspective-angle.svg b/app/data/icons/themes/playful/display/perspective-angle.svg new file mode 100644 index 0000000000..730edb4dbe --- /dev/null +++ b/app/data/icons/themes/playful/display/perspective-angle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/perspective-onepoint.svg b/app/data/icons/themes/playful/display/perspective-onepoint.svg new file mode 100644 index 0000000000..181dfed2e2 --- /dev/null +++ b/app/data/icons/themes/playful/display/perspective-onepoint.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/perspective-threepoints.svg b/app/data/icons/themes/playful/display/perspective-threepoints.svg new file mode 100644 index 0000000000..4e5ee7f054 --- /dev/null +++ b/app/data/icons/themes/playful/display/perspective-threepoints.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/display/perspective-twopoints.svg b/app/data/icons/themes/playful/display/perspective-twopoints.svg new file mode 100644 index 0000000000..478c627a2a --- /dev/null +++ b/app/data/icons/themes/playful/display/perspective-twopoints.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/clear-canvas.svg b/app/data/icons/themes/playful/menubar/clear-canvas.svg new file mode 100644 index 0000000000..622a54fba9 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/clear-canvas.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/copy.svg b/app/data/icons/themes/playful/menubar/copy.svg new file mode 100644 index 0000000000..ee48daa369 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/cut.svg b/app/data/icons/themes/playful/menubar/cut.svg new file mode 100644 index 0000000000..d97b9e4818 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/cut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/new.svg b/app/data/icons/themes/playful/menubar/new.svg new file mode 100644 index 0000000000..f554767916 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/open.svg b/app/data/icons/themes/playful/menubar/open.svg new file mode 100644 index 0000000000..a344bc2213 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/paste.svg b/app/data/icons/themes/playful/menubar/paste.svg new file mode 100644 index 0000000000..77635a80f7 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/paste.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/redo.svg b/app/data/icons/themes/playful/menubar/redo.svg new file mode 100644 index 0000000000..e0d0b29bab --- /dev/null +++ b/app/data/icons/themes/playful/menubar/redo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/save.svg b/app/data/icons/themes/playful/menubar/save.svg new file mode 100644 index 0000000000..5c0e590030 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/undo.svg b/app/data/icons/themes/playful/menubar/undo.svg new file mode 100644 index 0000000000..93a7b3129f --- /dev/null +++ b/app/data/icons/themes/playful/menubar/undo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/view-reset.svg b/app/data/icons/themes/playful/menubar/view-reset.svg new file mode 100644 index 0000000000..4744b3e865 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/view-reset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/zoom-in.svg b/app/data/icons/themes/playful/menubar/zoom-in.svg new file mode 100644 index 0000000000..b0b9338c98 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/zoom-in.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/zoom-out.svg b/app/data/icons/themes/playful/menubar/zoom-out.svg new file mode 100644 index 0000000000..9251aa6d29 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/zoom-out.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/menubar/zoom-select.svg b/app/data/icons/themes/playful/menubar/zoom-select.svg new file mode 100644 index 0000000000..fc55991536 --- /dev/null +++ b/app/data/icons/themes/playful/menubar/zoom-select.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/misc/add-color.svg b/app/data/icons/themes/playful/misc/add-color.svg new file mode 100644 index 0000000000..b4e82b5bc0 --- /dev/null +++ b/app/data/icons/themes/playful/misc/add-color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/misc/color-dialog.svg b/app/data/icons/themes/playful/misc/color-dialog.svg new file mode 100644 index 0000000000..e48c0e7abd --- /dev/null +++ b/app/data/icons/themes/playful/misc/color-dialog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/misc/more-options.svg b/app/data/icons/themes/playful/misc/more-options.svg new file mode 100644 index 0000000000..8edf749a6e --- /dev/null +++ b/app/data/icons/themes/playful/misc/more-options.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/misc/remove-color.svg b/app/data/icons/themes/playful/misc/remove-color.svg new file mode 100644 index 0000000000..59987335b0 --- /dev/null +++ b/app/data/icons/themes/playful/misc/remove-color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/onion/onionskin-blue.svg b/app/data/icons/themes/playful/onion/onionskin-blue.svg new file mode 100644 index 0000000000..2327808070 --- /dev/null +++ b/app/data/icons/themes/playful/onion/onionskin-blue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/onion/onionskin-enable.svg b/app/data/icons/themes/playful/onion/onionskin-enable.svg new file mode 100644 index 0000000000..2af800b059 --- /dev/null +++ b/app/data/icons/themes/playful/onion/onionskin-enable.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/onion/onionskin-red.svg b/app/data/icons/themes/playful/onion/onionskin-red.svg new file mode 100644 index 0000000000..2dc1faf2ab --- /dev/null +++ b/app/data/icons/themes/playful/onion/onionskin-red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/preferences/preferences-files.svg b/app/data/icons/themes/playful/preferences/preferences-files.svg new file mode 100644 index 0000000000..f93af37091 --- /dev/null +++ b/app/data/icons/themes/playful/preferences/preferences-files.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/preferences/preferences-general.svg b/app/data/icons/themes/playful/preferences/preferences-general.svg new file mode 100644 index 0000000000..d1a238695a --- /dev/null +++ b/app/data/icons/themes/playful/preferences/preferences-general.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/preferences/preferences-shortcuts.svg b/app/data/icons/themes/playful/preferences/preferences-shortcuts.svg new file mode 100644 index 0000000000..2957338e7d --- /dev/null +++ b/app/data/icons/themes/playful/preferences/preferences-shortcuts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/preferences/preferences-timeline.svg b/app/data/icons/themes/playful/preferences/preferences-timeline.svg new file mode 100644 index 0000000000..fd7c7d924a --- /dev/null +++ b/app/data/icons/themes/playful/preferences/preferences-timeline.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/preferences/preferences-tools.svg b/app/data/icons/themes/playful/preferences/preferences-tools.svg new file mode 100644 index 0000000000..122f4a3a65 --- /dev/null +++ b/app/data/icons/themes/playful/preferences/preferences-tools.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/cell-bitmap.svg b/app/data/icons/themes/playful/timeline/cell-bitmap.svg new file mode 100644 index 0000000000..d6c1ea2335 --- /dev/null +++ b/app/data/icons/themes/playful/timeline/cell-bitmap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/cell-camera.svg b/app/data/icons/themes/playful/timeline/cell-camera.svg new file mode 100644 index 0000000000..c493389459 --- /dev/null +++ b/app/data/icons/themes/playful/timeline/cell-camera.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/cell-sound.svg b/app/data/icons/themes/playful/timeline/cell-sound.svg new file mode 100644 index 0000000000..3503240e2b --- /dev/null +++ b/app/data/icons/themes/playful/timeline/cell-sound.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/cell-vector.svg b/app/data/icons/themes/playful/timeline/cell-vector.svg new file mode 100644 index 0000000000..a00f27599d --- /dev/null +++ b/app/data/icons/themes/playful/timeline/cell-vector.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/frame-add.svg b/app/data/icons/themes/playful/timeline/frame-add.svg new file mode 100644 index 0000000000..d898e6ac50 --- /dev/null +++ b/app/data/icons/themes/playful/timeline/frame-add.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/frame-duplicate.svg b/app/data/icons/themes/playful/timeline/frame-duplicate.svg new file mode 100644 index 0000000000..fcbe1a8caa --- /dev/null +++ b/app/data/icons/themes/playful/timeline/frame-duplicate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/frame-remove.svg b/app/data/icons/themes/playful/timeline/frame-remove.svg new file mode 100644 index 0000000000..56977b6d1d --- /dev/null +++ b/app/data/icons/themes/playful/timeline/frame-remove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/layer-add.svg b/app/data/icons/themes/playful/timeline/layer-add.svg new file mode 100644 index 0000000000..6aa9a06f5b --- /dev/null +++ b/app/data/icons/themes/playful/timeline/layer-add.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/layer-duplicate.svg b/app/data/icons/themes/playful/timeline/layer-duplicate.svg new file mode 100644 index 0000000000..f6d0a9ebff --- /dev/null +++ b/app/data/icons/themes/playful/timeline/layer-duplicate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/timeline/layer-remove.svg b/app/data/icons/themes/playful/timeline/layer-remove.svg new file mode 100644 index 0000000000..b0af390983 --- /dev/null +++ b/app/data/icons/themes/playful/timeline/layer-remove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-brush.svg b/app/data/icons/themes/playful/tools/tool-brush.svg new file mode 100644 index 0000000000..9627b4b631 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-brush.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-bucket.svg b/app/data/icons/themes/playful/tools/tool-bucket.svg new file mode 100644 index 0000000000..054a684f47 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-bucket.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-camera-move.svg b/app/data/icons/themes/playful/tools/tool-camera-move.svg new file mode 100644 index 0000000000..ac74f3c653 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-camera-move.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-camera-rotate.svg b/app/data/icons/themes/playful/tools/tool-camera-rotate.svg new file mode 100644 index 0000000000..853cc38239 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-camera-rotate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-camera-scale.svg b/app/data/icons/themes/playful/tools/tool-camera-scale.svg new file mode 100644 index 0000000000..bc8f954773 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-camera-scale.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-eraser.svg b/app/data/icons/themes/playful/tools/tool-eraser.svg new file mode 100644 index 0000000000..e9f2ab3f0e --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-eraser.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-eyedropper.svg b/app/data/icons/themes/playful/tools/tool-eyedropper.svg new file mode 100644 index 0000000000..808c1e7829 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-eyedropper.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-hand.svg b/app/data/icons/themes/playful/tools/tool-hand.svg new file mode 100644 index 0000000000..2071aa06bd --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-hand.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-move.svg b/app/data/icons/themes/playful/tools/tool-move.svg new file mode 100644 index 0000000000..fbb384c16b --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-move.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-pen.svg b/app/data/icons/themes/playful/tools/tool-pen.svg new file mode 100644 index 0000000000..b593c30d54 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-pen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-pencil.svg b/app/data/icons/themes/playful/tools/tool-pencil.svg new file mode 100644 index 0000000000..c4945557a1 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-pencil.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-polyline.svg b/app/data/icons/themes/playful/tools/tool-polyline.svg new file mode 100644 index 0000000000..59da896252 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-polyline.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-select.svg b/app/data/icons/themes/playful/tools/tool-select.svg new file mode 100644 index 0000000000..f25e2d0c16 --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-select.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/themes/playful/tools/tool-smudge.svg b/app/data/icons/themes/playful/tools/tool-smudge.svg new file mode 100644 index 0000000000..4527e8fe5a --- /dev/null +++ b/app/data/icons/themes/playful/tools/tool-smudge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/data/icons/thinlines5.png b/app/data/icons/thinlines5.png deleted file mode 100644 index 6d8655d1a2..0000000000 Binary files a/app/data/icons/thinlines5.png and /dev/null differ diff --git a/app/data/icons/undo.png b/app/data/icons/undo.png deleted file mode 100644 index a63c3ef998..0000000000 Binary files a/app/data/icons/undo.png and /dev/null differ diff --git a/app/data/icons/unused/TitleBarCloseButton.png b/app/data/icons/unused/TitleBarCloseButton.png deleted file mode 100644 index a1510b196c..0000000000 Binary files a/app/data/icons/unused/TitleBarCloseButton.png and /dev/null differ diff --git a/app/data/icons/unused/TitleBarNormalButton.png b/app/data/icons/unused/TitleBarNormalButton.png deleted file mode 100644 index d379c70a60..0000000000 Binary files a/app/data/icons/unused/TitleBarNormalButton.png and /dev/null differ diff --git a/app/data/icons/unused/TitleBarNormalButton1.png b/app/data/icons/unused/TitleBarNormalButton1.png deleted file mode 100644 index 7b73f6585e..0000000000 Binary files a/app/data/icons/unused/TitleBarNormalButton1.png and /dev/null differ diff --git a/app/data/icons/unused/TitleBarNormalButton2.png b/app/data/icons/unused/TitleBarNormalButton2.png deleted file mode 100644 index dbba6c93ef..0000000000 Binary files a/app/data/icons/unused/TitleBarNormalButton2.png and /dev/null differ diff --git a/app/data/icons/unused/aqua.png b/app/data/icons/unused/aqua.png deleted file mode 100644 index 303e80f24e..0000000000 Binary files a/app/data/icons/unused/aqua.png and /dev/null differ diff --git a/app/data/icons/unused/arrow.png b/app/data/icons/unused/arrow.png deleted file mode 100644 index ee926e95f4..0000000000 Binary files a/app/data/icons/unused/arrow.png and /dev/null differ diff --git a/app/data/icons/unused/brush0.png b/app/data/icons/unused/brush0.png deleted file mode 100644 index 03d1ecae21..0000000000 Binary files a/app/data/icons/unused/brush0.png and /dev/null differ diff --git a/app/data/icons/unused/bucket.png b/app/data/icons/unused/bucket.png deleted file mode 100644 index b87ff2bf47..0000000000 Binary files a/app/data/icons/unused/bucket.png and /dev/null differ diff --git a/app/data/icons/unused/bucket0.png b/app/data/icons/unused/bucket0.png deleted file mode 100644 index 98a74af436..0000000000 Binary files a/app/data/icons/unused/bucket0.png and /dev/null differ diff --git a/app/data/icons/unused/bucket1.png b/app/data/icons/unused/bucket1.png deleted file mode 100644 index 8823ce8cb1..0000000000 Binary files a/app/data/icons/unused/bucket1.png and /dev/null differ diff --git a/app/data/icons/unused/bucket2.png b/app/data/icons/unused/bucket2.png deleted file mode 100644 index 10a00993dd..0000000000 Binary files a/app/data/icons/unused/bucket2.png and /dev/null differ diff --git a/app/data/icons/unused/cameraBorder.png b/app/data/icons/unused/cameraBorder.png deleted file mode 100644 index 1961de39f2..0000000000 Binary files a/app/data/icons/unused/cameraBorder.png and /dev/null differ diff --git a/app/data/icons/unused/clear.png b/app/data/icons/unused/clear.png deleted file mode 100644 index e04870db8c..0000000000 Binary files a/app/data/icons/unused/clear.png and /dev/null differ diff --git a/app/data/icons/unused/eraser.png b/app/data/icons/unused/eraser.png deleted file mode 100644 index c86abe0c3c..0000000000 Binary files a/app/data/icons/unused/eraser.png and /dev/null differ diff --git a/app/data/icons/unused/eraser1.png b/app/data/icons/unused/eraser1.png deleted file mode 100644 index dc70873bec..0000000000 Binary files a/app/data/icons/unused/eraser1.png and /dev/null differ diff --git a/app/data/icons/unused/eraser2.png b/app/data/icons/unused/eraser2.png deleted file mode 100644 index fc7ec9a48d..0000000000 Binary files a/app/data/icons/unused/eraser2.png and /dev/null differ diff --git a/app/data/icons/unused/grid-b.png b/app/data/icons/unused/grid-b.png deleted file mode 100644 index f956c7a8ec..0000000000 Binary files a/app/data/icons/unused/grid-b.png and /dev/null differ diff --git a/app/data/icons/unused/hand.png b/app/data/icons/unused/hand.png deleted file mode 100644 index 2e16ba02c4..0000000000 Binary files a/app/data/icons/unused/hand.png and /dev/null differ diff --git a/app/data/icons/unused/house.png b/app/data/icons/unused/house.png deleted file mode 100644 index 00750a7621..0000000000 Binary files a/app/data/icons/unused/house.png and /dev/null differ diff --git a/app/data/icons/unused/logo0.png b/app/data/icons/unused/logo0.png deleted file mode 100644 index b632c49ac3..0000000000 Binary files a/app/data/icons/unused/logo0.png and /dev/null differ diff --git a/app/data/icons/unused/move.png b/app/data/icons/unused/move.png deleted file mode 100644 index 474bdf21ee..0000000000 Binary files a/app/data/icons/unused/move.png and /dev/null differ diff --git a/app/data/icons/unused/onion_type.png b/app/data/icons/unused/onion_type.png deleted file mode 100644 index d42ed6cf56..0000000000 Binary files a/app/data/icons/unused/onion_type.png and /dev/null differ diff --git a/app/data/icons/unused/outlines3.png b/app/data/icons/unused/outlines3.png deleted file mode 100644 index 025bcd3094..0000000000 Binary files a/app/data/icons/unused/outlines3.png and /dev/null differ diff --git a/app/data/icons/unused/outlines4.png b/app/data/icons/unused/outlines4.png deleted file mode 100644 index 6b2bffb26c..0000000000 Binary files a/app/data/icons/unused/outlines4.png and /dev/null differ diff --git a/app/data/icons/unused/overlayCenter.png b/app/data/icons/unused/overlayCenter.png deleted file mode 100644 index d01e95f071..0000000000 Binary files a/app/data/icons/unused/overlayCenter.png and /dev/null differ diff --git a/app/data/icons/unused/overlayGoldenRatio.png b/app/data/icons/unused/overlayGoldenRatio.png deleted file mode 100644 index 80a598da69..0000000000 Binary files a/app/data/icons/unused/overlayGoldenRatio.png and /dev/null differ diff --git a/app/data/icons/unused/overlayGoldenRatio_org.png b/app/data/icons/unused/overlayGoldenRatio_org.png deleted file mode 100644 index 21fa61af94..0000000000 Binary files a/app/data/icons/unused/overlayGoldenRatio_org.png and /dev/null differ diff --git a/app/data/icons/unused/overlaySafe.png b/app/data/icons/unused/overlaySafe.png deleted file mode 100644 index 3ed1c7facb..0000000000 Binary files a/app/data/icons/unused/overlaySafe.png and /dev/null differ diff --git a/app/data/icons/unused/overlaySafe_org.png b/app/data/icons/unused/overlaySafe_org.png deleted file mode 100644 index 34e9abe009..0000000000 Binary files a/app/data/icons/unused/overlaySafe_org.png and /dev/null differ diff --git a/app/data/icons/unused/overlayThirds.png b/app/data/icons/unused/overlayThirds.png deleted file mode 100644 index c0697d4a94..0000000000 Binary files a/app/data/icons/unused/overlayThirds.png and /dev/null differ diff --git a/app/data/icons/unused/pen0.png b/app/data/icons/unused/pen0.png deleted file mode 100644 index 326af06e2f..0000000000 Binary files a/app/data/icons/unused/pen0.png and /dev/null differ diff --git a/app/data/icons/unused/pencil.png b/app/data/icons/unused/pencil.png deleted file mode 100644 index 671082a0b4..0000000000 Binary files a/app/data/icons/unused/pencil.png and /dev/null differ diff --git a/app/data/icons/unused/pencil3.png b/app/data/icons/unused/pencil3.png deleted file mode 100644 index 8b2c430f0b..0000000000 Binary files a/app/data/icons/unused/pencil3.png and /dev/null differ diff --git a/app/data/icons/unused/polyline.png b/app/data/icons/unused/polyline.png deleted file mode 100644 index d7d2d59ce3..0000000000 Binary files a/app/data/icons/unused/polyline.png and /dev/null differ diff --git a/app/data/icons/unused/prefstimeline2.png b/app/data/icons/unused/prefstimeline2.png deleted file mode 100644 index c906a14521..0000000000 Binary files a/app/data/icons/unused/prefstimeline2.png and /dev/null differ diff --git a/app/data/icons/unused/printer3.png b/app/data/icons/unused/printer3.png deleted file mode 100644 index 84eac292b1..0000000000 Binary files a/app/data/icons/unused/printer3.png and /dev/null differ diff --git a/app/data/icons/unused/select.png b/app/data/icons/unused/select.png deleted file mode 100644 index 317f6f85e9..0000000000 Binary files a/app/data/icons/unused/select.png and /dev/null differ diff --git a/app/data/icons/unused/separator.png b/app/data/icons/unused/separator.png deleted file mode 100644 index f0b6a43c87..0000000000 Binary files a/app/data/icons/unused/separator.png and /dev/null differ diff --git a/app/data/icons/unused/smudgeblur.png b/app/data/icons/unused/smudgeblur.png deleted file mode 100644 index 5a11cf9560..0000000000 Binary files a/app/data/icons/unused/smudgeblur.png and /dev/null differ diff --git a/app/data/icons/unused/thinlines.png b/app/data/icons/unused/thinlines.png deleted file mode 100644 index b7b8393a9d..0000000000 Binary files a/app/data/icons/unused/thinlines.png and /dev/null differ diff --git a/app/data/icons/unused/thinlines2.png b/app/data/icons/unused/thinlines2.png deleted file mode 100644 index eb1c17204e..0000000000 Binary files a/app/data/icons/unused/thinlines2.png and /dev/null differ diff --git a/app/data/icons/unused/thinlines3.png b/app/data/icons/unused/thinlines3.png deleted file mode 100644 index d6e875b410..0000000000 Binary files a/app/data/icons/unused/thinlines3.png and /dev/null differ diff --git a/app/data/icons/unused/thinlines4.png b/app/data/icons/unused/thinlines4.png deleted file mode 100644 index 2c6ab49d67..0000000000 Binary files a/app/data/icons/unused/thinlines4.png and /dev/null differ diff --git a/app/data/icons/zoom-in.png b/app/data/icons/zoom-in.png deleted file mode 100644 index 0d63f15d26..0000000000 Binary files a/app/data/icons/zoom-in.png and /dev/null differ diff --git a/app/data/icons/zoom-out.png b/app/data/icons/zoom-out.png deleted file mode 100644 index 7ad245c474..0000000000 Binary files a/app/data/icons/zoom-out.png and /dev/null differ diff --git a/app/data/icons/zoom-reset.png b/app/data/icons/zoom-reset.png deleted file mode 100644 index 4e992fde37..0000000000 Binary files a/app/data/icons/zoom-reset.png and /dev/null differ diff --git a/app/src/colorpalettewidget.cpp b/app/src/colorpalettewidget.cpp index b65b656dc0..9038cc9bf2 100644 --- a/app/src/colorpalettewidget.cpp +++ b/app/src/colorpalettewidget.cpp @@ -360,8 +360,7 @@ void ColorPaletteWidget::palettePreferences() // Add to UI - ui->palettePref->setIcon(QIcon(":/app/icons/new/svg/more_options.svg")); - ui->palettePref->setIconSize(QSize(15,15)); + ui->palettePref->setIconSize(QSize(22,22)); ui->palettePref->setArrowType(Qt::ArrowType::NoArrow); ui->palettePref->setStyleSheet(buttonStylesheet); ui->palettePref->addAction(ui->listModeAction); diff --git a/app/src/colorslider.cpp b/app/src/colorslider.cpp index f3b3c24c4d..1f67e05853 100644 --- a/app/src/colorslider.cpp +++ b/app/src/colorslider.cpp @@ -182,7 +182,7 @@ void ColorSlider::drawColorBox(const QColor &color, QSize size) // draw checkerboard background painter.begin(&mBoxPixmapSource); - QBrush brush2(QBrush(QPixmap("://icons/new/checkerboard_smaller.png"))); + QBrush brush2(QBrush(QPixmap(":icons/general/checkerboard_smaller.png"))); painter.setBrush(brush2); QPen pen2; diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index f59aaa32ce..81ca1189bc 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -1697,6 +1697,9 @@ void MainWindow2::createToolbars() mOverlayToolbar->addAction(ui->actionTwoPointPerspective); mOverlayToolbar->addAction(ui->actionThreePointPerspective); mOverlayToolbar->setIconSize(QSize(22,22)); + mViewToolbar->setIconSize(QSize(22,22)); + mMainToolbar->setIconSize(QSize(22,22)); + QToolButton* perspectiveLinesAngleButton = new QToolButton(this); perspectiveLinesAngleButton->setDefaultAction(ui->menuPerspectiveLinesAngle->menuAction()); perspectiveLinesAngleButton->setPopupMode(QToolButton::InstantPopup); diff --git a/app/src/statusbar.cpp b/app/src/statusbar.cpp index a34e51d279..904c455062 100644 --- a/app/src/statusbar.cpp +++ b/app/src/statusbar.cpp @@ -39,7 +39,7 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent) addWidget(mToolLabel, 1); mModifiedLabel = new QLabel(this); - mModifiedLabel->setPixmap(QPixmap(":/icons/save.png")); + mModifiedLabel->setPixmap(QPixmap(":/icons/themes/playful/menubar/save.svg")); updateModifiedStatus(false); addPermanentWidget(mModifiedLabel); @@ -142,18 +142,18 @@ void StatusBar::updateToolStatus(ToolType tool) } static QPixmap toolIcons[TOOL_TYPE_COUNT]{ - {":icons/new/svg/pencil_detailed.svg"}, - {":icons/new/svg/eraser_detailed.svg"}, - {":icons/new/svg/selection.svg"}, - {":icons/new/svg/arrow.svg"}, - {":icons/new/svg/hand_detailed.svg"}, - {":icons/new/svg/smudge_detailed.svg"}, - {":icons/new/svg/arrow.svg"}, - {":icons/new/svg/pen_detailed.svg"}, - {":icons/new/svg/line.svg"}, - {":icons/new/svg/bucket_detailed.svg"}, - {":icons/new/svg/eyedropper_detailed.svg"}, - {":icons/new/svg/brush_detailed.svg"} + {":icons/themes/playful/tools/tool-pencil.svg"}, + {":icons/themes/playful/tools/tool-eraser.svg"}, + {":icons/themes/playful/tools/tool-select.svg"}, + {":icons/themes/playful/tools/tool-move.svg"}, + {":icons/themes/playful/tools/tool-hand.svg"}, + {":icons/themes/playful/tools/tool-smudge.svg"}, + {""}, // Camera tool does not have an icon + {":icons/themes/playful/tools/tool-pen.svg"}, + {":icons/themes/playful/tools/tool-polyline.svg"}, + {":icons/themes/playful/tools/tool-bucket.svg"}, + {":icons/themes/playful/tools/tool-eyedropper.svg"}, + {":icons/themes/playful/tools/tool-brush.svg"} }; mToolIcon->setPixmap(toolIcons[tool]); mToolIcon->setToolTip(BaseTool::TypeName(tool)); diff --git a/app/src/timecontrols.cpp b/app/src/timecontrols.cpp index 8a224c3ace..2dc7748f15 100644 --- a/app/src/timecontrols.cpp +++ b/app/src/timecontrols.cpp @@ -50,12 +50,17 @@ void TimeControls::initUI() mFps = mFpsBox->value(); mTimecodeSelect = new QToolButton(this); - mTimecodeSelect->setIcon(QIcon(":app/icons/new/svg/more_options.svg")); + + QMenu* timeSelectMenu = new QMenu(tr("Display timecode", "Timeline menu for choose a timecode"), this); + mTimecodeSelect->setIcon(QIcon(":/icons/themes/playful/misc/more-options.svg")); + + timeSelectMenu->addAction(mNoTimecodeAction = new QAction(tr("No text"), this)); + timeSelectMenu->addAction(mOnlyFramesAction = new QAction(tr("Frames"), this)); + timeSelectMenu->addAction(mSmpteAction = new QAction(tr("SMPTE Timecode"), this)); + timeSelectMenu->addAction(mSffAction = new QAction(tr("SFF Timecode"), this)); + mTimecodeSelect->setMenu(timeSelectMenu); mTimecodeSelect->setPopupMode(QToolButton::InstantPopup); - mTimecodeSelect->addAction(mNoTimecodeAction = new QAction(tr("No text"), this)); - mTimecodeSelect->addAction(mOnlyFramesAction = new QAction(tr("Frames"), this)); - mTimecodeSelect->addAction(mSmpteAction = new QAction(tr("SMPTE Timecode"), this)); - mTimecodeSelect->addAction(mSffAction = new QAction(tr("SFF Timecode"), this)); + mTimecodeSelect->setStyleSheet("::menu-indicator{ image: none; }"); mTimecodeLabelEnum = mEditor->preference()->getInt(SETTING::TIMECODE_TEXT); mTimecodeLabel = new QLabel(this); mTimecodeLabel->setContentsMargins(2, 0, 0, 0); @@ -100,23 +105,25 @@ void TimeControls::initUI() mPlaybackRangeCheckBox->setToolTip(tr("Playback range")); mPlayButton = new QPushButton(this); + mPlayButton->setIconSize(QSize(22,22)); mLoopButton = new QPushButton(this); + mLoopButton->setIconSize(QSize(22,22)); mSoundButton = new QPushButton(this); + mSoundButton->setIconSize(QSize(22,22)); mSoundScrubButton = new QPushButton(this); + mSoundScrubButton->setIconSize(QSize(22,22)); mJumpToEndButton = new QPushButton(this); + mJumpToEndButton->setIconSize(QSize(22,22)); mJumpToStartButton = new QPushButton(this); - - mLoopIcon = QIcon(":icons/controls/loop.png"); - mSoundIcon = QIcon(); - mSoundIcon.addFile(":icons/controls/sound.png", QSize(), QIcon::Normal, QIcon::On); - mSoundIcon.addFile(":icons/controls/sound-disabled.png", QSize(), QIcon::Normal, QIcon::Off); - mSoundScrubIcon = QIcon(); - mSoundScrubIcon.addFile(":icons/controls/soundscrub.png", QSize(), QIcon::Normal, QIcon::On); - mSoundScrubIcon.addFile(":icons/controls/soundscrub-disabled.png", QSize(), QIcon::Normal, QIcon::Off); - mJumpToEndIcon = QIcon(":icons/controls/endplay.png"); - mJumpToStartIcon = QIcon(":icons/controls/startplay.png"); - mStartIcon = QIcon(":icons/controls/play.png"); - mStopIcon = QIcon(":icons/controls/stop.png"); + mJumpToStartButton->setIconSize(QSize(22,22)); + + mLoopIcon = QIcon(":icons/themes/playful/controls/control-loop.svg"); + mSoundIcon = QIcon(":icons/themes/playful/controls/control-sound-enable.svg"); + mSoundScrubIcon = QIcon(":icons/themes/playful/controls/control-sound-scrub.svg"); + mJumpToEndIcon = QIcon(":icons/themes/playful/controls/control-play-end.svg"); + mJumpToStartIcon = QIcon(":icons/themes/playful/controls/control-play-start.svg"); + mStartIcon = QIcon(":icons/themes/playful/controls/control-play.svg"); + mStopIcon = QIcon(":icons/themes/playful/controls/control-stop.svg"); mPlayButton->setIcon(mStartIcon); mLoopButton->setIcon(mLoopIcon); mSoundButton->setIcon(mSoundIcon); diff --git a/app/src/timeline.cpp b/app/src/timeline.cpp index af5bd22c18..dcb26b28f1 100644 --- a/app/src/timeline.cpp +++ b/app/src/timeline.cpp @@ -67,23 +67,21 @@ void TimeLine::initUI() // --- left widget --- // --------- layer buttons --------- QToolBar* layerButtons = new QToolBar(this); + layerButtons->setIconSize(QSize(22,22)); QLabel* layerLabel = new QLabel(tr("Layers:")); layerLabel->setIndent(5); QToolButton* addLayerButton = new QToolButton(this); - addLayerButton->setIcon(QIcon(":icons/add.png")); + addLayerButton->setIcon(QIcon(":icons/themes/playful/timeline/layer-add.svg")); addLayerButton->setToolTip(tr("Add Layer")); - addLayerButton->setFixedSize(24, 24); mLayerDeleteButton = new QToolButton(this); - mLayerDeleteButton->setIcon(QIcon(":icons/remove.png")); + mLayerDeleteButton->setIcon(QIcon(":icons/themes/playful/timeline/layer-remove.svg")); mLayerDeleteButton->setToolTip(tr("Delete Layer")); - mLayerDeleteButton->setFixedSize(24, 24); QToolButton* duplicateLayerButton = new QToolButton(this); - duplicateLayerButton->setIcon(QIcon(":icons/controls/duplicate.png")); + duplicateLayerButton->setIcon(QIcon(":icons/themes/playful/timeline/layer-duplicate.svg")); duplicateLayerButton->setToolTip(tr("Duplicate Layer")); - duplicateLayerButton->setFixedSize(24, 24); layerButtons->addWidget(layerLabel); layerButtons->addWidget(addLayerButton); @@ -96,12 +94,12 @@ void TimeLine::initUI() leftToolBarLayout->addWidget(layerButtons); leftToolBar->setLayout(leftToolBarLayout); - QAction* newBitmapLayerAct = new QAction(QIcon(":icons/layer-bitmap.png"), tr("New Bitmap Layer"), this); - QAction* newVectorLayerAct = new QAction(QIcon(":icons/layer-vector.png"), tr("New Vector Layer"), this); - QAction* newSoundLayerAct = new QAction(QIcon(":icons/layer-sound.png"), tr("New Sound Layer"), this); - QAction* newCameraLayerAct = new QAction(QIcon(":icons/layer-camera.png"), tr("New Camera Layer"), this); + QAction* newBitmapLayerAct = new QAction(QIcon(":icons/themes/playful/timeline/cell-bitmap.svg"), tr("New Bitmap Layer"), this); + QAction* newVectorLayerAct = new QAction(QIcon(":icons/themes/playful/timeline/cell-vector.svg"), tr("New Vector Layer"), this); + QAction* newSoundLayerAct = new QAction(QIcon(":icons/themes/playful/timeline/cell-sound.svg"), tr("New Sound Layer"), this); + QAction* newCameraLayerAct = new QAction(QIcon(":icons/themes/playful/timeline/cell-camera.svg"), tr("New Camera Layer"), this); - QMenu* layerMenu = new QMenu(tr("&Layer", "Timeline add-layer menu"), this); + QMenu* layerMenu = new QMenu(tr("Layer", "Timeline add-layer menu"), this); layerMenu->addAction(newBitmapLayerAct); layerMenu->addAction(newVectorLayerAct); layerMenu->addAction(newSoundLayerAct); @@ -119,23 +117,21 @@ void TimeLine::initUI() // --- right widget --- // --------- key buttons --------- QToolBar* timelineButtons = new QToolBar(this); + timelineButtons->setIconSize(QSize(22,22)); QLabel* keyLabel = new QLabel(tr("Keys:")); keyLabel->setIndent(5); QToolButton* addKeyButton = new QToolButton(this); - addKeyButton->setIcon(QIcon(":icons/add.png")); + addKeyButton->setIcon(QIcon(":icons/themes/playful/timeline/frame-add.svg")); addKeyButton->setToolTip(tr("Add Frame")); - addKeyButton->setFixedSize(24, 24); QToolButton* removeKeyButton = new QToolButton(this); - removeKeyButton->setIcon(QIcon(":icons/remove.png")); + removeKeyButton->setIcon(QIcon(":icons/themes/playful/timeline/frame-remove.svg")); removeKeyButton->setToolTip(tr("Remove Frame")); - removeKeyButton->setFixedSize(24, 24); QToolButton* duplicateKeyButton = new QToolButton(this); - duplicateKeyButton->setIcon(QIcon(":icons/controls/duplicate.png")); + duplicateKeyButton->setIcon(QIcon(":icons/themes/playful/timeline/frame-duplicate.svg")); duplicateKeyButton->setToolTip(tr("Duplicate Frame")); - duplicateKeyButton->setFixedSize(24, 24); QLabel* zoomLabel = new QLabel(tr("Zoom:")); zoomLabel->setIndent(5); @@ -159,6 +155,7 @@ void TimeLine::initUI() // --------- Time controls --------- mTimeControls = new TimeControls(this); + mTimeControls->setIconSize(QSize(22,22)); mTimeControls->setEditor(editor()); mTimeControls->initUI(); updateLength(); diff --git a/app/src/timelinecells.cpp b/app/src/timelinecells.cpp index a25805aab3..4524cf38c1 100644 --- a/app/src/timelinecells.cpp +++ b/app/src/timelinecells.cpp @@ -605,10 +605,10 @@ void TimeLineCells::paintLabel(QPainter& painter, const Layer* layer, painter.drawEllipse(x + 6, y + 4, 9, 9); painter.setRenderHint(QPainter::Antialiasing, false); - if (layer->type() == Layer::BITMAP) painter.drawPixmap(QPoint(20, y + 2), QPixmap(":/icons/layer-bitmap.png")); - if (layer->type() == Layer::VECTOR) painter.drawPixmap(QPoint(20, y + 2), QPixmap(":/icons/layer-vector.png")); - if (layer->type() == Layer::SOUND) painter.drawPixmap(QPoint(21, y + 2), QPixmap(":/icons/layer-sound.png")); - if (layer->type() == Layer::CAMERA) painter.drawPixmap(QPoint(21, y + 2), QPixmap(":/icons/layer-camera.png")); + if (layer->type() == Layer::BITMAP) painter.drawPixmap(QPoint(22, y - 1), QPixmap(":icons/themes/playful/timeline/cell-bitmap.svg")); + if (layer->type() == Layer::VECTOR) painter.drawPixmap(QPoint(22, y - 1), QPixmap(":icons/themes/playful/timeline/cell-vector.svg")); + if (layer->type() == Layer::SOUND) painter.drawPixmap(QPoint(22, y - 1), QPixmap(":icons/themes/playful/timeline/cell-sound.svg")); + if (layer->type() == Layer::CAMERA) painter.drawPixmap(QPoint(22, y - 1), QPixmap(":icons/themes/playful/timeline/cell-camera.svg")); if (selected) { diff --git a/app/ui/cameraoptionswidget.ui b/app/ui/cameraoptionswidget.ui index ad3a20ac15..f2100f77f5 100644 --- a/app/ui/cameraoptionswidget.ui +++ b/app/ui/cameraoptionswidget.ui @@ -51,12 +51,12 @@ - :/icons/new/svg/camera-scale.svg:/icons/new/svg/camera-scale.svg + :/icons/themes/playful/tools/tool-camera-scale.svg:/icons/themes/playful/tools/tool-camera-scale.svg - 26 - 24 + 22 + 22 @@ -68,12 +68,12 @@ - :/icons/new/svg/camera-rotate.svg:/icons/new/svg/camera-rotate.svg + :/icons/themes/playful/tools/tool-camera-rotate.svg:/icons/themes/playful/tools/tool-camera-rotate.svg - 26 - 24 + 22 + 22 @@ -92,12 +92,12 @@ - :/icons/new/svg/camera-move.svg:/icons/new/svg/camera-move.svg + :/icons/themes/playful/tools/tool-camera-move.svg:/icons/themes/playful/tools/tool-camera-move.svg - 26 - 24 + 22 + 22 diff --git a/app/ui/colorpalette.ui b/app/ui/colorpalette.ui index a66c820f13..559d9a1e7e 100644 --- a/app/ui/colorpalette.ui +++ b/app/ui/colorpalette.ui @@ -51,7 +51,13 @@ - :/icons/add.png:/icons/add.png + :/icons/themes/playful/misc/add-color.svg:/icons/themes/playful/misc/add-color.svg + + + + 22 + 22 + true @@ -80,7 +86,13 @@ - :/icons/remove.png:/icons/remove.png + :/icons/themes/playful/misc/remove-color.svg:/icons/themes/playful/misc/remove-color.svg + + + + 22 + 22 + true @@ -95,7 +107,7 @@ 40 - 20 + 22 @@ -134,12 +146,12 @@ - :/app/icons/new/svg/color-dialog.svg:/app/icons/new/svg/color-dialog.svg + :/icons/themes/playful/misc/color-dialog.svg:/icons/themes/playful/misc/color-dialog.svg - 16 - 16 + 22 + 22 @@ -155,7 +167,7 @@ 40 - 20 + 22 @@ -179,12 +191,12 @@ - :/app/icons/new/svg/more_options.svg:/app/icons/new/svg/more_options.svg + :/icons/themes/playful/misc/more-options.svg:/icons/themes/playful/misc/more-options.svg - 15 - 15 + 22 + 22 diff --git a/app/ui/errordialog.ui b/app/ui/errordialog.ui index 7e955dca55..315bf36b77 100644 --- a/app/ui/errordialog.ui +++ b/app/ui/errordialog.ui @@ -40,7 +40,7 @@ - :/app/icons/dialog-error.svg + :/icons/themes/playful/dialog-error.svg Qt::AlignCenter diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui index 50b1089978..0d35271b71 100644 --- a/app/ui/mainwindow2.ui +++ b/app/ui/mainwindow2.ui @@ -49,7 +49,7 @@ 0 0 831 - 26 + 24 @@ -140,6 +140,10 @@ Zoom + + + :/icons/themes/playful/menubar/zoom-select.svg:/icons/themes/playful/menubar/zoom-select.svg + @@ -166,7 +170,7 @@ - :/icons/overlayAngle.png:/icons/overlayAngle.png + :/icons/themes/playful/display/perspective-angle.svg:/icons/themes/playful/display/perspective-angle.svg @@ -330,7 +334,7 @@ - :/icons/new.png:/icons/new.png + :/icons/themes/playful/menubar/new.svg:/icons/themes/playful/menubar/new.svg New @@ -339,7 +343,7 @@ - :/icons/open.png:/icons/open.png + :/icons/themes/playful/menubar/open.svg:/icons/themes/playful/menubar/open.svg Open @@ -348,7 +352,7 @@ - :/icons/save.png:/icons/save.png + :/icons/themes/playful/menubar/save.svg:/icons/themes/playful/menubar/save.svg Save @@ -357,17 +361,13 @@ - :/icons/saveas.png:/icons/saveas.png + :/icons/themes/playful/menubar/save.svg:/icons/themes/playful/menubar/save.svg Save As... - - - :/icons/exit.png:/icons/exit.png - Exit @@ -423,7 +423,7 @@ - :/icons/undo.png:/icons/undo.png + :/icons/themes/playful/menubar/undo.svg:/icons/themes/playful/menubar/undo.svg Undo @@ -432,7 +432,7 @@ - :/icons/redo.png:/icons/redo.png + :/icons/themes/playful/menubar/redo.svg:/icons/themes/playful/menubar/redo.svg Redo @@ -444,7 +444,7 @@ - :/icons/cut.png:/icons/cut.png + :/icons/themes/playful/menubar/cut.svg:/icons/themes/playful/menubar/cut.svg Cut @@ -456,7 +456,7 @@ - :/icons/copy.png:/icons/copy.png + :/icons/themes/playful/menubar/copy.svg:/icons/themes/playful/menubar/copy.svg Copy @@ -468,7 +468,7 @@ - :/icons/paste.png:/icons/paste.png + :/icons/themes/playful/menubar/paste.svg:/icons/themes/playful/menubar/paste.svg Paste @@ -487,7 +487,7 @@ - :/icons/new/svg/trash_detailed.svg:/icons/new/svg/trash_detailed.svg + :/icons/themes/playful/menubar/clear-canvas.svg:/icons/themes/playful/menubar/clear-canvas.svg Clear Frame @@ -509,7 +509,7 @@ - :/icons/zoom-in.png:/icons/zoom-in.png + :/icons/themes/playful/menubar/zoom-in.svg:/icons/themes/playful/menubar/zoom-in.svg Zoom In @@ -518,7 +518,7 @@ - :/icons/zoom-out.png:/icons/zoom-out.png + :/icons/themes/playful/menubar/zoom-out.svg:/icons/themes/playful/menubar/zoom-out.svg Zoom Out @@ -537,7 +537,7 @@ - :/icons/zoom-reset.png:/icons/zoom-reset.png + :/icons/themes/playful/menubar/view-reset.svg:/icons/themes/playful/menubar/view-reset.svg Reset @@ -549,7 +549,7 @@ - :/app/icons/mirror.png:/app/icons/mirror.png + :/icons/themes/playful/display/mirror-horizontal.svg:/icons/themes/playful/display/mirror-horizontal.svg Horizontal Flip @@ -561,7 +561,7 @@ - :/app/icons/mirrorV.png:/app/icons/mirrorV.png + :/icons/themes/playful/display/mirror-vertical.svg:/icons/themes/playful/display/mirror-vertical.svg Vertical Flip @@ -581,7 +581,7 @@ - :/icons/grid.png:/icons/grid.png + :/icons/themes/playful/display/overlay-grid.svg:/icons/themes/playful/display/overlay-grid.svg Grid @@ -593,7 +593,7 @@ - :/app/icons/onionPrev.png:/app/icons/onionPrev.png + :/icons/themes/playful/onion/onionskin-red.svg:/icons/themes/playful/onion/onionskin-red.svg Previous @@ -608,7 +608,7 @@ - :/app/icons/onionNext.png:/app/icons/onionNext.png + :/icons/themes/playful/onion/onionskin-blue.svg:/icons/themes/playful/onion/onionskin-blue.svg Next @@ -620,7 +620,7 @@ - :/icons/controls/play.png:/icons/controls/play.png + :/icons/themes/playful/controls/control-play.svg:/icons/themes/playful/controls/control-play.svg Play @@ -632,26 +632,18 @@ - :/icons/controls/loop.png:/icons/controls/loop.png + :/icons/themes/playful/controls/control-loop.svg:/icons/themes/playful/controls/control-loop.svg Loop - - - :/icons/next.png:/icons/next.png - Next Frame - - - :/icons/prev.png:/icons/prev.png - Previous Frame @@ -659,7 +651,7 @@ - :/icons/add.png:/icons/add.png + :/icons/themes/playful/timeline/frame-add.svg:/icons/themes/playful/timeline/frame-add.svg Add Frame @@ -668,7 +660,7 @@ - :/icons/controls/duplicate.png:/icons/controls/duplicate.png + :/icons/themes/playful/timeline/frame-duplicate.svg:/icons/themes/playful/timeline/frame-duplicate.svg Duplicate Frame @@ -677,7 +669,7 @@ - :/icons/remove.png:/icons/remove.png + :/icons/themes/playful/timeline/frame-remove.svg:/icons/themes/playful/timeline/frame-remove.svg Remove Frame @@ -686,7 +678,7 @@ - :/icons/new/svg/arrow.svg:/icons/new/svg/arrow.svg + :/icons/themes/playful/tools/tool-move.svg:/icons/themes/playful/tools/tool-move.svg Move @@ -695,7 +687,7 @@ - :/icons/new/svg/selection.svg:/icons/new/svg/selection.svg + :/icons/themes/playful/tools/tool-select.svg:/icons/themes/playful/tools/tool-select.svg Select @@ -704,7 +696,7 @@ - :/icons/new/svg/brush_detailed.svg:/icons/new/svg/brush_detailed.svg + :/icons/themes/playful/tools/tool-brush.svg:/icons/themes/playful/tools/tool-brush.svg Brush @@ -713,7 +705,7 @@ - :/icons/new/svg/line.svg:/icons/new/svg/line.svg + :/icons/themes/playful/tools/tool-polyline.svg:/icons/themes/playful/tools/tool-polyline.svg Polyline @@ -722,7 +714,7 @@ - :/icons/new/svg/smudge_detailed.svg:/icons/new/svg/smudge_detailed.svg + :/icons/themes/playful/tools/tool-smudge.svg:/icons/themes/playful/tools/tool-smudge.svg Smudge @@ -731,7 +723,7 @@ - :/icons/new/svg/pen_detailed.svg:/icons/new/svg/pen_detailed.svg + :/icons/themes/playful/tools/tool-pen.svg:/icons/themes/playful/tools/tool-pen.svg Pen @@ -740,7 +732,7 @@ - :/icons/new/svg/hand_detailed.svg:/icons/new/svg/hand_detailed.svg + :/icons/themes/playful/tools/tool-hand.svg:/icons/themes/playful/tools/tool-hand.svg Hand @@ -749,7 +741,7 @@ - :/icons/new/svg/pencil_detailed.svg:/icons/new/svg/pencil_detailed.svg + :/icons/themes/playful/tools/tool-pencil.svg:/icons/themes/playful/tools/tool-pencil.svg Pencil @@ -758,7 +750,7 @@ - :/icons/new/svg/bucket_detailed.svg:/icons/new/svg/bucket_detailed.svg + :/icons/themes/playful/tools/tool-bucket.svg:/icons/themes/playful/tools/tool-bucket.svg Bucket @@ -767,7 +759,7 @@ - :/icons/new/svg/eyedropper_detailed.svg:/icons/new/svg/eyedropper_detailed.svg + :/icons/themes/playful/tools/tool-eyedropper.svg:/icons/themes/playful/tools/tool-eyedropper.svg Eyedropper @@ -776,7 +768,7 @@ - :/icons/new/svg/eraser_detailed.svg:/icons/new/svg/eraser_detailed.svg + :/icons/themes/playful/tools/tool-eraser.svg:/icons/themes/playful/tools/tool-eraser.svg Eraser @@ -785,7 +777,7 @@ - :/icons/layer-bitmap.png:/icons/layer-bitmap.png + :/icons/themes/playful/timeline/cell-bitmap.svg:/icons/themes/playful/timeline/cell-bitmap.svg New Bitmap Layer @@ -794,7 +786,7 @@ - :/icons/layer-vector.png:/icons/layer-vector.png + :/icons/themes/playful/timeline/cell-vector.svg:/icons/themes/playful/timeline/cell-vector.svg New Vector Layer @@ -803,7 +795,7 @@ - :/icons/layer-sound.png:/icons/layer-sound.png + :/icons/themes/playful/timeline/cell-sound.svg:/icons/themes/playful/timeline/cell-sound.svg New Sound Layer @@ -812,13 +804,17 @@ - :/icons/layer-camera.png:/icons/layer-camera.png + :/icons/themes/playful/timeline/cell-camera.svg:/icons/themes/playful/timeline/cell-camera.svg New Camera Layer + + + :/icons/themes/playful/timeline/layer-remove.svg:/icons/themes/playful/timeline/layer-remove.svg + Delete Current Layer @@ -1123,7 +1119,7 @@ - :/app/icons/thinlines5.png:/app/icons/thinlines5.png + :/icons/themes/playful/display/lines-invisible.svg:/icons/themes/playful/display/lines-invisible.svg Show Invisible Lines @@ -1135,7 +1131,7 @@ - :/app/icons/outlines5.png:/app/icons/outlines5.png + :/icons/themes/playful/display/lines-outline.svg:/icons/themes/playful/display/lines-outline.svg Show Outlines Only @@ -1147,7 +1143,7 @@ - :/icons/overlayCenter.png:/icons/overlayCenter.png + :/icons/themes/playful/display/overlay-center.svg:/icons/themes/playful/display/overlay-center.svg Center @@ -1159,7 +1155,7 @@ - :/icons/overlayThirds.png:/icons/overlayThirds.png + :/icons/themes/playful/display/overlay-thirds.svg:/icons/themes/playful/display/overlay-thirds.svg Thirds @@ -1171,7 +1167,7 @@ - :/icons/overlayGoldenRatio.png:/icons/overlayGoldenRatio.png + :/icons/themes/playful/display/overlay-golden-ratio.svg:/icons/themes/playful/display/overlay-golden-ratio.svg Golden Ratio @@ -1183,7 +1179,7 @@ - :/icons/overlaySafe.png:/icons/overlaySafe.png + :/icons/themes/playful/display/overlay-safe.svg:/icons/themes/playful/display/overlay-safe.svg Safe Areas @@ -1195,7 +1191,7 @@ - :/icons/overlayPerspective1.png:/icons/overlayPerspective1.png + :/icons/themes/playful/display/perspective-onepoint.svg:/icons/themes/playful/display/perspective-onepoint.svg One Point Perspective @@ -1207,7 +1203,7 @@ - :/icons/overlayPerspective2.png:/icons/overlayPerspective2.png + :/icons/themes/playful/display/perspective-twopoints.svg:/icons/themes/playful/display/perspective-twopoints.svg Two Point Perspective @@ -1219,7 +1215,7 @@ - :/icons/overlayPerspective3.png:/icons/overlayPerspective3.png + :/icons/themes/playful/display/perspective-threepoints.svg:/icons/themes/playful/display/perspective-threepoints.svg Three Point Perspective diff --git a/app/ui/onionskin.ui b/app/ui/onionskin.ui index 9623c2cd59..20c6eec598 100644 --- a/app/ui/onionskin.ui +++ b/app/ui/onionskin.ui @@ -13,7 +13,7 @@ 187 - 121 + 122 @@ -77,7 +77,7 @@ 0 0 213 - 361 + 360 @@ -161,12 +161,12 @@ - :/app/icons/onion-red.png:/app/icons/onion-red.png + :/icons/themes/playful/onion/onionskin-red.svg:/icons/themes/playful/onion/onionskin-red.svg - 24 - 24 + 22 + 22 @@ -254,12 +254,12 @@ - :/app/icons/onion-blue.png:/app/icons/onion-blue.png + :/icons/themes/playful/onion/onionskin-blue.svg:/icons/themes/playful/onion/onionskin-blue.svg - 24 - 24 + 22 + 22 diff --git a/app/ui/preferencesdialog.ui b/app/ui/preferencesdialog.ui index aabb79cba6..2e9ddf3f0a 100644 --- a/app/ui/preferencesdialog.ui +++ b/app/ui/preferencesdialog.ui @@ -6,7 +6,7 @@ 0 0 - 563 + 534 445 @@ -44,21 +44,24 @@ - 96 - 84 + 64 + 64 QListView::Static - 5 + 20 QListView::IconMode + + false + - 0 + -1 @@ -69,7 +72,7 @@ - :/icons/prefspencil.png:/icons/prefspencil.png + :/icons/themes/playful/preferences/preferences-general.svg:/icons/themes/playful/preferences/preferences-general.svg ItemIsSelectable|ItemIsEnabled @@ -84,7 +87,7 @@ - :/icons/prefs-files.png:/icons/prefs-files.png + :/icons/themes/playful/preferences/preferences-files.svg:/icons/themes/playful/preferences/preferences-files.svg ItemIsSelectable|ItemIsEnabled @@ -99,7 +102,7 @@ - :/icons/prefstimeline.png:/icons/prefstimeline.png + :/icons/themes/playful/preferences/preferences-timeline.svg:/icons/themes/playful/preferences/preferences-timeline.svg ItemIsSelectable|ItemIsEnabled @@ -114,7 +117,7 @@ - :/icons/prefs-files.png:/icons/prefs-files.png + :/icons/themes/playful/preferences/preferences-tools.svg:/icons/themes/playful/preferences/preferences-tools.svg ItemIsSelectable|ItemIsEnabled @@ -129,7 +132,7 @@ - :/icons/prefs-shortcuts.png:/icons/prefs-shortcuts.png + :/icons/themes/playful/preferences/preferences-shortcuts.svg:/icons/themes/playful/preferences/preferences-shortcuts.svg ItemIsSelectable|ItemIsEnabled diff --git a/app/ui/toolboxwidget.ui b/app/ui/toolboxwidget.ui index 80ead29212..b2c062096b 100644 --- a/app/ui/toolboxwidget.ui +++ b/app/ui/toolboxwidget.ui @@ -56,7 +56,7 @@ 0 0 88 - 483 + 480 @@ -91,12 +91,12 @@ - :/icons/new/svg/pencil_detailed.svg:/icons/new/svg/pencil_detailed.svg + :/icons/themes/playful/tools/tool-pencil.svg:/icons/themes/playful/tools/tool-pencil.svg - 30 - 30 + 22 + 22 @@ -126,12 +126,12 @@ - :/icons/new/svg/eraser_detailed.svg:/icons/new/svg/eraser_detailed.svg + :/icons/themes/playful/tools/tool-eraser.svg:/icons/themes/playful/tools/tool-eraser.svg - 30 - 30 + 22 + 22 @@ -158,12 +158,12 @@ - :/icons/new/svg/selection.svg:/icons/new/svg/selection.svg + :/icons/themes/playful/tools/tool-select.svg:/icons/themes/playful/tools/tool-select.svg - 30 - 30 + 22 + 22 @@ -190,12 +190,12 @@ - :/icons/new/svg/arrow.svg:/icons/new/svg/arrow.svg + :/icons/themes/playful/tools/tool-move.svg:/icons/themes/playful/tools/tool-move.svg - 30 - 30 + 22 + 22 @@ -222,12 +222,12 @@ - :/icons/new/svg/pen_detailed.svg:/icons/new/svg/pen_detailed.svg + :/icons/themes/playful/tools/tool-pen.svg:/icons/themes/playful/tools/tool-pen.svg - 30 - 30 + 22 + 22 @@ -254,12 +254,12 @@ - :/icons/new/svg/hand_detailed.svg:/icons/new/svg/hand_detailed.svg + :/icons/themes/playful/tools/tool-hand.svg:/icons/themes/playful/tools/tool-hand.svg - 30 - 30 + 22 + 22 @@ -286,12 +286,12 @@ - :/icons/new/svg/line.svg:/icons/new/svg/line.svg + :/icons/themes/playful/tools/tool-polyline.svg:/icons/themes/playful/tools/tool-polyline.svg - 30 - 30 + 22 + 22 @@ -318,12 +318,12 @@ - :/icons/new/svg/bucket_detailed.svg:/icons/new/svg/bucket_detailed.svg + :/icons/themes/playful/tools/tool-bucket.svg:/icons/themes/playful/tools/tool-bucket.svg - 30 - 30 + 22 + 22 @@ -350,12 +350,12 @@ - :/icons/new/svg/eyedropper_detailed.svg:/icons/new/svg/eyedropper_detailed.svg + :/icons/themes/playful/tools/tool-eyedropper.svg:/icons/themes/playful/tools/tool-eyedropper.svg - 30 - 30 + 22 + 22 @@ -382,12 +382,12 @@ - :/icons/new/svg/brush_detailed.svg:/icons/new/svg/brush_detailed.svg + :/icons/themes/playful/tools/tool-brush.svg:/icons/themes/playful/tools/tool-brush.svg - 30 - 30 + 22 + 22 @@ -412,14 +412,17 @@ 32 + + Smudge + - :/icons/new/svg/smudge_detailed.svg:/icons/new/svg/smudge_detailed.svg + :/icons/themes/playful/tools/tool-smudge.svg:/icons/themes/playful/tools/tool-smudge.svg - 30 - 30 + 22 + 22 diff --git a/core_lib/data/core_lib.qrc b/core_lib/data/core_lib.qrc index a420eac515..5bc67e882b 100644 --- a/core_lib/data/core_lib.qrc +++ b/core_lib/data/core_lib.qrc @@ -1,13 +1,5 @@ - icons/brush.png - icons/bucketTool.png - icons/cross.png - icons/eyedropper.png - icons/liquify.png - icons/pen.png - icons/pencil2.png - icons/smudge.png resources/kb.ini diff --git a/core_lib/src/tool/brushtool.cpp b/core_lib/src/tool/brushtool.cpp index 88b6b6e22e..4bec803d58 100644 --- a/core_lib/src/tool/brushtool.cpp +++ b/core_lib/src/tool/brushtool.cpp @@ -132,9 +132,9 @@ QCursor BrushTool::cursor() { if (mEditor->preference()->isOn(SETTING::TOOL_CURSOR)) { - return QCursor(QPixmap(":icons/brush.png"), 0, 13); + return QCursor(QPixmap(":icons/general/cursor-brush.svg"), 4, 14); } - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } void BrushTool::pointerPressEvent(PointerEvent *event) diff --git a/core_lib/src/tool/buckettool.cpp b/core_lib/src/tool/buckettool.cpp index 911e881d60..6ef11c59c1 100644 --- a/core_lib/src/tool/buckettool.cpp +++ b/core_lib/src/tool/buckettool.cpp @@ -81,15 +81,11 @@ QCursor BucketTool::cursor() { if (mEditor->preference()->isOn(SETTING::TOOL_CURSOR)) { - QPixmap pixmap(":icons/bucketTool.png"); - QPainter painter(&pixmap); - painter.end(); - - return QCursor(pixmap, 4, 20); + return QCursor(QPixmap(":icons/general/cursor-bucket.svg"), -1, 17); } else { - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } } diff --git a/core_lib/src/tool/cameratool.cpp b/core_lib/src/tool/cameratool.cpp index feb0e54621..9c74fe31a3 100644 --- a/core_lib/src/tool/cameratool.cpp +++ b/core_lib/src/tool/cameratool.cpp @@ -122,24 +122,24 @@ QCursor CameraTool::cursor() case CameraMoveType::TOPLEFT: case CameraMoveType::BOTTOMRIGHT: { - moveTypeImage = QImage("://icons/new/svg/cursor-diagonal-left.svg"); + moveTypeImage = QImage("://icons/general/cursor-diagonal-left.svg"); break; } case CameraMoveType::TOPRIGHT: case CameraMoveType::BOTTOMLEFT: { - moveTypeImage = QImage("://icons/new/svg/cursor-diagonal-right.svg"); + moveTypeImage = QImage("://icons/general/cursor-diagonal-right.svg"); break; } case CameraMoveType::ROTATION: { - moveTypeImage = QImage("://icons/new/svg/cursor-rotate.svg"); + moveTypeImage = QImage("://icons/general/cursor-rotate.svg"); break; } case CameraMoveType::PATH: case CameraMoveType::CENTER: { - moveTypeImage = QImage("://icons/new/svg/cursor-move.svg"); + moveTypeImage = QImage("://icons/general/cursor-move.svg"); break; } default: diff --git a/core_lib/src/tool/erasertool.cpp b/core_lib/src/tool/erasertool.cpp index 0ae1005201..405a6498c3 100644 --- a/core_lib/src/tool/erasertool.cpp +++ b/core_lib/src/tool/erasertool.cpp @@ -144,7 +144,7 @@ void EraserTool::setStabilizerLevel(const int level) QCursor EraserTool::cursor() { - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } void EraserTool::pointerPressEvent(PointerEvent *event) diff --git a/core_lib/src/tool/eyedroppertool.cpp b/core_lib/src/tool/eyedroppertool.cpp index 0007c1d867..d72c3f71a3 100644 --- a/core_lib/src/tool/eyedroppertool.cpp +++ b/core_lib/src/tool/eyedroppertool.cpp @@ -49,17 +49,17 @@ QCursor EyedropperTool::cursor() { if (mEditor->preference()->isOn(SETTING::TOOL_CURSOR)) { - return QCursor(QPixmap(":icons/eyedropper.png"), 0, 15); + return QCursor(QPixmap(":icons/general/cursor-eyedropper.svg"), 0, 15); } else { - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } } QCursor EyedropperTool::cursor(const QColor color) { - QPixmap icon(":icons/eyedropper.png"); + QPixmap icon(":icons/general/cursor-eyedropper.svg"); QPixmap pixmap(32, 32); pixmap.fill(Qt::transparent); diff --git a/core_lib/src/tool/handtool.cpp b/core_lib/src/tool/handtool.cpp index e28e202995..d741a2ed12 100644 --- a/core_lib/src/tool/handtool.cpp +++ b/core_lib/src/tool/handtool.cpp @@ -62,7 +62,7 @@ void HandTool::updateSettings(const SETTING setting) QCursor HandTool::cursor() { - return mIsHeld ? Qt::ClosedHandCursor : Qt::OpenHandCursor; + return mIsHeld ? QCursor(Qt::ClosedHandCursor) : QCursor(Qt::OpenHandCursor); } void HandTool::pointerPressEvent(PointerEvent*) diff --git a/core_lib/src/tool/movetool.cpp b/core_lib/src/tool/movetool.cpp index ec02bafc07..c8b99315e0 100644 --- a/core_lib/src/tool/movetool.cpp +++ b/core_lib/src/tool/movetool.cpp @@ -376,32 +376,32 @@ QCursor MoveTool::cursor(MoveMode mode) const case MoveMode::PERSP_MIDDLE: case MoveMode::PERSP_SINGLE: { - cursorPainter.drawImage(QPoint(6,6),QImage("://icons/new/svg/cursor-move.svg")); + cursorPainter.drawImage(QPoint(6,6),QImage("://icons/general/cursor-move.svg")); break; } case MoveMode::TOPLEFT: case MoveMode::BOTTOMRIGHT: { - cursorPainter.drawImage(QPoint(6,6),QImage("://icons/new/svg/cursor-diagonal-left.svg")); + cursorPainter.drawImage(QPoint(6,6),QImage("://icons/general/cursor-diagonal-left.svg")); break; } case MoveMode::TOPRIGHT: case MoveMode::BOTTOMLEFT: { - cursorPainter.drawImage(QPoint(6,6),QImage("://icons/new/svg/cursor-diagonal-right.svg")); + cursorPainter.drawImage(QPoint(6,6),QImage("://icons/general/cursor-diagonal-right.svg")); break; } case MoveMode::ROTATIONLEFT: case MoveMode::ROTATIONRIGHT: case MoveMode::ROTATION: { - cursorPainter.drawImage(QPoint(6,6),QImage("://icons/new/svg/cursor-rotate.svg")); + cursorPainter.drawImage(QPoint(6,6),QImage("://icons/general/cursor-rotate.svg")); break; } case MoveMode::MIDDLE: case MoveMode::CENTER: { - cursorPainter.drawImage(QPoint(6,6),QImage("://icons/new/svg/cursor-move.svg")); + cursorPainter.drawImage(QPoint(6,6),QImage("://icons/general/cursor-move.svg")); break; } default: diff --git a/core_lib/src/tool/penciltool.cpp b/core_lib/src/tool/penciltool.cpp index 5e5e04636d..cd2169870b 100644 --- a/core_lib/src/tool/penciltool.cpp +++ b/core_lib/src/tool/penciltool.cpp @@ -140,9 +140,9 @@ QCursor PencilTool::cursor() { if (mEditor->preference()->isOn(SETTING::TOOL_CURSOR)) { - return QCursor(QPixmap(":icons/pencil2.png"), 0, 16); + return QCursor(QPixmap(":icons/general/cursor-pencil.svg"), 4, 14); } - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } void PencilTool::pointerPressEvent(PointerEvent *event) diff --git a/core_lib/src/tool/pentool.cpp b/core_lib/src/tool/pentool.cpp index 482d5c277f..64dbed9708 100644 --- a/core_lib/src/tool/pentool.cpp +++ b/core_lib/src/tool/pentool.cpp @@ -111,9 +111,9 @@ QCursor PenTool::cursor() { if (mEditor->preference()->isOn(SETTING::TOOL_CURSOR)) { - return QCursor(QPixmap(":icons/pen.png"), -5, 0); + return QCursor(QPixmap(":icons/general/cursor-pen.svg"), 5, 14); } - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } void PenTool::pointerPressEvent(PointerEvent *event) diff --git a/core_lib/src/tool/polylinetool.cpp b/core_lib/src/tool/polylinetool.cpp index c404e343c6..4d723b487b 100644 --- a/core_lib/src/tool/polylinetool.cpp +++ b/core_lib/src/tool/polylinetool.cpp @@ -107,7 +107,7 @@ bool PolylineTool::isActive() QCursor PolylineTool::cursor() { - return QCursor(QPixmap(":icons/cross.png"), 10, 10); + return QCursor(QPixmap(":icons/general/cross.png"), 10, 10); } void PolylineTool::clearToolData() diff --git a/core_lib/src/tool/selecttool.cpp b/core_lib/src/tool/selecttool.cpp index 52d57fa684..cab1188995 100644 --- a/core_lib/src/tool/selecttool.cpp +++ b/core_lib/src/tool/selecttool.cpp @@ -57,27 +57,26 @@ QCursor SelectTool::cursor() case MoveMode::TOPLEFT: case MoveMode::BOTTOMRIGHT: { - cursorPainter.drawPixmap(QPoint(6, 6), QPixmap("://icons/new/svg/cursor-diagonal-left.svg")); + cursorPainter.drawPixmap(QPoint(6,6),QPixmap("://icons/general/cursor-diagonal-left.svg")); break; } case MoveMode::TOPRIGHT: case MoveMode::BOTTOMLEFT: { - cursorPainter.drawPixmap(QPoint(6, 6), QPixmap("://icons/new/svg/cursor-diagonal-right.svg")); + cursorPainter.drawPixmap(QPoint(6,6),QPixmap("://icons/general/cursor-diagonal-right.svg")); break; } case MoveMode::MIDDLE: { - cursorPainter.drawPixmap(QPoint(6, 6), QPixmap("://icons/new/svg/cursor-move.svg")); + cursorPainter.drawPixmap(QPoint(6,6),QPixmap("://icons/general/cursor-move.svg")); break; } case MoveMode::NONE: - { - cursorPainter.drawPixmap(QPoint(2, 2), QPixmap(":icons/cross.png")); + cursorPainter.drawPixmap(QPoint(3,3), QPixmap(":icons/general/cross.png")); break; - } default: Q_UNREACHABLE(); + break; } return QCursor(mCursorPixmap); } diff --git a/core_lib/src/tool/smudgetool.cpp b/core_lib/src/tool/smudgetool.cpp index f555380009..de94077e66 100644 --- a/core_lib/src/tool/smudgetool.cpp +++ b/core_lib/src/tool/smudgetool.cpp @@ -104,12 +104,12 @@ bool SmudgeTool::emptyFrameActionEnabled() QCursor SmudgeTool::cursor() { - qDebug() << "smudge tool"; if (toolMode == 0) { //normal mode - return QCursor(QPixmap(":icons/smudge.png"), 0, 16); + return QCursor(QPixmap(":icons/general/cursor-smudge.svg"), 4, 18); + } else { // blured mode - return QCursor(QPixmap(":icons/liquify.png"), -4, 16); + return QCursor(QPixmap(":icons/general/cursor-smudge-liquify.svg"), 4, 18); } }