AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanups

Browse Source 
FossilOrigin-Name: b6473fc40399a46731c8741ceed7d3432d687c5a
This commit is contained in:
kostas
2015-04-27 19:04:11 +00:00
parent 5b3333836d
commit c039be3c8c
6 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bridge.cpp
View File

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

5
src/Bridge.h
View File

@ -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;

24
src/MainWindow.cpp
View File

@ -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);
}
//------------------------------------------------------------------------------

4
src/MainWindow.h
View File

@ -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;