Merge pull request #131 from jbunke/dev-branch

Dev branch
jbunke · Aug 9, 2024 · 2c383b4 · 2c383b4
2 parents 00575c9 + 8653770
commit 2c383b4
Show file tree

Hide file tree

Showing 334 changed files with 6,002 additions and 2,852 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,40 @@
 # Changelog
 
+## **1.1.0** - The UI/UX Update - 2024-08-09
+
+### Added:
+* Draggable buttons: buttons can be clicked and dragged to resort...
+  * Frames
+  * Layers
+  * Palette colors
+* Cel buttons
+  * A range of cels across multiple frames and layers can be selected
+  * Cel selection operations: copy, cut, paste, delete
+* Multiple color sampling modes
+  * RGB-A sliders
+  * HSV-A sliders
+  * Saturation-value matrix
+  * Color wheel
+* Navigation bar
+* Number key icons to first {9} project buttons
+
+### Changed:
+* Layout overhaul
+  * The layers and frames panels have been replaced with the "flipbook" panel
+  * The colors panel now displays the color sampler and the palette simultaneously
+* The preset palettes are no longer preloaded; can now be accessed in the navigation bar
+
+### Fixed:
+* Bug: Tool mouse actions can still be executed when the cursor is in a dropdown menu
+* Bug: Cannot use the brush tool without a selected palette
+
+### API Changes:
+* Removed:
+  * Removed the property `mutable` of the type `palette`
+
+* Changed:
+  * API references to `LAYER-FRAME` have been renamed to `CEL`; no changed behaviour
+
 ## **1.0.1** - 2024-07-11
 
 ### Added:
@@ -11,7 +46,7 @@
 * Tool tips display after hovering over a button for 0.25 seconds, twice as fast as before
 
 ### Fixed:
-* Bug: Script calls to .keys() not being handled correctly
+* Bug: Script calls to `.keys()` not being handled correctly
 * Bug: Box select tool does not select off-canvas pixels inside the selection bounds
 * Bug: Reimporting a scripted preview inherits layer name from its source project
 

diff --git a/res/blurbs/__changelog.txt b/res/blurbs/__changelog.txt
@@ -1,3 +1,38 @@
+{1.1.0} - The UI/UX Update - 2024-08-09
+
+Added:
+> Draggable buttons: buttons can be clicked and dragged to resort...
+  > Frames
+  > Layers
+  > Palette colors
+> Cel buttons
+  > A range of cels across multiple frames and layers can be selected
+  > Cel selection operations: copy, cut, paste, delete
+> Multiple color sampling modes
+  > RGB-A sliders
+  > HSV-A sliders
+  > Saturation-value matrix
+  > Color wheel
+> Navigation bar
+> Number key icons to first {9} project buttons
+
+Changed:
+> Layout overhaul
+  > The layers and frames panels have been replaced with the "flipbook" panel
+  > The colors panel now displays the color sampler and the palette simultaneously
+> The preset palettes are no longer preloaded; can now be accessed in the navigation bar
+
+Fixed:
+> Bug: Tool mouse actions can still be executed when the cursor is in a dropdown menu
+> Bug: Cannot use the brush tool without a selected palette
+
+API Changes:
+  Removed:
+  > Removed the property {mutable} of the type {palette}
+
+  Changed:
+  > API references to {LAYER-FRAME} have been renamed to {CEL}; no changed behaviour
+
 {1.0.1} - 2024-07-11
 
 Added:
@@ -9,7 +44,7 @@ Changed:
 > Tool tips display after hovering over a button for 0.25 seconds, twice as fast as before
 
 Fixed:
-> Bug: Script calls to .keys() not being handled correctly
+> Bug: Script calls to {.keys()} not being handled correctly
 > Bug: Box select tool does not select off-canvas pixels inside the selection bounds
 > Bug: Reimporting a scripted preview inherits layer name from its source project
 

diff --git a/res/blurbs/__clipboard_shortcuts.txt b/res/blurbs/__clipboard_shortcuts.txt
@@ -1,4 +1,4 @@
-Copy selection: {Ctrl + C}
-Cut selection: {Ctrl + X}
-Paste clipboard: {Ctrl + V}
-Paste clipboard to new layer: {Ctrl + Shift + V}
+Copy selection: {sc:COPY}
+Cut selection: {sc:CUT}
+Paste clipboard: {sc:PASTE}
+Paste clipboard to new layer: {sc:PASTE_NEW_LAYER}
diff --git a/res/blurbs/__color_shortcuts.txt b/res/blurbs/__color_shortcuts.txt
@@ -1,12 +1,12 @@
 RGB(A)-HSV slider adjustments:
