181 Commits

Author SHA1 Message Date
Yves Rizoud
145c9545e7 Fix the 'FX' button that didn't refresh its state when swapping pages between an image with Tilemap ON (button should be highlighted) and an image with Tilemap OFF (button not highlighted)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1928 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-03-11 16:50:28 +00:00
Yves Rizoud
747f9e8526 Fix most of issue 462 : Inconsistent directories in file selectors for image and brush.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1926 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-03-09 01:18:23 +00:00
Yves Rizoud
de6b3ac8d1 Toolbars now automatically switch to anim/layers when required
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1911 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-03-04 15:35:20 +00:00
Yves Rizoud
e73eb2786a Animation now has correct visual display and input feedback. Loading GIF guesses it's an anim if it loops, layers otherwise : Some rare non-looping GIF anims (usaully broken) will be misunderstood as layered. Editing of anims and layers seems flawless and stable. Still requires an auto-switch to the best toolbar (anim/layers) when relevant, but you can already switch manually.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1910 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-03-02 23:19:47 +00:00
Yves Rizoud
db50b4ebdc More unification of layers and anim version: toolbars work. You can switch toolbars by right-clicking the icon from status bar: it proposes 'Anim' only while the current image has 1 layer (see Button_toggle_toolbar()). The animation-specific stuff (rendering...) isn't activated yet, see all the NOLAYERS places remaining. Also will need a trick for keyboard shortcuts to work on multiple buttons, and extra code on swap-to-spare, undo, redo, load etc. to sync toolbars with Image_type.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1909 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-02-27 23:19:23 +00:00
Yves Rizoud
d38f5ee981 CPC mode 5 : replaced the global Constraint_mode by a state (Image_mode) in each versioned T_Page: This allows keeping it sane when swapping to Spare, and when Undo/Redoing. Also fixed the first page when program starts, it was unnecessarily allocating pointers for the maximum number of layers(16)/frames(999)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1907 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-02-27 00:47:18 +00:00
Franck Charlet
8ea1ab7fc8 fixed makefile for macosx again
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1905 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-02-20 19:56:52 +00:00
Adrien Destugues
836c224169 Display font dropdown in skin menu with the selected font.
Fixes #450.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1882 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-12-31 13:27:17 +00:00
Yves Rizoud
dae1bc856b Tilemap mode: Undo and Redo only refresh tilemap when image size changes. Lua scripts that change image size also refresh tilemap
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1877 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-11-26 14:46:09 +00:00
Yves Rizoud
496148d485 Tilemap effect: Added a menu to set options. Options saved and reloaded in .INI. Added support for shortcuts (but no helpfile so far, so you can't set them)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1870 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-11-13 23:21:59 +00:00
Yves Rizoud
e7d37cf367 Tilemap: now separate for main and spare. Safeties added in most places necessary (auto-recompute tilemap after load, undo, etc)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1866 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-11-11 22:57:35 +00:00
Yves Rizoud
a60a33c204 Tilemap mode works, and it's faster than I thought possible.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1858 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-11-07 00:06:17 +00:00
Yves Rizoud
f1f658ded4 Start of tilemap. Only a togglable effect
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1856 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-11-06 19:03:27 +00:00
Yves Rizoud
51a9ad0132 Icon for effect '8-bit'. Added in all skins
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1844 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-10-25 22:15:14 +00:00
Yves Rizoud
8fb16e7089 Re-integrated anim in trunk, fixing the 999-layer limit at the same time
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1841 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-10-19 23:35:56 +00:00
Yves Rizoud
1f10338f60 Merged trunk into branches/mode5 (=update mode5 branch to latest)
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1785 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-25 15:17:18 +00:00
Yves Rizoud
37d30ae114 Fix issue 428: Mouse cursor deadzones in fullscreen mode; also non-functional mouse in fullscreen if mouse speed (in options) was any other value than 'normal'. Mouse speed removed, it's impossible to make it work AND have working tablets -> Issue 317 re-opened. Added 2 missing bugfinders in credits
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1781 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-18 21:56:11 +00:00
Yves Rizoud
02ecd8d29d Fix issue 432: Options/Input: Missing graphic update after changing a numeric value
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1778 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-14 19:43:16 +00:00
Yves Rizoud
860648b190 Multi-shorcuts option now works. Default OFF, it will avoid situations where user mistakenly sets the same key for multiple actions.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1769 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-04 22:30:02 +00:00
Yves Rizoud
1d24885ddc Beginning of setting to disable multi-shortcuts: settable in options, saved and reloaded, no effect so far.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1768 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-04 19:34:15 +00:00
Yves Rizoud
04761c79c4 Unbroke the file selector (was listing only hidden files instead of non-hidden). Lua: can browse the whole filesystem now
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1761 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-02 17:43:16 +00:00
Yves Rizoud
9f8dada2b0 Lua window: Fix inconsistency of 'parent directory' appearance. Now applies the 'show hidden files/dirs' settings too.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1760 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-03-23 20:13:12 +00:00
Franck Charlet
431484914e more work done on Mac OSX version
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1752 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-03-10 22:16:42 +00:00
Yves Rizoud
7caab79d21 Issue 425: Spray setting 'Init' is now minimum 1
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1742 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-03-01 18:10:32 +00:00
Yves Rizoud
cdd7f21265 Fxed and simplified double-click handling in Listboxes (Skins window, Text window, Factory window). Double-clicking a font in Text window 'accepts' the rendering and closes the window.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1736 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-26 17:43:55 +00:00
Yves Rizoud
80c37034f9 Fix a remap problem on brush, when modified by Lua script then transformed. Fix Brush remap to maintain transparent pixels. Fix Text tool , respects transparent pixels and preview is always visible (The black PF_ fonts are no longer shown on a black background)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1726 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-16 17:03:45 +00:00
Adrien Destugues
72e9892b53 Constraint mode is now switchable on/off in the effect screen.
I did some changes to the effect screen to make some space : instead of displaying an "on/off" label, we now keep the button pressed for active effects. 

There is no "constraint menu" yet, we should allow to select different constraints there (C64, MO5, spectrum, ...) to activate their respective enforcer and plug the right thing to the associated checker.

This should eventually allow drawers to :
 * Load any single-layer picture
 * Select the mode they want to use (without enabling it)
 * Run the checker and get the result as a multilayer (with an error layer)
 * Then, once they feel enough issues are solved, switch to "enforcer" mode for further manual tweaking.

Now we need a checker for CPC Mode5... :)

