diff --git a/manifest b/manifest index d12054d..75557e8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Wrapped\s"revert"\s"rename"\s"undo" -D 2015-04-26T19:32:41.271 +C Wrapped\sfossil\sversion +D 2015-04-27T15:25:13.463 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 943994a2cb3e181bf58f0a8b4a8ba56e44d0da8f -F src/Bridge.h 6dc336ac0877ae51de668c42d60e0874c5820d72 +F src/Bridge.cpp 380baa815d78c21efa1e634df66e1a9efd2938ec +F src/Bridge.h 6ac7659bd5924aa7b571f8fce974a2b67650bd55 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539 @@ -200,7 +200,7 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp a44f5c8bee45621cce49a2b10f4393ec54d630e2 +F src/MainWindow.cpp c1421d8ade96fb91a6ae7846766b67ff111ef113 F src/MainWindow.h a727aea9b2b453c79682f61157b38a76a873060a F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 @@ -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 1284b0abf55c359e79d4953a00da1de2cebb6a31 -R ef26df4ff23cffb54b79b80643d10861 +P 09f2c8f44189b490da880f56011b95fae223a5a9 +R 377d8713271159c2aa61196856694261 U kostas -Z 0ab9d2c4bc0bb974d8abd63068614dd5 +Z d0a09250611bae97fd8dfec546e148ce diff --git a/manifest.uuid b/manifest.uuid index 30bc2f0..b24331a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -09f2c8f44189b490da880f56011b95fae223a5a9 \ No newline at end of file +239b8ac44d4dd954633b52d28b68e4cd9937efbc \ No newline at end of file diff --git a/src/Bridge.cpp b/src/Bridge.cpp index d9380f9..dbbadd6 100644 --- a/src/Bridge.cpp +++ b/src/Bridge.cpp @@ -155,6 +155,24 @@ bool Bridge::cloneRepository(const QString& repository, const QUrl& url, const Q return true; } +//------------------------------------------------------------------------------ +bool Bridge::getFossilVersion(QString& version) +{ + QStringList res; + if(!runFossil(QStringList() << "version", &res, RUNFLAGS_SILENT_ALL) && res.length()==1) + return false; + + if(res.length()==0) + return false; + + int off = res[0].indexOf("version "); + if(off==-1) + return false; + + version = res[0].mid(off+8); + return true; +} + //------------------------------------------------------------------------------ bool Bridge::diffFile(const QString &repoFile) { diff --git a/src/Bridge.h b/src/Bridge.h index bbb24d1..c2784cd 100644 --- a/src/Bridge.h +++ b/src/Bridge.h @@ -90,6 +90,8 @@ public: bool pullRepository(); bool cloneRepository(const QString &repository, const QUrl &url, const QUrl &proxyUrl); + bool getFossilVersion(QString &version); + bool uiRunning() const; bool startUI(const QString &httpPort); void stopUI(); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 13309bf..b5e564f 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -2223,14 +2223,19 @@ void MainWindow::on_actionUndo_triggered() void MainWindow::on_actionAbout_triggered() { QString fossil_ver; - QStringList res; +#ifndef BRIDGE_ENABLED + QStringList res; if(runFossil(QStringList() << "version", &res, RUNFLAGS_SILENT_ALL) && res.length()==1) { int off = res[0].indexOf("version "); if(off!=-1) fossil_ver = tr("Fossil version %0").arg(res[0].mid(off+8)) + "\n"; } +#else + if(bridge.getFossilVersion(fossil_ver)) + fossil_ver = tr("Fossil version %0").arg(fossil_ver) + "\n"; +#endif QString qt_ver = tr("QT version %0").arg(QT_VERSION_STR) + "\n\n";