diff --git a/manifest b/manifest index e4a907d..b00f95c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Bridge\snow\slonger\sderives\sfrom\sQObject\n -D 2015-04-27T19:59:29.459 +C Fixed\sfossil\soperation\stermination\sflag\n +D 2015-04-29T12:35:33.873 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 7f84e6b1ba2e2807a067aba0e16c4c62cdc00dff -F src/Bridge.h 545b83b2137290f3b514e12f5481a677e29bb6f0 +F src/Bridge.cpp 96aca0460c87ec2cdd154527a0583a00309ebcea +F src/Bridge.h 81d3e808ca1bd90771abc51d1557bb29e098fbf3 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 6a6a3ad412ec3c2c32ec1ff0c650979b85c770f4 -F src/MainWindow.h c593f74f3b7d0b8f6d29288c6badd6b350fcb25f +F src/MainWindow.cpp f87fb7425ae220f2b00d6e35c7e51c189232ada7 +F src/MainWindow.h fb8783a0bcc82b61e63d0b52db157c4a31881380 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 3d1e269fee5acd4b65025024f701319c3e993e97 -R c371a4175aab68d369af5a0cabed7310 +P 0017b55685a3fe99a72757e9f6a8c3c261612413 +R 1a2fe39703e4ffd7fef355a18e8d5a76 U kostas -Z 9e900d838d9caa3f99048fed896a33a5 +Z 30de43e6ae2e0ffe73371ce33c4e23bd diff --git a/manifest.uuid b/manifest.uuid index 8604e79..f396374 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0017b55685a3fe99a72757e9f6a8c3c261612413 \ No newline at end of file +f791fda7d73f7e7b71b28ecbaefd93330090a834 \ No newline at end of file diff --git a/src/Bridge.cpp b/src/Bridge.cpp index 79780b3..b7567a2 100644 --- a/src/Bridge.cpp +++ b/src/Bridge.cpp @@ -546,7 +546,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi QString ans_always = 'a' + EOL_MARK; QString ans_convert = 'c' + EOL_MARK; - abortOperation = false; + operationAborted = false; QString buffer; #ifdef Q_OS_WIN @@ -572,7 +572,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi if(state!=QProcess::Running && bytes_avail<1) break; - if(abortOperation) + if(operationAborted) { log("\n* "+QObject::tr("Terminated")+" *\n"); #ifdef Q_OS_WIN // Verify this is still true on Qt5 diff --git a/src/Bridge.h b/src/Bridge.h index 8f2ef8d..8fd9aa7 100644 --- a/src/Bridge.h +++ b/src/Bridge.h @@ -41,7 +41,7 @@ public: Bridge() - : abortOperation(false) + : operationAborted(false) , uiCallback(0) { } @@ -86,7 +86,6 @@ public: repositoryFile = filename; } - bool openRepository(const QString &repositoryPath, const QString& workspacePath); bool newRepository(const QString &repositoryPath); bool closeRepository(); @@ -119,6 +118,8 @@ public: bool stashDrop(const QString& name); bool stashDiff(const QString& name); + void abortOperation() { operationAborted = true; } + private: void log(const QString &text, bool isHTML=false) { @@ -128,7 +129,7 @@ private: QString getFossilPath(); - bool abortOperation; // FIXME: No GUI for it yet + bool operationAborted; UICallback *uiCallback; QString currentWorkspace; QString fossilPath; // The value from the settings diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 6823961..552eda5 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -198,7 +198,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP if(workspacePath && !workspacePath->isEmpty()) openWorkspace(*workspacePath); - abortOperation = false; + operationAborted = false; rebuildRecent(); } @@ -612,7 +612,7 @@ void MainWindow::scanWorkspace() workspaceFiles.clear(); pathSet.clear(); - abortOperation = false; + operationAborted = false; if(scan_files) { @@ -626,7 +626,7 @@ void MainWindow::scanWorkspace() ignore = settings.GetFossilValue(FOSSIL_SETTING_IGNORE_GLOB).toString().replace(',',';'); } - if(!scanDirectory(all_files, wkdir, wkdir, ignore, abortOperation)) + if(!scanDirectory(all_files, wkdir, wkdir, ignore, operationAborted)) goto _done; for(QFileInfoList::iterator it=all_files.begin(); it!=all_files.end(); ++it) @@ -2154,7 +2154,8 @@ void MainWindow::setBusy(bool busy) //------------------------------------------------------------------------------ void MainWindow::onAbort() { - abortOperation = true; + operationAborted = true; + bridge.abortOperation(); // FIXME: Rename this to something better, Operation Aborted log("
* "+tr("Terminated")+" *
", true); } diff --git a/src/MainWindow.h b/src/MainWindow.h index 966ce41..c9e75f0 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -252,7 +252,7 @@ private: class QAction *recentWorkspaceActs[MAX_RECENT]; class QProgressBar *progressBar; class QShortcut *abortShortcut; - bool abortOperation; + bool operationAborted; Settings &settings; QStringList workspaceHistory;