diff options
Diffstat (limited to 'tools/editor/progress_dialog.cpp')
| -rw-r--r-- | tools/editor/progress_dialog.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/editor/progress_dialog.cpp b/tools/editor/progress_dialog.cpp index a950f7acfc..03303b8c48 100644 --- a/tools/editor/progress_dialog.cpp +++ b/tools/editor/progress_dialog.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -42,7 +42,7 @@ void BackgroundProgress::_add_task(const String& p_task,const String& p_label, i t.hb->add_child(l); t.progress = memnew( ProgressBar ); t.progress->set_max(p_steps); - t.progress->set_val(p_steps); + t.progress->set_value(p_steps); Control *ec = memnew( Control ); ec->set_h_size_flags(SIZE_EXPAND_FILL); ec->set_v_size_flags(SIZE_EXPAND_FILL); @@ -83,9 +83,9 @@ void BackgroundProgress::_task_step(const String& p_task, int p_step){ Task &t=tasks[p_task]; if (p_step<0) - t.progress->set_val(t.progress->get_val()+1); + t.progress->set_value(t.progress->get_value()+1); else - t.progress->set_val(p_step); + t.progress->set_value(p_step); } void BackgroundProgress::_end_task(const String& p_task){ @@ -101,10 +101,10 @@ void BackgroundProgress::_end_task(const String& p_task){ void BackgroundProgress::_bind_methods(){ - ObjectTypeDB::bind_method("_add_task",&BackgroundProgress::_add_task); - ObjectTypeDB::bind_method("_task_step",&BackgroundProgress::_task_step); - ObjectTypeDB::bind_method("_end_task",&BackgroundProgress::_end_task); - ObjectTypeDB::bind_method("_update",&BackgroundProgress::_update); + ClassDB::bind_method("_add_task",&BackgroundProgress::_add_task); + ClassDB::bind_method("_task_step",&BackgroundProgress::_task_step); + ClassDB::bind_method("_end_task",&BackgroundProgress::_end_task); + ClassDB::bind_method("_update",&BackgroundProgress::_update); } @@ -182,7 +182,7 @@ void ProgressDialog::add_task(const String& p_task,const String& p_label,int p_s t.vb->add_margin_child(p_label,vb2); t.progress = memnew( ProgressBar ); t.progress->set_max(p_steps); - t.progress->set_val(p_steps); + t.progress->set_value(p_steps); vb2->add_child(t.progress); t.state=memnew( Label ); t.state->set_clip_text(true); @@ -206,9 +206,9 @@ void ProgressDialog::task_step(const String& p_task, const String& p_state, int Task &t=tasks[p_task]; if (p_step<0) - t.progress->set_val(t.progress->get_val()+1); + t.progress->set_value(t.progress->get_value()+1); else - t.progress->set_val(p_step); + t.progress->set_value(p_step); t.state->set_text(p_state); last_progress_tick=OS::get_singleton()->get_ticks_usec(); |