-Adjust red slider: {Shift + R + Scroll wheel} or {Shift + R + Left/Right Arrow Keys}
-Adjust green slider: {Shift + G + Scroll wheel} or {Shift + G + Left/Right Arrow Keys}
-Adjust blue slider: {Shift + B + Scroll wheel} or {Shift + B + Left/Right Arrow Keys}
-Adjust hue slider: {Shift + H + Scroll wheel} or {Shift + H + Left/Right Arrow Keys}
-Adjust saturation slider: {Shift + S + Scroll wheel} or {Shift + S + Left/Right Arrow Keys}
-Adjust value slider: {Shift + V + Scroll wheel} or {Shift + V + Left/Right Arrow Keys}
-Adjust alpha (opacity) slider: {Shift + A + Scroll wheel} or {Shift + A + Left/Right Arrow Keys}
+Adjust red slider: {Shift + R + Scroll wheel} or {Shift + R + Left/Right Arrow}
+Adjust green slider: {Shift + G + Scroll wheel} or {Shift + G + Left/Right Arrow}
+Adjust blue slider: {Shift + B + Scroll wheel} or {Shift + B + Left/Right Arrow}
+Adjust hue slider: {Shift + H + Scroll wheel} or {Shift + H + Left/Right Arrow}
+Adjust saturation slider: {Shift + S + Scroll wheel} or {Shift + S + Left/Right Arrow}
+Adjust value slider: {Shift + V + Scroll wheel} or {Shift + V + Left/Right Arrow}
+Adjust alpha (opacity) slider: {Shift + A + Scroll wheel} or {Shift + A + Left/Right Arrow}
 
 Advanced palette shortcuts:
-Select next included palette color to the left: {Ctrl + ,}
-Select next included palette color to the right: {Ctrl + .}
+Select next included palette color to the left: {sc:SELECT_COLOR_LEFT}
+Select next included palette color to the right: {sc:SELECT_COLOR_RIGHT}
diff --git a/res/blurbs/__frame_locking.txt b/res/blurbs/__frame_locking.txt
@@ -1,5 +1,4 @@
-Shortcut to toggle: {Ctrl + Q}
+Shortcut to toggle: {sc:TOGGLE_LAYER_LINKING}
 
-When a layer is locked, its contents are linked together across every frame. This means that a locked
-layer can be edited on any selected frame, and the changes made will persist on all frames in the
-animation.
+When the contents of a linked layer are edited on any frame, the changes made will be propagated
+across all frames of the animation.
diff --git a/res/blurbs/__general.txt b/res/blurbs/__general.txt
@@ -1,13 +1,13 @@
 Window / layout:
-Toggle fullscreen / windowed mode: {Escape}
-Recenter canvas in workspace: {Enter}
-Center the canvas around the target pixel: {Shift + Enter}
-Toggle show all UI / minimal UI mode: {Ctrl + Shift + A}
-Set checkerboard and pixel grid cell dimensions to project/selection bounds: {Ctrl + B}
+Toggle fullscreen / windowed mode: {sc:FULLSCREEN}
+Recenter canvas in workspace: {sc:SNAP_TO_CENTER}
+Center the canvas around the target pixel: {sc:SNAP_TO_TP}
+Toggle show all UI / minimal UI mode: {sc:TOGGLE_PANELS}
+Set checkerboard and pixel grid cell dimensions to project/selection bounds: {sc:SET_PIXEL_GRID_CANVAS}
 
 Projects:
-Quick select one of the first nine projects: {1} - {9}
+Quick select one of the first nine projects: {sc:PROJECT_1} - {sc:PROJECT_9}
 
 Layers:
-Navigate to layer above: {Ctrl + Up Arrow Key}
-Navigate to layer below: {Ctrl + Down Arrow Key}
+Navigate to layer above: {sc:LAYER_ABOVE}
+Navigate to layer below: {sc:LAYER_BELOW}
diff --git a/res/blurbs/__onion_skin.txt b/res/blurbs/__onion_skin.txt
@@ -1,4 +1,4 @@
-Shortcut to toggle: {Ctrl + 1}
+Shortcut to toggle: {sc:CYCLE_LAYER_ONION_SKIN_MODE}
 
 Enabling one of the onion skin modes will render translucent previews of {one or both of the frames}
 {adjacent} to the active frame under the editing layer. Note that the onion skins may not be visible

