Merge branch 'HEAD' of ssh://joachim99@git.code.sf.net/p/kdiff3/code

Author: joachim99

kdiff3/diff_ext_for_kdiff3/Makefile

@@ -10,7 +10,7 @@ ifdef DEBUG
   CXXFLAGS ?= -g
 else
   CXXFLAGS ?= -Os
-  LDFLAGS += -s -static-libgcc
+  LDFLAGS += -L. -s -static-libgcc
 endif
 CXXFLAGS += -pedantic -Wall -W -D_UNICODE -DUNICODE
 
@@ -49,7 +49,6 @@ clean:
 
 $(DLL): $(OBJ)
 	dllwrap.exe \
-		--mno-cygwin \
 		--def $(DEFFILE) \
 		--output-exp ${EXPLIB} \
 		--driver-name c++ -L/usr/local/lib -L/usr/lib/mingw \

kdiff3/diff_ext_for_kdiff3/diff_ext.cpp

@@ -498,7 +498,7 @@ DIFF_EXT::InvokeCommand(LPCMINVOKECOMMANDINFO ici)
              sBits = i18n("(64 Bit)");
          MessageBox( _hwnd, (i18n("Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n")
             + i18n("This software is distributable under the BSD license.\n")
-            + i18n("Some extensions for KDiff3 (c) 2006-2012 by Joachim Eibl.\n")
+            + i18n("Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n")
             + i18n("Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n")
             + i18n("Homepage for KDiff3: http://kdiff3.sourceforge.net")).c_str()
             , (i18n("About Diff-Ext for KDiff3 ")+sBits).c_str(), MB_OK );
@@ -563,6 +563,10 @@ DIFF_EXT::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT*, LPSTR pszName, UI
       }
       lstrcpyn( (LPTSTR)pszName, helpString.c_str(), cchMax );
    }
+   else
+   {
+      ret = E_INVALIDARG;
+   }
 
    return ret;
 }

kdiff3/src-QT4/difftextwindow.cpp

@@ -1529,6 +1529,7 @@ void DiffTextWindow::recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int
 
    if ( bWordWrap )
    {
+      ProgressProxy pp;
       d->m_lineNumberWidth = d->m_pOptions->m_bShowLineNumbers ? (int)log10((double)qMax(d->m_size,1))+1 : 0;
 
       d->m_diff3WrapLineVector.resize( wrapLineVectorSize );
@@ -1540,8 +1541,13 @@ void DiffTextWindow::recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int
       int i;
       int wrapLineIdx = 0;
       int size = d->m_pDiff3LineVector->size();
+      pp.setMaxNofSteps(size);
       for( i=0; i<size; ++i )
       {
+         pp.setInformation( i18n("Word wrap"), double(i)/size, false );
+         if ( pp.wasCancelled() ) 
+            break;
+
          QString s = d->getString( i );
          QTextLayout textLayout( s, font(), this);
          d->prepareTextLayout( textLayout, true, visibleTextWidth );

kdiff3/src-QT4/directorymergewindow.cpp

@@ -995,10 +995,11 @@ bool DirectoryMergeWindow::Data::init
    m_bUnfoldSubdirs = m_pOptions->m_bDmUnfoldSubdirs;
    m_bSkipDirStatus = m_pOptions->m_bDmSkipDirStatus;
 
+   
+   beginResetModel();
    m_pRoot->m_children.clear();
-
    m_mergeItemList.clear();
-   reset();
+   endResetModel();
 
    m_currentIndexForOperation = m_mergeItemList.end();
 
@@ -1782,7 +1783,8 @@ void DirectoryMergeWindow::Data::prepareListView( ProgressProxy& pp )
 
       setPixmaps( mfi, bCheckC );
    }
-   reset();
+   beginResetModel();
+   endResetModel();
 }
 
 static bool conflictingFileTypes(MergeFileInfos& mfi)
@@ -2219,8 +2221,9 @@ static void sortHelper( MergeFileInfos* pMFI, int sortColumn, Qt::SortOrder orde
 
 void DirectoryMergeWindow::Data::sort( int column, Qt::SortOrder order )
 {
+   beginResetModel();
    sortHelper( m_pRoot, column, order );
-   reset();
+   endResetModel();
 }
 
 //

kdiff3/src-QT4/fileaccess.cpp

@@ -844,7 +844,7 @@ QString FileAccess::tempFileName()
             break;
          }
       }
-      return QDir::convertSeparators(fileName+".2");
+      return QDir::toNativeSeparators(fileName+".2");
 
    #else  // using KDE
 

kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp

