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

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