diff --git a/res/blurbs/__playback.txt b/res/blurbs/__playback.txt
@@ -1 +1 @@
-Shortcut to cycle through: {Ctrl + Enter}
+Shortcut to cycle through: {sc:CYCLE_PLAYBACK_MODE}
diff --git a/res/blurbs/__roadmap.txt b/res/blurbs/__roadmap.txt
@@ -2,6 +2,13 @@ This is a rough outline of planned features and when to expect them. Everything
 subject to change.
 
 {Q3 2024}
-> Timeline: frames and layers combined in a single UI panel
-> Lossless video export
 > Presets for common scriptable behaviours
+> Onion skin options:
+  > Look ahead/behind multiple frames
+  > Opacity dropoff
+  > Types of skins
+  > Settings unique to layer
+
+{Q4 2024}
+> Lossless video exporting
+> Preview window embedded in main window while program is fullscreened
diff --git a/res/blurbs/__selection_shortcuts.txt b/res/blurbs/__selection_shortcuts.txt
@@ -1,7 +1,7 @@
-Select entire canvas: {Ctrl + A}
-Deselect: {Ctrl + D}
-Invert selection: {Ctrl + I}
-Fill selection with primary color: {Backspace}
-Fill selection with secondary color: {Shift + Backspace}
-Erase selection contents: {Delete}
-Erase selection contents and keep selection area: {Shift + Delete}
+Select entire canvas: {sc:SELECT_ALL}
+Deselect: {sc:DESELECT}
+Invert selection: {sc:INVERT_SELECTION}
+Fill selection with primary color: {sc:FILL_PRIMARY}
+Fill selection with secondary color: {sc:FILL_SECONDARY}
+Delete selection contents: {sc:DELETE_SELECTION_CONTENTS}
+Delete selection contents and keep selection area: {sc:DELETE_SELECTION_CONTENTS_NO_DESELECT}
diff --git a/res/blurbs/__visibility.txt b/res/blurbs/__visibility.txt
@@ -1,3 +1,3 @@
-Toggle the visibility of the current editing layer: {Shift + 1}
-Isolate the current editing layer: {Shift + 2}
-Enable all layers: {Shift + 3}
+Toggle the visibility of the current editing layer: {sc:TOGGLE_LAYER_VISIBILITY}
+Isolate the current editing layer: {sc:ISOLATE_LAYER}
+Enable all layers: {sc:ENABLE_ALL_LAYERS}
diff --git a/res/blurbs/add_color_to_palette.txt b/res/blurbs/add_color_to_palette.txt
@@ -1,4 +1,4 @@
-Shortcut: {Shift + A}
+Shortcut: {sc:ADD_TO_PALETTE}
 
 Adds the selected color (whichever of primary and secondary is marked with the selection icon) to
 the currently selected palette.
diff --git a/res/blurbs/automation_script.txt b/res/blurbs/automation_script.txt
@@ -1,4 +1,4 @@
-Shortcut: {Ctrl + W}
+Shortcut: {sc:AUTOMATION_SCRIPT}
 
 Upload and run an automation script. Scripts are written in DeltaScript, which has been extended
 for Stipple Effect's specifications and needs.

diff --git a/res/blurbs/box_select.txt b/res/blurbs/box_select.txt
@@ -1,4 +1,4 @@
-Shortcut: {X}
+Shortcut: {sc:SET_TOOL_BOX_SELECT}
 
 Use the box select tool to make rectangular selections.
 This is a convenient way to quickly enclose a desired selection area.

diff --git a/res/blurbs/brush.txt b/res/blurbs/brush.txt
@@ -1,4 +1,4 @@
-Shortcut: {B}
+Shortcut: {sc:SET_TOOL_BRUSH}
 
 A pixel-perfect paint brush with no anti-aliasing
 

diff --git a/res/blurbs/brush_select.txt b/res/blurbs/brush_select.txt
@@ -1,4 +1,4 @@
-Shortcut: {V}
+Shortcut: {sc:SET_TOOL_BRUSH_SELECT}
 
 Behaves like the brush, but for selection.
 

diff --git a/res/blurbs/color_menu_mode.txt b/res/blurbs/color_menu_mode.txt
diff --git a/res/blurbs/color_picker.txt b/res/blurbs/color_picker.txt
@@ -1,4 +1,4 @@
-Shortcut: {C}
+Shortcut: {sc:SET_TOOL_COLOR_PICKER}
 
 Use the color picker to set the primary or secondary color to the color on the current layer of the
 pixel that was clicked.

