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

Add clear button to Lua console

Browse source
This commit is contained in:
Celtic Minstrel 2016-07-15 01:02:28 -04:00
parent aedcdfe04b
commit 35d17dcaa1
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/gui/window/lua_interpreter.cfg
View file

@ -122,6 +122,21 @@
[/button]
[/column]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[button]
id = "clear"
label = _ "Clear Console"
# FIXME: tooltips cause weird interactions with map
# labels while running a GUI2 dialog, so let's
# not use a tooltip yet.
#tooltip = _ "Clear the log area"
[/button]
[/column]
[column]
grow_factor = 0
border = "all"

26
src/gui/dialogs/lua_interpreter.cpp
View file

@ -159,6 +159,13 @@ public:
std::string get_log() const { return log_.str(); } ///< Get the log string
std::string get_name() const { return L_.my_name(); } ///< Get a string describing the name of lua kernel
/// Clear the console log
void clear_log() {
L_.clear_log();
log_.str("");
log_.clear();
}
//* Tab completion: Get list of presently defined global variables */
std::vector<std::string> get_globals() { return L_.get_global_var_names(); }
//* Tab completion: Get list of attributes for variable corresponding to this path. */
@ -352,6 +359,7 @@ public:
class tlua_interpreter::controller {
private:
tbutton* copy_button;
tbutton* clear_button;
ttext_box* text_entry;
std::string text_entry_;
@ -377,6 +385,7 @@ public:
void bind(twindow& window);
void handle_copy_button_clicked(twindow & window);
void handle_clear_button_clicked(twindow & window);
void input_keypress_callback(bool& handled,
bool& halt,
@ -448,7 +457,6 @@ void tlua_interpreter::controller::bind(twindow& window)
_5,
std::ref(window)));
copy_button = &find_widget<tbutton>(&window, "copy", false);
connect_signal_mouse_left_click(
*copy_button,
@ -456,6 +464,13 @@ void tlua_interpreter::controller::bind(twindow& window)
this,
std::ref(window)));
clear_button = &find_widget<tbutton>(&window, "clear", false);
connect_signal_mouse_left_click(
*clear_button,
std::bind(&tlua_interpreter::controller::handle_clear_button_clicked,
this,
std::ref(window)));
if (!desktop::clipboard::available()) {
copy_button->set_active(false);
copy_button->set_tooltip(_("Clipboard support not found, contact your packager"));
@ -471,6 +486,15 @@ void tlua_interpreter::controller::handle_copy_button_clicked(twindow & /*window
desktop::clipboard::copy_to_clipboard(lua_model_->get_log(), false);
}
/** Clear the text */
void tlua_interpreter::controller::handle_clear_button_clicked(twindow & /*window*/)
{
assert(lua_model_);
lua_model_->clear_log();
assert(view_);
view_->update_contents("");
}
/** Handle return key (execute) or tab key (tab completion) */
void tlua_interpreter::controller::input_keypress_callback(bool& handled,
bool& halt,