Cleanups

FossilOrigin-Name: b6473fc40399a46731c8741ceed7d3432d687c5a

manifest

@@ -1,5 +1,5 @@
-C Refactored\sui\scallback\smechanism\nBridge\snow\shas\saccess\sto\sthe\sstatus\sbar\svia\sthe\snew\scallbacks
-D 2015-04-27T18:59:09.410
+C Cleanups
+D 2015-04-27T19:04:11.301
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -184,8 +184,8 @@ F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
 F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
 F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f
-F src/Bridge.cpp 7d9043cf388710ab09f8f2e3bb7ba04fecba94ee
-F src/Bridge.h 178ce7d42fae6f249866e473be1219c126a98646
+F src/Bridge.cpp 9e2881359f454238bd4d6df5f7b2a81a06c6c2db
+F src/Bridge.h 9c1828df15fcec90777afe998663d13138633d57
 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
 F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539
@@ -200,8 +200,8 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp 10501a468e95f3b18ac72ce5cf1d37515f582ee4
-F src/MainWindow.h f50d6fa91864f5499d7b627af87bd405f28acd31
+F src/MainWindow.cpp e793fdec0450d49fd3b787e4ad4693fb43d936d6
+F src/MainWindow.h 559547ce7aebd17d8bbb89195807f2a4a4ab3f76
 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
 F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca
@@ -215,7 +215,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
-P de84b1fda5b215f404dfafb1d5b95a694707573b
-R 16a653b7d4aa34851b31c4350ffaf2a2
+P ee4cf9240e411dfdfc7a4d2b69456fb38a2300c8
+R 0cc42bee3118407cae720e60ef185e0c
 U kostas
-Z 13e634934b62e62d5a4308841431d39a
+Z f46004bc190ae5569498873da8760a7b

manifest.uuid

@@ -1 +1 @@
-ee4cf9240e411dfdfc7a4d2b69456fb38a2300c8
+b6473fc40399a46731c8741ceed7d3432d687c5a

src/Bridge.cpp

@@ -7,6 +7,7 @@
 #include <QMessageBox>
 #include <QDir>
 #include <QTemporaryFile>
+#include <QUrl>
 #include "Utils.h"
 
 static const unsigned char		UTF8_BOM[] = { 0xEF, 0xBB, 0xBF };

src/Bridge.h

@@ -5,7 +5,6 @@ class QStringList;
 #include <QString>
 #include <QObject>
 #include <QProcess>
-#include <QTextBrowser>
 
 typedef QMap<QString, QString> stashmap_t;
 
@@ -38,11 +37,10 @@ public:
 	{
 	}
 
-	void Init(QWidget *parent, UICallback *callback, QTextBrowser *textBrowser, const QString &fossPath, const QString &workspace)
+	void Init(QWidget *parent, UICallback *callback, const QString &fossPath, const QString &workspace)
 	{
 		parentWidget = parent;
 		uiCallback = callback;
-		logTextBrowser = textBrowser;
 
 		fossilPath = fossPath;
 		currentWorkspace = workspace;
@@ -135,7 +133,6 @@ private:
 	bool				abortOperation;	// FIXME: No GUI for it yet
 
 	UICallback			*uiCallback;
-	QTextBrowser		*logTextBrowser;
 	QString				currentWorkspace;
 	QString				fossilPath;		// The value from the settings
 	QString				repositoryFile;

src/MainWindow.cpp

@@ -220,7 +220,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 #ifdef BRIDGE_ENABLED
 	uiCallback.init(this);
 	// Need to be before applySettings which sets the last workspace
-	bridge.Init(this, &uiCallback, ui->textBrowser, "", "");
+	bridge.Init(this, &uiCallback, "", "");
 #endif
 
 	applySettings();
@@ -1083,23 +1083,17 @@ void MainWindow::updateStashView()
 	ui->tableViewStash->resizeRowsToContents();
 }
 
-//------------------------------------------------------------------------------
-void MainWindow::log(QTextBrowser *textBrowser, const QString &text, bool isHTML)
-{
-	QTextCursor c = textBrowser->textCursor();
-	c.movePosition(QTextCursor::End);
-	textBrowser->setTextCursor(c);
-
-	if(isHTML)
-		textBrowser->insertHtml(text);
-	else
-		textBrowser->insertPlainText(text);
-}
-
 //------------------------------------------------------------------------------
 void MainWindow::log(const QString &text, bool isHTML)
 {
-	log(ui->textBrowser, text, isHTML);
+	QTextCursor c = ui->textBrowser->textCursor();
+	c.movePosition(QTextCursor::End);
+	ui->textBrowser->setTextCursor(c);
+
+	if(isHTML)
+		ui->textBrowser->insertHtml(text);
+	else
+		ui->textBrowser->insertPlainText(text);
 }
 
 //------------------------------------------------------------------------------

src/MainWindow.h

@@ -139,7 +139,6 @@ private:
 	void updateSettings();
 	const QString &getCurrentWorkspace();
 	void setCurrentWorkspace(const QString &workspace);
-	static void log(QTextBrowser *textBrowser, const QString &text, bool isHTML);
 	void log(const QString &text, bool isHTML=false);
 	void setStatus(const QString &text);
 	bool uiRunning() const;
@@ -285,7 +284,7 @@ private:
 	void				setRepositoryFile(const QString &filename) { repositoryFile = filename; }
 	const QString &		getProjectName() const { return projectName; }
 #else
-	MainWinUICallback		uiCallback;
+	MainWinUICallback	uiCallback;
 	Bridge				bridge;
 	const QString &		getProjectName() const { return bridge.getProjectName(); }
 	const QString &		getRepositoryFile() const { return bridge.getRepositoryFile(); }
@@ -295,7 +294,6 @@ private:
 	ViewMode			viewMode;
 	stringset_t			selectedDirs;	// The directory selected in the tree
 
-
 	// Repository State
 	typedef QList<RepoFile*> filelist_t;
 	typedef QMap<QString, RepoFile*> filemap_t;