From 1671411465c94e1d2e6c1979a96e4c6c8b786607 Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 4 Apr 2017 20:02:29 -0300 Subject: [PATCH] Add simple color selection for tag/user data colors --- data/palettes/tags.gpl | 11 ++ data/themes/default/sheet.png | Bin 13776 -> 13819 bytes data/themes/default/theme.xml | 10 +- data/widgets/frame_tag_properties.xml | 4 +- data/widgets/user_data.xml | 2 +- docs/gpl-palette-extension.md | 26 ++++ src/app/commands/cmd_mask_by_color.cpp | 4 +- src/app/commands/cmd_sprite_properties.cpp | 4 +- src/app/file/ase_format.cpp | 1 + src/app/ui/color_bar.cpp | 4 +- src/app/ui/color_button.cpp | 8 +- src/app/ui/color_button.h | 8 +- src/app/ui/color_popup.cpp | 135 ++++++++++++++++++++- src/app/ui/color_popup.h | 11 +- src/app/ui/context_bar.cpp | 2 +- src/app/widget_loader.cpp | 6 +- src/doc/file/gpl_file.cpp | 45 +++++-- src/doc/palette.cpp | 19 ++- src/doc/palette.h | 7 +- 19 files changed, 273 insertions(+), 34 deletions(-) create mode 100644 data/palettes/tags.gpl create mode 100644 docs/gpl-palette-extension.md diff --git a/data/palettes/tags.gpl b/data/palettes/tags.gpl new file mode 100644 index 000000000..222849003 --- /dev/null +++ b/data/palettes/tags.gpl @@ -0,0 +1,11 @@ +GIMP Palette +Channels: RGBA +# + 0 0 0 0 Transparent +254 91 89 255 Red +247 165 71 255 Orange +243 206 82 255 Yellow +106 205 91 255 Green + 87 185 242 255 Blue +209 134 223 255 Purple +165 165 167 255 Gray diff --git a/data/themes/default/sheet.png b/data/themes/default/sheet.png index 2d9d162fc90893903b20697b3e6b229bcdd14d5a..05ff8f5eb5bbe5435b47aa6f98e75dea9ff1465f 100644 GIT binary patch delta 13197 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 delta 13071 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 F`#&lgjWPfL diff --git a/data/themes/default/theme.xml b/data/themes/default/theme.xml index 3dd8ee7a5..7d1f06adb 100644 --- a/data/themes/default/theme.xml +++ b/data/themes/default/theme.xml @@ -391,6 +391,8 @@ + + + diff --git a/data/widgets/frame_tag_properties.xml b/data/widgets/frame_tag_properties.xml index 59bd9ab1b..d57066bb1 100644 --- a/data/widgets/frame_tag_properties.xml +++ b/data/widgets/frame_tag_properties.xml @@ -1,6 +1,6 @@ - + @@ -14,7 +14,7 @@