0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added support for slider and progress_bar widgets...

Browse source 
...to wesnoth.get_dialog_value

added support for text_box, slider, and progress_bar widgets to
wesnoth.set_dialog_value

(bug #18271, patch #2755 by Exasperation)
This commit is contained in:
Anonymissimus 2011-06-26 18:07:50 +00:00
parent 96daba9e2d
commit 4a8ffbcd63
3 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -1,6 +1,9 @@
Version 1.9.7+svn:
* Language and i18n:
* Updated translations: Irish, Vietnamese
* Lua API:
* added support for slider and progress_bar widgets to wesnoth.get_dialog_value
* added support for text_box, slider, and progress_bar widgets to wesnoth.set_dialog_value
* Multiplayer server:
* Treat inactive forum accounts as unregistered users to prevent abuse
of unverified registrations

3
data/core/about.cfg
View file

@ -875,6 +875,9 @@
# NOTE to new contributors: this section is listed alphabetically using the
# "name" attribute's first character. If you have to add yourself here,
# respect this rule.
[entry]
name = "Aaron Keisch-Walter (Exasperation)"
[/entry]
[entry]
name = "Alesis Novik"
[/entry]

29
src/scripting/lua.cpp
View file

@ -68,6 +68,8 @@
#include "gui/widgets/settings.hpp"
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/slider.hpp"
#include "gui/widgets/progress_bar.hpp"
#include "gui/widgets/window.hpp"
static lg::log_domain log_scripting_lua("scripting/lua");
@ -2799,6 +2801,29 @@ static int intf_set_dialog_value(lua_State *L)
{
b->set_value(lua_toboolean(L, 1));
}
else if (gui2::ttext_box *t = dynamic_cast<gui2::ttext_box *>(w))
{
const t_string& text = luaW_checktstring(L, 1);
t->set_value(text.str());
}
else if (gui2::tslider *s = dynamic_cast<gui2::tslider *>(w))
{
const int v = luaL_checkinteger(L, 1);
const int m = s->get_minimum_value();
const int n = s->get_maximum_value();
if (m <= v && v <= n)
s->set_value(v);
else
return luaL_argerror(L, 1, "out of bounds");
}
else if (gui2::tprogress_bar *p = dynamic_cast<gui2::tprogress_bar *>(w))
{
const int v = luaL_checkinteger(L, 1);
if (0 <= v && v <= 100)
p->set_percentage(v);
else
return luaL_argerror(L, 1, "out of bounds");
}
else
{
t_string v = luaW_checktstring(L, 1);
@ -2832,6 +2857,10 @@ static int intf_get_dialog_value(lua_State *L)
lua_pushboolean(L, b->get_value());
} else if (gui2::ttext_box *t = dynamic_cast<gui2::ttext_box *>(w)) {
lua_pushstring(L, t->get_value().c_str());
} else if (gui2::tslider *s = dynamic_cast<gui2::tslider *>(w)) {
lua_pushinteger(L, s->get_value());
} else if (gui2::tprogress_bar *p = dynamic_cast<gui2::tprogress_bar *>(w)) {
lua_pushinteger(L, p->get_percentage());
} else
return luaL_argerror(L, lua_gettop(L), "unsupported widget");