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

Moved UICallback and ScopedCallback to Utils

Browse Source 
FossilOrigin-Name: 717fb7a390f81af33ad40913960a30ff9c1c7a75
This commit is contained in:
kostas 2015-04-30 11:43:31 +00:00
parent 9dff9370ce
commit dbfc4f10da
8 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifest
View File

@ -1,5 +1,5 @@
C Added\smissing\sWorkspace.cpp/h
D 2015-04-30T11:37:04.334
C Moved\sUICallback\sand\sScopedCallback\sto\sUtils
D 2015-04-30T11:43:31.832
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 96aca0460c87ec2cdd154527a0583a00309ebcea
F src/Bridge.h 9a3a3a52eb64c673a9dedac1d5d15a44aac71bc7
F src/Bridge.cpp 5e67a6fd18dd3fdbc7f94addb47f1a8e50064318
F src/Bridge.h cc0d0128e2d286aa7d578d1213bed100ee4c458e
F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
F src/CloneDialog.cpp 4fc5aa8146ac63ba6ba7341b1635b3025819d708
@ -201,13 +201,13 @@ F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp f6ffb8c6d1283a812084094426d51a5ea601fa35
F src/MainWindow.h a10364f15b68ca12a8ed7a48ac35dd4da3645e28
F src/MainWindow.h d91eda93c4b0ad4de12cfe8e0f069639f1842e95
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca
F src/Utils.h 48ca8ab324068df2bf5120c961216c297b94cb45
F src/Workspace.cpp dd657ecc61161e2a14e821424a76220cfd4ca8ce
F src/Workspace.h fa11507567ee6dc336e19d18dd9574da4823ae2f
F src/Utils.h 8ad68bd227bd999eb6ea92a70bb4be2d6788d912
F src/Workspace.cpp a1ca37e803d6bccb9ddf1f80df66148438e6ea21
F src/Workspace.h 515d6ded914dd8be10a611ebbb0e9befc8d64174
F src/main.cpp 2ac8badc2a63fa123ceae53382ce24cfe1b5a54b
F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
@ -217,7 +217,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P 8527bab97be43b2370eb03045dee3818fa8a2edf
R a0658af9a44eb2edc8f67837992ca8ff
P 2e7553cddf1db1c9e22e883276829a8032dc9afb
R 20e7fdb7267d96eb9c994d7779618370
U kostas
Z c61114eaf068b6a2a510be12e212e0db
Z e23a9cc7623bde69f6e9e851375dd322

2
manifest.uuid
View File

@ -1 +1 @@
2e7553cddf1db1c9e22e883276829a8032dc9afb
717fb7a390f81af33ad40913960a30ff9c1c7a75

24
src/Bridge.cpp
View File

