Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI icons re-design #1361

Merged
merged 93 commits into from
Oct 16, 2023
Merged

UI icons re-design #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
515e4a8
Initial Commit
Fatih20 May 22, 2020
fa1ef84
Selection, Pen, Trash, and Move
Fatih20 May 22, 2020
7f88221
Action-Icons-Redesign
Fatih20 May 26, 2020
b185b2d
Fix app.qrc
Fatih20 May 26, 2020
d4f634a
Resizes controls to proper sizes
Fatih20 May 26, 2020
6f8547b
Recolor save-as
Fatih20 May 26, 2020
853b2e7
Redesign show lines, layer and keys addition for timeline update
Fatih20 May 26, 2020
c330984
Recolor hand tool, rework smudge tool and timelines
Fatih20 May 27, 2020
fd4eba9
Updated app.qrc
Fatih20 May 27, 2020
d929702
Magnify rework
Fatih20 May 27, 2020
541dffc
Add icons of upcoming shape, text, and camera
Fatih20 May 27, 2020
f288932
Change the icons for cursors of each individual tool, redesign the ar…
Fatih20 May 27, 2020
b4dc65a
Hand cursor for closed and open, show invisible and outline icons
Fatih20 May 28, 2020
bdd7e7c
Hand tool now have a hand cursor that open and close accordingly
Fatih20 May 28, 2020
33153e1
Uniforming perspective in the tools, tweaks to pencil, hand, onion sk…
Fatih20 Jun 3, 2020
29e8b64
Tweaks to layers icon
Fatih20 Jun 3, 2020
7332266
Vector layer back to before
Fatih20 Jun 3, 2020
668f07b
Merge branch 'master' into pr/1361
MrStevns Aug 18, 2022
365f43b
Tweak toolbar icon sizes
MrStevns Aug 18, 2022
bb46694
Optimize svg icons
MrStevns Aug 20, 2022
3bcf5c3
Fix paths after move
MrStevns Aug 20, 2022
ec14f07
Fix svg rendering
MrStevns Aug 20, 2022
0e4e8b8
Replace onion skin icon
MrStevns Aug 20, 2022
bf56d07
Fix more broken icon paths
MrStevns Aug 20, 2022
c1e892c
Replace smudge icon
MrStevns Aug 21, 2022
f6a52fa
Make and use alternative onion skin color icons
MrStevns Aug 21, 2022
e6210da
Update toolbox icons
MrStevns Aug 27, 2022
5b1d9bc
Apply icon suggestions from review
MrStevns Aug 28, 2022
ddea5c9
Merge branch 'master' into Action-Icons-Redesign
MrStevns Nov 12, 2022
7aa97de
Update icons in main window
MrStevns Nov 12, 2022
d567b18
Update onion skin icons
MrStevns Nov 12, 2022
33b10f4
Add new grid icon
MrStevns Nov 12, 2022
121d8b1
Fix crash after merge
MrStevns Nov 12, 2022
314a297
Use new general cursor icons
MrStevns Nov 12, 2022
eae3ec5
Update zoom icons and fix grid background
MrStevns Nov 12, 2022
610f2ed
Align add and remove colors and depth
MrStevns Nov 12, 2022
b3c3e90
Remove disabled icon for sound for consistency
MrStevns Nov 12, 2022
d9cc794
Update control playback icons
MrStevns Nov 12, 2022
5aa640e
Update more control icons
MrStevns Nov 13, 2022
edcb1c8
Tweak color of view icons
MrStevns Nov 13, 2022
b9415a5
Add new layer cell icons
MrStevns Nov 13, 2022
d30676c
Update toolbar icons
MrStevns Nov 20, 2022
7f94a62
Implement new clear canvas icon
MrStevns Mar 12, 2023
accb9eb
Merge remote-tracking branch 'pencil2d/master' into Action-Icons-Rede…
MrStevns Mar 12, 2023
a0bc5b4
Optimize and tweak preferences icons
MrStevns Mar 12, 2023
04bc175
Add new tool cursor icons
MrStevns Mar 12, 2023
5d69236
Adjust pixel alignment on overlay icons
MrStevns Apr 26, 2023
2501c4f
Resize overlay icons to 22x22
MrStevns Apr 26, 2023
8628b1f
Pixel align top toolbar icons
MrStevns Apr 27, 2023
1bb82c1
Fix pixel alignment for clear-canvas icon
MrStevns Apr 27, 2023
37e45d3
Fix pixel alignment for timeline layer type icons
MrStevns May 2, 2023
3dbb4a9
Timeline layers: increase size of icons
MrStevns May 3, 2023
8bc9f32
Fix pixel alignment for timeline layer add/remove buttons
MrStevns May 3, 2023
de2bc5b
Fix pixel alignment for time controls and frames
MrStevns May 4, 2023
37f0823
Fix minor pixel alignment in view-reset icon
MrStevns May 4, 2023
c2a2ddf
Remove backdrops from menubar icons
MrStevns May 5, 2023
3c26b6f
Fix pixel alignment for color palette icons
MrStevns May 5, 2023
da08561
Merge branch 'master' into Action-Icons-Redesign
MrStevns May 5, 2023
c0d5a73
Onion skin icons: pixel and styling alignment
MrStevns May 5, 2023
afabf81
Fix path to UI references in main window
MrStevns May 5, 2023
f5fe337
Toolbox icons: 22px and pixel aligned
MrStevns May 5, 2023
dfe16ac
Statusbar: fix wrong path
MrStevns May 5, 2023
c92874b
Camera transform icons: pixel align
MrStevns May 6, 2023
e3a741d
Fix missing icon in status bar
MrStevns May 6, 2023
2baca01
Add missing layer duplicate icon
MrStevns May 6, 2023
890b0a7
Try fix icons looking fuzzy on windows
MrStevns May 6, 2023
5e35cc6
Try fix some icons looking misaligned on windows
MrStevns May 6, 2023
377de39
Try fix icons looking fuzzy on windows
MrStevns May 6, 2023
1d9b148
View reset: remove shadow
MrStevns May 7, 2023
f6fda6e
Fix border thickness for copy/cut/paste icons
MrStevns May 7, 2023
5d4a120
Make sure preference dialog expects icons of 64x64
MrStevns May 17, 2023
323ddaf
Fix cursors in CameraTool
MrStevns May 31, 2023
4c126aa
Fix onion skin icons had been reversed
MrStevns May 31, 2023
1faed1b
Simplify palette on menubar and overlay icons
MrStevns Jul 30, 2023
ee5ee8b
Merge branch 'master' into Action-Icons-Redesign
MrStevns Jul 30, 2023
4cb7770
Update preference icons
MrStevns Aug 2, 2023
c44944d
Update cut icon
MrStevns Aug 3, 2023
3a1ce82
Update layer and frame icons
MrStevns Aug 3, 2023
61bfa98
Update playback buttons
MrStevns Aug 8, 2023
e9f94cb
Update sound, scrub, more-options and layer cell icons
MrStevns Aug 9, 2023
e19398e
Update magnifier icons and tweak Menu, Overlay and perspective icons
MrStevns Aug 10, 2023
0fd1c1f
Merge branch 'master' into Action-Icons-Redesign
MrStevns Aug 10, 2023
2f4998a
Clean up some leftovers
J5lx Oct 1, 2023
2dc0f92
Merge remote-tracking branch 'pencil2d/master' into Action-Icons-Rede…
MrStevns Oct 2, 2023
42d50d6
Fix zoom select icon using old style
MrStevns Oct 3, 2023
7b90e31
Show drop down arrow on perspective button
MrStevns Oct 3, 2023
6f28ca1
Update smudge and hand icons
MrStevns Oct 10, 2023
bcdd1c5
Update smudge cursor icons
MrStevns Oct 10, 2023
03f6e54
Adjust overlay on zoom in/out icons
MrStevns Oct 10, 2023
b1445b7
Brush tool icon: Fix pixel alignment at tip
MrStevns Oct 10, 2023
3ec5417
Pen tool icon: Fix pixel alignment at tip
MrStevns Oct 10, 2023
d599d50
Remove old and unused icons
MrStevns Oct 10, 2023
06bcb57
Update error dialog icon path
MrStevns Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 88 additions & 81 deletions app/data/app.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,98 @@
<RCC>
<qresource prefix="/">
<file>icons/remove.png</file>
<file>icons/add.png</file>
<file>icons/magnify.png</file>
<file>icons/layer-vector.png</file>
<file>icons/layer-bitmap.png</file>
<file>icons/layer-sound.png</file>
<file>icons/layer-camera.png</file>
<file>icons/controls/play.png</file>
<file>icons/controls/loop.png</file>
<file>icons/controls/sound.png</file>
<file>icons/prefspencil.png</file>
<file>icons/prefstimeline.png</file>
<file>icons/prefs-files.png</file>
<file>background/checkerboard.png</file>
<file>icons/logo.png</file>
<file>icons/icon.png</file>
<file>background/weave.jpg</file>
<file>background/dots.png</file>
<file>background/grid.jpg</file>
<file>icons/logo.png</file>
<file>icons/icon.png</file>
<file>icons/open.png</file>
<file>icons/copy.png</file>
<file>icons/paste.png</file>
<file>icons/next.png</file>
<file>icons/prev.png</file>
<file>icons/save.png</file>
<file>icons/saveas.png</file>
<file>icons/undo.png</file>
<file>icons/redo.png</file>
<file>icons/new.png</file>
<file>icons/controls/endplay.png</file>
<file>icons/controls/startplay.png</file>
<file>icons/controls/duplicate.png</file>
<file>icons/exit.png</file>
<file>icons/cut.png</file>
<file>icons/prefs-shortcuts.png</file>
<file>icons/grid.png</file>
<file>icons/zoom-in.png</file>
<file>icons/zoom-out.png</file>
<file>icons/zoom-reset.png</file>
<file>background/checkerboard.png</file>
<file>icons/controls/stop.png</file>
<file>icons/controls/sound-disabled.png</file>
<file>icons/new/svg/arrow.svg</file>
<file>icons/new/svg/brush_detailed.svg</file>
<file>icons/new/svg/bucket_detailed.svg</file>
<file>icons/new/svg/eraser_detailed.svg</file>
<file>icons/new/svg/eyedropper_detailed.svg</file>
<file>icons/new/svg/hand_detailed.svg</file>
<file>icons/new/svg/line.svg</file>
<file>icons/new/svg/pen_detailed.svg</file>
<file>icons/new/svg/pencil_detailed.svg</file>
<file>icons/new/svg/selection.svg</file>
<file>icons/new/svg/smudge_detailed.svg</file>
<file>icons/new/svg/trash_detailed.svg</file>
<file>icons/new/checkerboard_smaller.png</file>
<file>icons/overlayCenter.png</file>
<file>icons/overlayGoldenRatio.png</file>
<file>icons/overlaySafe.png</file>
<file>icons/overlayThirds.png</file>
<file>icons/overlayPerspective1.png</file>
<file>icons/overlayPerspective2.png</file>
<file>icons/overlayPerspective3.png</file>
<file>icons/overlayAngle.png</file>
<file>icons/controls/soundscrub.png</file>
<file>icons/controls/soundscrub-disabled.png</file>
<file>icons/new/svg/cursor-rotate.svg</file>
<file>icons/new/svg/cursor-diagonal-left.svg</file>
<file>icons/new/svg/cursor-diagonal-right.svg</file>
<file>icons/new/svg/cursor-horizontal.svg</file>
<file>icons/new/svg/cursor-move.svg</file>
<file>icons/new/svg/cursor-vertical.svg</file>
<file>icons/new/svg/camera-move.svg</file>
<file>icons/new/svg/camera-rotate.svg</file>
<file>icons/new/svg/camera-scale.svg</file>
<file>icons/themes/playful/timeline/frame-add.svg</file>
<file>icons/themes/playful/timeline/frame-duplicate.svg</file>
<file>icons/themes/playful/timeline/frame-remove.svg</file>
<file>icons/themes/playful/timeline/layer-add.svg</file>
<file>icons/themes/playful/timeline/layer-remove.svg</file>
<file>icons/themes/playful/dialog-error.svg</file>
<file>icons/themes/playful/display/perspective-angle.svg</file>
<file>icons/themes/playful/display/perspective-onepoint.svg</file>
<file>icons/themes/playful/display/perspective-threepoints.svg</file>
<file>icons/themes/playful/display/perspective-twopoints.svg</file>
<file>icons/themes/playful/display/lines-invisible.svg</file>
<file>icons/themes/playful/display/lines-outline.svg</file>
<file>icons/themes/playful/display/mirror-horizontal.svg</file>
<file>icons/themes/playful/display/mirror-vertical.svg</file>
<file>icons/themes/playful/display/overlay-center.svg</file>
<file>icons/themes/playful/display/overlay-thirds.svg</file>
<file>icons/themes/playful/menubar/copy.svg</file>
<file>icons/themes/playful/menubar/cut.svg</file>
<file>icons/themes/playful/menubar/new.svg</file>
<file>icons/themes/playful/menubar/open.svg</file>
<file>icons/themes/playful/menubar/paste.svg</file>
<file>icons/themes/playful/menubar/redo.svg</file>
<file>icons/themes/playful/menubar/save.svg</file>
<file>icons/themes/playful/menubar/undo.svg</file>
<file>icons/themes/playful/preferences/preferences-general.svg</file>
<file>icons/themes/playful/preferences/preferences-timeline.svg</file>
<file>icons/themes/playful/preferences/preferences-files.svg</file>
<file>icons/themes/playful/preferences/preferences-shortcuts.svg</file>
<file>icons/themes/playful/preferences/preferences-tools.svg</file>
<file>icons/general/checkerboard_smaller.png</file>
<file>icons/general/cross.png</file>
<file>icons/themes/playful/display/overlay-grid.svg</file>
<file>icons/general/cursor-diagonal-left.svg</file>
<file>icons/general/cursor-diagonal-right.svg</file>
<file>icons/general/cursor-horizontal.svg</file>
<file>icons/general/cursor-move.svg</file>
<file>icons/general/cursor-rotate.svg</file>
<file>icons/general/cursor-vertical.svg</file>
<file>icons/themes/playful/menubar/zoom-in.svg</file>
<file>icons/themes/playful/menubar/zoom-out.svg</file>
<file>icons/themes/playful/menubar/zoom-select.svg</file>
<file>icons/themes/playful/menubar/view-reset.svg</file>
<file>icons/themes/playful/misc/color-dialog.svg</file>
<file>icons/themes/playful/misc/add-color.svg</file>
<file>icons/themes/playful/misc/remove-color.svg</file>
<file>icons/themes/playful/controls/control-play.svg</file>
<file>icons/themes/playful/controls/control-stop.svg</file>
<file>icons/themes/playful/controls/control-loop.svg</file>
<file>icons/themes/playful/controls/control-sound-enable.svg</file>
<file>icons/themes/playful/controls/control-sound-scrub.svg</file>
<file>icons/themes/playful/timeline/cell-bitmap.svg</file>
<file>icons/themes/playful/timeline/cell-camera.svg</file>
<file>icons/themes/playful/timeline/cell-sound.svg</file>
<file>icons/themes/playful/timeline/cell-vector.svg</file>
<file>icons/themes/playful/menubar/clear-canvas.svg</file>
<file>icons/general/cursor-bucket.svg</file>
<file>icons/general/cursor-eyedropper.svg</file>
<file>icons/general/cursor-smudge.svg</file>
<file>icons/general/cursor-pen.svg</file>
<file>icons/general/cursor-brush.svg</file>
<file>icons/general/cursor-pencil.svg</file>
<file>icons/general/cursor-smudge-liquify.svg</file>
<file>icons/themes/playful/display/overlay-golden-ratio.svg</file>
<file>icons/themes/playful/display/overlay-safe.svg</file>
<file>icons/themes/playful/controls/control-play-start.svg</file>
<file>icons/themes/playful/controls/control-play-end.svg</file>
<file>icons/themes/playful/misc/more-options.svg</file>
<file>icons/themes/playful/onion/onionskin-blue.svg</file>
<file>icons/themes/playful/onion/onionskin-red.svg</file>
<file>icons/themes/playful/onion/onionskin-enable.svg</file>
<file>icons/themes/playful/tools/tool-smudge.svg</file>
<file>icons/themes/playful/tools/tool-pencil.svg</file>
<file>icons/themes/playful/tools/tool-bucket.svg</file>
<file>icons/themes/playful/tools/tool-hand.svg</file>
<file>icons/themes/playful/tools/tool-move.svg</file>
<file>icons/themes/playful/tools/tool-brush.svg</file>
<file>icons/themes/playful/tools/tool-eraser.svg</file>
<file>icons/themes/playful/tools/tool-eyedropper.svg</file>
<file>icons/themes/playful/tools/tool-polyline.svg</file>
<file>icons/themes/playful/tools/tool-pen.svg</file>
<file>icons/themes/playful/tools/tool-select.svg</file>
<file>icons/themes/playful/tools/tool-camera-rotate.svg</file>
<file>icons/themes/playful/tools/tool-camera-scale.svg</file>
<file>icons/themes/playful/tools/tool-camera-move.svg</file>
<file>icons/themes/playful/timeline/layer-duplicate.svg</file>
</qresource>
<qresource prefix="/app">
<file>icons/onion-blue.png</file>
<file>icons/onion-red.png</file>
<file>icons/onionNext.png</file>
<file>icons/onionPrev.png</file>
<file>icons/thinlines5.png</file>
<file>icons/outlines5.png</file>
<file>icons/mirror.png</file>
<file>icons/mirrorV.png</file>
<file>icons/dialog-error.svg</file>
<file>pencil2d_quick_guide.pdf</file>
<file>icons/new/svg/color-dialog.svg</file>
<file>icons/new/svg/more_options.svg</file>
</qresource>
</RCC>
Binary file removed app/data/icons/add.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/duplicate.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/endplay.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/loop.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/play.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/sound-disabled.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/sound.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/soundscrub-disabled.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/soundscrub.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/startplay.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/controls/stop.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/copy.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/data/icons/cut.png
View file
Open in desktop
Binary file not shown.
Loading