comparison mainwindow.cpp @ 299:fd6abd505f31

Font adjustment for pull/push confirm dialogs. Better, though the extra text will still be too small on OS/X
author Chris Cannam
date Tue, 22 Feb 2011 15:32:00 +0000
parents fd9dc5a457d8
children 5e4a10af7945
comparison
equal deleted inserted replaced
298:fd9dc5a457d8 299:fd6abd505f31
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 tr("Pull from remote repository?"), 863 tr("<qt><h3>Pull from remote repository?</h3></qt>"),
864 tr("<qt>You are about to pull changes from the repository at <code>%1</code></qt>").arg(xmlEncode(m_remoteRepoPath)), 864 tr("<qt><p>You are about to pull changes from the remote repository at <code>%1</code>.</p></qt>").arg(xmlEncode(m_remoteRepoPath)),
865 tr("Pull"))) { 865 tr("Pull"))) {
866 866
867 QStringList params; 867 QStringList params;
868 params << "pull" << m_remoteRepoPath; 868 params << "pull" << m_remoteRepoPath;
869 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params)); 869 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params));
872 872
873 void MainWindow::hgPush() 873 void MainWindow::hgPush()
874 { 874 {
875 if (ConfirmCommentDialog::confirm 875 if (ConfirmCommentDialog::confirm
876 (this, tr("Confirm push"), 876 (this, tr("Confirm push"),
877 tr("Push to remote repository?"), 877 tr("<qt><h3>Push to remote repository?</h3></qt>"),
878 tr("<qt>You are about to push your changes to the repository at <code>%1</code>").arg(xmlEncode(m_remoteRepoPath)), 878 tr("<qt><p>You are about to push your changes to the remote repository at <code>%1</code>.</p></qt>").arg(xmlEncode(m_remoteRepoPath)),
879 tr("Push"))) { 879 tr("Push"))) {
880 880
881 QStringList params; 881 QStringList params;
882 params << "push" << "--new-branch" << m_remoteRepoPath; 882 params << "push" << "--new-branch" << m_remoteRepoPath;
883 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params)); 883 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params));