diff --git a/res/blurbs/color_script.txt b/res/blurbs/color_script.txt
@@ -1,4 +1,4 @@
-Shortcut: {Ctrl + Shift + W}
+Shortcut: {sc:COLOR_SCRIPT}
 
 Allows for the transformation of a scope of the project (whole project, layer, frame, etc.) via an
 uploaded color script. A color script must take a single color as a parameter and return a color.
diff --git a/res/blurbs/contents_to_palette.txt b/res/blurbs/contents_to_palette.txt
@@ -1,4 +1,4 @@
-Shortcut: {Shift + D}
+Shortcut: {sc:CONTENTS_TO_PALETTE}
 
-Extracts every non-transparent color from the chosen project scope (selection, layer-frame, layer,
-frame, or the entire project) and adds them to the selected palette.
+Extracts every non-transparent color from the chosen project scope (selection, cel, layer, frame,
+or the entire project) and adds them to the selected palette.
diff --git a/res/blurbs/duplicate_frame.txt b/res/blurbs/duplicate_frame.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + F}
+Shortcut: {sc:DUPLICATE_FRAME}
 
 Creates a new frame by duplicating the previously selected one.
diff --git a/res/blurbs/duplicate_layer.txt b/res/blurbs/duplicate_layer.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + L}
+Shortcut: {sc:DUPLICATE_LAYER}
 
 Creates a new layer above by duplicating the previously selected one.
diff --git a/res/blurbs/eraser.txt b/res/blurbs/eraser.txt
@@ -1,4 +1,4 @@
-Shortcut: {E}
+Shortcut: {sc:SET_TOOL_ERASER}
 
 A pixel-perfect eraser with no anti-aliasing
 Sets the color of an erased pixel to {RGBA [0, 0, 0, 0]}

diff --git a/res/blurbs/fill.txt b/res/blurbs/fill.txt
@@ -1,4 +1,4 @@
-Shortcut: {F}
+Shortcut: {sc:SET_TOOL_FILL}
 
 Use fill to fill adjacent pixels of the same or similar color as the initial pixel that was clicked.
 Adjust the tolerance of fill to increase or decrease the threshold of the similarity of the colors.

diff --git a/res/blurbs/flatten.txt b/res/blurbs/flatten.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + M}
+Shortcut: {sc:FLATTEN}
 
 Compresses project's visible contents down to a single layer
diff --git a/res/blurbs/frame_properties.txt b/res/blurbs/frame_properties.txt
@@ -1,3 +1,3 @@
-Shortcut: {Shift + F}
+Shortcut: {sc:FRAME_PROPERTIES}
 
 Displays a dialog where the frame's properties can be modified
diff --git a/res/blurbs/gradient_tool.txt b/res/blurbs/gradient_tool.txt
@@ -1,7 +1,7 @@
-Shortcut: {G}
+Shortcut: {sc:SET_TOOL_GRADIENT}
 
 The gradient tool draws a gradient from the primary to the secondary color, or vice versa, either
-as a brush or as a linear spectrum that covers the entire selection or layer-frame.
+as a brush or as a linear spectrum that covers the entire selection or cel.
 
 Primary to secondary color: {Left Click & Drag}
 Secondary to primary color: {Right Click & Drag}

diff --git a/res/blurbs/granular_redo.txt b/res/blurbs/granular_redo.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + Y}
+Shortcut: {sc:GRANULAR_REDO}
 
 Return to a more advanced state within a single operation.
diff --git a/res/blurbs/granular_undo.txt b/res/blurbs/granular_undo.txt
@@ -1,4 +1,4 @@
-Shortcut: {Ctrl + Shift + Z}
+Shortcut: {sc:GRANULAR_UNDO}
 
 Return to a previous state within a single operation.
 

diff --git a/res/blurbs/hand.txt b/res/blurbs/hand.txt
@@ -1,4 +1,4 @@
-Shortcut: {H}
+Shortcut: {sc:SET_TOOL_HAND}
 
 Use the hand to move the image canvas around the workspace.
 

diff --git a/res/blurbs/history.txt b/res/blurbs/history.txt
@@ -1,3 +1,3 @@
-Shortcut: {Shift + Y}
+Shortcut: {sc:HISTORY}
 
 Opens a dialog that lists all the retained major project states, any of which can be reverted to.
diff --git a/res/blurbs/horizontal_reflection.txt b/res/blurbs/horizontal_reflection.txt
@@ -1,5 +1,5 @@
-Reflect selection bounds about y-axis: {Ctrl + 4}
-Reflect selection contents about y-axis: {Ctrl + Shift + 4}
+Reflect selection bounds about y-axis: {sc:HORZ_BOUNDS_REFLECTION}
+Reflect selection contents about y-axis: {sc:HORZ_CONTENTS_REFLECTION}
 
 Reflect the selection about the y-axis. Pressing the button will reflect the {bounds} or {contents}
 based on the current {selection mode}. To specify {bounds reflection}, ensure the {move selection}

