0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Editor hotkeys now work under Mac OS X

Browse source
This commit is contained in:
Bram Ridder 2005-07-15 10:24:02 +00:00
parent 239222c4b0
commit b332fa9869
2 changed files with 381 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

556
data/themes/editor.cfg
View file

@ -11,205 +11,409 @@ height=1
name=editor
#textdomain wesnoth-editor
[hotkey]
command="zoomin"
key="z"
ctrl=no
alt=no
shift=no
[/hotkey]
#ifdef APPLE
[hotkey]
command="zoomin"
key="z"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="undo"
key="u"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="undo"
key="u"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="redo"
key="r"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="redo"
key="r"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomout"
key="x"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomout"
key="x"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomdefault"
key="d"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomdefault"
key="d"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="togglegrid"
key="g"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="togglegrid"
key="g"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsavemap"
key="s"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsavemap"
key="s"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsaveas"
key="s"
ctrl=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editsaveas"
key="s"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editquit"
key="q"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editquit"
key="q"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsetstartpos"
key="t"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsetstartpos"
key="t"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editnewmap"
key="n"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editnewmap"
key="n"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editloadmap"
key="l"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editloadmap"
key="l"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfloodfill"
key="f"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfloodfill"
key="f"
cmd=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfillselection"
key="f"
ctrl=no
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editfillselection"
key="f"
cmd=no
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editcut"
key="x"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcut"
key="x"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcopy"
key="c"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcopy"
key="c"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editpaste"
key="v"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editpaste"
key="v"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrevert"
key="r"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrevert"
key="r"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="preferences"
key="p"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="preferences"
key="p"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editresize"
key="r"
ctrl=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editresize"
key="r"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="fullscreen"
key="f"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="fullscreen"
key="f"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editselectall"
key="a"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editselectall"
key="a"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editflip"
key="f"
ctrl=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editflip"
key="f"
cmd=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editdraw"
key="d"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editdraw"
key="d"
cmd=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrefresh"
key="e"
cmd=yes
alt=no
shift=no
[/hotkey]
#else
[hotkey]
command="zoomin"
key="z"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="undo"
key="u"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="redo"
key="r"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomout"
key="x"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="zoomdefault"
key="d"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="togglegrid"
key="g"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsavemap"
key="s"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsaveas"
key="s"
ctrl=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editquit"
key="q"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editsetstartpos"
key="t"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editnewmap"
key="n"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editloadmap"
key="l"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfloodfill"
key="f"
ctrl=no
alt=no
shift=no
[/hotkey]
[hotkey]
command="editfillselection"
key="f"
ctrl=no
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editcut"
key="x"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editcopy"
key="c"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editpaste"
key="v"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrevert"
key="r"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="preferences"
key="p"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editresize"
key="r"
ctrl=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="fullscreen"
key="f"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editselectall"
key="a"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editflip"
key="f"
ctrl=yes
alt=yes
shift=no
[/hotkey]
[hotkey]
command="editdraw"
key="d"
ctrl=yes
alt=no
shift=no
[/hotkey]
[hotkey]
command="editrefresh"
key="e"
ctrl=yes
alt=no
shift=no
[/hotkey]
#endif
[hotkey]
command="editrefresh"
key="e"
ctrl=yes
alt=no
shift=no
[/hotkey]
[resolution]
width=800
@ -313,7 +517,7 @@ height=600
[/position]
[edit_left_button_function]
font_size=12
font_size=10
rect=900,330,1024,345
xanchor=right
yanchor=fixed

2
src/hotkeys.cpp
View file

@ -84,7 +84,7 @@ const struct {
{ hotkey::HOTKEY_EDIT_LOAD_MAP, "editloadmap", N_("Load Map"),true },
{ hotkey::HOTKEY_EDIT_SAVE_MAP, "editsavemap", N_("Save Map"),true },
{ hotkey::HOTKEY_EDIT_SAVE_AS, "editsaveas", N_("Save As"),true },
{ hotkey::HOTKEY_EDIT_SET_START_POS, "editsetstartpos", N_("Set Player Start Position"),true },
{ hotkey::HOTKEY_EDIT_SET_START_POS, "editsetstartpos", N_("Set Player's keep"),true },
{ hotkey::HOTKEY_EDIT_FLOOD_FILL, "editfloodfill", N_("Flood Fill"),true },
{ hotkey::HOTKEY_EDIT_FILL_SELECTION, "editfillselection", N_("Fill Selection"),true },
{ hotkey::HOTKEY_EDIT_CUT, "editcut", N_("Cut"),true },