summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2010-08-15 23:32:32 +0000
committermichi_cc <michi_cc@openttd.org>2010-08-15 23:32:32 +0000
commit0796ba3d26e385b673a6f3beb32bfd8e03cf9f7e (patch)
treeff6b305756c7bcbaf52fb2c4d14577d797fd45d6
parenta994c1ef71adecc7bc1968d31ab0bcbcf4912d24 (diff)
downloadopenttd-0796ba3d26e385b673a6f3beb32bfd8e03cf9f7e.tar.xz
(svn r20507) -Change: Remove the shortcut hints from the screenshot menu strings (as they're configurable now) and rename "Giant screenshot" to "Whole map screenshot".
-rw-r--r--src/lang/english.txt4
-rw-r--r--src/toolbar_gui.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 76397e6f5..cfcac30aa 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -441,8 +441,8 @@ STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area infor
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Toggle console
STR_ABOUT_MENU_AI_DEBUG :AI debug
-STR_ABOUT_MENU_SCREENSHOT :Screenshot (Ctrl+S)
-STR_ABOUT_MENU_GIANT_SCREENSHOT :Giant screenshot (Ctrl+G)
+STR_ABOUT_MENU_SCREENSHOT :Screenshot
+STR_ABOUT_MENU_GIANT_SCREENSHOT :Whole map screenshot
STR_ABOUT_MENU_ABOUT_OPENTTD :About 'OpenTTD'
STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite aligner
############ range ends here
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 06ce3c969..19af55e3e 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1411,7 +1411,7 @@ Hotkey<MainToolbarWindow> MainToolbarWindow::maintoolbar_hotkeys[] = {
Hotkey<MainToolbarWindow>(WKC_SHIFT | WKC_F11, "build_trees", MTHK_BUILD_TREES),
Hotkey<MainToolbarWindow>(WKC_SHIFT | WKC_F12, "music", MTHK_MUSIC),
Hotkey<MainToolbarWindow>(WKC_CTRL | 'S', "small_screenshot", MTHK_SMALL_SCREENSHOT),
- Hotkey<MainToolbarWindow>(WKC_CTRL | 'G', "giant_screenshot", MTHK_GIANT_SCREENSHOT),
+ Hotkey<MainToolbarWindow>((uint16)0, "giant_screenshot", MTHK_GIANT_SCREENSHOT),
Hotkey<MainToolbarWindow>(WKC_CTRL | WKC_ALT | 'C', "cheats", MTHK_CHEATS),
Hotkey<MainToolbarWindow>('L', "terraform", MTHK_TERRAFORM),
Hotkey<MainToolbarWindow>('V', "extra_viewport", MTHK_EXTRA_VIEWPORT),
@@ -1700,7 +1700,7 @@ Hotkey<ScenarioEditorToolbarWindow> ScenarioEditorToolbarWindow::scenedit_mainto
Hotkey<ScenarioEditorToolbarWindow>(WKC_F11, "industry_list", MTEHK_MUSIC),
Hotkey<ScenarioEditorToolbarWindow>(WKC_F12, "train_list", MTEHK_LANDINFO),
Hotkey<ScenarioEditorToolbarWindow>(WKC_CTRL | 'S', "small_screenshot", MTEHK_SMALL_SCREENSHOT),
- Hotkey<ScenarioEditorToolbarWindow>(WKC_CTRL | 'G', "giant_screenshot", MTEHK_GIANT_SCREENSHOT),
+ Hotkey<ScenarioEditorToolbarWindow>((uint16)0, "giant_screenshot", MTEHK_GIANT_SCREENSHOT),
Hotkey<ScenarioEditorToolbarWindow>(_maintoolbar_zoomin_keys, "zoomin", MTEHK_ZOOM_IN),
Hotkey<ScenarioEditorToolbarWindow>(_maintoolbar_zoomout_keys, "zoomout", MTEHK_ZOOM_OUT),
Hotkey<ScenarioEditorToolbarWindow>('L', "terraform", MTEHK_TERRAFORM),