comparison mainwindow.cpp @ 309:978b8c03118a

Make a further couple of dialogs use MoreInformationDialog
author Chris Cannam
date Mon, 28 Feb 2011 14:31:57 +0000
parents 7708149d252a
children b8ed12c2035f
comparison
equal deleted inserted replaced
305:7708149d252a 309:978b8c03118a
1718 tr("The Mercurial program either could not be found or failed to run.<br>Check that the Mercurial program path is correct in %1.").arg(setstr), 1718 tr("The Mercurial program either could not be found or failed to run.<br>Check that the Mercurial program path is correct in %1.").arg(setstr),
1719 output); 1719 output);
1720 settings(); 1720 settings();
1721 return; 1721 return;
1722 case ACT_TEST_HG_EXT: 1722 case ACT_TEST_HG_EXT:
1723 QMessageBox::warning 1723 MoreInformationDialog::warning
1724 (this, 1724 (this,
1725 tr("Failed to run Mercurial"), 1725 tr("Failed to run Mercurial"),
1726 tr("Failed to run Mercurial with extension enabled"), 1726 tr("Failed to run Mercurial with extension enabled"),
1727 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem with EasyMercurial.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication may not work if you do this.").arg(setstr), 1727 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem with EasyMercurial.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication may not work if you do this.").arg(setstr),
1728 output); 1728 output);
1769 if (command == "") command = "hg"; 1769 if (command == "") command = "hg";
1770 foreach (QString arg, action.params) { 1770 foreach (QString arg, action.params) {
1771 command += " " + arg; 1771 command += " " + arg;
1772 } 1772 }
1773 1773
1774 //!!! 1774 MoreInformationDialog::warning
1775 1775 (this,
1776 QString message = tr("<qt><h3>Command failed</h3>" 1776 tr("Command failed"),
1777 "<p>The following command failed:</p>" 1777 tr("Command failed"),
1778 "<code>%1</code>" 1778 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See &ldquo;More Details&rdquo; for the command output."),
1779 "%2</qt>") 1779 output);
1780 .arg(command)
1781 .arg((output.trimmed() != "") ?
1782 tr("<p>Its output said:</p><code>%1</code>")
1783 .arg(xmlEncode(output.left(800))
1784 .replace("\n", "<br>"))
1785 : "");
1786
1787 QMessageBox::warning(this, tr("Command failed"), message);
1788 } 1780 }
1789 1781
1790 void MainWindow::commandCompleted(HgAction completedAction, QString output) 1782 void MainWindow::commandCompleted(HgAction completedAction, QString output)
1791 { 1783 {
1792 restoreFileSystemWatcher(); 1784 restoreFileSystemWatcher();