ALT Linux repositórios
Group :: Ferramentas de texto
RPM: kdiff3
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: kdiff3-avoid-dirmerge-dialog.patch
Download
Download
diff -ur kdiff3-0.9.95-orig/src-QT4/directorymergewindow.cpp kdiff3-0.9.95/src-QT4/directorymergewindow.cpp
--- kdiff3-0.9.95-orig/src-QT4/directorymergewindow.cpp 2009-02-23 01:34:00.000000000 +1000
+++ kdiff3-0.9.95/src-QT4/directorymergewindow.cpp 2010-02-18 11:48:31.898671103 +1000
@@ -732,14 +732,14 @@
nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
QString s;
- s = i18n("Directory Comparison Status") + "\n\n" +
+ s = i18n("Directory Comparison Status:") + "\n\n" +
i18n("Number of subdirectories:") +" "+ QString::number(nofDirs) + "\n"+
i18n("Number of equal files:") +" "+ QString::number(nofEqualFiles) + "\n"+
i18n("Number of different files:") +" "+ QString::number(nofFiles-nofEqualFiles);
if ( m_dirC.isValid() )
s += "\n" + i18n("Number of manual merges:") +" "+ QString::number(nofManualMerges);
- KMessageBox::information( this, s );
+ statusBarMessage( s );
if ( topLevelItemCount()>0 )
topLevelItem(0)->setSelected(true);
}