1 files changed, 33 insertions, 9 deletions

diff --git a/tools/editor/editor_log.cpp b/tools/editor/editor_log.cpp
index f7f5f596d7..264117eecd 100644
--- a/tools/editor/editor_log.cpp
+++ b/tools/editor/editor_log.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 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       */
@@ -81,6 +81,7 @@ void EditorLog::_notification(int p_what) {
 		log->add_color_override("default_color",get_color("font_color","Tree"));
 		tb->set_normal_texture( get_icon("Collapse","EditorIcons"));
 		tb->set_hover_texture( get_icon("CollapseHl","EditorIcons"));
+		//button->set_icon(get_icon("Console","EditorIcons"));
 
 	}
 
@@ -104,6 +105,17 @@ void EditorLog::_close_request() {
 }
 
 
+void EditorLog::_clear_request() {
+
+	log->clear();
+
+}
+
+void EditorLog::clear() {
+	_clear_request();
+}
+
+
 void EditorLog::add_message(const String& p_msg,bool p_error) {
 
 
@@ -114,6 +126,7 @@ void EditorLog::add_message(const String& p_msg,bool p_error) {
 		log->push_color(get_color("fg_error","Editor"));
 	} else {
 		button->set_icon(Ref<Texture>());
+
 	}
 
 
@@ -143,17 +156,20 @@ void EditorLog::_dragged(const Point2& p_ofs) {
 */
 
 
-ToolButton *EditorLog::get_button() {
+Button *EditorLog::get_button() {
 
 	return button;
 }
 
 void EditorLog::_flip_request() {
 
-	if (is_visible())
+	if (is_visible()) {
 		hide();
-	else
+		button->show();
+	} else {
 		show();
+		button->hide();
+	}
 }
 
 void EditorLog::_undo_redo_cbk(void *p_self,const String& p_name) {
@@ -167,9 +183,12 @@ void EditorLog::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_close_request"),&EditorLog::_close_request );
 	ObjectTypeDB::bind_method(_MD("_flip_request"),&EditorLog::_flip_request );
+	ObjectTypeDB::bind_method(_MD("_clear_request"),&EditorLog::_clear_request );
+
 	//ObjectTypeDB::bind_method(_MD("_dragged"),&EditorLog::_dragged );
 	ADD_SIGNAL( MethodInfo("close_request"));
 	ADD_SIGNAL( MethodInfo("show_request"));
+	ADD_SIGNAL( MethodInfo("clear_request"));
 }
 
 EditorLog::EditorLog() {
@@ -186,7 +205,7 @@ EditorLog::EditorLog() {
 	hb->add_child(title);
 
 
-	button = memnew( ToolButton );
+	button = memnew( Button );
 	button->set_text_align(Button::ALIGN_LEFT);
 	button->connect("pressed",this,"_flip_request");
 	button->set_focus_mode(FOCUS_NONE);
@@ -198,14 +217,19 @@ EditorLog::EditorLog() {
 	//pd->connect("dragged",this,"_dragged");
 	//pd->set_default_cursor_shape(Control::CURSOR_MOVE);
 
+	clearbutton = memnew( Button );
+	hb->add_child(clearbutton);
+	clearbutton->set_text("Clear");
+	clearbutton->connect("pressed", this,"_clear_request");
+
 	tb = memnew( TextureButton );
 	hb->add_child(tb);
 	tb->connect("pressed",this,"_close_request");
 
 
-	ec = memnew( EmptyControl);
+	ec = memnew( Control);
 	vb->add_child(ec);
-	ec->set_minsize(Size2(0,100));
+	ec->set_custom_minimum_size(Size2(0,100));
 	ec->set_v_size_flags(SIZE_EXPAND_FILL);
 
 
@@ -219,7 +243,7 @@ EditorLog::EditorLog() {
 	log->set_selection_enabled(true);
 	log->set_focus_mode(FOCUS_CLICK);
 	pc->add_child(log);
-	add_message(VERSION_FULL_NAME" (c) 2008-2014 Juan Linietsky, Ariel Manzur.");
+	add_message(VERSION_FULL_NAME" (c) 2008-2015 Juan Linietsky, Ariel Manzur.");
 	//log->add_text("Initialization Complete.\n"); //because it looks cool.
 	add_style_override("panel",get_stylebox("panelf","Panel"));
 
@@ -241,8 +265,8 @@ void EditorLog::deinit() {
 
 }
 
+
 EditorLog::~EditorLog() {
 
 
 }
-