widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395322-tool3 into lp:widelands.

Commit message:
Added CTRL as selection key for the 2nd alternative tool and updated help text.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1395322 in widelands: "Editor: Second alternative tool needs different access key"
  https://bugs.launchpad.net/widelands/+bug/1395322

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829

Left ALT is causing problems in some OS, so I added the CTRL keys for the 2nd alternative tool. I left the ALT keys in though in order not to frustrate map designers who are used to the Alt key.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1395322-tool3 into lp:widelands.

=== modified file 'data/scripting/editor/editor_controls.lua'
--- data/scripting/editor/editor_controls.lua	2016-04-02 08:09:19 +0000
+++ data/scripting/editor/editor_controls.lua	2016-04-03 16:26:56 +0000
@@ -4,9 +4,20 @@
 include "txts/help/common_helptexts.lua"
 
 return {
-   title = _"Keyboard Shortcuts",
+   title = _"Controls",
    text =
       rt(
+         h2(_"Tools") ..
+         p(
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "Click")), _"Places new elements on the map, or increases map elements by the selected value") ..
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "Shift + Click")), _"Decreases map elements by the selected value") ..
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "Ctrl + Click")), _"Sets map elements to the selected value")
+         ) ..
+
+         h2(_"Keyboard Shortcuts") ..
          p(
             -- TRANSLATORS: This is an access key combination.
             dl(help_format_hotkey("H"), _"Toggle main menu") ..
@@ -24,10 +35,6 @@
             dl(help_format_hotkey("Ctrl + Y"), _"Redo") ..
             -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
             dl(help_format_hotkey("F1"), _"Help") ..
-            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
-            dl(help_format_hotkey(pgettext("hotkey", "Shift (Hold)")), _"First alternative tool while pressed") ..
-            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
-            dl(help_format_hotkey(pgettext("hotkey", "Alt (Hold)")), _"Second alternative tool while pressed") ..
             -- TRANSLATORS: This is an access key combination. The hotkey is 'i'
             dl(help_format_hotkey("I"), _"Activate information tool") ..
             -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2016-04-02 07:33:57 +0000
+++ src/editor/editorinteractive.cc	2016-04-03 16:26:56 +0000
@@ -441,6 +441,9 @@
 			handled = true;
 			break;
 
+		case SDLK_LCTRL:
+		case SDLK_RCTRL:
+		// TODO(GunChleoc): Keeping ALT and MODE to make the transition easier. Remove for Build 20.
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
@@ -525,6 +528,9 @@
 		switch (code.sym) {
 		case SDLK_LSHIFT:
 		case SDLK_RSHIFT:
+		case SDLK_LCTRL:
+		case SDLK_RCTRL:
+		// TODO(GunChleoc): Keeping ALT and MODE to make the transition easier. Remove for Build 20.
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE: