# HG changeset patch
# User Chris Cannam
# Date 1302723574 -3600
# Node ID 61d74c8be93853c263a0ae12cf121e7b63ba5d07
# Parent  2df4daf33fbd71ecf75a29f52f66e8962eeaa479
Come up with all directories expanded by default; don't show summary dialog

diff -r 2df4daf33fbd -r 61d74c8be938 kdiff3/src-QT4/directorymergewindow.cpp
--- 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);
diff -r 2df4daf33fbd -r 61d74c8be938 kdiff3/src-QT4/main.cpp
--- 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";