Mercurial > hg > easyhg-kdiff3
changeset 106:61d74c8be938 easyhg_kdiff3_simplifications
Come up with all directories expanded by default; don't show summary dialog
| author | Chris Cannam |
|---|---|
| date | Wed, 13 Apr 2011 20:39:34 +0100 |
| parents | 2df4daf33fbd |
| children | b2f15a7c66cc |
| files | kdiff3/src-QT4/directorymergewindow.cpp kdiff3/src-QT4/main.cpp |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src-QT4/directorymergewindow.cpp Wed Apr 13 17:05:13 2011 +0100 +++ b/kdiff3/src-QT4/directorymergewindow.cpp Wed Apr 13 20:39:34 2011 +0100 @@ -722,6 +722,7 @@ setColumnHidden(s_OpCol, true); setColumnHidden(s_OpStatusCol, true); } + slotUnfoldAllSubdirs(); #endif m_bScanning = false; @@ -738,6 +739,7 @@ calcDirStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(topLevelItem(childIdx)), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); +#ifndef SIMPLIFIED_KDIFF3 QString s; s = i18n("Directory Comparison Status") + "\n\n" + i18n("Number of subdirectories:") +" "+ QString::number(nofDirs) + "\n"+ @@ -747,6 +749,8 @@ if ( m_dirC.isValid() ) s += "\n" + i18n("Number of manual merges:") +" "+ QString::number(nofManualMerges); KMessageBox::information( this, s ); +#endif + if ( topLevelItemCount()>0 ) { topLevelItem(0)->setSelected(true);
--- a/kdiff3/src-QT4/main.cpp Wed Apr 13 17:05:13 2011 +0100 +++ b/kdiff3/src-QT4/main.cpp Wed Apr 13 20:39:34 2011 +0100 @@ -161,7 +161,7 @@ const QByteArray& appCatalog = appName; 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 description = ki18n("Tool for Comparison and Merge of Files and Directories\n(With minor modifications by Chris Cannam for EasyHg)"); const KLocalizedString copyright = ki18n("(c) 2002-2010 Joachim Eibl"); const QByteArray& homePage = "http://kdiff3.sourceforge.net/"; const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de";