git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1721 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-14 13:37:35 +00:00
Adrien Destugues
eba26aaa96 Merge trunk to the cpcmode5 branch. This gets us a more recent grafx2 with the cpcmode5 drawing. Now to make this mode optional so users can still work in regular mode :)
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1719 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-13 21:49:31 +00:00
Yves Rizoud
2378d8cedc Fix remaining issue of gradients / color cycling.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1716 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-09 21:40:15 +00:00
Yves Rizoud
1e6c4d22bc Default gradients (or cycles) are now loaded from skins. Initialized all current skins so that range 0 is a white->black range, this way the grad shapes are immediately efficient. Still has a problem when loading an image in command-line.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1714 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-09 00:57:33 +00:00
Yves Rizoud
ce3181b230 Fixed compilation warnings: a few missing declarations, and 2 strange casts on WIN32-specific code.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1712 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-07 19:39:45 +00:00
Yves Rizoud
d0aaabf6b2 Merge of r1709 into trunk: Atari Falcon port
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1710 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-06 19:30:55 +00:00
Yves Rizoud
57a1bda6de Improved text with bitmap fonts : Works great with 'Get brush colors' (F11) to import the exact font colors.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1708 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-05 19:43:51 +00:00
Yves Rizoud
065503ef64 Improved text rendering in Truetype mode (with and without antialias), thanks to the improved brush remapping. Still todo: bitmap fonts, colored and monochrome cases.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1707 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-05 00:07:28 +00:00
Yves Rizoud
abadd59b12 Brush container saves and restores the right palette
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1702 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-01-30 00:17:47 +00:00
Yves Rizoud
5d2dd927e4 Much work on color brushes (issue 362). You can rotate, resize, flip etc. without losing original palette.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1701 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-01-30 00:03:38 +00:00
Yves Rizoud
e01b310317 Some work on brush remapping
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1700 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-01-29 21:20:54 +00:00
Yves Rizoud
40a7bcf40e Changes on brushes memory management, in preparation for Issue 362
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1699 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-01-27 19:52:36 +00:00
Yves Rizoud
14a859f711 Key to swap buttons: reduced choices to Ctrl (default) and Alt
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1692 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-01-22 19:02:28 +00:00
Yves Rizoud
7ef353e8fd Issue 400:Button for changing stylus click into right click behavior. Done with actual keyboard keys, now to do joystick buttons
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1691 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-01-22 17:15:17 +00:00
Yves Rizoud
9b4be3abd1 Modified filelists so that they can support arbitrary width. Generalized the 'quicksearch' system and implemented it in Brush Factory screen: Type some letters to locate matching filename.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1660 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-12-17 00:56:58 +00:00
Yves Rizoud
7a3ae5824a Merged the specifics of Caanoo 1.2 port by Pheel + Enabled TTF text on Caanoo
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1645 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-11-05 01:03:11 +00:00
Yves Rizoud
e5703c0895 Implemented issue 327: Having the magnifier settings identical for main and spare page
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1622 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-09-17 16:25:00 +00:00
Yves Rizoud
db8bde5ba6 Fix issue 380: Exiting zoom mode in a large image jumps the viewport to a 'random' position
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1620 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-09-17 14:27:43 +00:00
Yves Rizoud
79dbd3722a Fix sliders displayed position. Pfew.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1609 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-09-11 00:37:43 +00:00
Yves Rizoud
25f8942641 Cycling colors: increased max speed from 64 to 105, because I found old LBM file that uses this speed
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1605 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-09-04 14:59:33 +00:00
Yves Rizoud
a61bb9893c Gradient menu: palette now resets when you release speed slider, this fixes bad menu colors when they are in the shift. Lua: messagebox() and inputbox() now recompute menu colors before opening, this fixes bad menu colors if the script had altered the palette earlier.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1602 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-09-02 00:06:57 +00:00
Yves Rizoud
962d23dbc4 The gradients (Cycling or not) are now per-picture, so: The main and spare page have separate gradients; Loading a picture resets the gradients and loads the new image's (if any); Undo and Redo correctly navigate to the right gradients when you Undo/Redo Loading different color-cycling images.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1600 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-08-31 23:48:10 +00:00
Yves Rizoud
97060bc146 Improved Gradation menu for cycling colors, including a horizontal scrollbar. Added helpfile.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1598 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-08-29 23:56:42 +00:00
Yves Rizoud
520da7d168 Reverted the change of input system (mostly, still needs more testing) Changed color cycling so it no longer needs a separate thread.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1581 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2010-08-19 00:33:06 +00:00