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

Transitioned to new fossil bridge

Browse Source 
FossilOrigin-Name: c5b0a1a62a9607f434ac6426401fd40c94d6a2d8
This commit is contained in:
kostas 2015-04-27 19:31:43 +00:00
parent 762172f124
commit 46c5fba9d2
4 changed files with 14 additions and 839 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C More\srefactoring\n C Transitioned\sto\snew\sfossil\sbridge
D 2015-04-27T19:15:43.096 D 2015-04-27T19:31:43.310
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 691e536058a9360f1a0db56c153638a196941283 F src/MainWindow.cpp 8f20a49621c42bfa7ee5f6018900a9f6ef08f6c8
F src/MainWindow.h 9e4f2887690bffa9a154e7f9666f4655584256d1 F src/MainWindow.h 045b784735d86cef7ed415ca46dccf9b6a005c39
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca
@ -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 b6473fc40399a46731c8741ceed7d3432d687c5a P e2b03b2a965ec50382ea89d374ece4a6a56b72b5
R 217c3c621c2a2ca89f57d3cea5717343 R 7230e39179ffadefe20ce40a0176c6fa
U kostas U kostas
Z 2a41dd117ed487365f20972afe89eb8f Z 1c155b4c26131deaf429fe2b750502dc

2
manifest.uuid
View File

@ -1 +1 @@
e2b03b2a965ec50382ea89d374ece4a6a56b72b5 c5b0a1a62a9607f434ac6426401fd40c94d6a2d8

812
src/MainWindow.cpp
View File

File diff suppressed because it is too large Load Diff

25
src/MainWindow.h
View File

@ -12,15 +12,10 @@
#include "SettingsDialog.h" #include "SettingsDialog.h"
#include "Bridge.h" #include "Bridge.h"
#define BRIDGE_ENABLED
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }
class QStringList;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// RepoFile // RepoFile
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -131,10 +126,6 @@ private:
private: private:
bool refresh(); bool refresh();
void scanWorkspace(); void scanWorkspace();
#ifndef BRIDGE_ENABLED
bool runFossilRaw(const QStringList &args, QStringList *output=0, int *exitCode=0, int runFlags=RUNFLAGS_NONE);
bool runFossil(const QStringList &args, QStringList *output=0, int runFlags=RUNFLAGS_NONE);
#endif
void applySettings(); void applySettings();
void updateSettings(); void updateSettings();
const QString &getCurrentWorkspace(); const QString &getCurrentWorkspace();
@ -168,10 +159,6 @@ private:
void setBusy(bool busy); void setBusy(bool busy);
virtual QMenu *createPopupMenu(); virtual QMenu *createPopupMenu();
#ifndef BRIDGE_ENABLED
RepoStatus getRepoStatus();
#endif
enum ViewMode enum ViewMode
{ {
VIEWMODE_LIST, VIEWMODE_LIST,
@ -229,7 +216,6 @@ private slots:
void on_tableView_customContextMenuRequested(const QPoint &pos); void on_tableView_customContextMenuRequested(const QPoint &pos);
private: private:
#ifdef BRIDGE_ENABLED
class MainWinUICallback : public Bridge::UICallback class MainWinUICallback : public Bridge::UICallback
{ {
public: public:
@ -248,7 +234,6 @@ private:
private: private:
class MainWindow *mainWindow; class MainWindow *mainWindow;
}; };
#endif
friend class MainWinUICallback; friend class MainWinUICallback;
@ -270,22 +255,14 @@ private:
Settings &settings; Settings &settings;
QStringList workspaceHistory; QStringList workspaceHistory;
#ifndef BRIDGE_ENABLED
QString projectName;
QString currentWorkspace;
QString repositoryFile;
const QString & getRepositoryFile() const { return repositoryFile; }
void setRepositoryFile(const QString &filename) { repositoryFile = filename; }
const QString & getProjectName() const { return projectName; }
#else
MainWinUICallback uiCallback; MainWinUICallback uiCallback;
Bridge bridge; Bridge bridge;
const QString & getProjectName() const { return bridge.getProjectName(); } const QString & getProjectName() const { return bridge.getProjectName(); }
const QString & getRepositoryFile() const { return bridge.getRepositoryFile(); } const QString & getRepositoryFile() const { return bridge.getRepositoryFile(); }
void setRepositoryFile(const QString &filename) { bridge.setRepositoryFile(filename); } void setRepositoryFile(const QString &filename) { bridge.setRepositoryFile(filename); }
#endif
ViewMode viewMode; ViewMode viewMode;
stringset_t selectedDirs; // The directory selected in the tree stringset_t selectedDirs; // The directory selected in the tree