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

Fixed status bar updates

Browse Source 
FossilOrigin-Name: bf0e885bf80d28fda92ed20315d93445bb2b42a6
This commit is contained in:
kostas
2015-04-26 13:57:13 +00:00
parent a1d60fa19c
commit 68575b95cd
5 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bridge.cpp
View File

@ -110,14 +110,6 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
if(detached)
return QProcess::startDetached(fossil, args, wkdir);
// Make StatusBar message
#if 0 // FIXME
QString status_msg = tr("Running Fossil");
if(args.length() > 0)
status_msg = QString("Fossil %0").arg(args[0].toCaseFolded());
ScopedStatus status(status_msg, ui, progressBar);
#endif
// Generate args file
const QStringList *final_args = &args;
QTemporaryFile args_file;

14
src/MainWindow.cpp
View File

@ -600,7 +600,6 @@ bool MainWindow::scanDirectory(QFileInfoList &entries, const QString& dirPath, c
return false;
QFileInfo info = list[i];
QString filename = info.fileName();
QString filepath = info.filePath();
QString rel_path = filepath;
rel_path.remove(baseDir+PATH_SEP);
@ -1428,15 +1427,14 @@ QString MainWindow::getFossilPath()
bool MainWindow::runFossil(const QStringList &args, QStringList *output, int runFlags)
{
// Make StatusBar message
QString status_msg = tr("Running Fossil");
if(args.length() > 0)
status_msg = QString("Fossil %0").arg(args[0].toCaseFolded());
ScopedStatus status(status_msg, ui, progressBar);
return bridge.runFossil(args, output, runFlags);
}
//------------------------------------------------------------------------------
bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int *exitCode, int runFlags)
{
return bridge.runFossilRaw(args, output, exitCode, runFlags);
}
#endif
//------------------------------------------------------------------------------

2
src/MainWindow.h
View File

@ -140,7 +140,9 @@ private:
bool refresh();
void scanWorkspace();
bool runFossil(const QStringList &args, QStringList *output=0, int runFlags=RUNFLAGS_NONE);
#ifndef BRIDGE_ENABLED
bool runFossilRaw(const QStringList &args, QStringList *output=0, int *exitCode=0, int runFlags=RUNFLAGS_NONE);
#endif
void applySettings();
void updateSettings();
const QString &getCurrentWorkspace();