151 Commits

Author SHA1 Message Date
Yves Rizoud
7076e8e06d Eliminated a lot of tab characters in source code
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1342 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-02-13 19:25:49 +00:00
Yves Rizoud
6f08d59f01 Layer toolbar visible by default. Grafx2 now records which toolbars are visible on exit, and restores them next time.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1327 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-02-08 18:58:42 +00:00
Yves Rizoud
571cf70b58 Hide button: inverted right and left clicks. Fixed credits. Lua: arguments of MatchColor and SetColor are now automatically clamped on 0 and 255 when they are too small or too big, instead of wrapping.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1321 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-02-05 01:27:00 +00:00
Adrien Destugues
b36dee613e Ensure pointers are put back to NULL when freed.
--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    trunk/palette.c
M    trunk/init.c
M    trunk/engine.c
M    trunk/filesel.c
M    trunk/miscfileformats.c
M    trunk/pages.c
M    trunk/brush_ops.c
M    trunk/op_c.c
M    trunk/operatio.c
M    trunk/brush.c
M    trunk/loadsave.c
M    trunk/graph.c
M    trunk/fileformats.c
M    trunk/main.c


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1277 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-01-18 14:26:59 +00:00
Adrien Destugues
fe0f87521b -Add some more zoom factors (up to x32)
-Replace the zoom window with a popup menu. Note this make shift+M unusable. Do you think it's annoying ? (also, I don't know how to remove/disable the shortcut, and have no idea what it could do instead)


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1272 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-01-17 22:10:19 +00:00
Yves Rizoud
6a69fa2b79 Hide button now brings a drop-down menu to choose toolbars to show/hide. Right-clicking it toggles them all off/on. Internal: Added support for dropdowns that expand above the button (available in toolbars and windows); Allowed toolbar buttons to wait for button release (the usual) or immediately trigger their effect.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1266 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-01-17 01:56:56 +00:00
Yves Rizoud
84ac0df49c Issue 285: For skins and fonts, replaced calls to SDL_image with our own image-loading functions. Also fixed the generic loader that was updating the screen palette even when not useful.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1247 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-01-15 01:48:33 +00:00
Yves Rizoud
3538abadb9 Added support for hiding the main toolbar, keeping the status line and optionally layer bar. Made it the default behaviour of F10 / right-click 'hide', for testing and feedback. (IMO it's less unforgiving for new users, and we can provide alternative shortcut with old behaviour for veterans).
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1225 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-26 00:32:45 +00:00
Adrien Destugues
63191fec2f Fix nasty bug whith skin management.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1210 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-16 23:09:06 +00:00
Yves Rizoud
e2f4ed00f1 Fix a mouse dropping remaining when clicking layer color. Made the button pick current transp color when left-clicking, and set it on right-click.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1201 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-15 22:24:12 +00:00
Adrien Destugues
853d2b6cad Two buttons were reversed in the layer bar.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1197 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-15 21:09:02 +00:00
Yves Rizoud
883653480b Working layer bar. Champagne!
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1193 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-15 19:24:04 +00:00
Yves Rizoud
353f5dbbd2 Display of layer icons with auto-size (not updated automatically yet, and no action on click)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1192 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-15 18:18:21 +00:00
Yves Rizoud
f7a5b23541 Support for textured toolbars of variable length. Grafx2 repeats the last two columns, so the dither pattern of Modern skin works.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1191 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-15 16:43:59 +00:00
Yves Rizoud
22b5dc56e5 Loading of Layer icons (unused atm.)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1189 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-14 23:04:06 +00:00
Yves Rizoud
04f7c56179 Some layer functions plugged to layer menu bar
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1185 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-14 19:19:05 +00:00
Adrien Destugues
17d3e62398 Added layer toolbar buttons
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1182 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-14 16:54:43 +00:00
Adrien Destugues
90595e3af6 "Hide" button now toggles the layerbar. Right-click works as before. Enjoy the layerbar !
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1179 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-14 14:11:24 +00:00
Adrien Destugues
6a4ba08343 Support for stacked menubars. May still be incomplete...
TODO : add a way to hide and show them...


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1178 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-14 10:25:23 +00:00
Yves Rizoud
c150be2664 [layers] merged in the recent changes from trunk
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1162 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-10 20:35:09 +00:00
Adrien Destugues
e6e698c2bd Added vim modelines to all files.
Set them to 2-space indent, I hope this is ok.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1161 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-10 20:08:11 +00:00
Yves Rizoud
f38fd068a2 [layers] Merged changes from trunk
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1131 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-11-01 01:05:21 +00:00
Yves Rizoud
e7f34fefe4 Skin preview previews gui colors
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1123 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-31 17:07:56 +00:00
Yves Rizoud
036d8008cb (internal) Skins have their own GUI color indices : avoids sharing/restoring MC_ colors
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1121 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-31 15:46:07 +00:00
Adrien Destugues
49cce9643e Load the favorite colors from the skin, not the ini file. We may want to override them, but for now just change the skin's palette.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1116 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-31 12:10:07 +00:00
Adrien Destugues
2b02ff505f Moved skin preview to the Gfx struct so it is not overwritten if you cancel skin loading.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1115 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-31 11:19:44 +00:00
Adrien Destugues
0661e59e1c Preview skins.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1108 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-30 16:58:37 +00:00
Adrien Destugues
1934425972 Added "Brush Factory", allowing you to run a lua script to generate (or alter, untested yet) a brush.
Added a simple (and ugly) sample script.
This needs updates to the makefile for platforms other than linux.
TODO: add a listbox to select the script you want to run. Do we have a simple API to handle filelists yet ?


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1094 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-29 15:22:45 +00:00
Yves Rizoud
3781dae7d3 [layers] Updated from trunk.
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1087 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-21 22:44:45 +00:00
Yves Rizoud
db130fc60d trunk: Implemented file loading of JPEG, TGA, TIFF and a few others, by using SDL_Image builtin loader. Added visible 'hourglass' cursor during 24bit color reduction.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1085 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-21 22:12:56 +00:00
Yves Rizoud
8cf9b530a8 Release: Fix issue 217: high CPU usage while idle
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1079 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-20 18:43:34 +00:00
Yves Rizoud
0b07b43722 [layers] Merged r1063 from trunk. Separated the controls for layers from translucency keys. Can now control up to 8 layers
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1065 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-07 00:07:27 +00:00
Yves Rizoud
56e62c4b47 [layers] Fixed many embarrassing memory overruns and uninitialized memory reads. Woops.
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1050 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-10-01 22:11:26 +00:00
Yves Rizoud
78e59e6127 (layers branch) Adjust tool implemented. Left click and drag to move a single layer, Right-click and drag to move everything.
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1041 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-09-22 22:55:02 +00:00
Adrien Destugues
b12423d03b Trying to compile on amiga with vbcc.
Removed some useless unixisms.
Still not working.
Hope I did not break too much things.




git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1035 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-09-19 22:41:51 +00:00
Yves Rizoud
8ac66726f2 Brush container integrated as the bottom row of Paintbrush screen (F4)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1003 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-08-22 22:11:01 +00:00
Yves Rizoud
29ee887c78 Brush container (unfinished). Temporarily bound to right-click 'Brush FX'. Only accepts monochrome brushes of any size at the moment.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@997 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-08-18 23:42:07 +00:00
Yves Rizoud
025d27ff71 (cont'd from previous commit) Fixed Issue 183. Added intermediate screen updates during expensive operations (including rectangle, I forgot it in previous commit). Display more responsive to users of fast mice.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@991 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-08-15 16:56:20 +00:00
Yves Rizoud
d4dcba62a6 More work on fonts/skins
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@890 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-28 21:50:01 +00:00
Yves Rizoud
ab9671b286 Separated font graphics from skin graphics. WIP, a lot is still hard-coded (font list) or not coded at all (save/load in ini, and match in skin selection screen).
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@885 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-23 21:04:58 +00:00
Yves Rizoud
f683d9ff2e GUI skins: The loader now recovers cleanly from errors and displays a message that says what's the problem in the image.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@881 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-21 18:34:57 +00:00
Yves Rizoud
1b2fa69f6a GUi skin elements are allocated on the heap
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@871 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-16 19:43:37 +00:00
Adrien Destugues
62738a1526 Begin of work on the file selector.
Quite ugly, i tried to reuse code from the other fileselectors, but I failed.

Basically, it works, but we can improve it a lot.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@870 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-15 21:43:21 +00:00
Yves Rizoud
2189d00ec4 Merged buttons 'Grad rectangle' and 'Gradient menu' (issue 107)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@868 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-15 19:53:12 +00:00
Adrien Destugues
8987f07c8a Fix many bugs introduced by the gp2x "hack" of not having a windowed mode.
Still not working perfectly, but at least i can manage to get the program in 320x240 by default on gp2x, without modifying the config files.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@856 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-11 16:19:45 +00:00
Yves Rizoud
9ae2ead8dd Fixed (GP2X): 320x240 is now the Default and 'Safe' videomode.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@849 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-07 16:23:33 +00:00
Yves Rizoud
f1730ea0e4 Reverted the default mode to 'window'. Disabled window mode for GP2X, so it falls back on the first available mode.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@847 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-06 22:56:17 +00:00
Yves Rizoud
33bb5622c0 Fixed bad display and possible crash, when the zoomed area showed more than 512 pixels (requires resolution >1600)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@824 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-06-01 18:47:08 +00:00
Adrien Destugues
2fa494f77e Removed postal address of the FSF since it's moving faster thant the website :)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@779 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-05-05 18:19:37 +00:00
Adrien Destugues
e5fc3a9ef3 AmigaOS 68k build fixes by Artur Jarosik. Thanks!
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@770 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2009-05-03 17:45:10 +00:00