# HG changeset patch
# User insilmaril
# Date 1201879715 0
# Node ID 827d334d55f15687921b67feaa09d5aea9153e47
# Parent  9abdd5e6c3dc315ee1545c988e90bf4fef6c7d1d
Added brasilian translation by Amadeu JĂșnior

diff -r 9abdd5e6c3dc -r 827d334d55f1 mainwindow.cpp
--- a/mainwindow.cpp	Fri Feb 01 15:28:35 2008 +0000
+++ b/mainwindow.cpp	Fri Feb 01 15:28:35 2008 +0000
@@ -3801,8 +3801,8 @@
 void Main::testFunction1()
 {
 	if (!currentMapEditor()) return;
-	//currentMapEditor()->testFunction1();
-	editAttribute();
+	currentMapEditor()->testFunction1();
+	//editAttribute();
 }
 
 void Main::testFunction2()
diff -r 9abdd5e6c3dc -r 827d334d55f1 mapeditor.cpp
--- a/mapeditor.cpp	Fri Feb 01 15:28:35 2008 +0000
+++ b/mapeditor.cpp	Fri Feb 01 15:28:35 2008 +0000
@@ -1554,9 +1554,7 @@
 	}
 	if (lmode==NewMap)
 	{
-		if (xelection.isEmpty() ) xelection.unselect();
 		xelection.clear();
-		model->clear();
 		model->setMapEditor(this);
 		// (map state is set later at end of load...)
 	} else
@@ -4218,6 +4216,10 @@
 
 void MapEditor::testFunction1()
 {
+	BranchObj *bo=xelection.getBranch();
+	if (bo) model->moveAway (bo);
+
+
 /*
 	BranchObj *bo=xelection.getBranch();
 	if (bo) animObjList.append( bo );
diff -r 9abdd5e6c3dc -r 827d334d55f1 noteobj.cpp
--- a/noteobj.cpp	Fri Feb 01 15:28:35 2008 +0000
+++ b/noteobj.cpp	Fri Feb 01 15:28:35 2008 +0000
@@ -84,6 +84,11 @@
 	rx.setPattern (""");
 	r.replace (rx,"\"");
 
+	// Indent everything
+	rx.setPattern ("^\n");
+	r.replace (rx,indent);
+	r=indent + r;	// Don't forget first line
+
 /* FIXME	wrap text at width
 	if (fonthint !="fixed")
 	{
diff -r 9abdd5e6c3dc -r 827d334d55f1 ornamentedobj.cpp
--- a/ornamentedobj.cpp	Fri Feb 01 15:28:35 2008 +0000
+++ b/ornamentedobj.cpp	Fri Feb 01 15:28:35 2008 +0000
@@ -279,7 +279,7 @@
 
 QString OrnamentedObj::getNoteASCII(const QString &indent, const int &width)
 {
-    return note.getNoteASCII();
+    return note.getNoteASCII(indent,width);
 }
 
 QString OrnamentedObj::getNoteASCII()