Author: ilor
Date: Tue Oct 7 20:47:44 2008
New Revision: 29954
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29954&view=rev
Log:
change editor2's base-only paint modifier key to shift from alt to avoid a KDE
issue
Modified:
trunk/changelog
trunk/data/core/editor2-tool-hints.cfg
trunk/players_changelog
trunk/src/editor2/mouse_action.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=29954&r1=29953&r2=29954&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue Oct 7 20:47:44 2008
@@ -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:
Modified: trunk/data/core/editor2-tool-hints.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/editor2-tool-hints.cfg?rev=29954&r1=29953&r2=29954&view=diff
==============================================================================
--- trunk/data/core/editor2-tool-hints.cfg (original)
+++ trunk/data/core/editor2-tool-hints.cfg Tue Oct 7 20:47:44 2008
@@ -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]
Modified: trunk/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=29954&r1=29953&r2=29954&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Tue Oct 7 20:47:44 2008
@@ -3,6 +3,9 @@
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.
Modified: trunk/src/editor2/mouse_action.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/mouse_action.cpp?rev=29954&r1=29953&r2=29954&view=diff
==============================================================================
--- trunk/src/editor2/mouse_action.cpp (original)
+++ trunk/src/editor2/mouse_action.cpp Tue Oct 7 20:47:44 2008
@@ -250,13 +250,13 @@
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 @@
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 @@
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;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
