Mercurial > hg > easyhg-kdiff3
changeset 103:1b9430d5cf2b
Separate deltas if only one is of type where B==C
| author | joachim99 |
|---|---|
| date | Sun, 28 Nov 2010 16:44:56 +0000 |
| parents | 4bac4535ea7f |
| children | 3d87e427431d |
| files | kdiff3/src-QT4/main.cpp kdiff3/src-QT4/mergeresultwindow.cpp kdiff3/src-QT4/pdiff.cpp kdiff3/src-QT4/version.h |
| diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src-QT4/main.cpp Thu Sep 02 20:27:45 2010 +0000 +++ b/kdiff3/src-QT4/main.cpp Sun Nov 28 16:44:56 2010 +0000 @@ -162,7 +162,7 @@ const KLocalizedString i18nName = ki18n("kdiff3"); const QByteArray& appVersion = QByteArray( VERSION ); const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories"); - const KLocalizedString copyright = ki18n("(c) 2002-2009 Joachim Eibl"); + const KLocalizedString copyright = ki18n("(c) 2002-2010 Joachim Eibl"); const QByteArray& homePage = "http://kdiff3.sourceforge.net/"; const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de"; KAboutData aboutData( appName, appCatalog, i18nName,
--- a/kdiff3/src-QT4/mergeresultwindow.cpp Thu Sep 02 20:27:45 2010 +0000 +++ b/kdiff3/src-QT4/mergeresultwindow.cpp Sun Nov 28 16:44:56 2010 +0000 @@ -286,7 +286,9 @@ } else return ( - !ml1.bConflict && !ml2.bConflict && ml1.bDelta && ml2.bDelta && ml1.srcSelect == ml2.srcSelect || + !ml1.bConflict && !ml2.bConflict && ml1.bDelta && ml2.bDelta && ml1.srcSelect == ml2.srcSelect + && (ml1.mergeDetails==ml2.mergeDetails || ml1.mergeDetails!=eBCAddedAndEqual && ml2.mergeDetails!=eBCAddedAndEqual ) + || !ml1.bDelta && !ml2.bDelta ); }
--- a/kdiff3/src-QT4/pdiff.cpp Thu Sep 02 20:27:45 2010 +0000 +++ b/kdiff3/src-QT4/pdiff.cpp Sun Nov 28 16:44:56 2010 +0000 @@ -771,6 +771,10 @@ sizes[0]=total/2; sizes[1]=total/2; pVSplitter->setSizes( sizes ); + QList<int> hSizes; + hSizes << 1 << 1 << 1; + m_pDiffWindowSplitter->setSizes( hSizes ); + m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking