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

Refactored ui callback mechanism

Browse Source 
Bridge now has access to the status bar via the new callbacks

FossilOrigin-Name: ee4cf9240e411dfdfc7a4d2b69456fb38a2300c8
This commit is contained in:
kostas
2015-04-27 18:59:09 +00:00
parent 906873e7f9
commit 5b3333836d
6 changed files with 102 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/MainWindow.cpp
View File

@@ -80,6 +80,7 @@ static QStringMap MakeKeyValues(QStringList lines)
}
#ifndef BRIDGE_ENABLED
///////////////////////////////////////////////////////////////////////////////
class ScopedStatus
{
@@ -99,6 +100,7 @@ private:
Ui::MainWindow *ui;
QProgressBar *progressBar;
};
#endif
///////////////////////////////////////////////////////////////////////////////
MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspacePath) :
@@ -216,8 +218,9 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
viewMode = VIEWMODE_TREE;
#ifdef BRIDGE_ENABLED
uiCallback.init(this);
// Need to be before applySettings which sets the last workspace
bridge.Init(this, &log, ui->textBrowser, "", "");
bridge.Init(this, &uiCallback, ui->textBrowser, "", "");
#endif
applySettings();
@@ -2959,3 +2962,28 @@ void MainWindow::fullRefresh()
// Select the Root of the tree to update the file view
selectRootDir();
}
#ifdef BRIDGE_ENABLED
//------------------------------------------------------------------------------
void MainWindow::MainWinUICallback::logText(const QString& text, bool isHTML)
{
Q_ASSERT(mainWindow);
mainWindow->log(text, isHTML);
}
//------------------------------------------------------------------------------
void MainWindow::MainWinUICallback::beginProcess(const QString& text)
{
Q_ASSERT(mainWindow);
mainWindow->ui->statusBar->showMessage(text);
mainWindow->progressBar->setHidden(false);
}
//------------------------------------------------------------------------------
void MainWindow::MainWinUICallback::endProcess()
{
Q_ASSERT(mainWindow);
mainWindow->ui->statusBar->clearMessage();
mainWindow->progressBar->setHidden(true);
}
#endif