comparison mainwindow.cpp @ 298:fd9dc5a457d8

* Make "More Details" button non-auto-default in more-info dialog * Make Incoming dialog show same message as in Pull dialog when no changes are pending * Try to make the confirm-push/pull dialogs look more in-keeping on OS/X... but mostly we end up making their text too small. Hmm.
author Chris Cannam
date Tue, 22 Feb 2011 15:12:56 +0000
parents 01a471e9cbe3
children fd6abd505f31
comparison
equal deleted inserted replaced
295:01a471e9cbe3 298:fd9dc5a457d8
858 858
859 void MainWindow::hgPull() 859 void MainWindow::hgPull()
860 { 860 {
861 if (ConfirmCommentDialog::confirm 861 if (ConfirmCommentDialog::confirm
862 (this, tr("Confirm pull"), 862 (this, tr("Confirm pull"),
863 format3(tr("Pull from remote repository?"), 863 tr("Pull from remote repository?"),
864 tr("You are about to pull changes from the following remote repository:"), 864 tr("<qt>You are about to pull changes from the repository at <code>%1</code></qt>").arg(xmlEncode(m_remoteRepoPath)),
865 m_remoteRepoPath),
866 tr("Pull"))) { 865 tr("Pull"))) {
867 866
868 QStringList params; 867 QStringList params;
869 params << "pull" << m_remoteRepoPath; 868 params << "pull" << m_remoteRepoPath;
870 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params)); 869 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params));
873 872
874 void MainWindow::hgPush() 873 void MainWindow::hgPush()
875 { 874 {
876 if (ConfirmCommentDialog::confirm 875 if (ConfirmCommentDialog::confirm
877 (this, tr("Confirm push"), 876 (this, tr("Confirm push"),
878 format3(tr("Push to remote repository?"), 877 tr("Push to remote repository?"),
879 tr("You are about to push your changes to the following remote repository:"), 878 tr("<qt>You are about to push your changes to the repository at <code>%1</code>").arg(xmlEncode(m_remoteRepoPath)),
880 m_remoteRepoPath),
881 tr("Push"))) { 879 tr("Push"))) {
882 880
883 QStringList params; 881 QStringList params;
884 params << "push" << "--new-branch" << m_remoteRepoPath; 882 params << "push" << "--new-branch" << m_remoteRepoPath;
885 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params)); 883 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params));