@@ -19,14 +19,15 @@
 //
 //////////////////////////////////////////////////////////////////////
 #ifdef _WIN32
+#include "stable.h"
 #include <windows.h>
 #include <shlobj.h>
 #include <malloc.h>
-#include <QString>
-#include <QStringList>
-#include <qwidget.h>
-#include <QDir>
-#include <QMenu>
+//#include <QString>
+//#include <QStringList>
+//#include <qwidget.h>
+//#include <QDir>
+//#include <QMenu>
 #include "ShellContextMenu.h"
 
 #ifdef _DEBUG
@@ -149,7 +150,7 @@ LRESULT CALLBACK CShellContextMenu::HookWndProc(HWND hWnd, UINT message, WPARAM
 
 UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMenu* pMenu )
 {
-        HWND hWnd = pParentWidget->winId();
+        HWND hWnd = (HWND)pParentWidget->winId();
         int iMenuType = 0;	// to know which version of IContextMenu is supported
 	LPCONTEXTMENU pContextMenu;	// common pointer to IContextMenu and higher version interface
 
@@ -188,7 +189,7 @@ UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMen
 	else
 		OldWndProc = NULL;
 
-	UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, pParentWidget->winId(), 0);
+	UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, (HWND)pParentWidget->winId(), 0);
 
 	if (OldWndProc) // unsubclass
         SetWindowLongPtr (hWnd, GWLP_WNDPROC, (DWORD_PTR) OldWndProc);

kdiff3/src-QT4/kreplacements/kreplacements.cpp

@@ -84,7 +84,7 @@ static void showHelp()
 
 #ifndef Q_OS_OS2
       char buf[256];
-      HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf );
+      HINSTANCE hi = FindExecutableA( helpFile.fileName().toLatin1(), helpFile.absolutePath().toLatin1(), buf );
       if ( (quintptr)hi<=32 )
       {
 #endif
@@ -1207,9 +1207,9 @@ QObject* KLibFactory::create(QObject* pParent, const QString& name, const QStrin
 {
    KParts::Factory* f = qobject_cast<KParts::Factory*>(this);
    if (f!=0)
-      return f->createPartObject( (QWidget*)pParent, name.toAscii(),
-                                            pParent, name.toAscii(),
-                                            classname.toAscii(),  QStringList() );
+      return f->createPartObject( (QWidget*)pParent, name.toLatin1(),
+                                            pParent, name.toLatin1(),
+                                            classname.toLatin1(),  QStringList() );
    else
       return 0;
 }

kdiff3/src-QT4/pdiff.cpp

@@ -1583,13 +1583,25 @@ void KDiff3App::recalcWordWrap(int nofVisibleColumns) // nofVisibleColumns is >=
          sumOfLines += d3l.linesNeededForDisplay;
       }
 
+      ProgressProxy pp;
+      pp.setMaxNofSteps(  (m_bTripleDiff ? 6 : 4 ) );
+      pp.setInformation("Word wrap",false);
       // Let every window calc how many lines will be needed.
       if ( m_pDiffTextWindow1 )
+      {
          m_pDiffTextWindow1->recalcWordWrap(true,0,nofVisibleColumns);
+         pp.step();
+      }
       if ( m_pDiffTextWindow2 )
+      {
          m_pDiffTextWindow2->recalcWordWrap(true,0,nofVisibleColumns);
+         pp.step();
+      }
       if ( m_pDiffTextWindow3 )
+      {
          m_pDiffTextWindow3->recalcWordWrap(true,0,nofVisibleColumns);
+         pp.step();
+      }
 
       sumOfLines=0;
       for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i )
@@ -1601,11 +1613,20 @@ void KDiff3App::recalcWordWrap(int nofVisibleColumns) // nofVisibleColumns is >=
 
       // Finish the initialisation:
       if ( m_pDiffTextWindow1 )
+      {
          m_pDiffTextWindow1->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
+         pp.step();
+      }
       if ( m_pDiffTextWindow2 )
+      {
          m_pDiffTextWindow2->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
+         pp.step();
+      }
       if ( m_pDiffTextWindow3 )
+      {
          m_pDiffTextWindow3->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
+         pp.step();
+      }
 
       m_neededLines = sumOfLines;
    }

kdiff3/src-QT4/stable.h

@@ -2,6 +2,9 @@
 #define STABLE_H
 #include <QtCore>
 #include <QtGui>
+#if QT_VERSION>=0x050000
+#include <QtWidgets/QtWidgets>
+#endif
 #ifdef _WIN32
 #include <qt_windows.h>
 #endif