m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[layers] Merged in the changes from r1070.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1072 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2009-10-12 23:50:09 +00:00
commit 64f1449a3b
4 changed files with 88 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
const.h
View File

@ -33,7 +33,7 @@
#define BETA1 98 ///< Version number for gfx2.cfg (3/4)
#define BETA2 0 ///< Version number for gfx2.cfg (4/4)
#define MAX_VIDEO_MODES 100 ///< Maximum number of video modes Grafx2 can propose.
#define NB_SHORTCUTS 175 ///< Number of actions that can have a key combination associated to it.
#define NB_SHORTCUTS 181 ///< Number of actions that can have a key combination associated to it.
#define NB_ZOOM_FACTORS 12 ///< Number of zoom levels available in the magnifier.
#define MENU_WIDTH 254 ///< Width of the menu (not counting the palette)
#define MENU_HEIGHT 44 ///< Height of the menu.
@ -423,7 +423,13 @@ enum SPECIAL_ACTIONS
SPECIAL_LAYER7_SELECT,
SPECIAL_LAYER7_TOGGLE,
SPECIAL_LAYER8_SELECT,
SPECIAL_LAYER8_TOGGLE,
SPECIAL_LAYER8_TOGGLE,
SPECIAL_LAYER_ADD,
SPECIAL_LAYER_DELETE,
SPECIAL_LAYER_MERGE,
SPECIAL_LAYER_SWAP_UP,
SPECIAL_LAYER_SWAP_DOWN,
SPECIAL_LAYER_MENU,
NB_SPECIAL_SHORTCUTS ///< Number of special shortcuts
};

BIN
gfx2.cfg
View File

Binary file not shown.

41
helpfile.h
View File

@ -284,22 +284,31 @@ static const T_Help_table helptable_help[] =
HELP_LINK (" Previous: %s", SPECIAL_PREVIOUS_USER_BACKCOLOR)
HELP_TEXT ("")
HELP_TEXT ("LAYERS")
HELP_LINK (" Select 1 : %s", SPECIAL_LAYER1_SELECT)
HELP_LINK (" Toggle 1 : %s", SPECIAL_LAYER1_TOGGLE)
HELP_LINK (" Select 2 : %s", SPECIAL_LAYER2_SELECT)
HELP_LINK (" Toggle 2 : %s", SPECIAL_LAYER2_TOGGLE)
HELP_LINK (" Select 3 : %s", SPECIAL_LAYER3_SELECT)
HELP_LINK (" Toggle 3 : %s", SPECIAL_LAYER3_TOGGLE)
HELP_LINK (" Select 4 : %s", SPECIAL_LAYER4_SELECT)
HELP_LINK (" Toggle 4 : %s", SPECIAL_LAYER4_TOGGLE)
HELP_LINK (" Select 5 : %s", SPECIAL_LAYER5_SELECT)
HELP_LINK (" Toggle 5 : %s", SPECIAL_LAYER5_TOGGLE)
HELP_LINK (" Select 6 : %s", SPECIAL_LAYER6_SELECT)
HELP_LINK (" Toggle 6 : %s", SPECIAL_LAYER6_TOGGLE)
HELP_LINK (" Select 7 : %s", SPECIAL_LAYER7_SELECT)
HELP_LINK (" Toggle 7 : %s", SPECIAL_LAYER7_TOGGLE)
HELP_LINK (" Select 8 : %s", SPECIAL_LAYER8_SELECT)
HELP_LINK (" Toggle 8 : %s", SPECIAL_LAYER8_TOGGLE)
HELP_TEXT ("")
HELP_LINK (" Menu : %s", SPECIAL_LAYER_MENU)
HELP_LINK (" Add new : %s", SPECIAL_LAYER_ADD)
HELP_LINK (" Delete : %s", SPECIAL_LAYER_DELETE)
HELP_LINK (" Merge : %s", SPECIAL_LAYER_MERGE)
HELP_LINK (" Move up : %s", SPECIAL_LAYER_SWAP_UP)
HELP_LINK (" Move down : %s", SPECIAL_LAYER_SWAP_DOWN)
HELP_TEXT (" Select :")
HELP_LINK (" 1 : %s", SPECIAL_LAYER1_SELECT)
HELP_LINK (" 2 : %s", SPECIAL_LAYER2_SELECT)
HELP_LINK (" 3 : %s", SPECIAL_LAYER3_SELECT)
HELP_LINK (" 4 : %s", SPECIAL_LAYER4_SELECT)
HELP_LINK (" 5 : %s", SPECIAL_LAYER5_SELECT)
HELP_LINK (" 6 : %s", SPECIAL_LAYER6_SELECT)
HELP_LINK (" 7 : %s", SPECIAL_LAYER7_SELECT)
HELP_LINK (" 8 : %s", SPECIAL_LAYER8_SELECT)
HELP_TEXT (" Toggle :")
HELP_LINK (" 1 : %s", SPECIAL_LAYER1_TOGGLE)
HELP_LINK (" 2 : %s", SPECIAL_LAYER2_TOGGLE)
HELP_LINK (" 3 : %s", SPECIAL_LAYER3_TOGGLE)
HELP_LINK (" 4 : %s", SPECIAL_LAYER4_TOGGLE)
HELP_LINK (" 5 : %s", SPECIAL_LAYER5_TOGGLE)
HELP_LINK (" 6 : %s", SPECIAL_LAYER6_TOGGLE)
HELP_LINK (" 7 : %s", SPECIAL_LAYER7_TOGGLE)
HELP_LINK (" 8 : %s", SPECIAL_LAYER8_TOGGLE)
};
static const T_Help_table helptable_credits[] =
{

57
hotkeys.c
View File

@ -1427,7 +1427,54 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
true,
0,
0},
{175,
"Add a layer",
"Adds a new layer on top of the",
"active one. The new layer is filled",
"with transparent color.",
true,
SDLK_INSERT|MOD_ALT, // Alt + Insert
0},
{176,
"Delete a layer",
"Delete the current layer.",
"You can't delete the last",
"layer.",
true,
SDLK_DELETE|MOD_ALT, // Alt + Delete
0},
{177,
"Merge a layer",
"Merges the current layer with",
"the one directly below it.",
"",
true,
SDLK_END|MOD_ALT, // Alt + End
0},
{178,
"Swap layer (up)",
"Moves the current layer one position",
"up the stack. No effect if already",
"on top.",
true,
SDLK_PAGEUP|MOD_ALT, // Alt + PageUp
0},
{179,
"Swap layer (down)",
"Moves the current layer one position",
"down the stack. No effect if already",
"on bottom.",
true,
SDLK_PAGEDOWN|MOD_ALT, // Alt + PageDown
0},
{180,
"Layers menu",
"Opens the window with layer options.",
"",
"",
true,
SDLK_HOME|MOD_ALT, // Alt + Home
0},
};
word Ordering[NB_SHORTCUTS]=
@ -1606,5 +1653,11 @@ word Ordering[NB_SHORTCUTS]=
SPECIAL_LAYER7_SELECT,
SPECIAL_LAYER7_TOGGLE,
SPECIAL_LAYER8_SELECT,
SPECIAL_LAYER8_TOGGLE,
SPECIAL_LAYER8_TOGGLE,
SPECIAL_LAYER_ADD,
SPECIAL_LAYER_DELETE,
SPECIAL_LAYER_MERGE,
SPECIAL_LAYER_SWAP_UP,
SPECIAL_LAYER_SWAP_DOWN,
SPECIAL_LAYER_MENU,
};