@ -14,29 +14,7 @@ static const unsigned char UTF8_BOM[] = { 0xEF, 0xBB, 0xBF };
// 19: [5c46757d4b9765] on 2012-04-22 04:41:15
static const QRegExp REGEX_STASH("\\s*(\\d+):\\s+\\[(.*)\\] on (\\d+)-(\\d+)-(\\d+) (\\d+):(\\d+):(\\d+)", Qt::CaseInsensitive);
#define FOSSIL_CHECKOUT1 "_FOSSIL_"
#define FOSSIL_CHECKOUT2 ".fslckout"
#define FOSSIL_EXT "fossil"
///////////////////////////////////////////////////////////////////////////////
class ScopedFossilStatus
{
public:
ScopedFossilStatus(Bridge::UICallback *callback, const QString &text) : uiCallback(callback)
{
uiCallback->beginProcess(text);
}
~ScopedFossilStatus()
{
uiCallback->endProcess();
}
private:
Bridge::UICallback *uiCallback;
};
//------------------------------------------------------------------------------
RepoStatus Bridge::getRepoStatus()
{
QStringList res;
@ -499,7 +477,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
QString status_msg = QObject::tr("Running Fossil");
if(args.length() > 0)
status_msg = QString("Fossil %0").arg(args[0].toCaseFolded());
ScopedFossilStatus status(uiCallback, status_msg);
ScopedStatus status(uiCallback, status_msg);
// Generate args file
const QStringList *final_args = &args;

13
src/Bridge.h
View File

@ -5,7 +5,7 @@ class QStringList;
#include <QString>
#include <QObject>
#include <QProcess>
#include <QMessageBox>
#include "Utils.h"
typedef QMap<QString, QString> stashmap_t;
@ -30,17 +30,6 @@ enum RepoStatus
class Bridge
{
public:
class UICallback
{
public:
virtual void logText(const QString &text, bool isHTML)=0;
virtual void beginProcess(const QString &text)=0;
virtual void updateProcess(const QString &text)=0;
virtual void endProcess()=0;
virtual QMessageBox::StandardButton Query(const QString &title, const QString &query, QMessageBox::StandardButtons buttons)=0;
};
Bridge()
: operationAborted(false)
, uiCallback(0)

2
src/MainWindow.h
View File

@ -116,7 +116,7 @@ private slots:
void on_tableView_customContextMenuRequested(const QPoint &pos);
private:
class MainWinUICallback : public Bridge::UICallback
class MainWinUICallback : public UICallback
{
public:
MainWinUICallback() : mainWindow(0)

27
src/Utils.h
View File

@ -18,5 +18,32 @@ QStringList QuotePaths(const QStringList &paths);
bool ShowExplorerMenu(HWND hwnd, const QString &path, const QPoint &qpoint);
#endif
class UICallback
{
public:
virtual void logText(const QString &text, bool isHTML)=0;
virtual void beginProcess(const QString &text)=0;
virtual void updateProcess(const QString &text)=0;
virtual void endProcess()=0;
virtual QMessageBox::StandardButton Query(const QString &title, const QString &query, QMessageBox::StandardButtons buttons)=0;
};
class ScopedStatus
{
public:
ScopedStatus(UICallback *callback, const QString &text) : uiCallback(callback)
{
uiCallback->beginProcess(text);
}
~ScopedStatus()
{
uiCallback->endProcess();
}
private:
UICallback *uiCallback;
};
#endif // UTILS_H

4
src/Workspace.cpp
View File

@ -20,7 +20,7 @@ void Workspace::clearState()
}
//------------------------------------------------------------------------------
bool Workspace::scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool &abort, Bridge::UICallback &uiCallback)
bool Workspace::scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool &abort, UICallback &uiCallback)
{
QDir dir(dirPath);
@ -53,7 +53,7 @@ bool Workspace::scanDirectory(QFileInfoList &entries, const QString& dirPath, co
}
//------------------------------------------------------------------------------
void Workspace::scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QString &ignoreGlob, Bridge::UICallback &uiCallback, bool &operationAborted)
void Workspace::scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QString &ignoreGlob, UICallback &uiCallback, bool &operationAborted)
{
// Scan all workspace files
QFileInfoList all_files;

7
src/Workspace.h
View File

@ -6,11 +6,10 @@
#include <QDir>
#include <QSet>
#include <QMap>
#include "Bridge.h"
//////////////////////////////////////////////////////////////////////////
// RepoFile
// WorkspaceFile
//////////////////////////////////////////////////////////////////////////
struct WorkspaceFile
{
@ -111,8 +110,8 @@ public:
Bridge & fossil() { return bridge; }
const Bridge & fossil() const { return bridge; }
static bool scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool& abort, Bridge::UICallback &uiCallback);
void scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QString &ignoreGlob, Bridge::UICallback &uiCallback, bool &operationAborted);
static bool scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool& abort, UICallback &uiCallback);
void scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QString &ignoreGlob, UICallback &uiCallback, bool &operationAborted);
QStandardItemModel &getFileModel() { return repoFileModel; }
QStandardItemModel &getDirModel() { return repoDirModel; }