1.1 --- a/mainwindow.cpp Fri Feb 01 15:28:35 2008 +0000
1.2 +++ b/mainwindow.cpp Fri Feb 01 15:28:35 2008 +0000
1.3 @@ -3801,8 +3801,8 @@
1.4 void Main::testFunction1()
1.5 {
1.6 if (!currentMapEditor()) return;
1.7 - //currentMapEditor()->testFunction1();
1.8 - editAttribute();
1.9 + currentMapEditor()->testFunction1();
1.10 + //editAttribute();
1.11 }
1.12
1.13 void Main::testFunction2()
2.1 --- a/mapeditor.cpp Fri Feb 01 15:28:35 2008 +0000
2.2 +++ b/mapeditor.cpp Fri Feb 01 15:28:35 2008 +0000
2.3 @@ -1554,9 +1554,7 @@
2.4 }
2.5 if (lmode==NewMap)
2.6 {
2.7 - if (xelection.isEmpty() ) xelection.unselect();
2.8 xelection.clear();
2.9 - model->clear();
2.10 model->setMapEditor(this);
2.11 // (map state is set later at end of load...)
2.12 } else
2.13 @@ -4218,6 +4216,10 @@
2.14
2.15 void MapEditor::testFunction1()
2.16 {
2.17 + BranchObj *bo=xelection.getBranch();
2.18 + if (bo) model->moveAway (bo);
2.19 +
2.20 +
2.21 /*
2.22 BranchObj *bo=xelection.getBranch();
2.23 if (bo) animObjList.append( bo );
3.1 --- a/noteobj.cpp Fri Feb 01 15:28:35 2008 +0000
3.2 +++ b/noteobj.cpp Fri Feb 01 15:28:35 2008 +0000
3.3 @@ -84,6 +84,11 @@
3.4 rx.setPattern (""");
3.5 r.replace (rx,"\"");
3.6
3.7 + // Indent everything
3.8 + rx.setPattern ("^\n");
3.9 + r.replace (rx,indent);
3.10 + r=indent + r; // Don't forget first line
3.11 +
3.12 /* FIXME wrap text at width
3.13 if (fonthint !="fixed")
3.14 {
4.1 --- a/ornamentedobj.cpp Fri Feb 01 15:28:35 2008 +0000
4.2 +++ b/ornamentedobj.cpp Fri Feb 01 15:28:35 2008 +0000
4.3 @@ -279,7 +279,7 @@
4.4
4.5 QString OrnamentedObj::getNoteASCII(const QString &indent, const int &width)
4.6 {
4.7 - return note.getNoteASCII();
4.8 + return note.getNoteASCII(indent,width);
4.9 }
4.10
4.11 QString OrnamentedObj::getNoteASCII()