Merge pull request #2919 from TheHX/pr-groups-editor

Update Groups Editor

tools/editor/groups_editor.cpp

@@ -27,151 +27,130 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "groups_editor.h"
-#include "scene/gui/box_container.h"
 
+#include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 
-
+void GroupsEditor::_add_group(const String& p_group) {
-#include "print_string.h"
-
-void GroupsEditor::_notification(int p_what) {
-	
-	if (p_what==NOTIFICATION_ENTER_TREE) {
-		connect("confirmed", this,"_close");
-	}	
-	if (p_what==NOTIFICATION_EXIT_TREE) {
-		disconnect("confirmed", this,"_close");
-	}
-}
-
-void GroupsEditor::_close() {
-	
-	hide();
-	
-}
-void GroupsEditor::_add() {
 
 	if (!node)
 		return;
 
-	undo_redo->create_action("Add To Group");
+	String name = group_name->get_text();
-	undo_redo->add_do_method(node,"add_to_group",group_name->get_text(),true);
+	if (name.strip_edges()=="")
-	undo_redo->add_undo_method(node,"remove_from_group",group_name->get_text());
+		return;
 
+	if (node->is_in_group(name))
+		return;
+
+	undo_redo->create_action("Add to Group");
+
+	undo_redo->add_do_method(node,"add_to_group",name,true);
 	undo_redo->add_do_method(this,"update_tree");
+	undo_redo->add_undo_method(node,"remove_from_group",name,get_text());
 	undo_redo->add_undo_method(this,"update_tree");
 
 	undo_redo->commit_action();
 }
 
+void GroupsEditor::_remove_group(Object *p_item, int p_column, int p_id) {
 
-void GroupsEditor::_remove() {
-	
-	if (!tree->get_selected())
-		return;
 	if (!node)
 		return;
 
-	TreeItem *sel = tree->get_selected();
+	TreeItem *ti = p_item->cast_to<TreeItem>();
-	if (!sel)
+	if (!ti)
 		return;
 
-	node->remove_from_group( sel->get_text(0) );
+	String name = ti->get_text(0);
-	update_tree();
+
+	undo_redo->create_action("Remove from Group");
+
+	undo_redo->add_do_method(node,"remove_from_group",name);
+	undo_redo->add_do_method(this,"update_tree");
+	undo_redo->add_undo_method(node,"add_to_group",name,true);
+	undo_redo->add_undo_method(this,"update_tree");
+
+	undo_redo->commit_action();
 }
 
-void GroupsEditor::update_tree() {
+struct _GroupInfoComparator {
 
+	bool operator()(const Node::GroupInfo& p_a, const Node::GroupInfo& p_b) const {
+		return p_a.name.operator String() < p_b.name.operator String();
+	}
+};
+
+void GroupsEditor::update_tree() {
 
 	tree->clear();
 
 	if (!node)
 		return;
 
-	List<GroupInfo> groups;
+	List<Node::GroupInfo> groups;
 	node->get_groups(&groups);
+	groups.sort_custom<_GroupInfoComparator>();
 
 	TreeItem *root=tree->create_item();
 
 	for(List<GroupInfo>::Element *E=groups.front();E;E=E->next()) {
 
-		if (!E->get().persistent)
+		Node::GroupInfo gi = E->get();
+		if (!gi.persistent)
 			continue;
+
 		TreeItem *item=tree->create_item(root);
-		item->set_text(0, E->get().name);	
+		item->set_text(0, gi.name);
-	
+		item->add_button(0, get_icon("Remove", "EditorIcons"), 0);
 	}
-
 }
 
 void GroupsEditor::set_current(Node* p_node) {
 
 	node=p_node;
 	update_tree();
-
 }
 
 void GroupsEditor::_bind_methods() {
 
-	ObjectTypeDB::bind_method("_add",&GroupsEditor::_add);
+	ObjectTypeDB::bind_method("_add_group",&GroupsEditor::_add_group);
-	ObjectTypeDB::bind_method("_close",&GroupsEditor::_close);
+	ObjectTypeDB::bind_method("_remove_group",&GroupsEditor::_remove_group);
-	ObjectTypeDB::bind_method("_remove",&GroupsEditor::_remove);	
 	ObjectTypeDB::bind_method("update_tree",&GroupsEditor::update_tree);
 }
 
 GroupsEditor::GroupsEditor() {
 
+	node=NULL;
+
 	set_title("Group Editor");
 
-	Label * label = memnew( Label );
+	VBoxContainer *vbc = memnew( VBoxContainer );
-	label->set_pos( Point2( 8,11) );
+	add_child(vbc);
-	label->set_text("Groups:");
+	set_child_rect(vbc);
 
-	add_child(label);	
+	HBoxContainer *hbc = memnew( HBoxContainer );
+	vbc->add_margin_child("Group", hbc);
 
-	group_name = memnew(LineEdit);
+	group_name = memnew( LineEdit );
-	group_name->set_anchor( MARGIN_RIGHT, ANCHOR_END );
+	group_name->set_h_size_flags(SIZE_EXPAND_FILL);
-	group_name->set_begin( Point2( 15,28) );
+	hbc->add_child(group_name);
-	group_name->set_end( Point2( 94,48 ) );
+	group_name->connect("text_entered",this,"_add_group");
-	
-	add_child(group_name);
-	
-	tree = memnew( Tree );
-	tree->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	tree->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-	tree->set_begin( Point2( 15,52) );
-	tree->set_end( Point2( 94,42 ) );
-	tree->set_hide_root(true);		
-	add_child(tree);
 
 	add = memnew( Button );
-	add->set_anchor( MARGIN_LEFT, ANCHOR_END );
-	add->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	add->set_begin( Point2( 90, 28 ) );
-	add->set_end( Point2( 15, 48 ) );	
 	add->set_text("Add");
+	hbc->add_child(add);
+	add->connect("pressed", this,"_add_group", varray(String()));
 
-	add_child(add);
+	tree = memnew( Tree );
-	
+	tree->set_hide_root(true);
-	remove = memnew( Button );
+	tree->set_v_size_flags(SIZE_EXPAND_FILL);
-	remove->set_anchor( MARGIN_LEFT, ANCHOR_END );
+	vbc->add_margin_child("Node Group(s)", tree, true);
-	remove->set_anchor( MARGIN_RIGHT, ANCHOR_END );
+	tree->connect("button_pressed",this,"_remove_group");
-	remove->set_begin( Point2( 90, 52 ) );
-	remove->set_end( Point2( 15, 72 ) );	
-	remove->set_text("Remove");
-	
-	add_child(remove);
 
 	get_ok()->set_text("Close");
-			
-	add->connect("pressed", this,"_add");
-	remove->connect("pressed", this,"_remove");	
-
-	
-	node=NULL;
 }
 
-
 GroupsEditor::~GroupsEditor()
 {
 }

tools/editor/groups_editor.h

@@ -29,34 +29,34 @@
 #ifndef GROUPS_EDITOR_H
 #define GROUPS_EDITOR_H
 
-
 #include "scene/gui/dialogs.h"
 #include "scene/gui/button.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/line_edit.h"
 #include "undo_redo.h"
+
 /**
 @author Juan Linietsky <reduzio@gmail.com>
 */
-class GroupsEditor : public ConfirmationDialog {
 
-	OBJ_TYPE( GroupsEditor, ConfirmationDialog );
+class GroupsEditor : public AcceptDialog {
+
+	OBJ_TYPE(GroupsEditor,AcceptDialog);
+
+	Node *node;
 
 	LineEdit *group_name;
-	Tree *tree;
 	Button *add;
-	Button *remove;
+	Tree *tree;
-	Node *node;
+
 	UndoRedo *undo_redo;
 
 	void update_tree();
-	void _add();
+	void _add_group(const String& p_group="");
-	void _remove();
+	void _remove_group(Object *p_item, int p_column, int p_id);
 	void _close();
-	
 protected:
 
-	void _notification(int p_what);
 	static void _bind_methods();
 public:
 
@@ -65,6 +65,6 @@ public:
 
 	GroupsEditor();	
 	~GroupsEditor();
-	
 };
+
 #endif