upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 13:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

change editor2's base-only paint modifier key...

Browse Source 
...to shift from alt to avoid a KDE issue
This commit is contained in:
Tomasz Śniatowski 2008-10-07 19:47:44 +01:00
parent f7f7797d13
commit 364451886d
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -1,4 +1,7 @@
Version 1.5.5+svn:
* Editor2
* Changed the base-terrain key modifier to shift from alt.
This fixes an issue with some window managers grabbing the event.
* Language and i18n:
* updated translations: Galician, German
* Units:

4
data/core/editor2-tool-hints.cfg
View File

@ -3,12 +3,12 @@
[editor2_tool_hint]
id="editor-tool-paint"
text= _ "Use left/right mouse button to draw fore-/background terrain. Hold ALT to paint base layer only"
text= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only"
[/editor2_tool_hint]
[editor2_tool_hint]
id="editor-tool-fill"
text= _ "Use left/right mouse button to draw fore-/background terrain. Hold ALT to paint base layer only"
text= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only"
[/editor2_tool_hint]
[editor2_tool_hint]

3
players_changelog
View File

@ -3,6 +3,9 @@ changes may be omitted). For a complete list of changes, see the main
changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
Version 1.5.5+svn:
* Editor2
* changed the base-terrain key modifier to shift from alt.
* Language and translations
* updated translations: Galician, German.

8
src/editor2/mouse_action.cpp
View File

@ -250,13 +250,13 @@ const brush& brush_drag_mouse_action::get_brush()
editor_action* mouse_action_paint::click_perform_left(
editor_display& /*disp*/, const std::set<gamemap::location>& hexes)
{
return new editor_action_chain(new editor_action_paint_area(hexes, terrain_left_, has_alt_modifier()));
return new editor_action_chain(new editor_action_paint_area(hexes, terrain_left_, has_shift_modifier()));
}
editor_action* mouse_action_paint::click_perform_right(
editor_display& /*disp*/, const std::set<gamemap::location>& hexes)
{
return new editor_action_chain(new editor_action_paint_area(hexes, terrain_right_, has_alt_modifier()));
return new editor_action_chain(new editor_action_paint_area(hexes, terrain_right_, has_shift_modifier()));
}
void mouse_action_paint::set_mouse_overlay(editor_display& disp)
@ -348,7 +348,7 @@ editor_action* mouse_action_fill::click_left(editor_display& disp, int x, int y)
gamemap::location hex = disp.hex_clicked_on(x, y);
//TODO only take the base terrain into account when searching for contigious terrain when painting base only
//or use a different key modifier for that
editor_action_fill* a = new editor_action_fill(hex, terrain_left_, has_alt_modifier());
editor_action_fill* a = new editor_action_fill(hex, terrain_left_, has_shift_modifier());
return a;
}
@ -357,7 +357,7 @@ editor_action* mouse_action_fill::click_right(editor_display& disp, int x, int y
gamemap::location hex = disp.hex_clicked_on(x, y);
//TODO only take the base terrain into account when searching for contigious terrain when painting base only
//or use a different key modifier for that
editor_action_fill* a = new editor_action_fill(hex, terrain_right_, has_alt_modifier());
editor_action_fill* a = new editor_action_fill(hex, terrain_right_, has_shift_modifier());
return a;
}