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

Cleanups

Browse Source 
FossilOrigin-Name: c179d505cea29fe7e6b9c1b149bbd46eb6a0b009
This commit is contained in:
kostas 2015-05-03 14:52:59 +00:00
parent 234f27302c
commit 1a395023d4
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@ -1,5 +1,5 @@
C Renamed\sUpdateDialog\sto\sRevisionDialog
D 2015-05-03T14:47:53.844
C Cleanups
D 2015-05-03T14:52:59.139
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -200,10 +200,10 @@ F src/Fossil.cpp f27b97eaf068275a0e8558dd2b739f9c7b61774a
F src/Fossil.h f9b49ed930af2159f97a86ce0f6da821a0b0819e
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp d430100fd7dce89899830505869d30d7fe78c80d
F src/MainWindow.cpp bf2fb9a33bd5e3b3018d6eebcce0dcdd6817f38e
F src/MainWindow.h e6797adc543fd07a117a4eacc202fb166ec6665a
F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c w src/UpdateDialog.cpp
F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 w src/UpdateDialog.h
F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c
F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/Utils.cpp 748a58f19187aff7f3b867894129291cbe091678
@ -218,9 +218,9 @@ F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd w ui/UpdateDialog.ui
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P 71aeb47a33d20919a71efc23d973c5f6a3c3bb90
R f78244cea8d27d8c7919d636f9f5d003
P 9704609d5e9ccbadfce2ed96e74893f97e453e0f
R 504f4c50865a254bc523ba40c7e39978
U kostas
Z 077b53fc9177948b0f7f836370f27e76
Z 5d7c10b74310a360858f5d60d0e3715c

2
manifest.uuid
View File

@ -1 +1 @@
9704609d5e9ccbadfce2ed96e74893f97e453e0f
c179d505cea29fe7e6b9c1b149bbd46eb6a0b009

16
src/MainWindow.cpp
View File

@ -19,8 +19,7 @@
#include "RevisionDialog.h"
#include "Utils.h"
#define LATEST_VERSION "Latest Revision"
#define CURRENT_VERSION "Current Revision"
#define REVISION_LATEST "Latest"
//-----------------------------------------------------------------------------
enum
@ -2214,7 +2213,7 @@ QMessageBox::StandardButton MainWindow::MainWinUICallback::Query(const QString &
//------------------------------------------------------------------------------
void MainWindow::updateRevision(const QString &revision)
{
const QString latest = tr(LATEST_VERSION);
const QString latest = tr(REVISION_LATEST);
QString defaultval = latest;
if(!revision.isEmpty())
@ -2233,7 +2232,6 @@ void MainWindow::updateRevision(const QString &revision)
if(!fossil().updateRepository(res, selected_revision, true))
return;
// FIXME: parse "changes: None. Already up-to-date" and avoid dialog
if(res.length()==0)
return;
@ -2309,10 +2307,8 @@ void MainWindow::on_actionNewBranch_triggered()
if(!fossil().branchNew(branch_name, revision, false))
return;
if(QMessageBox::Yes == DialogQuery(this, tr("New Branch"), tr("Would you like to check-out the branch '%0' ?").arg(branch_name)))
updateRevision(branch_name);
else
refresh();
// Update to this branch.
updateRevision(branch_name);
}
//------------------------------------------------------------------------------
void MainWindow::MergeRevision(const QString &defaultRevision)
@ -2322,7 +2318,7 @@ void MainWindow::MergeRevision(const QString &defaultRevision)
bool integrate = false;
bool force = false;
revision = RevisionDialog::runMerge(this, tr("Merge"), versionList, revision, integrate, force);
revision = RevisionDialog::runMerge(this, tr("Merge Branch"), versionList, revision, integrate, force);
if(revision.isEmpty())
return;
@ -2331,7 +2327,7 @@ void MainWindow::MergeRevision(const QString &defaultRevision)
if(!fossil().branchMerge(res, revision, integrate, force, true))
return;
if(!FileActionDialog::run(this, tr("Merge"), tr("The following changesd will be made.")+"\n"+tr("Are you sure?"), res))
if(!FileActionDialog::run(this, tr("Merge"), tr("The following changes will be applied.")+"\n"+tr("Are you sure?"), res))
return;
// Do update