projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
37dfcbe
)
changed editor key shortcut for undo/redo to 'u' and 'Shift-u'
author
Holger Schemel
<info@artsoft.org>
Mon, 23 Feb 2015 22:05:13 +0000
(23:05 +0100)
committer
Holger Schemel
<info@artsoft.org>
Mon, 23 Feb 2015 22:05:13 +0000
(23:05 +0100)
ChangeLog
patch
|
blob
|
history
src/editor.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 391f8b86550ef63a686d00cfce567f827bbdd1f2..dc189929dc557c4053256089ce2156b3c911d8cd 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,5
+1,6
@@
2015-02-23
* added key pad '-', '+' and '0' keys to zoom function in level editor
2015-02-23
* added key pad '-', '+' and '0' keys to zoom function in level editor
+ * changed editor key shortcut for undo/redo to 'u' and 'Shift-u'
2015-02-21
* added 1%, 2% and 5% to volume controls for sound and music settings
2015-02-21
* added 1%, 2% and 5% to volume controls for sound and music settings
diff --git
a/src/editor.c
b/src/editor.c
index 3baec5725bb4cb8b3da700f7475021ac5c0f88ab..6f2426752cf19529aee2ca23e9203426e8d5bdaa 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1047,7
+1047,7
@@
static struct
{
IMG_EDITOR_BUTTON_GFX_UNDO, GADGET_ID_UNDO,
&editor.button.undo, GD_TYPE_NORMAL_BUTTON,
{
IMG_EDITOR_BUTTON_GFX_UNDO, GADGET_ID_UNDO,
&editor.button.undo, GD_TYPE_NORMAL_BUTTON,
- "undo/redo last operation", '
U
'
+ "undo/redo last operation", '
u
'
},
{
IMG_EDITOR_BUTTON_GFX_CONF, GADGET_ID_INFO,
},
{
IMG_EDITOR_BUTTON_GFX_CONF, GADGET_ID_INFO,
@@
-11833,7
+11833,7
@@
void HandleLevelEditorKeyInput(Key key)
ClickOnGadget(level_editor_gadget[GADGET_ID_PROPERTIES], button);
else if (letter == '.')
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
ClickOnGadget(level_editor_gadget[GADGET_ID_PROPERTIES], button);
else if (letter == '.')
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
- else if (letter == '
R
')
+ else if (letter == '
U
')
ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
else if (key == KSYM_KP_Subtract)
ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
else if (key == KSYM_KP_Subtract)
ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
@@
-11913,7
+11913,7
@@
void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
else if (gi->custom_id == GADGET_ID_TEST)
sprintf(shortcut, " ('Enter' or 'Shift-%c')", key);
else if (gi->custom_id == GADGET_ID_UNDO)
else if (gi->custom_id == GADGET_ID_TEST)
sprintf(shortcut, " ('Enter' or 'Shift-%c')", key);
else if (gi->custom_id == GADGET_ID_UNDO)
- sprintf(shortcut, " ('
Shift-%c/R
')", key);
+ sprintf(shortcut, " ('
%c/Shift-U
')", key);
else if (gi->custom_id == GADGET_ID_ZOOM)
sprintf(shortcut, " ('%c', '0', '+')", key);
else
else if (gi->custom_id == GADGET_ID_ZOOM)
sprintf(shortcut, " ('%c', '0', '+')", key);
else