From 0796ba3d26e385b673a6f3beb32bfd8e03cf9f7e Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sun, 15 Aug 2010 23:32:32 +0000 Subject: [PATCH] (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". --- src/lang/english.txt | 4 ++-- src/toolbar_gui.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 76397e6f5c..cfcac30aa9 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 06ce3c969f..19af55e3ec 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1411,7 +1411,7 @@ Hotkey MainToolbarWindow::maintoolbar_hotkeys[] = { Hotkey(WKC_SHIFT | WKC_F11, "build_trees", MTHK_BUILD_TREES), Hotkey(WKC_SHIFT | WKC_F12, "music", MTHK_MUSIC), Hotkey(WKC_CTRL | 'S', "small_screenshot", MTHK_SMALL_SCREENSHOT), - Hotkey(WKC_CTRL | 'G', "giant_screenshot", MTHK_GIANT_SCREENSHOT), + Hotkey((uint16)0, "giant_screenshot", MTHK_GIANT_SCREENSHOT), Hotkey(WKC_CTRL | WKC_ALT | 'C', "cheats", MTHK_CHEATS), Hotkey('L', "terraform", MTHK_TERRAFORM), Hotkey('V', "extra_viewport", MTHK_EXTRA_VIEWPORT), @@ -1700,7 +1700,7 @@ Hotkey ScenarioEditorToolbarWindow::scenedit_mainto Hotkey(WKC_F11, "industry_list", MTEHK_MUSIC), Hotkey(WKC_F12, "train_list", MTEHK_LANDINFO), Hotkey(WKC_CTRL | 'S', "small_screenshot", MTEHK_SMALL_SCREENSHOT), - Hotkey(WKC_CTRL | 'G', "giant_screenshot", MTEHK_GIANT_SCREENSHOT), + Hotkey((uint16)0, "giant_screenshot", MTEHK_GIANT_SCREENSHOT), Hotkey(_maintoolbar_zoomin_keys, "zoomin", MTEHK_ZOOM_IN), Hotkey(_maintoolbar_zoomout_keys, "zoomout", MTEHK_ZOOM_OUT), Hotkey('L', "terraform", MTEHK_TERRAFORM),