Author: ilor
Date: Sun Oct 5 14:16:40 2008
New Revision: 29899
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29899&view=rev
Log:
make the editor's lighting settings auto-update-when-slider-moved feature
optional via a toggle button and off by default
Modified:
trunk/data/gui/default/window/editor_settings.cfg
trunk/src/gui/dialogs/editor_settings.cpp
trunk/src/gui/dialogs/editor_settings.hpp
Modified: trunk/data/gui/default/window/editor_settings.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/editor_settings.cfg?rev=29899&r1=29898&r2=29899&view=diff
==============================================================================
--- trunk/data/gui/default/window/editor_settings.cfg (original)
+++ trunk/data/gui/default/window/editor_settings.cfg Sun Oct 5 14:16:40 2008
@@ -75,6 +75,23 @@
label =
_ "Next"
[/button]
[/column]
+ [column]
+ [toggle_button]
+ id =
"custom_tod_toggle"
+
definition = "default"
+ label =
_ "Custom lightning setting"
+ [/toggle_button]
+ [/column]
+ [column]
+ border = "all"
+ border_size = 5
+
horizontal_alignment = "right"
+ [toggle_button]
+ id =
"custom_tod_auto_refresh"
+
definition = "default"
+ label =
_ "Auto-update map view"
+ [/toggle_button]
+ [/column]
[/row]
[/grid]
[/column]
@@ -88,16 +105,6 @@
[/label]
[/column]
[/row]
- [row]
- grow_factor = 0
- [column]
- [toggle_button]
- id = "custom_tod_toggle"
- definition = "default"
- label = _ "Custom lightning
setting"
- [/toggle_button]
- [/column]
- [/row]
[row]
[column]
[grid]
@@ -210,6 +217,16 @@
label =
_ "Cancel"
[/button]
[/column]
+ [column]
+ border = "all"
+ border_size = 5
+
horizontal_alignment = "right"
+ [button]
+ id =
"apply"
+
definition = "default"
+ label =
_ "Apply"
+ [/button]
+ [/column]
[/row]
[/grid]
[/column]
Modified: trunk/src/gui/dialogs/editor_settings.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/editor_settings.cpp?rev=29899&r1=29898&r2=29899&view=diff
==============================================================================
--- trunk/src/gui/dialogs/editor_settings.cpp (original)
+++ trunk/src/gui/dialogs/editor_settings.cpp Sun Oct 5 14:16:40 2008
@@ -82,6 +82,13 @@
custom_tod_blue_->get_value());
}
+void teditor_settings::slider_update_callback(twindow& window)
+{
+ if (custom_tod_auto_refresh_->get_value()) {
+ update_tod_display(window);
+ }
+}
+
void teditor_settings::set_current_adjustment(int r, int g, int b)
{
for (size_t i = 0; i < tods_.size(); ++i) {
@@ -137,20 +144,24 @@
current_tod_label_ = &window.get_widget<tlabel>("current_tod", false);
current_tod_image_ = &window.get_widget<tlabel>("current_tod_image",
false);
custom_tod_toggle_ =
&window.get_widget<ttoggle_button>("custom_tod_toggle", false);
+ custom_tod_auto_refresh_ =
&window.get_widget<ttoggle_button>("custom_tod_auto_refresh", false);
custom_tod_red_ = &window.get_widget<tslider>("custom_tod_red", false);
custom_tod_green_ = &window.get_widget<tslider>("custom_tod_green",
false);
custom_tod_blue_ = &window.get_widget<tslider>("custom_tod_blue",
false);
tbutton& next_tod_button = window.get_widget<tbutton>("next_tod",
false);
next_tod_button.set_callback_mouse_left_click(
dialog_callback<teditor_settings,
&teditor_settings::do_next_tod>);
+ tbutton& apply_button = window.get_widget<tbutton>("apply", false);
+ apply_button.set_callback_mouse_left_click(
+ dialog_callback<teditor_settings,
&teditor_settings::update_tod_display>);
custom_tod_toggle_->set_callback_state_change(
dialog_callback<teditor_settings,
&teditor_settings::update_selected_tod_info>);
custom_tod_red_->set_callback_positioner_move(
- dialog_callback<teditor_settings,
&teditor_settings::update_tod_display>);
+ dialog_callback<teditor_settings,
&teditor_settings::slider_update_callback>);
custom_tod_green_->set_callback_positioner_move(
- dialog_callback<teditor_settings,
&teditor_settings::update_tod_display>);
+ dialog_callback<teditor_settings,
&teditor_settings::slider_update_callback>);
custom_tod_blue_->set_callback_positioner_move(
- dialog_callback<teditor_settings,
&teditor_settings::update_tod_display>);
+ dialog_callback<teditor_settings,
&teditor_settings::slider_update_callback>);
update_selected_tod_info(window);
}
Modified: trunk/src/gui/dialogs/editor_settings.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/editor_settings.hpp?rev=29899&r1=29898&r2=29899&view=diff
==============================================================================
--- trunk/src/gui/dialogs/editor_settings.hpp (original)
+++ trunk/src/gui/dialogs/editor_settings.hpp Sun Oct 5 14:16:40 2008
@@ -39,6 +39,8 @@
void update_tod_display(twindow& window);
+ void slider_update_callback(twindow& window);
+
void set_tods(const std::vector<time_of_day>& tods) { tods_ = tods; }
const std::vector<time_of_day>& get_tods() const { return tods_; }
@@ -78,6 +80,7 @@
tlabel* current_tod_image_;
ttoggle_button* custom_tod_toggle_;
+ ttoggle_button* custom_tod_auto_refresh_;
tfield_bool* custom_tod_toggle_field_;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
