Implemented palette ordering (issue 112). You can activate it in the secondary palette window (shift-P), it's saved in gfx2.ini.

The skin file has 2 more icons for the arrows (Ilija, grafx2 won't load if you don't update yours)
Updated contextual help for the secondary palette window.
Fixed some typos in code.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@704 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2009-03-29 21:58:38 +00:00
parent eb781b9bd6
commit 8ff9028eab
14 changed files with 233 additions and 119 deletions

View File

@@ -217,10 +217,10 @@ static const T_Help_table helptable_help[] =
HELP_LINK ("Exclude colors menu: %s", SPECIAL_EXCLUDE_COLORS_MENU)
HELP_TEXT("")
HELP_TEXT("Scroll palette")
HELP_LINK (" Left: %s", 0x100+BUTTON_PAL_LEFT)
HELP_LINK (" Right: %s", 0x100+BUTTON_PAL_RIGHT)
HELP_LINK (" Left faster: %s", 0x200+BUTTON_PAL_LEFT)
HELP_LINK (" Right faster: %s", 0x200+BUTTON_PAL_RIGHT)
HELP_LINK (" Back: %s", 0x100+BUTTON_PAL_LEFT)
HELP_LINK (" Forward: %s", 0x100+BUTTON_PAL_RIGHT)
HELP_LINK (" Back faster: %s", 0x200+BUTTON_PAL_LEFT)
HELP_LINK (" Forward faster: %s", 0x200+BUTTON_PAL_RIGHT)
HELP_TEXT("")
HELP_TEXT("Change brush attachement")
HELP_LINK (" Center : %s", SPECIAL_CENTER_ATTACHMENT)
@@ -2094,21 +2094,44 @@ static const T_Help_table helptable_palette[] =
HELP_TEXT("remapped as it was just before this action.")
HELP_TEXT("Only Cancel will.")
HELP_TEXT("")
HELP_TITLE("PALETTE OPTIONS")
HELP_TEXT("")
HELP_BOLD ("RIGHT CLICK")
HELP_LINK ("(Key:%s)",0x200+BUTTON_PALETTE)
HELP_TEXT("")
HELP_TEXT("Opens a menu from where you can access the")
HELP_TEXT("following menus:")
HELP_TEXT("Opens a menu from where you have the")
HELP_TEXT("following options:")
HELP_TEXT("")
HELP_TEXT("- A menu in which you can select the colors")
HELP_TEXT("that have not to be used")
HELP_TEXT("for smoothing, for the transparency mode and")
HELP_TEXT("for remapping.")
HELP_TEXT("- Colors for best match:")
HELP_TEXT("A menu in which you can select the colors")
HELP_TEXT("that have not to be used for smoothing, for")
HELP_TEXT("the transparency mode and for remapping.")
HELP_TEXT("")
HELP_TEXT("- A menu in which you can define color")
HELP_TEXT("series.")
HELP_TEXT("- User's color series:")
HELP_TEXT("A menu in which you can define color series")
HELP_TEXT("for next/previous colors.")
HELP_TEXT("*** Not implemented yet ***")
};
HELP_TEXT("")
HELP_TEXT("- Palette layout:")
HELP_TEXT("Lets you customize the palette that appears")
HELP_TEXT("on the right of the menu. You can choose the")
HELP_TEXT("number of lines and columns.")
HELP_TEXT("If you want the colors to run top to bottom,")
HELP_TEXT("check the 'Vertical' button, otherwise the")
HELP_TEXT("colors runs left to right.")
HELP_TEXT("")
HELP_TEXT("- RGB Scale:")
HELP_TEXT("Lets you set the scale of the R G B sliders")
HELP_TEXT("in the palette screen. You should normally")
HELP_TEXT("leave it at 256 to get the full 0-255 range,")
HELP_TEXT("but if you want to constrain the palette")
HELP_TEXT("to the capabilities of some specific")
HELP_TEXT("computers and consoles, you can choose eg:")
HELP_TEXT(" 64 : VGA")
HELP_TEXT(" 16 : Amiga")
HELP_TEXT(" 4 : MSX2")
HELP_TEXT(" 2 : Amstrad CPC")
};
static const T_Help_table helptable_pal_scroll[] =
{
@@ -2118,14 +2141,14 @@ static const T_Help_table helptable_pal_scroll[] =
HELP_TEXT("")
HELP_TEXT("Scrolls the palette window in the right of")
HELP_TEXT("the menu.")
HELP_LINK ("Key for left: %s",0x100+BUTTON_PAL_LEFT)
HELP_LINK ("Key for right: %s",0x100+BUTTON_PAL_RIGHT)
HELP_LINK ("Key for back: %s", 0x100+BUTTON_PAL_LEFT)
HELP_LINK ("Key for forward: %s", 0x100+BUTTON_PAL_RIGHT)
HELP_TEXT("")
HELP_BOLD ("RIGHT CLICK")
HELP_TEXT("")
HELP_TEXT("Same as above, but faster.")
HELP_LINK ("Key for left: %s",0x200+BUTTON_PAL_LEFT)
HELP_LINK ("Key for right: %s",0x200+BUTTON_PAL_RIGHT)
HELP_LINK ("Key for back: %s", 0x200+BUTTON_PAL_LEFT)
HELP_LINK ("Key for forward: %s", 0x200+BUTTON_PAL_RIGHT)
HELP_TEXT("")
};
static const T_Help_table helptable_color_select[] =