| 1514 | } |
| 1515 | |
| 1516 | bool KDiff3App::canContinue() |
| 1517 | { |
| 1518 | // First test if anything must be saved. |
| 1519 | if(m_bOutputModified) |
| 1520 | { |
| 1521 | qint32 result = Compat::warningTwoActionsCancel(this, |
| 1522 | i18n("The merge result has not been saved."), |
| 1523 | i18nc("Error dialog title", "Warning"), |
| 1524 | KGuiItem(i18n("Save && Continue")), |
| 1525 | KGuiItem(i18n("Continue Without Saving"))); |
| 1526 | if(result == KMessageBox::Cancel) |
| 1527 | return false; |
| 1528 | else if(result == Compat::PrimaryAction) |
| 1529 | { |
| 1530 | slotFileSave(); |
| 1531 | if(m_bOutputModified) |
| 1532 | { |
| 1533 | KMessageBox::error(this, i18n("Saving the merge result failed."), i18nc("Error dialog title", "Warning")); |
| 1534 | return false; |
| 1535 | } |
| 1536 | } |
| 1537 | } |
| 1538 | |
| 1539 | m_bOutputModified = false; |
| 1540 | return true; |
| 1541 | } |
| 1542 | |
| 1543 | void KDiff3App::slotDirShowBoth() |
| 1544 | { |
no test coverage detected