From 9e866aec5c7c40b37abab3ce20fd26a8915afe86 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Mon, 12 Oct 2009 23:32:40 +0000
Subject: [PATCH] (trunk) Added shortcuts to more layers tools. Remove gfx2.cfg
 from versioning, so anybody can use his own (get
 http://grafx2.googlecode.com/svn-history/r1036/trunk/gfx2.cfg to recover
 latest version in your workspace)

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1070 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 const.h    |  10 ++++++++--
 gfx2.cfg   | Bin 10308 -> 0 bytes
 helpfile.h |  41 +++++++++++++++++++++++---------------
 hotkeys.c  |  57 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 88 insertions(+), 20 deletions(-)
 delete mode 100644 gfx2.cfg

diff --git a/const.h b/const.h
index 0966e758..9d8afc2d 100644
--- a/const.h
+++ b/const.h
@@ -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
 };
 
diff --git a/gfx2.cfg b/gfx2.cfg
deleted file mode 100644
index 662d545c8023ea348b49394994cdef8a99550e35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10308
zcmeI2>0eZ37>2JifI@{i49d>TAexyFAR?I>D4>}cnrTKP%mAatCW|4Nw(tAC@B8+l
zzp!i0r~ZcKJ@e!GJ-?fC-gD0V+|T>z92q&9AP0@*kc@`25jD|BHbHGPoGc?1jU>xS
zCZU2Fxq(`_k(8_?IS5tM$XlqDw~~^#k<3ChHF6WR@^(^kGa0-Gnaxncwg^(R$y#oz
zZ=uC{D=n^E$COGvQ=Zwtl$SL!tJ1`*N;8wzElgUsGGl$68S6BctTSA)&a!0P#*+0m
z^49I-Gq9b!$`0~fa0m11JDFF%lX>-B%&XtU(g5tHAUnv*PV%F0Hx)i%7ZpBXH`725
zttxwHRe6EdEWAi-H}sNL-%DD(kMtnyBYg_`DR|XA6uj4d3K_VUf_FSXVFC`4@v1{)
zyy`w|1W%K-9w6%qgX9L_Fgc&(NU>oIk;}j^IaeEDP30)p<T2Le{j94WXW9AzmaR{)
zVErHq)+cFq{fF2tM|n#96#vN6O!(i2nPVtA!<_XaY>I}Xvs6bT(K&Jx@F**udEO4g
zV^n+27>%y;IE_B-xQT!#s8YW`lllZr>XS5E=V-Rh)0D*?H_K_Zsm!qIRRvbP>LqT<
zi{=YET4{ZmE7ni4D4$_b<#`q}n2CDVoTEX`Q|~$pG{{9NT=@!H<r4LBnL4>bgIx6)
z;i^xKZ$9p7YmCVob^x>3A)n=-%5!wcYi0pG?UXMwt@4Wfhga=Cyk`I5b$bqP*mHQ(
zp2J)A9NxC)@Qyu)cg+sGM|TF^r$>Ik9{C}?@+0=jkLi=2uupzUzx<5i@p;TIVtyI(
ztC(L?7=>@*`rDY_#r!_z4>5m?`BTiFWBwBJ*O<S>{5|F$G5?JDSIoa-MvzEm9N?sb
zn{r^cIH+|FXoG{<<UqDKh-rv24qlrB*Y2S0aKLstSi2mk-J06z01<U*U5}RaYE_>W
z^=r+3$KZhGA2Rkt14jL@5g#(zBS!j|Q9f>jPZ-^kMwV#Qu%0%gXAI|A&Kbz_264;)
zjvKrSo-twEa>i`Rc+D8Aiw5bk0h%=|^TjcU7LCV}u~;z<SB=4%ZC-cat{bo$#SJM6
zzu-V{;J*&I4TPx(4g?2E)`74CgdH$AP|6O39iWuEAKpDU5O#o&f#5(XI}mn&Qtp0u
z_uxR-0YV0X1EuUh*a1qp`{CV#0}*AKP~t~<F$bl6R79qrte6A8?;!EN48(>iqC}J^
W_b=KQQeT<SgQ`lu&?<hT1^)t_OrbXb

diff --git a/helpfile.h b/helpfile.h
index 4b443f94..748794f7 100644
--- a/helpfile.h
+++ b/helpfile.h
@@ -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[] =
 {
diff --git a/hotkeys.c b/hotkeys.c
index 0ce265ff..4e05beb5 100644
--- a/hotkeys.c
+++ b/hotkeys.c
@@ -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,
 };