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

Ported uiRunning

Browse Source 
FossilOrigin-Name: bc822e7b940bf0e3eceaf99d6a47921af1a361f0
This commit is contained in:
kostas 2015-04-26 10:41:44 +00:00
parent de78beb1b5
commit f261fbaa66
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Started\smoving\sfossil\soperations\sinto\sBridge\n C Ported\suiRunning
D 2015-04-26T10:36:55.373 D 2015-04-26T10:41:44.338
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -200,8 +200,8 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp 7d07c97213b1a448d0a850c017cf226fb1c553da F src/MainWindow.cpp 16c97083d455983f1c7d21c8d21a16d7d0676ba4
F src/MainWindow.h a69b2e5ad3e6cd42343bccf145fa99dc9eb6c4f2 F src/MainWindow.h 8336643bbdca5c294f9fafc91ae78303fb7c063e
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77 F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
@ -215,7 +215,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7 F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P 7f876a0b9e2c3c802938bd843e3e387e5e7e027a P 7a4ea959c64034b6e20dec41a4a8c16a09397bfa
R 5d10ed53db083d8513096d001d39f7ff R d99dba3c5888b6181bf266039eef3548
U kostas U kostas
Z 36c407da296e8989c57827d80d13d2da Z 8b104a9799f52bcdd97acb20bb55d2d7

2
manifest.uuid
View File

@ -1 +1 @@
7a4ea959c64034b6e20dec41a4a8c16a09397bfa bc822e7b940bf0e3eceaf99d6a47921af1a361f0

13
src/MainWindow.cpp
View File

@ -1769,6 +1769,13 @@ void MainWindow::stopUI()
ui->actionFossilUI->setChecked(false); ui->actionFossilUI->setChecked(false);
} }
//------------------------------------------------------------------------------
bool MainWindow::uiRunning() const
{
return fossilUI.state() == QProcess::Running;
}
#else #else
bool MainWindow::startUI() bool MainWindow::startUI()
{ {
@ -1784,6 +1791,12 @@ void MainWindow::stopUI()
ui->actionFossilUI->setChecked(false); ui->actionFossilUI->setChecked(false);
} }
//------------------------------------------------------------------------------
bool MainWindow::uiRunning() const
{
return bridge.uiRunning();
}
#endif #endif

2
src/MainWindow.h
View File

@ -145,7 +145,7 @@ private:
void setCurrentWorkspace(const QString &workspace); void setCurrentWorkspace(const QString &workspace);
void log(const QString &text, bool isHTML=false); void log(const QString &text, bool isHTML=false);
void setStatus(const QString &text); void setStatus(const QString &text);
bool uiRunning() const { return fossilUI.state() == QProcess::Running; } bool uiRunning() const;
void getSelectionFilenames(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false); void getSelectionFilenames(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
void getFileViewSelection(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false); void getFileViewSelection(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
void getDirViewSelection(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false); void getDirViewSelection(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);