Mercurial > hg > easyhg
comparison mainwindow.cpp @ 194:5ca49523892f
* Fixes to dialog return code handling
author | Chris Cannam |
---|---|
date | Mon, 20 Dec 2010 22:39:45 +0000 |
parents | ef5feb0d648f |
children | ff0d76dcb3b8 |
comparison
equal
deleted
inserted
replaced
193:ef5feb0d648f | 194:5ca49523892f |
---|---|
770 if (ConfirmCommentDialog::confirm | 770 if (ConfirmCommentDialog::confirm |
771 (this, tr("Confirm pull"), | 771 (this, tr("Confirm pull"), |
772 format3(tr("Confirm pull from remote repository"), | 772 format3(tr("Confirm pull from remote repository"), |
773 tr("You are about to pull changes from the following remote repository:"), | 773 tr("You are about to pull changes from the following remote repository:"), |
774 remoteRepoPath), | 774 remoteRepoPath), |
775 tr("Pull")) == QMessageBox::Ok) { | 775 tr("Pull"))) { |
776 | 776 |
777 QStringList params; | 777 QStringList params; |
778 params << "pull" << remoteRepoPath; | 778 params << "pull" << remoteRepoPath; |
779 runner->requestAction(HgAction(ACT_PULL, workFolderPath, params)); | 779 runner->requestAction(HgAction(ACT_PULL, workFolderPath, params)); |
780 } | 780 } |
785 if (ConfirmCommentDialog::confirm | 785 if (ConfirmCommentDialog::confirm |
786 (this, tr("Confirm push"), | 786 (this, tr("Confirm push"), |
787 format3(tr("Confirm push to remote repository"), | 787 format3(tr("Confirm push to remote repository"), |
788 tr("You are about to push your changes to the following remote repository:"), | 788 tr("You are about to push your changes to the following remote repository:"), |
789 remoteRepoPath), | 789 remoteRepoPath), |
790 tr("Push")) == QMessageBox::Ok) { | 790 tr("Push"))) { |
791 | 791 |
792 QStringList params; | 792 QStringList params; |
793 params << "push" << "--new-branch" << remoteRepoPath; | 793 params << "push" << "--new-branch" << remoteRepoPath; |
794 runner->requestAction(HgAction(ACT_PUSH, workFolderPath, params)); | 794 runner->requestAction(HgAction(ACT_PUSH, workFolderPath, params)); |
795 } | 795 } |