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

Bridge now longer derives from QObject

Browse Source 
FossilOrigin-Name: 0017b55685a3fe99a72757e9f6a8c3c261612413
This commit is contained in:
kostas 2015-04-27 19:59:29 +00:00
parent 2eb430b6e1
commit a661606572
5 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@ -1,5 +1,5 @@
C Bridge\sno\slonger\sneeds\sdepends\son\sthe\sUI.\sAll\sinteraction\soccurs\svia\sthe\scallback\nMore\scleanups C Bridge\snow\slonger\sderives\sfrom\sQObject\n
D 2015-04-27T19:54:01.466 D 2015-04-27T19:59:29.459
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -184,8 +184,8 @@ F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038 F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f
F src/Bridge.cpp a0661a0a68799140c7e0d9b185e64c266c882c98 F src/Bridge.cpp 7f84e6b1ba2e2807a067aba0e16c4c62cdc00dff
F src/Bridge.h 33cea48e72c4c1a8dc8bd41c0bdd972454ca9240 F src/Bridge.h 545b83b2137290f3b514e12f5481a677e29bb6f0
F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539 F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539
@ -200,7 +200,7 @@ 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 5a66bf80a0af7c2f1255a7e567f108466dd4eba8 F src/MainWindow.cpp 6a6a3ad412ec3c2c32ec1ff0c650979b85c770f4
F src/MainWindow.h c593f74f3b7d0b8f6d29288c6badd6b350fcb25f F src/MainWindow.h c593f74f3b7d0b8f6d29288c6badd6b350fcb25f
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
@ -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 c5b0a1a62a9607f434ac6426401fd40c94d6a2d8 P 3d1e269fee5acd4b65025024f701319c3e993e97
R f57a18f9cee5453e9453dfa80c854856 R c371a4175aab68d369af5a0cabed7310
U kostas U kostas
Z 7bfd61383d77ec4c7853ed5119f2785e Z 9e900d838d9caa3f99048fed896a33a5

2
manifest.uuid
View File

@ -1 +1 @@
3d1e269fee5acd4b65025024f701319c3e993e97 0017b55685a3fe99a72757e9f6a8c3c261612413

14
src/Bridge.cpp
View File

