| 1583 | } |
| 1584 | |
| 1585 | void DirectoryMergeWindow::onDoubleClick(const QModelIndex& mi) |
| 1586 | { |
| 1587 | if(!mi.isValid()) |
| 1588 | return; |
| 1589 | |
| 1590 | d->m_bSimulatedMergeStarted = false; |
| 1591 | if(d->m_bDirectoryMerge) |
| 1592 | mergeCurrentFile(); |
| 1593 | else |
| 1594 | compareCurrentFile(); |
| 1595 | } |
| 1596 | |
| 1597 | void DirectoryMergeWindow::currentChanged(const QModelIndex& current, const QModelIndex& previous) |
| 1598 | { |