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

Also Include "Latest Revision" to the version list of updateRevision

Browse Source 
FossilOrigin-Name: e4ee91a2c5ca3e29c020cc31e2e018e69ff76b16
This commit is contained in:
Kostas 2015-08-27 14:43:06 +00:00
parent be6b875dc6
commit be1381e9c7
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Added\slong\soperation\stermination\sbutton\son\sstatus\sbar\nMore\srobust\sprocess\stermination\nFolded\sthe\sAbort\sshortcut\sinto\sa\sQAction\n C Also\sInclude\s"Latest\sRevision"\sto\sthe\sversion\slist\sof\supdateRevision\n
D 2015-08-27T14:30:44.033 D 2015-08-27T14:43:06.142
F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76 F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
@ -232,7 +232,7 @@ F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac
F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp 751deebc3a887701fb1712dfb10563537d7de14e F src/MainWindow.cpp 461a0ef941ae50c567c039ad1d60c69321c7e3df
F src/MainWindow.h fd8bb12f0bf49a6cb5ce9b875ad5277426380e3f F src/MainWindow.h fd8bb12f0bf49a6cb5ce9b875ad5277426380e3f
F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3 F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3
F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@ -261,7 +261,7 @@ F ui/MainWindow.ui ad04643d071fe513b46ef413749a493909a90ad1
F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5 F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
P ee09b7f597c4ab4b81a24c281ab33893f3c20ed6 P ea4b656b8237af73b81e6b22fd4c451a51450d2d
R 045e3d666e9e7764e0e5696cec816ce6 R aad03cdd877a499269b73777cb90716a
U Kostas U Kostas
Z 446f655f3a22f719427b796cf499616e Z 5479aafd66cafb08fd77bc06441f49bf

2
manifest.uuid
View File

@ -1 +1 @@
ea4b656b8237af73b81e6b22fd4c451a51450d2d e4ee91a2c5ca3e29c020cc31e2e018e69ff76b16

12
src/MainWindow.cpp
View File

@ -24,8 +24,6 @@
#include "AboutDialog.h" #include "AboutDialog.h"
#include "Utils.h" #include "Utils.h"
#define REVISION_LATEST "Latest revision"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
enum enum
{ {
@ -2537,14 +2535,19 @@ QMessageBox::StandardButton MainWindow::MainWinUICallback::Query(const QString &
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void MainWindow::updateRevision(const QString &revision) void MainWindow::updateRevision(const QString &revision)
{ {
const QString latest = tr(REVISION_LATEST); const QString latest = tr("<Latest Revision>");
QString defaultval = latest; QString defaultval = latest;
if(!revision.isEmpty()) if(!revision.isEmpty())
defaultval = revision; defaultval = revision;
QString selected_revision = RevisionDialog::runUpdate(this, tr("Update workspace"), versionList, defaultval).trimmed(); // Also include our "Latest Revision" to the version list
QStringList versions = versionList;
versions.push_front(latest);
QString selected_revision = RevisionDialog::runUpdate(this, tr("Update workspace"), versions, defaultval).trimmed();
// Nothing selected ?
if(selected_revision.isEmpty()) if(selected_revision.isEmpty())
return; return;
else if(selected_revision == latest) else if(selected_revision == latest)
@ -2564,6 +2567,7 @@ void MainWindow::updateRevision(const QString &revision)
QStringMap kv; QStringMap kv;
ParseProperties(kv, res, ':'); ParseProperties(kv, res, ':');
// If no changes exit // If no changes exit
if(kv.contains("changes") && kv["changes"].indexOf("None.")!=-1) if(kv.contains("changes") && kv["changes"].indexOf("None.")!=-1)
return; return;