@ -496,7 +496,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
return QProcess::startDetached(fossil, args, wkdir); return QProcess::startDetached(fossil, args, wkdir);
// Make status message // Make status message
QString status_msg = tr("Running Fossil"); QString status_msg = QObject::tr("Running Fossil");
if(args.length() > 0) if(args.length() > 0)
status_msg = QString("Fossil %0").arg(args[0].toCaseFolded()); status_msg = QString("Fossil %0").arg(args[0].toCaseFolded());
ScopedFossilStatus status(uiCallback, status_msg); ScopedFossilStatus status(uiCallback, status_msg);
@ -506,7 +506,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
QTemporaryFile args_file; QTemporaryFile args_file;
if(!args_file.open()) if(!args_file.open())
{ {
log(tr("Could not generate command line file")); log(QObject::tr("Could not generate command line file"));
return false; return false;
} }
@ -537,7 +537,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
process.start(fossil, *final_args); process.start(fossil, *final_args);
if(!process.waitForStarted()) if(!process.waitForStarted())
{ {
log(tr("Could not start Fossil executable '%0'").arg(fossil)+"\n"); log(QObject::tr("Could not start Fossil executable '%0'").arg(fossil)+"\n");
return false; return false;
} }
const QChar EOL_MARK('\n'); const QChar EOL_MARK('\n');
@ -574,7 +574,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi
if(abortOperation) if(abortOperation)
{ {
log("\n* "+tr("Terminated")+" *\n"); log("\n* "+QObject::tr("Terminated")+" *\n");
#ifdef Q_OS_WIN // Verify this is still true on Qt5 #ifdef Q_OS_WIN // Verify this is still true on Qt5
process.kill(); // QT on windows cannot terminate console processes with QProcess::terminate process.kill(); // QT on windows cannot terminate console processes with QProcess::terminate
#else #else
@ -801,7 +801,7 @@ bool Bridge::startUI(const QString &httpPort)
{ {
if(uiRunning()) if(uiRunning())
{ {
log(tr("Fossil UI is already running")+"\n"); log(QObject::tr("Fossil UI is already running")+"\n");
return true; return true;
} }
@ -812,14 +812,14 @@ bool Bridge::startUI(const QString &httpPort)
fossilUI.setWorkingDirectory(getCurrentWorkspace()); fossilUI.setWorkingDirectory(getCurrentWorkspace());
log("<b>&gt; fossil ui</b><br>", true); log("<b>&gt; fossil ui</b><br>", true);
log(tr("Starting Fossil browser UI. Please wait.")+"\n"); log(QObject::tr("Starting Fossil browser UI. Please wait.")+"\n");
QString fossil = getFossilPath(); QString fossil = getFossilPath();
fossilUI.start(fossil, QStringList() << "server" << "--localauth" << "-P" << httpPort ); fossilUI.start(fossil, QStringList() << "server" << "--localauth" << "-P" << httpPort );
if(!fossilUI.waitForStarted() || fossilUI.state()!=QProcess::Running) if(!fossilUI.waitForStarted() || fossilUI.state()!=QProcess::Running)
{ {
log(tr("Could not start Fossil executable '%s'").arg(fossil)+"\n"); log(QObject::tr("Could not start Fossil executable '%s'").arg(fossil)+"\n");
return false; return false;
} }

17
src/Bridge.h
View File

@ -27,7 +27,7 @@ enum RepoStatus
REPO_OLD_SCHEMA REPO_OLD_SCHEMA
}; };
class Bridge : public QObject class Bridge
{ {
public: public:
class UICallback class UICallback
@ -41,17 +41,16 @@ public:
Bridge() Bridge()
: QObject(0) : abortOperation(false)
, abortOperation(false)
, uiCallback(0) , uiCallback(0)
{ {
} }
void Init(UICallback *callback, const QString &fossPath, const QString &workspace) void Init(UICallback *callback)
{ {
uiCallback = callback; uiCallback = callback;
fossilPath = fossPath; fossilPath.clear();
currentWorkspace = workspace; currentWorkspace.clear();
} }
bool runFossil(const QStringList &args, QStringList *output=0, int runFlags=RUNFLAGS_NONE); bool runFossil(const QStringList &args, QStringList *output=0, int runFlags=RUNFLAGS_NONE);
@ -94,7 +93,8 @@ public:
bool pushRepository(); bool pushRepository();
bool pullRepository(); bool pullRepository();
bool cloneRepository(const QString &repository, const QUrl &url, const QUrl &proxyUrl); bool cloneRepository(const QString &repository, const QUrl &url, const QUrl &proxyUrl);
bool undoRepository(QStringList& result, bool explainOnly);
bool updateRepository(QStringList& result, bool explainOnly);
bool getFossilVersion(QString &version); bool getFossilVersion(QString &version);
bool uiRunning() const; bool uiRunning() const;
@ -108,8 +108,6 @@ public:
bool removeFiles(const QStringList& fileList, bool deleteLocal); bool removeFiles(const QStringList& fileList, bool deleteLocal);
bool revertFiles(const QStringList& fileList); bool revertFiles(const QStringList& fileList);
bool renameFile(const QString& beforePath, const QString& afterPath, bool renameLocal); 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); bool getFossilSettings(QStringList& result);
bool setFossilSetting(const QString &name, const QString &value, bool global); bool setFossilSetting(const QString &name, const QString &value, bool global);
bool setRemoteUrl(const QString &url); bool setRemoteUrl(const QString &url);
@ -136,7 +134,6 @@ private:
QString fossilPath; // The value from the settings QString fossilPath; // The value from the settings
QString repositoryFile; QString repositoryFile;
QString projectName; QString projectName;
QProcess fossilUI; QProcess fossilUI;
}; };

2
src/MainWindow.cpp
View File

@ -190,7 +190,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
uiCallback.init(this); uiCallback.init(this);
// Need to be before applySettings which sets the last workspace // Need to be before applySettings which sets the last workspace
bridge.Init(&uiCallback, "", ""); bridge.Init(&uiCallback);
applySettings(); applySettings();