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
This commit is contained in:
Adrien Destugues
2011-02-13 21:49:31 +00:00
parent 4e60f5ad74
commit eba26aaa96
65 changed files with 8669 additions and 3286 deletions

View File

@@ -62,7 +62,11 @@ static const T_Help_table helptable_about[] =
HELP_BOLD (" \"Dragon's Layers\" Edition")
HELP_BOLD (" THE ULTIMATE MULTI-RESOLUTION GFX EDITOR")
HELP_TEXT (" http://grafx2.googlecode.com")
#if defined(__MINT__)
HELP_TEXT (" atari build ")
#else
HELP_TEXT ("")
#endif
HELP_TEXT ("Copyright 2007-2010, the Grafx2 project team")
HELP_TEXT (" Copyright 1996-2001, SUNSET DESIGN")
};
@@ -156,6 +160,7 @@ static const T_Help_table helptable_help[] =
HELP_LINK ("Filled polyform: %s", 0x200+BUTTON_POLYFILL)
HELP_LINK ("Gradient rectangle: %s", 0x100+BUTTON_GRADRECT)
HELP_LINK ("Gradation menu: %s", 0x200+BUTTON_GRADRECT)
HELP_LINK ("Toggle color cycling:%s", SPECIAL_CYCLE_MODE)
HELP_LINK ("Spheres: %s", 0x100+BUTTON_SPHERES)
HELP_LINK ("Gradient ellipses: %s", 0x200+BUTTON_SPHERES)
HELP_LINK ("Adjust picture: %s", 0x100+BUTTON_ADJUST)
@@ -204,6 +209,10 @@ static const T_Help_table helptable_help[] =
HELP_LINK ("Distort brush: %s", SPECIAL_DISTORT)
HELP_LINK ("Outline brush: %s", SPECIAL_OUTLINE)
HELP_LINK ("Nibble brush: %s", SPECIAL_NIBBLE)
HELP_LINK ("Double brush size: %s", SPECIAL_BRUSH_DOUBLE)
HELP_LINK ("Halve brush size: %s", SPECIAL_BRUSH_HALVE)
HELP_LINK ("Double brush width: %s", SPECIAL_BRUSH_DOUBLE_WIDTH)
HELP_LINK ("Double brush height: %s", SPECIAL_BRUSH_DOUBLE_HEIGHT)
HELP_LINK ("Get brush colors: %s", SPECIAL_GET_BRUSH_COLORS)
HELP_LINK ("Recolorize brush: %s", SPECIAL_RECOLORIZE_BRUSH)
HELP_LINK ("Rotate brush: %s", SPECIAL_ROTATE_ANY_ANGLE)
@@ -228,6 +237,18 @@ static const T_Help_table helptable_help[] =
HELP_LINK (" 18:1 %s", SPECIAL_ZOOM_18)
HELP_LINK (" 20:1 %s", SPECIAL_ZOOM_20)
HELP_LINK ("Brush effects menu: %s", 0x100+BUTTON_BRUSH_EFFECTS)
HELP_LINK ("Brush factory: %s", 0x200+BUTTON_BRUSH_EFFECTS)
HELP_LINK ("Repeat last script: %s", SPECIAL_REPEAT_SCRIPT)
HELP_LINK ("Run script #1: %s", SPECIAL_RUN_SCRIPT_1)
HELP_LINK ("Run script #2: %s", SPECIAL_RUN_SCRIPT_2)
HELP_LINK ("Run script #3: %s", SPECIAL_RUN_SCRIPT_3)
HELP_LINK ("Run script #4: %s", SPECIAL_RUN_SCRIPT_4)
HELP_LINK ("Run script #5: %s", SPECIAL_RUN_SCRIPT_5)
HELP_LINK ("Run script #6: %s", SPECIAL_RUN_SCRIPT_6)
HELP_LINK ("Run script #7: %s", SPECIAL_RUN_SCRIPT_7)
HELP_LINK ("Run script #8: %s", SPECIAL_RUN_SCRIPT_8)
HELP_LINK ("Run script #9: %s", SPECIAL_RUN_SCRIPT_9)
HELP_LINK ("Run script #10: %s", SPECIAL_RUN_SCRIPT_10)
HELP_LINK ("Text: %s", 0x100+BUTTON_TEXT)
HELP_LINK ("Resolution menu: %s", 0x100+BUTTON_RESOL)
HELP_LINK ("Safety resolution: %s", 0x200+BUTTON_RESOL)
@@ -424,6 +445,14 @@ static const T_Help_table helptable_credits[] =
HELP_TEXT ("")
HELP_TEXT (" Luc Schrijvers (Begasus)")
HELP_TEXT ("")
HELP_BOLD (" WIZ & CAANOO PORT")
HELP_TEXT ("")
HELP_TEXT (" Alexander Filyanov (PheeL)")
HELP_TEXT ("")
HELP_BOLD (" ATARI PORT")
HELP_TEXT ("")
HELP_TEXT (" Pawel Goralski (Saulot)")
HELP_TEXT ("")
HELP_TEXT ("")
HELP_TEXT (" ... made it work on your favourite toaster")
HELP_TEXT ("")
@@ -432,17 +461,18 @@ static const T_Help_table helptable_credits[] =
//HELP_TEXT ("0----5----0----5----0----5----0----5----0--X")
HELP_TEXT (" anibiqme blumunkee BDCIron ")
HELP_TEXT (" Ced DawnBringer El Topo ")
HELP_TEXT (" falenblood fano fogbot121 ")
HELP_TEXT (" Frost Grimmy grknsngn ")
HELP_TEXT (" falenblood fanickbux fano ")
HELP_TEXT (" fogbot121 Frost Grimmy ")
HELP_TEXT (" Gürkan Sengün Hatch HoraK-FDF ")
HELP_TEXT (" iLKke Iw2evk Jamon ")
HELP_TEXT (" keito kusma Lord Graga ")
HELP_TEXT (" Lorenzo Gatti MagerValp maymunbeyin ")
HELP_TEXT (" mind MooZ Pasi Kallinen ")
HELP_TEXT (" the Peach petter richienyhus ")
HELP_TEXT (" tape.wyrm TeeEmCee tempest ")
HELP_TEXT (" the Peach petter PheeL ")
HELP_TEXT (" richienyhus sm4tik spratek ")
HELP_TEXT (" tape.yrm TeeEmCee tempest ")
HELP_TEXT (" Timo Kurrpa titus^Rab Tobé ")
HELP_TEXT (" yakumo9275 00ai99")
HELP_TEXT (" yakumo2975 00ai99")
HELP_TEXT ("")
HELP_TEXT (" ... posted the annoying bug reports.")
HELP_TEXT ("")
@@ -631,9 +661,25 @@ static const T_Help_table helptable_paintbrush[] =
HELP_TEXT ("brush size by using the keys:")
HELP_LINK ("Reduce : %s", SPECIAL_SMALLER_PAINTBRUSH)
HELP_LINK ("Increase : %s", SPECIAL_BIGGER_PAINTBRUSH)
HELP_TEXT ("The last 3 paintbrushes in the menu belong")
HELP_TEXT ("to the \"miscellaneous\" family and their size")
HELP_TEXT ("cannot be modified.")
HELP_TEXT ("")
HELP_TEXT ("Other brushes are bitmaps, their size can't")
HELP_TEXT ("be adjusted.")
HELP_TEXT ("")
HELP_TEXT ("Click with left mouse button to choose a ")
HELP_TEXT ("paintbrush, and right mouse button to store")
HELP_TEXT ("your current brush in the slot. If your")
HELP_TEXT ("current brush is a grabbed brush, it will")
HELP_TEXT ("store a monochrome version of it, maximum")
HELP_TEXT ("15x15. (See below 'Brush container' to store")
HELP_TEXT ("backups of a big brush)")
HELP_TEXT ("The stored brushes are saved when you exit")
HELP_TEXT ("the program.")
HELP_TEXT ("")
HELP_TEXT ("The 'Preset' button allows you to pick a")
HELP_TEXT ("brush from any family. It's useful if you've")
HELP_TEXT ("overwritten all normal slots with brushes")
HELP_TEXT ("that you use more often.")
HELP_TEXT ("")
HELP_TEXT ("")
HELP_BOLD ("BRUSH CONTAINER")
HELP_TEXT ("")
@@ -1123,6 +1169,27 @@ static const T_Help_table helptable_grad_rect[] =
HELP_TEXT ("- Index scroller: Defines the current")
HELP_TEXT ("gradation among a set of 16 that will be")
HELP_TEXT ("memorised.")
HELP_TEXT ("")
HELP_BOLD ("COLOR CYCLING")
HELP_TEXT ("")
HELP_TEXT ("These options allow you to use animation of")
HELP_TEXT ("colors: Grafx2 will shift palette entries")
HELP_TEXT ("at real-time. Note that only the LBM file")
HELP_TEXT ("format can record these settings, and very")
HELP_TEXT ("few image viewers will play it back.")
HELP_TEXT ("")
HELP_TEXT ("- Cycling: Activates or desactivates the")
HELP_TEXT ("cycling of colors when you're in the editor.")
HELP_LINK ("Key: %s", SPECIAL_CYCLE_MODE)
HELP_TEXT ("")
HELP_TEXT ("- Speed: Sets the speed for the cycling of")
HELP_TEXT ("this range. Zero means this range doesn't")
HELP_TEXT ("cycle. With 1, the range shifts 0.2856 times")
HELP_TEXT ("per second; at speed 64 it's 18.28 times")
HELP_TEXT ("per second. The program activates cycling")
HELP_TEXT ("while you hold the speed slider, so you can")
HELP_TEXT ("preview the speed.")
HELP_TEXT ("")
};
static const T_Help_table helptable_spheres[] =
{
@@ -1253,15 +1320,17 @@ static const T_Help_table helptable_brush_fx[] =
HELP_TEXT ("point at coordinates inferior to the ones of")
HELP_TEXT ("the first point, the brush will be inverted.")
HELP_TEXT ("Meanwhile, you can press the following keys")
HELP_TEXT ("whose effects are: 'D' : double the")
HELP_TEXT ("brush in X and Y 'H' : reduce the")
HELP_TEXT ("brush by half in X and Y 'X' : double")
HELP_TEXT ("the brush in X 'Shift+X': reduce the brush")
HELP_TEXT ("by half in X 'Y' : double the brush")
HELP_TEXT ("in Y 'Shift+Y': reduce the brush by half")
HELP_TEXT ("in Y 'N' : restore the normal size of")
HELP_TEXT ("the brush (can be useful")
HELP_TEXT ("because it's the only way for cancelling)")
HELP_TEXT ("whose effects are:")
HELP_TEXT (" 'D' : Double the brush")
HELP_TEXT (" 'H' : Reduce the brush by half")
HELP_TEXT (" 'X' : Double the brush in X")
HELP_TEXT (" 'Shift+X': Reduce the brush by half in X")
HELP_TEXT (" 'Y' : Double the brush in Y")
HELP_TEXT (" 'Shift+Y': Reduce the brush by half in Y")
HELP_TEXT (" 'N' : Restore the normal size of the")
HELP_TEXT (" brush (can be useful because")
HELP_TEXT (" it's the only way for")
HELP_TEXT (" cancelling)")
HELP_TEXT ("")
HELP_LINK ("- Distort: (Key:%s)",SPECIAL_DISTORT)
HELP_TEXT ("Triggers an interactive operation")
@@ -1312,6 +1381,8 @@ static const T_Help_table helptable_brush_fx[] =
HELP_TEXT ("")
HELP_TITLE("BRUSH FACTORY")
HELP_TEXT ("")
HELP_LINK ("(Key:%s)",0x200+BUTTON_BRUSH_EFFECTS)
HELP_TEXT ("")
HELP_TEXT ("This menu allows you to run scripts. Scripts")
HELP_TEXT ("are written in the Lua language, and allow")
HELP_TEXT ("you to modify the brush (hence the name")
@@ -1331,6 +1402,8 @@ static const T_Help_table helptable_brush_fx[] =
HELP_TEXT ("time you open the window. Scripts are loaded")
HELP_TEXT ("from disk when you run them.")
HELP_TEXT ("")
HELP_LINK ("- Repeat last script: %s", SPECIAL_REPEAT_SCRIPT)
HELP_TEXT ("")
};
static const T_Help_table helptable_effects[] =
{
@@ -2273,6 +2346,13 @@ static const T_Help_table helptable_settings_details[] =
HELP_TEXT ("variants of your original palette, resulting")
HELP_TEXT ("in a pretty grid !")
HELP_TEXT ("")
HELP_BOLD (" Sync views")
HELP_TEXT ("When this mode is active, scrolling the view")
HELP_TEXT ("(and the magnifier view) affects both the")
HELP_TEXT ("main image and the spare page - as long as")
HELP_TEXT ("they have the same dimensions.")
HELP_TEXT ("")
HELP_TEXT ("")
HELP_TEXT ("")
HELP_TITLE("INPUT")
HELP_TEXT ("")
@@ -2323,6 +2403,14 @@ static const T_Help_table helptable_settings_details[] =
HELP_TEXT ("GrafX2 to recognize them as a combo.")
HELP_TEXT ("")
HELP_TEXT ("")
HELP_BOLD (" Swap buttons")
HELP_TEXT ("This setting determines which key inverts")
HELP_TEXT ("the mouse buttons when it's held : A left")
HELP_TEXT ("click is then interpreted as a right-click.")
HELP_TEXT ("It's especially useful for one-button")
HELP_TEXT ("controllers, such as touchscreens and")
HELP_TEXT ("tablets.")
HELP_TEXT ("")
HELP_TITLE("EDITING")
HELP_TEXT ("")
HELP_TEXT ("")
@@ -2359,7 +2447,14 @@ static const T_Help_table helptable_settings_details[] =
HELP_TEXT ("window. (Set it to 'no' if you have a slow")
HELP_TEXT ("computer or if you edit huge pictures)")
HELP_TEXT ("")
HELP_TEXT ("")
HELP_BOLD (" Right click colorpick")
HELP_TEXT ("This enables a mode where the right mouse")
HELP_TEXT ("buttons acts as a color picker until")
HELP_TEXT ("it's released, and selects Foreground color.")
HELP_TEXT ("This mode prevents you from painting with")
HELP_TEXT ("Background color.")
HELP_TEXT ("This option is ignored when the Shade,")
HELP_TEXT ("Quick-shade, or Tiling mode is used.")
};
static const T_Help_table helptable_clear[] =
@@ -2474,16 +2569,28 @@ static const T_Help_table helptable_palette[] =
HELP_TEXT ("- Gauges: Allow you to modify the")
HELP_TEXT ("current selection.")
HELP_TEXT ("")
HELP_TEXT ("- RGB or HSL above the gauges: Switches")
HELP_TEXT ("between RGB and HSL color spaces. In HSL")
HELP_TEXT ("mode, the three sliders allow you to set the")
HELP_TEXT ("Hue (tint), Saturation (from grayscale to")
HELP_TEXT ("pure color) and Lightness (from black to")
HELP_TEXT ("white).")
HELP_TEXT ("")
HELP_TEXT ("- numbers below the gauges: Allows you to")
HELP_TEXT ("type in a new color in hexadecimal RRGGBB")
HELP_TEXT ("or RGB: ie. to get blue, you can type either")
HELP_TEXT ("0000ff or 00f.")
HELP_TEXT ("")
HELP_TEXT ("- \"+\" and \"-\": Allow you to lighten or")
HELP_TEXT ("darken the current selection.")
HELP_TEXT ("")
HELP_TEXT ("- Default: Restores the predifined GrafX2")
HELP_TEXT ("- Preset: Restores the predefined GrafX2")
HELP_TEXT ("palette.")
HELP_TEXT ("")
HELP_TEXT ("- Gray: Transforms the current selection")
HELP_TEXT ("into its gray-scaled equivalent.")
HELP_TEXT ("")
HELP_TEXT ("- Negative: Transforms the current selection")
HELP_TEXT ("- Neg: Transforms the current selection")
HELP_TEXT ("into its reverse video equivalent.")
HELP_TEXT ("")
HELP_TEXT ("- Invert: Swaps the colors of the current")
@@ -2520,18 +2627,12 @@ static const T_Help_table helptable_palette[] =
HELP_TEXT ("whole palette it will sort this range.")
HELP_TEXT ("")
HELP_TEXT ("- Used: Indicates the number of colors used")
HELP_TEXT ("in the picture.")
HELP_TEXT ("in the picture and opens a histogram screen.")
HELP_TEXT ("")
HELP_TEXT ("- Zap unused: Erases the unused colors with")
HELP_TEXT ("copies of the current selection. (The")
HELP_TEXT ("keyboard shortcut for this button is <Del>).")
HELP_TEXT ("")
HELP_TEXT ("- HSL: Switches between RGB and HSL color")
HELP_TEXT ("spaces. In HSL mode, the three sliders")
HELP_TEXT ("allow you to set the Hue (tint), Saturation")
HELP_TEXT ("(from grayscale to pure color) and")
HELP_TEXT ("Lightness (from black to white).")
HELP_TEXT ("")
HELP_TEXT ("- Reduce: Allows you to reduce the palette")
HELP_TEXT ("to the number of colors you want (and")
HELP_TEXT ("modifies the picture).")