Author: grzywacz
Date: Thu Jun 25 00:50:27 2009
New Revision: 36396
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36396&view=rev
Log:
Merge branch 'ellipse_hotkey'
Modified:
trunk/data/core/hotkeys.cfg
trunk/src/hotkeys.cpp
trunk/src/hotkeys.hpp
trunk/src/menu_events.cpp
trunk/src/menu_events.hpp
trunk/src/play_controller.cpp
trunk/src/play_controller.hpp
trunk/src/preferences.cpp
trunk/src/preferences.hpp
trunk/src/preferences_display.cpp
trunk/src/preferences_display.hpp
Modified: trunk/data/core/hotkeys.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/hotkeys.cfg?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/data/core/hotkeys.cfg (original)
+++ trunk/data/core/hotkeys.cfg Thu Jun 25 00:50:27 2009
@@ -215,6 +215,11 @@
alt=yes
[/hotkey]
[hotkey]
+ command=toggleellipses
+ key=e
+ {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
command=togglegrid
key=g
{IF_APPLE_CMD_ELSE_CTRL}
Modified: trunk/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.cpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/hotkeys.cpp (original)
+++ trunk/src/hotkeys.cpp Thu Jun 25 00:50:27 2009
@@ -67,6 +67,7 @@
{ hotkey::HOTKEY_REPEAT_RECRUIT, "repeatrecruit", N_("Repeat Recruit"),
false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_RECALL, "recall", N_("Recall"), false,
hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_ENDTURN, "endturn", N_("End Turn"), false,
hotkey::SCOPE_GAME },
+ { hotkey::HOTKEY_TOGGLE_ELLIPSES, "toggleellipses", N_("Toggle
Ellipses"), false, hotkey::SCOPE_GENERAL },
{ hotkey::HOTKEY_TOGGLE_GRID, "togglegrid", N_("Toggle Grid"), false,
hotkey::SCOPE_GENERAL },
{ hotkey::HOTKEY_MOUSE_SCROLL, "mousescroll", N_("Mouse Scrolling"),
false, hotkey::SCOPE_GENERAL },
{ hotkey::HOTKEY_STATUS_TABLE, "statustable", N_("Status Table"),
false, hotkey::SCOPE_GAME },
@@ -724,6 +725,9 @@
case HOTKEY_LOAD_GAME:
load_game();
break;
+ case HOTKEY_TOGGLE_ELLIPSES:
+ toggle_ellipses();
+ break;
case HOTKEY_TOGGLE_GRID:
toggle_grid();
break;
Modified: trunk/src/hotkeys.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.hpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/hotkeys.hpp (original)
+++ trunk/src/hotkeys.hpp Thu Jun 25 00:50:27 2009
@@ -49,7 +49,7 @@
HOTKEY_UNIT_DESCRIPTION, HOTKEY_RENAME_UNIT,
HOTKEY_SAVE_GAME, HOTKEY_SAVE_REPLAY, HOTKEY_SAVE_MAP, HOTKEY_LOAD_GAME,
HOTKEY_RECRUIT, HOTKEY_REPEAT_RECRUIT, HOTKEY_RECALL, HOTKEY_ENDTURN,
- HOTKEY_TOGGLE_GRID, HOTKEY_STATUS_TABLE, HOTKEY_MUTE,
HOTKEY_MOUSE_SCROLL,
+ HOTKEY_TOGGLE_ELLIPSES, HOTKEY_TOGGLE_GRID, HOTKEY_STATUS_TABLE,
HOTKEY_MUTE, HOTKEY_MOUSE_SCROLL,
HOTKEY_SPEAK, HOTKEY_CREATE_UNIT, HOTKEY_CHANGE_SIDE,
HOTKEY_PREFERENCES,
HOTKEY_OBJECTIVES, HOTKEY_UNIT_LIST, HOTKEY_STATISTICS,
HOTKEY_STOP_NETWORK, HOTKEY_START_NETWORK, HOTKEY_QUIT_GAME,
HOTKEY_LABEL_TEAM_TERRAIN, HOTKEY_LABEL_TERRAIN,
HOTKEY_CLEAR_LABELS,HOTKEY_SHOW_ENEMY_MOVES, HOTKEY_BEST_ENEMY_MOVES,
@@ -253,6 +253,7 @@
virtual void save_replay() {}
virtual void save_map() {}
virtual void load_game() {}
+ virtual void toggle_ellipses() {}
virtual void toggle_grid() {}
virtual void status_table() {}
virtual void recall() {}
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Thu Jun 25 00:50:27 2009
@@ -1554,6 +1554,12 @@
gui_->set_route(&route);
move_unit(gui_,map_,units_,teams_,route.steps,&recorder,&undo_stack_,NULL,continue_move);
gui_->invalidate_game_status();
+ }
+
+ void menu_handler::toggle_ellipses()
+ {
+ preferences::set_ellipses(!preferences::ellipses());
+ gui_->invalidate_all();
}
void menu_handler::toggle_grid()
Modified: trunk/src/menu_events.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.hpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/menu_events.hpp (original)
+++ trunk/src/menu_events.hpp Thu Jun 25 00:50:27 2009
@@ -94,6 +94,7 @@
void label_terrain(mouse_handler& mousehandler, bool team_only);
void clear_labels();
void continue_move(mouse_handler &mousehandler, int side_num);
+ void toggle_ellipses();
void toggle_grid();
void unit_hold_position(mouse_handler &mousehandler, int side_num);
void end_unit_turn(mouse_handler &mousehandler, int side_num);
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Thu Jun 25 00:50:27 2009
@@ -369,6 +369,10 @@
menu_handler_.unit_description(mouse_handler_);
}
+void play_controller::toggle_ellipses(){
+ menu_handler_.toggle_ellipses();
+}
+
void play_controller::toggle_grid(){
menu_handler_.toggle_grid();
}
@@ -628,6 +632,7 @@
case hotkey::HOTKEY_MAP_SCREENSHOT:
case hotkey::HOTKEY_ACCELERATED:
case hotkey::HOTKEY_SAVE_MAP:
+ case hotkey::HOTKEY_TOGGLE_ELLIPSES:
case hotkey::HOTKEY_TOGGLE_GRID:
case hotkey::HOTKEY_MOUSE_SCROLL:
case hotkey::HOTKEY_STATUS_TABLE:
Modified: trunk/src/play_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.hpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/play_controller.hpp (original)
+++ trunk/src/play_controller.hpp Thu Jun 25 00:50:27 2009
@@ -72,6 +72,7 @@
virtual void show_enemy_moves(bool ignore_units);
virtual void goto_leader();
virtual void unit_description();
+ virtual void toggle_ellipses();
virtual void toggle_grid();
virtual void search();
Modified: trunk/src/preferences.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences.cpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/preferences.cpp (original)
+++ trunk/src/preferences.cpp Thu Jun 25 00:50:27 2009
@@ -256,6 +256,16 @@
void set_language(const std::string& s)
{
preferences::set("locale", s);
+}
+
+bool ellipses()
+{
+ return utils::string_bool(get("show_side_colours"), false);
+}
+
+void _set_ellipses(bool ison)
+{
+ preferences::set("show_side_colours", (ison ? "yes" : "no"));
}
bool grid()
Modified: trunk/src/preferences.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences.hpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/preferences.hpp (original)
+++ trunk/src/preferences.hpp Thu Jun 25 00:50:27 2009
@@ -159,6 +159,9 @@
bool show_fps();
void set_show_fps(bool value);
+ bool ellipses();
+ void _set_ellipses(bool ison);
+
bool grid();
void _set_grid(bool ison);
} // end namespace preferences
Modified: trunk/src/preferences_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences_display.cpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/preferences_display.cpp (original)
+++ trunk/src/preferences_display.cpp Thu Jun 25 00:50:27 2009
@@ -137,6 +137,11 @@
if(disp != NULL) {
disp->set_turbo_speed(speed);
}
+}
+
+void set_ellipses(bool ison)
+{
+ _set_ellipses(ison);
}
void set_grid(bool ison)
Modified: trunk/src/preferences_display.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences_display.hpp?rev=36396&r1=36395&r2=36396&view=diff
==============================================================================
--- trunk/src/preferences_display.hpp (original)
+++ trunk/src/preferences_display.hpp Thu Jun 25 00:50:27 2009
@@ -31,6 +31,7 @@
void set_scroll_to_action(bool ison);
void set_resolution(const std::pair<int,int>& res);
void set_turbo(bool ison);
+ void set_ellipses(bool ison);
void set_grid(bool ison);
void set_turbo_speed(double speed);
void set_colour_cursors(bool value);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