diff --git a/res/blurbs/hsv_shift.txt b/res/blurbs/hsv_shift.txt
@@ -1,4 +1,4 @@
-Shortcut: {Ctrl + Shift + H}
+Shortcut: {sc:HSV_SHIFT}
 
 Allows for the transformation of a scope of the project (whole project, layer, frame, etc.) by
 shifting the HSV color levels in the scope. These are:

diff --git a/res/blurbs/info.txt b/res/blurbs/info.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + H}
+Shortcut: {sc:INFO}
 
 Display the Help & Information window
diff --git a/res/blurbs/layer_settings.txt b/res/blurbs/layer_settings.txt
@@ -1,4 +1,4 @@
-Shortcut: {Shift + L}
+Shortcut: {sc:LAYER_SETTINGS}
 
 Displays a dialog where the layer's settings and properties can be modified
 

diff --git a/res/blurbs/line_tool.txt b/res/blurbs/line_tool.txt
@@ -1,4 +1,4 @@
-Shortcut: {L}
+Shortcut: {sc:SET_TOOL_LINE}
 
 The line tool plots a continuous line of a determined pixel width.
 

diff --git a/res/blurbs/merge_with_layer_below.txt b/res/blurbs/merge_with_layer_below.txt
@@ -1,4 +1,4 @@
-Shortcut: {Ctrl + Shift + M}
+Shortcut: {sc:MERGE_WITH_LAYER_BELOW}
 
 Draws the contents of this layer onto the layer below it and removes the layer above. The merged layer
 inherits all the lower layer's properties.
diff --git a/res/blurbs/move_color_left_in_palette.txt b/res/blurbs/move_color_left_in_palette.txt
@@ -1 +1 @@
-Shortcut: {Shift + ,}
+Shortcut: {sc:MOVE_COLOR_LEFT}
diff --git a/res/blurbs/move_color_right_in_palette.txt b/res/blurbs/move_color_right_in_palette.txt
@@ -1 +1 @@
-Shortcut: {Shift + .}
+Shortcut: {sc:MOVE_COLOR_RIGHT}
diff --git a/res/blurbs/move_frame_back.txt b/res/blurbs/move_frame_back.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + Left Arrow}
+Shortcut: {sc:MOVE_FRAME_BACK}
 
 Reorders the selected frame by placing it immediately before the previous frame
diff --git a/res/blurbs/move_frame_forward.txt b/res/blurbs/move_frame_forward.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + Right Arrow}
+Shortcut: {sc:MOVE_FRAME_FORWARD}
 
 Reorders the selected frame by placing it immediately after the next frame
diff --git a/res/blurbs/move_layer_down.txt b/res/blurbs/move_layer_down.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + Down}
+Shortcut: {sc:MOVE_LAYER_DOWN}
 
 Reorders the selected layer by swapping it with the layer below
diff --git a/res/blurbs/move_layer_up.txt b/res/blurbs/move_layer_up.txt
@@ -1,3 +1,3 @@
-Shortcut: {Ctrl + Shift + Up Arrow Key}
+Shortcut: {sc:MOVE_LAYER_UP}
 
 Reorders the selected layer by swapping it with the layer above
diff --git a/res/blurbs/move_selection.txt b/res/blurbs/move_selection.txt
@@ -1,4 +1,4 @@
-Shortcut: {M}
+Shortcut: {sc:SET_TOOL_MOVE_SELECTION}
 
 Move: {Click & Drag} or {Arrow Keys}
 [ Move Modifiers ]
@@ -13,4 +13,4 @@ If the pixel grid is on, hold {Shift} to snap the stretch operation to the pixel
 Rotate: {Click & Drag} around one of the transform nodes
 Modify the rotation operation to snap to the nearest 45-degree angle by holding {Shift}.
 
-You can also move the selection with the arrow keys with the {Box Select} tool equipped.
+You can also move the selection with the arrow keys with {Box Select} equipped.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Shortcut to cycle through: {Ctrl + Enter}
		Shortcut to cycle through: {sc:CYCLE_PLAYBACK_MODE}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Shortcut: {Shift + ,}
		Shortcut: {sc:MOVE_COLOR_LEFT}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Shortcut: {Shift + .}
		Shortcut: {sc:MOVE_COLOR_RIGHT}