diff -r f0fe7c36ec5c -r 43268373032d exports.cpp --- a/exports.cpp Fri Apr 09 14:24:04 2010 +0000 +++ b/exports.cpp Wed Jun 09 13:14:08 2010 +0000 @@ -156,6 +156,8 @@ // Main loop over all branches QString s; QString curIndent; + QString dashIndent; + int i; BranchItem *cur=NULL; BranchItem *prev=NULL; @@ -183,6 +185,8 @@ colString="[G]"; else colString="[?]"; + + dashIndent=""; switch (cur->depth()) { case 0: @@ -218,9 +222,14 @@ default: ts << (curIndent + "- " + cur->getHeading()); ts << "\n"; + dashIndent=" "; break; } + // If necessary, write URL + if (!cur->getURL().isEmpty()) + ts << (curIndent + dashIndent + cur->getURL()) +"\n"; + // If necessary, write note if (!cur->getNoteObj().isEmpty()) { @@ -263,6 +272,7 @@ // Main loop over all branches QString s; QString curIndent; + QString dashIndent; int i; BranchItem *cur=NULL; BranchItem *prev=NULL; @@ -279,6 +289,8 @@ if (!cur->hasHiddenExportParent() ) { //std::cout << "ExportASCII:: "<getHeading().toStdString()<depth()) { case 0: @@ -294,17 +306,24 @@ ts << "\n"; ts << (curIndent + "* " + cur->getHeading()); ts << "\n"; + dashIndent=" "; break; case 3: ts << (curIndent + "- " + cur->getHeading()); ts << "\n"; + dashIndent=" "; break; default: ts << (curIndent + "- " + cur->getHeading()); ts << "\n"; + dashIndent=" "; break; } + // If necessary, write URL + if (!cur->getURL().isEmpty()) + ts << (curIndent + dashIndent + cur->getURL()) +"\n"; + // If necessary, write note if (!cur->getNoteObj().isEmpty()) { @@ -512,10 +531,11 @@ .arg(col) .arg(id); QString url=current->getURL(); + QString heading=quotemeta(current->getHeading()); if (!url.isEmpty()) { s+=QString ("").arg(url); - s+=QString ("%1").arg(quotemeta(current->getHeading())); + s+=QString ("%1").arg(heading); s+=""; QRectF fbox=current->getBBoxURLFlag (); @@ -664,7 +684,9 @@ model->setExportMode (true); // Write header - ts<<""+model->getMapName()<<""; + ts<<""; + ts<<" "; + ts<<""+model->getMapName()<<""; ts<<" \n"; // Include image