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

Wrapped "settings"

Browse Source 
FossilOrigin-Name: 2b7585554eaec0b930d78171ee9c6855637cd7ab
This commit is contained in:
kostas 2015-04-27 15:53:09 +00:00
parent efe0b61464
commit 79c351c043
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@ -1,5 +1,5 @@
C -\sMore\sfossil\s"mv"\swrapping\n-\sstopUI\snow\snavigates\sto\s"about:blank"
D 2015-04-27T15:49:05.526
C Wrapped\s"settings"
D 2015-04-27T15:53:09.050
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 50996723afa0ebf24dc2e4c0ec93a73ec6c0f9e4
F src/Bridge.h 52401305a45aa48e147000ebda538719d17ebb6f
F src/Bridge.cpp aa2ebe96902c441f6b39c32f7d38ea7ffab9405d
F src/Bridge.h 64ad587c13537066a2294ad76134077a19c4006f
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 d1a07a3cc3b6b7ee9892b87691d9dee44f7760c7
F src/MainWindow.cpp afbca2ef960db0a7adc35b6ce67005203625802b
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 11a0f979fc198ad134c95c139547baae81d90050
R 7c36928b15b28edaefddc669a790ffc2
P 77ff1ae8697fa89d87f3ca03fc50cf40ce537f24
R a372585b2168c96a373b54d319b9d7d6
U kostas
Z a63695d7f1d6a5fd1462c09f9c0b905b
Z c575daebd28a465ba5a799a992716136

2
manifest.uuid
View File

@ -1 +1 @@
77ff1ae8697fa89d87f3ca03fc50cf40ce537f24
2b7585554eaec0b930d78171ee9c6855637cd7ab

7
src/Bridge.cpp
View File

@ -303,6 +303,13 @@ bool Bridge::updateRepository(QStringList &result, bool explainOnly)
return runFossil(params, &result);
}
//------------------------------------------------------------------------------
bool Bridge::getFossilSettings(QStringList &result)
{
return runFossil(QStringList() << "settings", &result, RUNFLAGS_SILENT_ALL);
}
//------------------------------------------------------------------------------
bool Bridge::stashList(stashmap_t& stashes)
{

1
src/Bridge.h
View File

@ -106,6 +106,7 @@ public:
bool renameFile(const QString& beforePath, const QString& afterPath, bool renameLocal);
bool undoRepository(QStringList& result, bool explainOnly);
bool updateRepository(QStringList& result, bool explainOnly);
bool getFossilSettings(QStringList& result);
private:
void log(const QString &text, bool isHTML=false)
{

6
src/MainWindow.cpp
View File

@ -2297,8 +2297,14 @@ void MainWindow::loadFossilSettings()
{
// Also retrieve the fossil global settings
QStringList out;
#ifndef BRIDGE_ENABLED
if(!runFossil(QStringList() << "settings", &out, RUNFLAGS_SILENT_ALL))
return;
#else
if(!bridge.getFossilSettings(out))
return;
#endif
QStringMap kv = MakeKeyValues(out);