# HG changeset patch # User Chris Cannam # Date 1298312429 0 # Node ID fc9d411ff6e722472cc6801cea3492e1e7ba534a # Parent 7b4f42cfc596320855f7a2544fc6c1b366432324 Fix some breakages from prior merge commit (oops); make merge result use more-information dialog diff -r 7b4f42cfc596 -r fc9d411ff6e7 mainwindow.cpp --- a/mainwindow.cpp Mon Feb 21 18:17:18 2011 +0000 +++ b/mainwindow.cpp Mon Feb 21 18:20:29 2011 +0000 @@ -1599,7 +1599,7 @@ } else if (n == 0) { head = tr("No changes to push"); report = tr("The remote repository already contains all changes that have been committed locally."); - if (hgTabs->canCommit()) { + if (m_hgTabs->canCommit()) { report = tr("%1

You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.").arg(report); } } else { @@ -1627,8 +1627,6 @@ } m_runner->hide(); - runner->hide(); - MoreInformationDialog::information(this, tr("Pull complete"), head, report, output); } @@ -1877,7 +1875,7 @@ (this, tr("Clone"), tr("Clone successful"), - tr("The remote repository

%1
was successfully cloned to the local folder
%2
.").arg(remoteRepoPath).arg(workFolderPath), + tr("The remote repository
%1
was successfully cloned to the local folder
%2
.").arg(m_remoteRepoPath).arg(m_workFolderPath), output); enableDisableActions(); m_shouldHgStat = true; @@ -1986,8 +1984,10 @@ break; case ACT_MERGE: - //!!! use format3? - QMessageBox::information(this, tr("Merge"), tr("

Merge successful

%1
").arg(xmlEncode(output))); + MoreInformationDialog::information + (this, tr("Merge"), tr("Merge successful"), + tr("The merge succeeded. Remember to commit the result!"), + output); m_shouldHgStat = true; m_justMerged = true; break;