From d70ae79ae9fa57f834924ae0db81b6ce51442909 Mon Sep 17 00:00:00 2001
From: kostas <kostas@noemail.net>
Date: Thu, 20 Oct 2011 16:31:08 +0000
Subject: [PATCH] Beautified log output

FossilOrigin-Name: 36ef959eec3bb9c4f84b5e0acf9cc728c14633e1
---
 MainWindow.cpp | 11 ++++++++---
 MainWindow.h   |  2 +-
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index 2801be4..d8abf28 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -866,9 +866,12 @@ MainWindow::RepoStatus MainWindow::getRepoStatus()
 	return run_ok ? REPO_OK : REPO_NOT_FOUND;
 }
 //------------------------------------------------------------------------------
-void MainWindow::log(const QString &text)
+void MainWindow::log(const QString &text, bool isHTML)
 {
-	ui->textBrowser->insertPlainText(text);
+	if(isHTML)
+		ui->textBrowser->insertHtml(text);
+	else
+		ui->textBrowser->insertPlainText(text);
 	QTextCursor c = ui->textBrowser->textCursor();
 	c.movePosition(QTextCursor::End);
 	ui->textBrowser->setTextCursor(c);
@@ -922,7 +925,7 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 	bool detached = (runFlags & RUNGLAGS_DETACHED) != 0;
 
 	if(!silent_input)
-		log("> fossil "+args.join(" ")+"\n");
+		log("<b>&gt; fossil "+args.join(" ")+"</b><br>", true);
 
 	QString wkdir = getCurrentWorkspace();
 
@@ -1010,6 +1013,7 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 		// Now process any query
 		if(have_query && have_yna_query)
 		{
+			log(last_line);
 			QString query = ParseFossilQuery(last_line);
 			DialogAnswer res = DialogQuery(this, "Fossil", query, true);
 			if(res==ANSWER_YES)
@@ -1031,6 +1035,7 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 		}
 		else if(have_query && have_yn_query)
 		{
+			log(last_line);
 			QString query = ParseFossilQuery(last_line);
 			DialogAnswer res = DialogQuery(this, "Fossil", query, false);
 
diff --git a/MainWindow.h b/MainWindow.h
index 55889c3..d34186f 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -142,7 +142,7 @@ private:
 	void saveSettings();
 	const QString &getCurrentWorkspace();
 	void setCurrentWorkspace(const QString &workspace);
-	void log(const QString &text);
+	void log(const QString &text, bool isHTML=false);
 	void setStatus(const QString &text);
 	bool uiRunning() const { return fossilUI.state() == QProcess::Running; }
 	void getSelectionFilenames(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
diff --git a/manifest b/manifest
index 4e02b19..766f1b6 100644
--- a/manifest
+++ b/manifest
@@ -1,13 +1,13 @@
-C Beautified\sthe\ssettings\sdialog\nDouble-clicking\sa\sfolder\sin\sthe\sbehaves\slike\sopen\sfolder\n
-D 2011-10-20T15:36:18.415
+C Beautified\slog\soutput\n
+D 2011-10-20T16:31:08.243
 F CommitDialog.cpp 8965e52d077c300cf1acb1b16fb2dcca5c7070f8
 F CommitDialog.h a9596d99865cf312b419d01d51334ffc916f5508
 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154
 F FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
 F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
 F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
-F MainWindow.cpp 149a4bdf9ae5f372f3026294c311b53470119a4e
-F MainWindow.h c16460dfb72df649e5c3bd6057c46d5ceb559106
+F MainWindow.cpp 5b4503c06d65c73b8f5cc5f018e348e08b185c45
+F MainWindow.h 7ad2f4090d58127cbb3f6801cd64fb932a8d4a14
 F MainWindow.ui 7f9e5cda55cffd5da8c01de7729a1806126c0d6b
 F SettingsDialog.cpp a386f03a13115b8179361344c830bcdb2c319476
 F SettingsDialog.h 079e869f60b37feac78198afe0dfd5b75eee9add
@@ -172,7 +172,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214
 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
 F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93
 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
-P 91c5a65b7e4ca4801a6d7632abd7982d2063a1f3
-R b1e75a926cff0a17e96ba42e01dc5da3
+P 8a4fbbb14628b2dc53b8d46a35a3b4f43182db9c
+R 5899c275d3ebca904b12f5fa2b05e637
 U kostas
-Z df7a5182fb8be64251d47442ec7c00a8
+Z 14cb25d35a9b96e0bb97a5497ed70fbe
diff --git a/manifest.uuid b/manifest.uuid
index 3f442a3..3a0d7ac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a4fbbb14628b2dc53b8d46a35a3b4f43182db9c
\ No newline at end of file
+36ef959eec3bb9c4f84b5e0acf9cc728c14633e1
\ No newline at end of file