Index: trunk/extragear/utils/kdiff3/KDiff3.kdevelop.filelist =================================================================== Index: trunk/extragear/utils/kdiff3/CMakeLists.txt =================================================================== --- trunk/extragear/utils/kdiff3/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/kdiff3/CMakeLists.txt (nonexistent) @@ -1,54 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -project(kdiff3) - -find_package(KDE4 REQUIRED) -include (MacroLibrary) -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - -add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - -include_directories( - ${KDE4_INCLUDE_DIR} - ${QT_INCLUDES} - ${ALSA_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ) - -link_directories( - ${KDE4_LIB_DIR} - ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h ) - -add_subdirectory(src) -#add_subdirectory(po) -#add_subdirectory(doc) - - -find_file(KFILEITEMACTIONPLUGIN_FOUND kfileitemactionplugin.h PATHS ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) -if(KFILEITEMACTIONPLUGIN_FOUND) - message(STATUS "") - message(STATUS "kfileitemactionplugin.h found........... YES") - message(STATUS " => kdiff3fileitemactionplugin (KDiff3 contextmenu plugin for Konqueror/Dolphin, KDE>4.6) will be built.") - message(STATUS "") - add_subdirectory(kdiff3fileitemactionplugin) -else(KFILEITEMACTIONPLUGIN_FOUND) - message(STATUS "") - message(STATUS "kfileitemactionplugin.h found........... NO") - message(STATUS " => kdiff3fileitemactionplugin (KDiff3 contextmenu plugin for Konqueror/Dolphin, KDE>4.6) will not be built.)") - message(STATUS "Trying fallback via libkonq (works with Konqueror only) ...") - MACRO_OPTIONAL_FIND_PACKAGE(LibKonq) - MACRO_BOOL_TO_01(LIBKONQ_FOUND HAVE_LIBKONQ) - if(LIBKONQ_FOUND) - message(STATUS "") - message(STATUS "libkonq module found........... YES") - message(STATUS " => kdiff3plugin (KDiff3 contextmenu plugin for Konqueror) will be built.") - message(STATUS "") - add_subdirectory(kdiff3plugin) - else(LIBKONQ_FOUND) - message(STATUS "") - message(STATUS "libkonq module found........... NO") - message(STATUS " => kdiff3plugin (KDiff3 contextmenu plugin for Konqueror) will not be built.)") - message(STATUS "") - endif(LIBKONQ_FOUND) -endif(KFILEITEMACTIONPLUGIN_FOUND) Index: trunk/extragear/utils/kdiff3/README =================================================================== --- trunk/extragear/utils/kdiff3/README (revision 1510721) +++ trunk/extragear/utils/kdiff3/README (nonexistent) @@ -1,220 +0,0 @@ -KDiff3-Readme -============= - -Author: Joachim Eibl (joachim.eibl at gmx.de) -Copyright: (C) 2002-2009 by Joachim Eibl -KDiff3-Version: 0.9.95 - -KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. -These are available for Un*x, Windows, Mac. -Thus there are many setup possibilities to consider. - -From version 0.9.95 on the main target platform is KDE4/Qt4. -For KDiff3 for KDE3/Qt3 use KDiff3-0.9.92 or older. - -Contents --------- - -- Introduction -- License -- Requirements & Installation - - For KDE4 - - With Qt4-libs, without KDE - - for Linux/Un*x - - for Windows - - Debugging with MinGW under Windows: - - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary - - Creating and installing translation messages -- Additional hints - - -Introduction ------------- - -KDiff3 is a program that -- compares and merges two or three input files or directories, -- shows the differences line by line and character by character (!), -- provides an automatic merge-facility and -- an integrated editor for comfortable solving of merge-conflicts -- has support for KDE-KIO (ftp, sftp, http, fish, smb), -- has an intuitive graphical user interface, -- provides a context menu for KDE-Konqueror and Windows-Explorer, -- supports 64 bit systems. (Some build issues are discussed in here.) - -Do you want help translating? Read the README in the po-subdirectory! - - -License -------- - - GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA - - For details see file "COPYING". - -Exception from the GPL: - As a special exception, the copyright holder Joachim Eibl gives permission - to link this program with the Qt-library (commercial or open source edition) - from Trolltech (www.trolltech.com), and he permits to distribute the resulting - executable, without including the source code for the Qt-library in the - source distribution. - - -Requirements & Installation ---------------------------- - -- for KDE4: - From version 0.9.95 on KDiff3 supports KDE4. - For installation on most distributions you usually also require these packages (names as on opensuse): - - g++ (g++, version 3.4 or newer) - - libqt4-devel (Qt4-libs, version 4.4.0 or newer) - - libkde4-devel (KDE4 Header files and development libraries) - - libkonq-devel (optional, needed for the kdiff3-plugin, if not installed - then the contextmenu plugin for konqueror won't be built.) - - cmake (>2.6, checks dependencies and creates the Makefiles appopriate for your system) - - Typically in a terminal (e.g. konsole) you cd into the kdiff3-directory and run these commands. - - mkdir release # create sub directory - cd release # cd into that directory - kde4-config --prefix # Find out your KDE4-directory and note the result - cmake .. -DCMAKE_INSTALL_PREFIX= # create Makefile, replace with the prior result - make # run make (compile and link) - sudo make install # install as root user - - Now KDiff3 should be ready to use. Type "kdiff3" to start it. - There should also be a entry in your KDE-start menu in "(Applications->)Development". - - For creating a debug version: - mkdir debug - cd debug - kde4-config --prefix # Find out your KDE4-directory and note the result - cmake .. -DCMAKE_INSTALL_PREFIX= -DCMAKE_BUILD_TYPE=debugfull - make - sudo make install - - The depends on your distribution: - The command "kde4-config --prefix" should tell you. - - For opensuse 11 use "/usr". - -- Building KDiff3 with Qt4-libs, but without KDE - - for Linux/Un*x - - for Windows - - for Mac - - The version 0.9.95 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. - - You always need - - kdiff3-0.9.95.tar.gz - - - for Un*x: gcc, g++ with version >=3.4.2 - Qt-X11-libraries - - - for Windows: Qt-win-libs - If you have the Qt4 commercial edition, then compile with Visual Studio.NET2003 or newer. - If you use the Qt4 open source edition, then you'll need MinGW. - I verified that compilation and debugging works with these packages (probably newer ones will also work): - - Use MinGW-5.1.4.exe or newer to install the following or newer: - - gcc-core-3.4.5-20060117-1.tar.gz - - binutils-2.17.50-20060824-1.tar.gz - - gcc-g++-3.4.5-20060117-1.tar.gz - - mingw-runtime-3.14.tar.gz - - mingw32-make-3.81-2.tar.gz - - w32api-3.11.tar.gz - - gdb-6.3-2.exe (for debugging) - - - for Mac: gcc, g++ with version >=3.4.2 - Qt-Mac-libraries - - Optional: Qt Creator IDE: Development environment optimized for Qt (http://trolltech.com/developer/qt-creator) - - Build-instructions (Un*x): - - Make sure your shell-variable QTDIR is correct and that - your path contains the Qt4-bin-directory. - - cd into the directory kdiff3-0.9.95/src-QT4 and type - - qmake kdiff3.pro - - make (or "gmake" for GNU-Make) - - Build-instructions (Windows): - - set QTDIR= e.g.: c:\qt\4.4.1 - set "PATH=%QTDIR%\bin;%PATH%" - - cd into the directory kdiff3-0.9.95\src-Qt4 and type - - qmake kdiff3.pro - - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have. - - Debugging with MinGW under Windows: - - Qt Creator worked very good as debugger frontend too! - - Debugging without gdb on the console: - - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the - debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make". - - cd into the directory kdiff3-0.9.95\src-Qt4 - - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" - (this is necessary so that gdb can send a break signal to the running program) - - mingw32-make debug (create a debuggable executable) - - gdb debug\kdiff3.exe - - At the "(gdb)"-prompt type "run" and enter to start. - - While the program runs you can't set breakpoints, first interrupt it with Ctrl-C. - - Use "help" to find out about how to use gdb. (Important commands: run, break, backtrace, print, quit) - Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work. - - Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt) - 1) Install Qt/Mac 4.x with thread support, static libraries and universal flag. - (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.) - 2) cd .../kdiff3-0.9.95/src-QT4 - 3a) Create a makefile for kdiff3 by executing: - qmake kdiff3.pro - 3b) optionally generate XCode-Project (for debugging purposes only) by executing: - qmake -spec macx-xcode kdiff3.pro - 4) Execute: - make - 5) After the build completes copy kdiff3 from the kdiff3-0.9.95/src-QT4 directory to - /Applications - - Creating and installing the translation messages - The po directory contains translations from the KDE-translation teams. - If you use the Qt-only-version of KDiff3, then the installation described above - won't install translations automatically. - To create and install the translations: - 0) Make sure /usr/lib/qt3/bin/msg2qm exists - (comes with qt3-devel-tools. [Yes, really Qt3. There is no Qt4 replacement yet.]) - 1) cd .../kdiff3-0.9.95/po - 2) sh create_qm_files install (asks for a super user password) - Just to create the files in the po directory (as needed for the windows version): - 2) sh create_qm_files local - - -(End of KDiff3 with Qt4-instructions) ------------------------------------------------------------------------- - -Additional hints ----------------- - - Start from commandline: - - Comparing 2 files: kdiff3 file1 file2 - - Merging 2 files: kdiff3 file1 file2 -o outputfile - - Comparing 3 files: kdiff3 file1 file2 file3 - - Merging 3 files: kdiff3 file1 file2 file3 -o outputfile - Note that file1 will be treated as base of file2 and file3. - - If all files have the same name but are in different directories, you can - reduce typework by specifying the filename only for the first file. E.g.: - - Comparing 3 files: kdiff3 dir1/filename dir2 dir3 - (This also works in the open-dialog.) - - If you start without arguments, then a dialog will appear where you can - select your files via a filebrowser. - - For more documentation, see the help-menu or the subdirectory doc. - - Have fun! Index: trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3_plugin.desktop =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3_plugin.desktop (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3_plugin.desktop (nonexistent) @@ -1,51 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service -Name=Compare/Merge Files/Directories -Name[bg]=Сравняване/Сливане на файлове/директории -Name[bs]=Poredi/Spoji datoteke/Direktorije -Name[ca]=Compara/fusiona fitxers/directoris -Name[ca@valencia]=Compara/fusiona fitxers/directoris -Name[cs]=Porovnat/spojit soubory/adresáře -Name[da]=Sammenlign/sammenflet filer/mapper -Name[de]=Dateien und Ordner vergleichen und zusammenführen -Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων -Name[en_GB]=Compare/Merge Files/Directories -Name[es]=Comparar/fusionar archivos/directorios -Name[et]=Failide/kataloogide võrdlemine/liitmine -Name[fi]=Vertaa ja yhdistä tiedostoja sekä hakemistoja -Name[fr]=Comparaison et fusion de fichiers ou de dossiers -Name[ga]=Cuir Comhaid/Comhadlanna i gComparáid agus Cumaisc iad -Name[gl]=Compara e fusiona ficheiros e directorios -Name[hi]=तुलना करें/मिलाएं फ़ाइलें/डिरेक्ट्रीज़ -Name[hne]=फाइल/डिरेक्टरीज मन ल तुलना करव / मिलाव -Name[hu]=Fájlok/Könyvtárak összehasonlítása/egyesítése -Name[it]=Confronta o fondi file e cartelle -Name[ja]=ファイルやディレクトリを比較/マージ -Name[km]=ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត -Name[ko]=파일과 디렉터리를 비교하거나 병합 -Name[lt]=Palyginti/Sulieti failus/Direktorijas -Name[ml]=ഫയലുകള്‍/അറകള്‍ താരതമ്യം ചെയ്യുക/ലയിപ്പിക്കുക -Name[nb]=Samenlikne/flette filer/mapper -Name[nds]=Verglieken/Tosamenföhren Dateien Ornern -Name[nl]=Bestanden/mappen vergelijken/samenvoegen -Name[nn]=Samanlikn/flett filer og mapper -Name[pl]=Porównanie/Łączenie plików i katalogów -Name[pt]=Comparar/Juntar os Ficheiros/Pastas -Name[pt_BR]=Comparar/Mesclar arquivos/pastas -Name[ro]=Compară/îmbină fișiere/directoare -Name[ru]=Сравнение и объединение файлов и каталогов -Name[sk]=Porovnať/zlúčiť súbory/adresáre -Name[sl]=Primerjajte/združujte datoteke/mape -Name[sr]=Поређење и стапање фајлова и фасцикли -Name[sr@ijekavian]=Поређење и стапање фајлова и фасцикли -Name[sr@ijekavianlatin]=Poređenje i stapanje fajlova i fascikli -Name[sr@latin]=Poređenje i stapanje fajlova i fascikli -Name[sv]=Jämför, sammanfoga filer, kataloger -Name[tr]=Dosyaları/Dizinleri Karşılaştır/Birleştir -Name[uk]=Порівняння/З’єднання Файлів/Тек -Name[x-test]=xxCompare/Merge Files/Directoriesxx -Name[zh_CN]=比较/合并 文件或目录 -Name[zh_TW]=比較/合併檔案與目錄 -X-KDE-Library=libkdiff3plugin -ServiceTypes=KonqPopupMenu/Plugin,application/octet-stream,inode/directory Index: trunk/extragear/utils/kdiff3/kdiff3plugin/Messages.sh =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3plugin/Messages.sh (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3plugin/Messages.sh (nonexistent) @@ -1,2 +0,0 @@ -#! /usr/bin/env bash -$XGETTEXT -kaliasLocal `find -name \*.cpp -o -name \*.h` -o $podir/kdiff3plugin.pot Index: trunk/extragear/utils/kdiff3/kdiff3plugin/CMakeLists.txt =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3plugin/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3plugin/CMakeLists.txt (nonexistent) @@ -1,15 +0,0 @@ -########### kdiff3 plugin ############### -find_package(LibKonq REQUIRED) -set(kdiff3plugin_SRCS - kdiff3plugin.cpp ) - -kde4_add_plugin(kdiff3plugin WITH_PREFIX ${kdiff3plugin_SRCS}) - -target_link_libraries(kdiff3plugin ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} konq ) -#${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KIO_LIBRARY} QtGui QtCore konq ) - -install(TARGETS kdiff3plugin DESTINATION ${PLUGIN_INSTALL_DIR} ) - -########## install files ############### - -install( FILES kdiff3_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) Index: trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.desktop =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.desktop (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.desktop (nonexistent) @@ -1,53 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service -Name=Compare/Merge Files/Directories with KDiff3 -Name[bg]=Сравняване/Сливане на файлове/директории с KDiff3 -Name[bs]=Poredi/Spoji datoteke/Direktorije sa KDiff3 -Name[ca]=Compara/fusiona fitxers/directoris amb KDiff3 -Name[ca@valencia]=Compara/fusiona fitxers/directoris amb KDiff3 -Name[cs]=Porovnat/spojit soubory/adresáře pomocí KDiff3 -Name[da]=Sammenlign/sammenflet filer/mapper med KDiff3 -Name[de]=Dateien und Ordner vergleichen und zusammenführen mit KDiff3 -Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων με το KDiff3 -Name[en_GB]=Compare/Merge Files/Directories with KDiff3 -Name[es]=Comparar/fusionar archivos/directorios con KDiff3 -Name[et]=Failide/kataloogide võrdlemine/liitmine KDiff3-ga -Name[fi]=Vertaa ja yhdistä tiedostoja sekä hakemistoja KDiff3:lla -Name[fr]=Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 » -Name[ga]=Cuir Comhaid/Comhadlanna i gComparáid agus Cumaisc iad le KDiff3 -Name[gl]=Compara e fusiona ficheiros e directorios con KDiff3 -Name[hi]=केडिफ़३ के साथ तुलना करें/मिलाएं फ़ाइलें/डिरेक्ट्रीज़ -Name[hne]=केडिफ३ के साथ तुलना करव/मिलाव फाइल/डिरेक्टरीज मन ल -Name[hu]=Fájlok/Könyvtárat KDiff3-mal való összehasonlítása/egyesítése -Name[it]=Confronta o fondi file e cartelle con KDiff3 -Name[ja]=KDiff3 でファイルやディレクトリを比較/マージ -Name[km]=ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត​ជាមួយ KDiff3 -Name[ko]=KDiff3으로 파일과 디렉터리를 비교하거나 병합합니다 -Name[lt]=Palyginti/Sulieti failus/Direktorijas su KDiff3 -Name[ml]=ഫയലുകള്‍/അറകള്‍ താരതമ്യം ചെയ്യുക/കെഡിഫ്3 ഉപയോഗിച്ചു് ലയിപ്പിക്കുക -Name[nb]=Samenlikne/flette filer/mapper med KDiff3 -Name[nds]=Verglieken Tosamenföhren vun Dateien/Ornern mit KDiff3 -Name[nl]=Bestanden/mappen vergelijken/samenvoegen met KDiff3 -Name[nn]=Samanlikn/flett filer og mapper med KDiff3 -Name[pl]=Porównaj/Scal pliki/katalogi przy pomocy KDiff3 -Name[pt]=Comparar/Juntar os Ficheiros/Pastas com o KDiff3 -Name[pt_BR]=Comparar/Mesclar arquivos/pastas com o KDiff3 -Name[ro]=Compară/îmbină fișiere/directoare cu KDiff3 -Name[ru]=Сравнение и объединение файлов и каталогов в KDiff3 -Name[sk]=Porovnať/zlúčiť súbory/adresáre s KDiff3 -Name[sl]=Primerjajte/združujte datoteke/mape z KDiff3 -Name[sr]=Поређење и стапање фајлова и фасцикли К‑диф3 -Name[sr@ijekavian]=Поређење и стапање фајлова и фасцикли К‑диф3 -Name[sr@ijekavianlatin]=Poređenje i stapanje fajlova i fascikli KDiff3 -Name[sr@latin]=Poređenje i stapanje fajlova i fascikli KDiff3 -Name[sv]=Jämför, sammanfoga filer, kataloger med Kdiff3 -Name[tr]=KDiff3 ile Dosyaları/Dizinleri Karşılaştır/Birleştir -Name[uk]=Порівнюйте або з’єднуйте файли або теки з KDiff3 -Name[x-test]=xxCompare/Merge Files/Directories with KDiff3xx -Name[zh_CN]=使用 KDiff3 比较/合并文件或目录 -Name[zh_TW]=用 KDiff3 比較/合併檔案與目錄 -Icon=kdiff3 -#X-KDE-ParentApp=konqueror -#DocPath=konq-plugins/kdiff3plugin/index.html -NoDisplay=true Index: trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.cpp =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.cpp (nonexistent) @@ -1,281 +0,0 @@ -/* This file is part of the KDiff3 project - - Copyright (C) 2008 Joachim Eibl - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; version 2 - of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include "kdiff3plugin.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//#include - -static QStringList* s_pHistory=0; - -class KDiff3PluginFactory : public KGenericFactory < KDiff3Plugin, KonqPopupMenu > -{ - KConfig* m_pConfig; - KConfigGroup* m_pConfigGroup; -public: - KDiff3PluginFactory( const char* instanceName = 0 ) - : KGenericFactory< KDiff3Plugin, KonqPopupMenu >( instanceName ) - { - m_pConfig = 0; - if (s_pHistory==0) - { - //std::cout << "New History: " << instanceName << std::endl; - s_pHistory = new QStringList; - m_pConfig = new KConfig( "kdiff3pluginrc", KConfig::SimpleConfig ); - m_pConfigGroup = new KConfigGroup( m_pConfig, "KDiff3Plugin" ); - *s_pHistory = m_pConfigGroup->readEntry("HistoryStack", QStringList() ); - } - } - - ~KDiff3PluginFactory() - { - //std::cout << "Delete History" << std::endl; - if ( s_pHistory && m_pConfigGroup ) - m_pConfigGroup->writeEntry("HistoryStack",*s_pHistory); - delete s_pHistory; - delete m_pConfigGroup; - delete m_pConfig; - s_pHistory = 0; - m_pConfig = 0; - } -}; - -K_EXPORT_COMPONENT_FACTORY (libkdiff3plugin, KDiff3PluginFactory ("kdiff3plugin")) - -KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupMenu, const QStringList & /* list */ ) -:KonqPopupMenuPlugin(pPopupMenu) -{ - KGlobal::locale()->insertCatalog("kdiff3plugin"); - m_pPopupMenu = pPopupMenu; - m_pParentWidget = pPopupMenu->parentWidget(); -} - -void KDiff3Plugin::setup( KActionCollection* actionCollection, const KonqPopupMenuInformation& popupMenuInfo, QMenu* pMenu ) -{ - if (KStandardDirs::findExe("kdiff3").isNull ()) - return; - - // remember currently selected files (copy to a QStringList) - KFileItemList itemList = popupMenuInfo.items(); - foreach ( const KFileItem& item, itemList ) - { - //m_urlList.append( item.url() ); - m_list.append( item.url().url() ); - } - - - /* Menu structure: - KDiff3 -> (1 File selected): Save 'selection' for later comparison (push onto history stack) - Compare 'selection' with first file on history stack. - Compare 'selection' with -> choice from history stack - Merge 'selection' with first file on history stack. - Merge 'selection' with last two files on history stack. - (2 Files selected): Compare 's1' with 's2' - Merge 's1' with 's2' - (3 Files selected): Compare 's1', 's2' and 's3' - */ - - KActionMenu* pActionMenu = new KActionMenu (i18n ("KDiff3"), actionCollection ); - KAction* pAction = 0; - QString s; - - if(m_list.count() == 1) - { - int historyCount = s_pHistory ? s_pHistory->count() : 0; - s = i18n("Compare with %1", (historyCount>0 ? s_pHistory->front() : QString()) ); - pAction = new KAction ( s, actionCollection ); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareWith())); - pAction->setEnabled( m_list.count()>0 && historyCount>0 ); - pActionMenu->addAction(pAction); - - s = i18n("Merge with %1", historyCount>0 ? s_pHistory->front() : QString() ); - pAction = new KAction( s, actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotMergeWith())); - pAction->setEnabled( m_list.count()>0 && historyCount>0 ); - pActionMenu->addAction (pAction); - - s = i18n("Save '%1' for later", ( m_list.front() ) ); - pAction = new KAction ( s, actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotSaveForLater())); - pAction->setEnabled( m_list.count()>0 ); - pActionMenu->addAction(pAction); - - pAction = new KAction (i18n("3-way merge with base"), actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotMergeThreeWay())); - pAction->setEnabled( m_list.count()>0 && historyCount>=2 ); - pActionMenu->addAction (pAction); - - if ( s_pHistory && !s_pHistory->empty() ) - { - KActionMenu* pHistoryMenu = new KActionMenu( i18n("Compare with ..."), actionCollection ); - pHistoryMenu->setEnabled( m_list.count()>0 && historyCount>0 ); - pActionMenu->addAction(pHistoryMenu); - for (QStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i) - { - pAction = new KAction( *i, actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareWithHistoryItem())); - pHistoryMenu->addAction (pAction); - } - - pAction = new KAction (i18n("Clear list"), actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotClearList())); - pActionMenu->addAction (pAction); - pAction->setEnabled( historyCount>0 ); - } - } - else if(m_list.count() == 2) - { - pAction = new KAction (i18n("Compare"), actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareTwoFiles())); - pActionMenu->addAction (pAction); - } - else if ( m_list.count() == 3 ) - { - pAction = new KAction (i18n("3 way comparison"), actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareThreeFiles())); - pActionMenu->addAction (pAction); - } - pAction = new KAction (i18n("About KDiff3 menu plugin ..."), actionCollection); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotAbout())); - pActionMenu->addAction (pAction); - - pMenu->addSeparator(); - pMenu->addAction( pActionMenu ); - pMenu->addSeparator(); -} - -KDiff3Plugin::~KDiff3Plugin () -{ -} - -void KDiff3Plugin::slotCompareWith() -{ - if ( m_list.count() > 0 && s_pHistory && ! s_pHistory->empty() ) - { - QStringList args; - args << s_pHistory->front(); - args << m_list.front(); - KProcess::startDetached("kdiff3", args); - } -} - -void KDiff3Plugin::slotCompareWithHistoryItem() -{ - const KAction* pAction = dynamic_cast( sender() ); - if ( m_list.count() > 0 && pAction ) - { - QStringList args; - args << pAction->text(); - args << m_list.front(); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3Plugin::slotCompareTwoFiles() -{ - if ( m_list.count() == 2 ) - { - QStringList args; - args << m_list.front(); - args << m_list.back(); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3Plugin::slotCompareThreeFiles() -{ - if ( m_list.count() == 3 ) - { - QStringList args; - args << m_list[0]; - args << m_list[1]; - args << m_list[2]; - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3Plugin::slotMergeWith() -{ - if ( m_list.count() > 0 && s_pHistory && ! s_pHistory->empty() ) - { - QStringList args; - args << s_pHistory->front(); - args << m_list.front(); - args << ( "-o" + m_list.front() ); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3Plugin::slotMergeThreeWay() -{ - if ( m_list.count() > 0 && s_pHistory && s_pHistory->count()>=2 ) - { - QStringList args; - args << (*s_pHistory)[1]; - args << (*s_pHistory)[0]; - args << m_list.front(); - args << ("-o" + m_list.front()); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3Plugin::slotSaveForLater() -{ - if ( !m_list.isEmpty() && s_pHistory ) - { - while ( s_pHistory->count()>=10 ) - s_pHistory->pop_back(); - s_pHistory->push_front( m_list.front() ); - } -} - -void KDiff3Plugin::slotClearList() -{ - if ( s_pHistory ) - s_pHistory->clear(); -} - -void KDiff3Plugin::slotAbout() -{ - QString s = i18n("KDiff3 Menu Plugin: Copyright (C) 2008 Joachim Eibl\n" - "KDiff3 homepage: http://kdiff3.sourceforge.net\n\n"); - s += i18n("Using the context menu extension:\n" - "For simple comparison of two selected files choose \"Compare\".\n" - "If the other file is somewhere else, \"Save\" the first file for later, " - "and it will appear in the \"Compare With ...\" submenu. " - "Then, use \"Compare With\" on the second file.\n" - "For a 3-way merge first, \"Save\" the base file, then the branch to merge, and " - "then \"3-way merge with base\" on the other branch which will be used as the destination.\n" - "The same also applies to directory comparison and merge."); - KMessageBox::information(m_pParentWidget, s, i18n("About KDiff3 Menu Plugin") ); -} - Index: trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.h =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3plugin/kdiff3plugin.h (nonexistent) @@ -1,55 +0,0 @@ -/* This file is part of the KDiff3 project - - Copyright (C) 2008 Joachim Eibl - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; version 2 - of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#ifndef _KDIFF3PLUGIN_H_ -#define _KDIFF3PLUGIN_H_ - -#include -#include -#include - -class QStringList; - -class KDiff3Plugin : public KonqPopupMenuPlugin -{ - Q_OBJECT -public: - KDiff3Plugin (KonqPopupMenu *, const QStringList & list); - virtual ~KDiff3Plugin(); - // implement pure virtual method from KonqPopupMenuPlugin - virtual void setup( KActionCollection* actionCollection, const KonqPopupMenuInformation& popupMenuInfo, QMenu* menu ); - -private slots: - void slotCompareWith(); - void slotCompareTwoFiles(); - void slotCompareThreeFiles(); - void slotMergeWith(); - void slotMergeThreeWay(); - void slotSaveForLater(); - void slotClearList(); - void slotCompareWithHistoryItem(); - void slotAbout(); - -private: - QStringList m_list; - QWidget* m_pParentWidget; - KonqPopupMenu* m_pPopupMenu; -}; -#endif Index: trunk/extragear/utils/kdiff3/KDiff3.kdevelop =================================================================== --- trunk/extragear/utils/kdiff3/KDiff3.kdevelop (revision 1510721) +++ trunk/extragear/utils/kdiff3/KDiff3.kdevelop (nonexistent) @@ -1,138 +0,0 @@ - - - - KDevCustomProject - /vrac/kde/src/4/playground/devtools/kdiff3.work - true - - - $VERSION$ - C++ - - - C - - KDiff3 - - - /home/valentin/kde/src/4/playground/devtools/kdiff3.work - - /vrac/kde/src/4/playground/devtools/kdiff3.work/src/kdiff3 - custom - /vrac/kde/src/4/playground/devtools/kdiff3.work - - false - true - - - - make - /home/valentin/kde/src/4/playground/devtools/kdiff3.work - - - false - 1 - false - - default - - - - - - *.java - *.h - *.H - *.hh - *.hxx - *.hpp - *.c - *.C - *.cc - *.cpp - *.c++ - *.cxx - Makefile - CMakeLists.txt - - - - - - - - - - - - - html/ - html/ - - - - - - - - - - .h - .cpp - - - - - true - true - true - false - true - true - true - 250 - 400 - 250 - false - 0 - true - true - false - std=_GLIBCXX_STD;__gnu_cxx=std - true - false - false - false - false - true - true - false - .; - - - - false - 3 - 3 - /usr/lib/qt3 - EmbeddedKDevDesigner - /usr/lib/qt3/bin/qmake - /usr/lib/qt3/bin/designer - - - - - - - - - - true - false - - - *.o,*.lo,CVS,*~,cmake* - true - - - Index: trunk/extragear/utils/kdiff3/ChangeLog =================================================================== --- trunk/extragear/utils/kdiff3/ChangeLog (revision 1510721) +++ trunk/extragear/utils/kdiff3/ChangeLog (nonexistent) @@ -1,513 +0,0 @@ -Version 0.9.96 - 2011-08-26 -============================ -- KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4.6) -- Parser for preprocessor commands. (Allows single apostrophs ') -- Warn if conversion errors appear (Invalid characters) -- Fix crash on A/B-overview (infinite recursion) -- Fix clearcase temp files not deleted problem on windows -- KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore -- String corrections (Frederik Schwarzer) -- Fixed writing to KIO. -- OS2-Port (Patch by Silvan Scherrer) -- Fixed problem where destination directory would be renamed or deleted during copy operation. - Now if the destination directory exists only the files inside will be copied. -- In merge: Separate lines where the automatic choice would be the same but for different reasons. -- Fixed some problems with huge files in directory comparison mode (>2GB) (but direct comparison is still not possible) -- Fixed documentation compile errors with KDE>=4.5 -- Fixed white space merge default options -- Fixed regexp test tool. -- Exclude printing code if Qt was compiled without printing support. -- For Windows: Fixed handling of unicode characters in command line parameters. -- Improved "old mac" lineendstyle handling: Break lines. -- Detect encoding specified in xml header or html "meta" tag. - -Version 0.9.95 - 2009/03/03 -=========================== -- Show line end style for each file. -- Updated message translations. -- Fixed permissions when writing executable file. (Un*x only) -- Fixed IgnorableCmdLineOptions (important for SVNs '-u'-option) -- Directory merge: Error when either B or C is changed and the other is deleted. (User choice required.) -- Qt-only Un*x-version looks for translations in /usr/share/locale//LC_MESSAGES/kdiff3.qm - (for Debian, by Eike Sauer) -- New script: po/create_qm_files: To create and install translations for Qt-only version. - -Version 0.9.94 - 2009/01/17 -=========================== -- Fix for hidden text windows with --auto-flag. -- Fix for pasting clipboard truncated text if it contained characters that needed more than one byte in UTF-8 encoding. -- Fix for horizontal scrolling if word wrap is enabled. -- Directory tree: files hidden due to options (e.g. patterns etc.) don't affect folder equality any more. -- KDE: KIO-progress dialog is now hidden. (KDiff3 has its own progress dialog.) -- Directory merge: Default op for change in either B or C and delete in the other is now merge (previously copy). -- Directory merge: Not preserving merge operation after reload, because it might have changed. - -Version 0.9.93 - 2009/01/06 -=========================== -- Support for KDE4 (with much porting help from Valentin Rusu) -- Fix for diff_ext_for_kdiff3 (by Sergey Zorin) -- Win32-Installation: SendTo-integration fixed for Vista. -- Optional auto detection of line end style for saving. -- Option to close on ESC (default is off) -- Option to align B and C for 3 input files (default is off which is usually better for merging). - -Version 0.9.92 - 2007/04/15 -=========================== -- Windows installer now allows to install KDiff3 as Clearcase Diff and Merge Tool -- Windows installer "SVN Merge tool" corrected: Not creating $AppData\Subversion\config subdir anymore. -- KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on Windows.) -- Qt4-version - - Printing crash fixed - - Compilation issue for Mac fixed -- Dir Rescan keeps settings for Show identical files etc. -- Bugfix: Empty file and not existing file were detected as binary equal. -- Temp file names use the process id in file name to allow several instances. -- Suppress flicker during startup. (Don't show status info window on creation.) -- New File comparison mode: Trust the size and date, but use binary comparison if date doesn't match (unsafe) -- After explicitely selecting files any file of the selected may be right clicked for context menu. -- Open dialog also shows current directories in directory comparison mode. -- Writing a file via --auto option didn't work for relative files. (Reported by Guilhem Bichot) -- New option for history merge: Max number of history entries -- New option "Auto save and quit on merge without conflicts" -- Directory Merge with Case sensitivity disabled: Correct destination filename chosen for merge. - -Version 0.9.91 - 2006/10/29 -=========================== -- Encoding auto detection -- Fix for crash after double click below last line -- Saving of maximized window-state (Patch by Robert Vock) -- Separated Merge-options in own tab because "Diff and Merge"-options tab got too big. -- When pasting multiple lines into openfile dialog only first line is kept -- Drawing in directory view fixed. -- When specifying a separate output dir then for equal files a copy operation will also be offered. -- Windows specific: - - Windows installer problems fixed for users without admin-rights - - Fix for slow startup problem on Windows (Patch by Manfred Koehler) - - New: diff-ext-for-kdiff3 - Shell extension (originally by Sergey Zorin) -- Qt4-version: - - Saving of merge-result didn't work. - - Start external processes directly without cmd.exe-window - - Rewrote everything requiring Qt3-support - -Version 0.9.90 - 2006/05/14 -=========================== -- Fixed KIO-problems of type "File exists" with tempfiles (introduced in 0.9.89) -- Fix for manual alignment with 3 files which caused crash (new feature in 0.9.89) -- Fix for Alt-Left caused crash for leftmost window on windows (due to changed compiler) -- Use of WResizeNoErase|WRepaintNoErase instead of WNoAutoErase (fix for compiler error with Qt3.1) -- Removed #include which is (currently) unneeded and required extra dependencies. -- Removed "Save/Load Directory Merge State ..." in directory menu. (These aren't working yet.) -- Fixed crash when used as Diff-part with KDevelop. -- Preserve executable bit when overwriting an existing file. - -Version 0.9.89 - 2006/04/09 -=========================== -New features: -- Version control history auto merge plus sorting -- Auto merge regular expression -- Splitting and joining differences for merging -- Manual Diff Alignment tool -- Printing of differences -- Colorsettings for Dir-Colors -- Dir-show identical/different/A-only/B-only/C-only files with immediate effect (instead of option "List only deltas") -- Filename-edit above DiffInputWindows -- Windows-Context Menu in A/B/C-columns for dir-comparison (Windows only) -- Edit Menu: Select All (Ctrl-A) -- New commandline options: - --config filename: Select an individual config file. (Now also available for Windows and Qt-only version.) - --cs config: Change one specific setting via the command line. (For settings that were previously adjustable via GUI only.) - --confighelp: Show available config items and their current values. -- Dircomp: "Compare/Merge explicitly selected files" (Select files/dirs by clicking icons in columns A/B/C) -- User definable ignored command line options. -- Ability to swap pathnames in open dialog -- "Ignore"-button in error dialog when option not understood (Windows only) -- Quadratical scroll speedup during selection when mouse moves out of the diff input window. -Bugfixes, redesign: -- Preparations for Qt4-Port + some redesign -- GNU-Diff algorithm improved to be independent of line endings (needed for manual diff alignment) -- Avoid restoring a window where it is almost invisible (if moved almost out of the screen area) -- Go to next delta honors special "A vs. B", "A vs. C" or "B vs. C" overview when active. (Patch by Vladan Bato) -- DirectoryMergeWindow: File/Antifile and DirPattern changes will update immediately without rescan. -- Blue toolbar icons (for better visibility of disabled state) -- Bugfix: Crash when merging and selecting "Choose A/B/C for all unsolved conflicts" - and one of the solved conflicts contained no lines in chosen input. -- Fix: With --auto option, GUI stays invisible if not necessary -- Fixed odd ProgressDialog-behaviour when continuing after an error or abort. -- Directory merge: Fixed FollowFileLinks. (Didn't work when copying a file.) -- Initial position now (x=0,y=22). This solves a problem on some Macs. -- Better alignment of B and C in 3-file comparison -- Correctly updating the selection when scrolling via keys and mouse is pressed -- Horizontal scrolling in right-to-left language caused vertical lines - fixed. - - -Version 0.9.88 - 2005/25/02 -=========================== -- Fixed crash that occurred in Directory Comparison mode "Full-Analysis". -- Fix for Windows: Didn't save encoding correctly. -- Many translations updated. - -Version 0.9.87 - 2005/30/01 -=========================== -- Unicode16 and UTF8 support (Internal data format is now QString (Unicode16). Conversion during save and load.) -- Directory "Full Analysis": Equality-Coloring for files with only whitespace differences. (Michael Denio) -- Support for right to left languages. -- In MergeResultWindow show "" for whitespace-only conflicts -- Statusbar shows the number of remaining conflicts and whitespace conflicts. -- Go Next/Prev Difference/Conflict now have improved tooltips informing about "Show White Space"-disabled-behaviour. - -Version 0.9.86 - 2004/06/14 -=========================== -- Double click on any file in directory merge would close the directory merge window. (Regression in 0.9.85) - -Version 0.9.85 - 2004/06/14 -=========================== -- When solving a conflict KDiff3 reports the number of remaining unsolved conflicts in the status bar. -Bugfixes: -- Fix for MergeResultWindow-contextmenu: All items were disabled always. (new in 0.9.84) -- Fix for problem when opening files specified relative to current directory. (new in 0.9.84, qt-only-version) -- Fix for compilation with older gcc (2.9x) -- Several Word-wrap problems fixed: - - Find string with word wrap active didn't work if found text was not in first wrap-line. - - overview-position was not updated when toggling word wrap - - horizontal scrollbar was not updated when toggling word wrap - - current selection was lost when toggling word wrap - - selecting a conflict in the diff-text-window didn't work right with word wrap. -- Qt-only: Bold attribute for fonts was not persistent -- Qt-only: Toolbar position was not persistent -- Qt-only: Language-choice shows also the full language name. -- Cursor and windows-boundary-lines were always black instead of having the foreground color -- Starting KDiff3 with two not existing files showed a dialog saying that files are binary equal. -- Errors while starting a directory comparison now also reopens the open-dialog. -- Speedup during directory comparison by avoiding unnecessary redraws. (These always creep in again :-() -- On KDE: When resetting to default options (or first start) now the default KDE-fixed font will be used. -- Mergeresultwindow: Improved behaviour after automatic merge operation. - -Version 0.9.84 - 2004/05/29 -============================ -New Features: -- Word Wrap for DiffTextWindow -- Directory-Comparison: Option "Full Analysis" allows to show the number of solved vs. unsolved - conflicts or deltas vs. whitespace-changes in the directory tree. -- Diff-Menu for Diff-view specific entries -- Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor. -- Added several credits which now are also visible in the Qt-only version. -- The Qt-only version now also shows all command-line options. Under windows a dialog shows them. -- Command line options -u and -L for Subversion-support. -- Command line options --L1/2/3 for specifying alias names. -- In the Qt-only-version the user-interface-language can be set via the regional-settings - (only effective after a restart). -- ProgressDialog redesign for recursive use. -- Overview now allows to show the delta between two other files in triplediff-mode. -- Option to ignore case which treats case-changes like white space (instead of conversion to upcase). -Bugfixes: -- Dir-Comp: When one file exists, but the other doesn't then instead the latest used other file was displayed. -- Open dialog: When previously a file C was used, but should be empty now, it reappeared unbidden. -- Several bugs for 64-bit systems fixed. -- Fixed crash when one file ended with a newline and the other did not. -- Windows: Case insensitive filename-pattern matching. -- Corrected behaviour for files with size 0. -- Fix for crash due to a race-condition (Patch by Eike Sauer) -- Windows: Scrolling didn't work right when another window was in front. -- Mergeresultwindow didn't show correct position when starting a second or later merge. -- Fix for problem where sometimes the A/B/C-buttons were in wrong state. -- Pasting from selection via the middle mousebutton. - -Version 0.9.83 - 2004/03/06 -=========================== -- Reading directorys fixed for Win95/98 -- Caseinsensitive filename matching for windows. -- Autocopy to selection for systems that support this. (Patch by Stefan Partheymueller) -- Drawing during recalc suppressed in merge result editor. -- Cursor could go beyond last line in merge result editor. (Corrected NrOfLine-counting.) -- Windows: Start with invalid cmd-line-options brings up a messagebox with the list of options. -- Corrected encoding when copying to or pasting from clipboard. -- Corrected char-by-char-diff at beginning of line. ("012345 12345 xyz" <-> "012345 xyz") -- Warning when merging with preprocessor or upcase-conversion enabled. -- Rewrite of preprocessing code should fix several problems. E.g.: - - Ignore C/C++-comments only worked with a preprocessor active. - - Preprocessor output now is input of line-matching preprocessor. - - Paste to diff-window, didn't work if LMPP or Ignore C/C++-Comments was set. - -Version 0.9.82 - 2004/02/02 -=========================== -- DirectoryMerge: Running merge op for last item in a folder, performed the - merge op for all following items in following folders. (Possible data loss!) -- Fix: Preprocessors and "Ignore Comments" didn't work at the same time. -- Fix: Preprocessors crashed with remote files. -- Open-Dialog: When either input is changed, then reset the output to be empty. - (To avoid accidental overwrites.) -- Icon for "Highlight white space differences." -- Editor-Option: Line End Style for saving: Dos/Windows "\r\n" vs. Unix "\n" -- Merge output editor: Corrected wrong encoding for output-filename and - user-typed characters. -- Speedup for reading directories under Windows. -- Enhanced progress dialog responsiveness during local file copy. -- Fix for non-KDE-version: No URL-encoding when dropping files in open dialog. - -Version 0.9.81 - 2004/01/08 -=========================== -- Allow to compile with --enable-final -- Bugfix for 3 file-compare (and A or B don't exist, crashed) -- Bugfix for crash when second directory is merged -- Some keyboard-shortcuts for selection of merge-operation didn't work correctly. -- Shortcuts Ctrl-1/2/3 are possible in textmergewindow and in dirmergewindow, - depending on the focus. -- First steps towards internationalisation -- Manpage doc/en/kdiff3.1 by Eike Sauer (for Debian) -- Directory rescan shortcut SHIFT-F5 - -Version 0.9.80 - 2003/12/08 -=========================== -New Text Diff/Merge Features: -- Now using GNU-diff algorithms internally. (Option "External Diff" removed.) -- Option for treating C/C++ comments as whitespace during diff. -- Bugfix for locale character encoding (+ new option "Use string encoding") -- Option for suppressing highlighting in white-space changes. - (Also suppresses highlighting in comments and numbers when the - respective options are active.) -- Merge-menu: Choose A/B/C for all unsolved conflicts. - Choose A/B/C for all unsolved whitespace conflicts. -- Options to automatically choose a certain source for whitespace conflicts. -- Shorcut F5 now used to reload the current file. - -New Directory-Comparison/Merge Features: -- Option to trust filesize. (Some directory services don't copy the date/time correctly.) -- Shortcut F7 now starts complete directory merge (previously F5). -- Do the selected merge operation for the selected file/dir only - "Run Operation For Current Item" (F6). -- Shortcuts for selecting the merge operation for the selected item. - Ctrl-1/2/3/4/Del select A/B/C/Merge/Delete respectively. - -Other Improvements: -- Several i18n-corrections (by Stephan Binner) -- Bugfix for option CVS-ignore: Didn't work correctly in subdirectories. -- Bugfix for remote operations: Operation can now be aborted, when KIO-slaves doesn't respond. -- Cancel-Button in progress bar. -- Default diff-view now again side by side instead of one above the other. - - -Version 0.9.71 - 2003/10/17 -=========================== -- Windows-Installer by Sebastien Fricker. -- Bugfixes for Windows. (Problems with setFont() in paintEvent().) -- Default font for Windows now "Courier New" (instead of Courier) -- Fix for compilation with gcc 2.95 -- Support for Ctrl-Tab under Windows. -- Fix for finding documentation. -- Fix for problem with directory-sync-mode (new in 0.9.70). -- Fix for several subsequent CR-characters in input file. - -Version 0.9.70 - 2003/09/28 -=========================== -- Transparent access to URLs via KIO (KDE only): - Compare files and directories on ftp, fish, smb, tar etc. ressources. -- Workaround for a Win32-bug (Crashed sometimes during selections) -- When the merge flag is selected in the open dialog, the directory-tool - always starts a merge by default for each file. Without the flag only a - diff will be started by default. -- Immediately showing progress bar in dir scan. -- Showing progress bar for file comparison too. -- Directory-menu: Fold/Unfold all subdirs -- Bugfix for 3-way auto-merge: A line deleted from the base in B and C - resulted in a empty line instead of being completely removed. -- Improved locale support -- KDiff3 is now a KPart - - in KDevelop3 it can be used to compare the current text with the - last saved version, or the current version on disk with the last cvs version. - - in Konqueror it can be used to look at a unified *.patch-file if one complete - version is available too. -- Documentation is now in docbook-format. -- "Toggle Split Orientation" for Diff-Input windows. (Good for long lines.) -- When "Dir and Text Split-Screen-View" is off: Now "Focus Next/Prev Window" - also toggles between dir and text-windows. Selecting a file via double click - switches to text-screen. -- KDiff3 displays a warning when trying to read a dir without the permission. -- Directory-Diff-Option "Use CVS-Ignore" to ignore files like CVS does. -- Displaying a status message at the end of the directory-comparison. -- Cursor in MergeResultWindow is automatically placed at current difference when a jump occurred. - (But not when something was selected.) -- Fix for cursor blinking in the topline of the MergeResultWindow. - - -Version 0.9.61 - 2003/06/07 -=========================== -- Compilation problem fixed. -- Directory merge: Preserving file attributes and times during copy. (now also for Win32) -- Crash fixed, when directory comparison from the command-line was started. - - -Version 0.9.60 - 2003/06/01 -=========================== -New features: -- New ways to select input for the diff window: - - Pasting clipboard text into a diff window. - - Drag and drop a file from a filemanager (e.g. konqueror) onto a diff window. - - Drag and drop text from an editor (e.g. kate) onto a diff window. - Reanalysis starts immediately if no merge is in progress. - (This should help you to compare similar parts in the same file.) -- New/Deleted white lines are now also considered as white deltas. -- Configurable keyboard shortcuts for most actions (KDE version only). -- The overview now also distinguishes whitespace deltas. -New preprocessor options: -- You can now define your own external Preprocessor and LineMatchingPreprocessor: -- "Convert to upper case", -- "Ignore numbers" -Fixed bugs: -- Directory merge: Preserving file attributes and times during copy. - (not for Win32 yet) -Source-tree-structure: -- Switch to KDevelop3 (Gideon): Renamed subdir "kdiff3" to "src". -- xpm-files in xpm-subdirectory. - - -Version 0.9.51 - 2003/04/14 -=========================== -- Compilation fix for gcc 2.95. - - -Version 0.9.50 - 2003/03/30 -=========================== -Fixed bugs: -- Auto-Advance setting was lost when entering the settings-dialog. -- Windows specific: Keys with AltGr-Combination didn't work. -- Windows 95/98/ME: Fixed crash when KDiff3 is called used without parameters, - and corrected support for external diff. -New Features: -- Search-function: Search for a string in all open text windows. -- Special background colors for current region. -- Button to toggle showing of whitespace in differences. -- Buttons to go to next/prev unsolved (!) conflict. -- While auto-advance waits, no more choices are allowed. -- New setting: Auto-advance-delay. - (Note that with delay 0 fast clicks might be detected as double clicks and the second - click does nothing. My advice: Prefer the keyboard-shortcuts Ctrl-1/2/3) -- Functions to Show/Hide Diff Window A, B or C. The other windows then have more space. -- Merge editor: The right mouse button selects the current region and lets you choose - A, B or C via a popup menu. -- Commandline option --auto: No GUI if all conflicts are auto-solvable. -- When equal files are compared, then a message box informs you. -- Merge current file: When comparing two or three files, the merge can be started with a single click. -- Option dialog: Warning for "Defaults" added, because it resets all options. -- A warning is given, when the user tries to merge binary files. (i.e. files that contain '\0'-bytes) -Changed behaviour: -- 3 file automerge: When for a line B==C (and A!=B) then C will be selected. - (In older versions this was a conflict. I was convinced that this is no problem.) -- Auto-Advance now jumps to next unsolved (!) conflict. -- On 256-color-displays KDiff3 uses them. (Previously KDiff3 only used 16 colors.) -- On 16-color-displays the Defaults-button in the options dialog selects special colors. - - -Version 0.941 - 2003/02/09 -========================== -Fixed bugs: -- Qt-only-version: Compile problem corrected. -- Documentation: Formatting for tables corrected. - - -Version 0.94 - 2003/02/09 -========================= -New features: -- Option to use external GNU-diff for line matching. - (Sometimes GNU-diff is better, sometimes not: You may choose now.) -- In diff-windows a tooltip shows the full path if you move the mouse on the filename. -- Speedup of directory-merge operations without user interaction. - (Not every item in the tree is made visible anymore. This took too long.) -- When opening a file for comparison or merge KDiff3 immediately shows the first difference. -- "Go To Top/Bottom"-action have been changed to "Go To First/Last Delta". -- Font-Option "Italic For Deltas" added. -- Many icons and actions will only be enabled, when the operation is possible. -- Icon for merge of current file in directory merge mode added. -- New action "Go to Current Delta". -- Conflicts where some lines contained only-white-space-changes are now separated from - other non-white-space-conflicts. -- Experimental: Use as replacement for ClearCase-cleardiffmrg.exe (under Windows only). - See main.cpp for details. - -Fixed bugs: -- If files were different, but had the same dates, the "not existant"-icon was - shown for one file. Now a error message will be shown if the option - "Copy newer instead of merging" is used. -- Documentation: Section "The Operation Column" corrected. -- Qt-only-version: Fontsize wasn't correctly restored. -- Keyboard accelerators didn't work for ToggleActions. - - -Version 0.931 - 2003/01/19 -========================== -Fix for compilation problems with gcc version < 3. - - -Version 0.93 - 2003/01/16 -========================= -New features: -- Directory comparison and merge. (More than 3000 new lines of code only here!!!) -- Open-Dialog: Filename specification: If no previous filename is there then start - directory is taken from another file. -- Message about number of found and automatically solved conflicts. -- Support for wheelmouse based scrolling. -- New option in Diff-tab: Preserve Carriage Return Characters - -Fixed bugs: -- Save button disabled until all conflicts are solved. -- Copy-operation conserves conflict messages "". -- Paste operation created pseudo conflicts when the clipboard contained empty lines. -- W95/98/ME specific program crash removed. - - -Version 0.92 - 2002/11/04 -========================= -Severe bug corrected: -- Merge menu: Choose A/B/C Everywhere sometimes lost data. (introduced in 0.9) - - -Version 0.91 - 2002/11/03 -========================= -Speed improvements for very big/complicated files: -- Faster analysis because of limited search range (can be adjusted). -- Faster scrolling and editor behaviour. - -Fixed bugs: -- Compilation problem with gcc 3.2 fixed. -- When comparing two lines, matching spaces often were undetected. -- Merge editor appended extra empty line when saving. -- Sometimes the next diff/conflict wasn't made visible. -- The Auto-Advance setting is saved now. -- When doing a merge the application now has modified-state, - even without further input. (The old method wasn't safe.) -- File selection now always in directory of respective file. - - -Version 0.9 - 2002/10/16 -======================== -New features: -- Qt-only support. Allows compilation under KDE2, Gnome, Mac, Windows, ... - Note that KDE3 still gets special treatment. -- For Mergers: Auto-Advance after selection, Choose A/B/C everwhere, ... -- Commandline: If files with same name in different directories - are compared, only the first parameter needs the filename. -- Shift-Del, Ctrl-Ins, Shift-Ins supported for Cut/Copy/Paste - -Fixed bugs: -- Make failed on some systems because of missing "minmax.h". -- Files where opened for reading, but not closed afterwards. -- Vertical scrollbar sometimes didn't work correctly. - - - -Version 0.81 - 2002/08/18 -========================= -New features: -- Now KDE3 is also supported. Previously only KDE2 was supported. -- Navigation via click into the overview column now supported. - -Fixed bugs: -- Some input files caused a crash in the diff-algorithm. -- The meaning of option "Ignore trivial matches" was inverted. -- When selecting a text in one window, this deselects any previously - active selection in the same or another window. - - - -Version 0.8 - 2002/07/28 -======================== -This is the first version to be released. Index: trunk/extragear/utils/kdiff3/src/merger.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/merger.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/merger.cpp (nonexistent) @@ -1,87 +0,0 @@ -/*************************************************************************** - merger.cpp - description - ------------------- - begin : Sun Mar 24 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "merger.h" -#include -#include -#include - -Merger::Merger( const DiffList* pDiffListAB, const DiffList* pDiffListCA ) -: md1( pDiffListAB, 0 ), md2( pDiffListCA, 1 ) -{ -} - - -Merger::MergeData::MergeData( const DiffList* p, int i ) -: d(0,0,0) -{ - idx=i; - pDiffList = p; - if ( p!=0 ) - { - it=p->begin(); - update(); - } -} - -bool Merger::MergeData::eq() -{ - return pDiffList==0 || d.nofEquals > 0; -} - -bool Merger::MergeData::isEnd() -{ - return ( pDiffList==0 || ( it==pDiffList->end() && d.nofEquals==0 && - ( idx == 0 ? d.diff1==0 : d.diff2==0 ) - ) ); -} - -void Merger::MergeData::update() -{ - if ( d.nofEquals > 0 ) - --d.nofEquals; - else if ( idx==0 && d.diff1 > 0 ) - --d.diff1; - else if ( idx==1 && d.diff2 > 0 ) - --d.diff2; - - while( d.nofEquals == 0 && ((idx==0 && d.diff1 == 0) || (idx==1 && d.diff2 == 0)) - && pDiffList!=0 && it != pDiffList->end() ) - { - d = *it; - ++it; - } -} - -void Merger::next() -{ - md1.update(); - md2.update(); -} - -int Merger::whatChanged() -{ - int changed = 0; - changed |= md1.eq() ? 0 : 1; - changed |= md2.eq() ? 0 : 2; - return changed; -} - -bool Merger::isEndReached() -{ - return md1.isEnd() && md2.isEnd(); -} Index: trunk/extragear/utils/kdiff3/src/CMakeLists.txt =================================================================== --- trunk/extragear/utils/kdiff3/src/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/CMakeLists.txt (nonexistent) @@ -1,57 +0,0 @@ - - -#add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) - - -########### kdiff3 KPart ############### - -set(kdiff3part_PART_SRCS - kdiff3_part.cpp - kdiff3.cpp - directorymergewindow.cpp - merger.cpp - pdiff.cpp - difftextwindow.cpp - diff.cpp - optiondialog.cpp - mergeresultwindow.cpp - fileaccess.cpp - gnudiff_analyze.cpp - gnudiff_io.cpp - gnudiff_xmalloc.cpp - common.cpp - smalldialogs.cpp ) - -kde4_add_plugin(kdiff3part WITH_PREFIX ${kdiff3part_PART_SRCS}) - -set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART) - -target_link_libraries(kdiff3part ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) - -install(TARGETS kdiff3part DESTINATION ${PLUGIN_INSTALL_DIR} ) - -########### kdiff3 executable ############### - -set(kdiff3_SRCS - main.cpp - kdiff3_shell.cpp - ${kdiff3part_PART_SRCS} - ) - -kde4_add_executable(kdiff3 ${kdiff3_SRCS}) - -target_link_libraries(kdiff3 ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} ) - -install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS}) - - -########### install files ############### - -install( FILES kdiff3part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part ) -install( FILES kdiff3_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 ) -install( PROGRAMS kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) - -kde4_install_icons( ${ICON_INSTALL_DIR} ) - - Index: trunk/extragear/utils/kdiff3/src/gnudiff_xmalloc.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/gnudiff_xmalloc.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/gnudiff_xmalloc.cpp (nonexistent) @@ -1,86 +0,0 @@ -/* xmalloc.c -- malloc with out of memory checking - - Modified for KDiff3 by Joachim Eibl 2003. - The original file was part of GNU DIFF. - - Copyright (C) 1990-1999, 2000, 2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */ - -# include - -#include - - -#include -#include - - -#ifndef EXIT_FAILURE -# define EXIT_FAILURE 1 -#endif - -#include "gnudiff_diff.h" -/* If non NULL, call this function when memory is exhausted. */ -//void (*xalloc_fail_func) PARAMS ((void)) = 0; -void (*xalloc_fail_func)(void) = 0; - - -void GnuDiff::xalloc_die (void) -{ - if (xalloc_fail_func) - (*xalloc_fail_func) (); - //error (exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted)); - /* The `noreturn' cannot be given to error, since it may return if - its first argument is 0. To help compilers understand the - xalloc_die does terminate, call exit. */ - exit (EXIT_FAILURE); -} - -/* Allocate N bytes of memory dynamically, with error checking. */ - -void * -GnuDiff::xmalloc (size_t n) -{ - void *p; - - p = malloc (n == 0 ? 1 : n); // There are systems where malloc returns 0 for n==0. - if (p == 0) - xalloc_die (); - return p; -} - -/* Change the size of an allocated block of memory P to N bytes, - with error checking. */ - -void * -GnuDiff::xrealloc (void *p, size_t n) -{ - p = realloc (p, n==0 ? 1 : n); - if (p == 0) - xalloc_die (); - return p; -} - - -/* Yield a new block of SIZE bytes, initialized to zero. */ - -void * -GnuDiff::zalloc (size_t size) -{ - void *p = xmalloc (size); - memset (p, 0, size); - return p; -} Index: trunk/extragear/utils/kdiff3/src/stable.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/stable.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/stable.cpp (nonexistent) @@ -1 +0,0 @@ -#include "stable.h" Index: trunk/extragear/utils/kdiff3/src/main.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/main.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/main.cpp (nonexistent) @@ -1,260 +0,0 @@ -/*************************************************************************** - main.cpp - Where everything starts. - ------------------- - begin : Don Jul 11 12:31:29 CEST 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include -#include -#include -#include "kdiff3_shell.h" -#include -#include "version.h" -#include -#include -#include -#include -#include -#include -#include - -#ifdef KREPLACEMENTS_H -#include "optiondialog.h" -#endif -#include "common.h" - -void initialiseCmdLineArgs( KCmdLineOptions& options ) -{ - QString configFileName = KStandardDirs().findResource("config","kdiff3rc"); - QFile configFile( configFileName ); - QString ignorableOptionsLine = "-u;-query;-html;-abort"; - if ( configFile.open( QIODevice::ReadOnly ) ) - { - QTextStream ts( &configFile ); - while(!ts.atEnd()) - { - QString line = ts.readLine(); - if ( line.startsWith("IgnorableCmdLineOptions=") ) - { - int pos = line.indexOf('='); - if (pos>=0) - { - ignorableOptionsLine = line.mid(pos+1); - } - break; - } - } - } - -#ifdef KREPLACEMENTS_H - QStringList sl = ignorableOptionsLine.split( '|' ); -#else - QStringList sl = ignorableOptionsLine.split( ',' ); -#endif - if (!sl.isEmpty()) - { - QStringList ignorableOptions = sl.front().split( ';' ); - for (QStringList::iterator i=ignorableOptions.begin(); i!=ignorableOptions.end(); ++i) - { - (*i).remove('-'); - if (!(*i).isEmpty()) - { - if ( i->length()==1 ) - options.add( i->toLatin1() ).add("ignore", ki18n("Ignored. (User defined.)") ); - else - options.add( i->toLatin1(), ki18n("Ignored. (User defined.)") ); - } - } - } -} - -#ifdef _WIN32 -#include -// This command checks the comm -static bool isOptionUsed(const QString& s, int argc, char* argv[]) -{ - for(int j=0; jreadEntry("Language", "Auto"); - int spacePos = locale.indexOf(' '); - if (spacePos>0) locale = locale.left(spacePos); - ContextFreeTranslator kdiff3Translator( 0 ); - QTranslator qtTranslator( 0 ); - if (locale != "en_orig") - { - if ( locale == "Auto" || locale.isEmpty() ) - locale = locale = QLocale::system().name().left(2); - - QString translationDir = getTranslationDir(locale); - kdiff3Translator.load( QString("kdiff3_")+locale, translationDir ); - app.installTranslator( &kdiff3Translator ); - - qtTranslator.load( QString("qt_")+locale, translationDir ); - app.installTranslator( &qtTranslator ); - } -#endif - - if (app.isSessionRestored()) - { - RESTORE(KDiff3Shell); - } - else - { - KDiff3Shell* p = new KDiff3Shell(); - p->show(); - } -//app.installEventFilter( new CFilter ); - int retVal = app.exec(); - return retVal; -} - -// Suppress warning with --enable-final -#undef VERSION Index: trunk/extragear/utils/kdiff3/src/optiondialog.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/optiondialog.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/optiondialog.cpp (nonexistent) @@ -1,1873 +0,0 @@ -/* - * kdiff3 - Text Diff And Merge Tool - * Copyright (C) 2002-2009 Joachim Eibl, joachim.eibl at gmx.de - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include // For KFontChooser -#include -#include -#include -#include -#include //For ktoolbar.h -#include - -//#include -#include - -#include "optiondialog.h" -#include "diff.h" -#include "smalldialogs.h" - -#include - -#ifndef KREPLACEMENTS_H -#include -#endif - -#define KDIFF3_CONFIG_GROUP "KDiff3 Options" - -static QString s_historyEntryStartRegExpToolTip; -static QString s_historyEntryStartSortKeyOrderToolTip; -static QString s_autoMergeRegExpToolTip; -static QString s_historyStartRegExpToolTip; - -void OptionDialog::addOptionItem(OptionItem* p) -{ - m_optionItemList.push_back(p); -} - -class OptionItem -{ -public: - OptionItem( OptionDialog* pOptionDialog, const QString& saveName ) - { - assert(pOptionDialog!=0); - pOptionDialog->addOptionItem( this ); - m_saveName = saveName; - } - virtual ~OptionItem(){} - virtual void setToDefault()=0; - virtual void setToCurrent()=0; - virtual void apply()=0; - virtual void write(ValueMap*)=0; - virtual void read(ValueMap*)=0; - QString getSaveName(){return m_saveName;} -protected: - QString m_saveName; -}; - -class OptionCheckBox : public QCheckBox, public OptionItem -{ -public: - OptionCheckBox( QString text, bool bDefaultVal, const QString& saveName, bool* pbVar, - QWidget* pParent, OptionDialog* pOD ) - : QCheckBox( text, pParent ), OptionItem( pOD, saveName ) - { - m_pbVar = pbVar; - m_bDefaultVal = bDefaultVal; - } - void setToDefault(){ setChecked( m_bDefaultVal ); } - void setToCurrent(){ setChecked( *m_pbVar ); } - void apply() { *m_pbVar = isChecked(); } - void write(ValueMap* config){ config->writeEntry(m_saveName, *m_pbVar ); } - void read (ValueMap* config){ *m_pbVar = config->readBoolEntry( m_saveName, *m_pbVar ); } -private: - OptionCheckBox( const OptionCheckBox& ); // private copy constructor without implementation - bool* m_pbVar; - bool m_bDefaultVal; -}; - -class OptionRadioButton : public QRadioButton, public OptionItem -{ -public: - OptionRadioButton( QString text, bool bDefaultVal, const QString& saveName, bool* pbVar, - QWidget* pParent, OptionDialog* pOD ) - : QRadioButton( text, pParent ), OptionItem( pOD, saveName ) - { - m_pbVar = pbVar; - m_bDefaultVal = bDefaultVal; - } - void setToDefault(){ setChecked( m_bDefaultVal ); } - void setToCurrent(){ setChecked( *m_pbVar ); } - void apply() { *m_pbVar = isChecked(); } - void write(ValueMap* config){ config->writeEntry(m_saveName, *m_pbVar ); } - void read (ValueMap* config){ *m_pbVar = config->readBoolEntry( m_saveName, *m_pbVar ); } -private: - OptionRadioButton( const OptionRadioButton& ); // private copy constructor without implementation - bool* m_pbVar; - bool m_bDefaultVal; -}; - - -template -class OptionT : public OptionItem -{ -public: - OptionT( const T& defaultVal, const QString& saveName, T* pVar, OptionDialog* pOD ) - : OptionItem( pOD, saveName ) - { - m_pVar = pVar; - *m_pVar = defaultVal; - } - OptionT( const QString& saveName, T* pVar, OptionDialog* pOD ) - : OptionItem( pOD, saveName ) - { - m_pVar = pVar; - } - void setToDefault(){} - void setToCurrent(){} - void apply() {} - void write(ValueMap* vm){ writeEntry( vm, m_saveName, *m_pVar ); } - void read (ValueMap* vm){ *m_pVar = vm->readEntry ( m_saveName, *m_pVar ); } -private: - OptionT( const OptionT& ); // private copy constructor without implementation - T* m_pVar; -}; - -template void writeEntry(ValueMap* vm, const QString& saveName, const T& v ) { vm->writeEntry( saveName, v ); } -static void writeEntry(ValueMap* vm, const QString& saveName, const QStringList& v ) { vm->writeEntry( saveName, v, '|' ); } - -//static void readEntry(ValueMap* vm, const QString& saveName, bool& v ) { v = vm->readBoolEntry( saveName, v ); } -//static void readEntry(ValueMap* vm, const QString& saveName, int& v ) { v = vm->readNumEntry( saveName, v ); } -//static void readEntry(ValueMap* vm, const QString& saveName, QSize& v ) { v = vm->readSizeEntry( saveName, &v ); } -//static void readEntry(ValueMap* vm, const QString& saveName, QPoint& v ) { v = vm->readPointEntry( saveName, &v ); } -//static void readEntry(ValueMap* vm, const QString& saveName, QStringList& v ){ v = vm->readListEntry( saveName, QStringList(), '|' ); } - -typedef OptionT OptionToggleAction; -typedef OptionT OptionNum; -typedef OptionT OptionPoint; -typedef OptionT OptionSize; -typedef OptionT OptionStringList; - -class OptionFontChooser : public KFontChooser, public OptionItem -{ -public: - OptionFontChooser( const QFont& defaultVal, const QString& saveName, QFont* pbVar, QWidget* pParent, OptionDialog* pOD ) : - KFontChooser( pParent ), - OptionItem( pOD, saveName ) - { - m_pbVar = pbVar; - *m_pbVar = defaultVal; - m_default = defaultVal; - } - void setToDefault(){ setFont( m_default, true /*only fixed*/ ); } - void setToCurrent(){ setFont( *m_pbVar, true /*only fixed*/ ); } - void apply() { *m_pbVar = font();} - void write(ValueMap* config){ config->writeEntry(m_saveName, *m_pbVar ); } - void read (ValueMap* config){ *m_pbVar = config->readFontEntry( m_saveName, m_pbVar ); } -private: - OptionFontChooser( const OptionToggleAction& ); // private copy constructor without implementation - QFont* m_pbVar; - QFont m_default; -}; - -class OptionColorButton : public KColorButton, public OptionItem -{ -public: - OptionColorButton( QColor defaultVal, const QString& saveName, QColor* pVar, QWidget* pParent, OptionDialog* pOD ) - : KColorButton( pParent ), OptionItem( pOD, saveName ) - { - m_pVar = pVar; - m_defaultVal = defaultVal; - } - void setToDefault(){ setColor( m_defaultVal ); } - void setToCurrent(){ setColor( *m_pVar ); } - void apply() { *m_pVar = color(); } - void write(ValueMap* config){ config->writeEntry(m_saveName, *m_pVar ); } - void read (ValueMap* config){ *m_pVar = config->readColorEntry( m_saveName, m_pVar ); } -private: - OptionColorButton( const OptionColorButton& ); // private copy constructor without implementation - QColor* m_pVar; - QColor m_defaultVal; -}; - -class OptionLineEdit : public QComboBox, public OptionItem -{ -public: - OptionLineEdit( const QString& defaultVal, const QString& saveName, QString* pVar, - QWidget* pParent, OptionDialog* pOD ) - : QComboBox( pParent ), OptionItem( pOD, saveName ) - { - setMinimumWidth(50); - setEditable(true); - m_pVar = pVar; - m_defaultVal = defaultVal; - m_list.push_back(defaultVal); - insertText(); - } - void setToDefault(){ setEditText( m_defaultVal ); } - void setToCurrent(){ setEditText( *m_pVar ); } - void apply() { *m_pVar = currentText(); insertText(); } - void write(ValueMap* config){ config->writeEntry( m_saveName, m_list, '|' ); } - void read (ValueMap* config){ - m_list = config->readListEntry( m_saveName, QStringList(m_defaultVal), '|' ); - if ( !m_list.empty() ) *m_pVar = m_list.front(); - clear(); - insertItems(0,m_list); - } -private: - void insertText() - { // Check if the text exists. If yes remove it and push it in as first element - QString current = currentText(); - m_list.removeAll( current ); - m_list.push_front( current ); - clear(); - if ( m_list.size()>10 ) - m_list.erase( m_list.begin()+10, m_list.end() ); - insertItems(0,m_list); - } - OptionLineEdit( const OptionLineEdit& ); // private copy constructor without implementation - QString* m_pVar; - QString m_defaultVal; - QStringList m_list; -}; - -#if defined QT_NO_VALIDATOR -#error No validator -#endif -class OptionIntEdit : public QLineEdit, public OptionItem -{ -public: - OptionIntEdit( int defaultVal, const QString& saveName, int* pVar, int rangeMin, int rangeMax, - QWidget* pParent, OptionDialog* pOD ) - : QLineEdit( pParent ), OptionItem( pOD, saveName ) - { - m_pVar = pVar; - m_defaultVal = defaultVal; - QIntValidator* v = new QIntValidator(this); - v->setRange( rangeMin, rangeMax ); - setValidator( v ); - } - void setToDefault(){ QString s; s.setNum(m_defaultVal); setText( s ); } - void setToCurrent(){ QString s; s.setNum(*m_pVar); setText( s ); } - void apply() { const QIntValidator* v=static_cast(validator()); - *m_pVar = minMaxLimiter( text().toInt(), v->bottom(), v->top()); - setText( QString::number(*m_pVar) ); } - void write(ValueMap* config){ config->writeEntry(m_saveName, *m_pVar ); } - void read (ValueMap* config){ *m_pVar = config->readNumEntry( m_saveName, *m_pVar ); } -private: - OptionIntEdit( const OptionIntEdit& ); // private copy constructor without implementation - int* m_pVar; - int m_defaultVal; -}; - -class OptionComboBox : public QComboBox, public OptionItem -{ -public: - OptionComboBox( int defaultVal, const QString& saveName, int* pVarNum, - QWidget* pParent, OptionDialog* pOD ) - : QComboBox( pParent ), OptionItem( pOD, saveName ) - { - setMinimumWidth(50); - m_pVarNum = pVarNum; - m_pVarStr = 0; - m_defaultVal = defaultVal; - setEditable(false); - } - OptionComboBox( int defaultVal, const QString& saveName, QString* pVarStr, - QWidget* pParent, OptionDialog* pOD ) - : QComboBox( pParent ), OptionItem( pOD, saveName ) - { - m_pVarNum = 0; - m_pVarStr = pVarStr; - m_defaultVal = defaultVal; - setEditable(false); - } - void setToDefault() - { - setCurrentIndex( m_defaultVal ); - if (m_pVarStr!=0){ *m_pVarStr=currentText(); } - } - void setToCurrent() - { - if (m_pVarNum!=0) setCurrentIndex( *m_pVarNum ); - else setText( *m_pVarStr ); - } - void apply() - { - if (m_pVarNum!=0){ *m_pVarNum = currentIndex(); } - else { *m_pVarStr = currentText(); } - } - void write(ValueMap* config) - { - if (m_pVarStr!=0) config->writeEntry(m_saveName, *m_pVarStr ); - else config->writeEntry(m_saveName, *m_pVarNum ); - } - void read (ValueMap* config) - { - if (m_pVarStr!=0) setText( config->readEntry( m_saveName, currentText() ) ); - else *m_pVarNum = config->readNumEntry( m_saveName, *m_pVarNum ); - } -private: - OptionComboBox( const OptionIntEdit& ); // private copy constructor without implementation - int* m_pVarNum; - QString* m_pVarStr; - int m_defaultVal; - - void setText(const QString& s) - { - // Find the string in the combobox-list, don't change the value if nothing fits. - for( int i=0; i m_codecVec; - QTextCodec** m_ppVarCodec; -public: - OptionEncodingComboBox( const QString& saveName, QTextCodec** ppVarCodec, - QWidget* pParent, OptionDialog* pOD ) - : QComboBox( pParent ), OptionItem( pOD, saveName ) - { - m_ppVarCodec = ppVarCodec; - insertCodec( i18n("Unicode, 8 bit"), QTextCodec::codecForName("UTF-8") ); - insertCodec( i18n("Unicode"), QTextCodec::codecForName("iso-10646-UCS-2") ); - insertCodec( i18n("Latin1"), QTextCodec::codecForName("iso 8859-1") ); - - // First sort codec names: - std::map names; - QList mibs = QTextCodec::availableMibs(); - foreach(int i, mibs) - { - QTextCodec* c = QTextCodec::codecForMib(i); - if ( c!=0 ) - names[QString(c->name()).toUpper()]=c; - } - - std::map::iterator it; - for(it=names.begin();it!=names.end();++it) - { - insertCodec( "", it->second ); - } - - this->setToolTip( i18n( - "Change this if non-ASCII characters are not displayed correctly." - )); - } - void insertCodec( const QString& visibleCodecName, QTextCodec* c ) - { - if (c!=0) - { - for( unsigned int i=0; iname()) : visibleCodecName+" ("+c->name()+")", (int)m_codecVec.size() ); - m_codecVec.push_back( c ); - } - } - void setToDefault() - { - QString defaultName = QTextCodec::codecForLocale()->name(); - for(int i=0;iwriteEntry(m_saveName, QString((*m_ppVarCodec)->name()) ); - } - void read (ValueMap* config) - { - QString codecName = config->readEntry( m_saveName, QString(m_codecVec[ currentIndex() ]->name()) ); - for(unsigned int i=0; iname() ) - { - setCurrentIndex( i ); - if (m_ppVarCodec!=0) *m_ppVarCodec = m_codecVec[i]; - break; - } - } - } -}; - - -OptionDialog::OptionDialog( bool bShowDirMergeSettings, QWidget *parent, char *name ) : -// KPageDialog( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel, -// Ok, parent, name, true /*modal*/, true ) - KPageDialog( parent ) -{ - setFaceType( List ); - setWindowTitle( i18n("Configure") ); - setButtons( Help|Default|Apply|Ok|Cancel ); - setDefaultButton( Ok ); - setObjectName( name ); - setModal( true ); - showButtonSeparator( true ); - setHelp( "kdiff3/index.html", QString::null ); - - setupFontPage(); - setupColorPage(); - setupEditPage(); - setupDiffPage(); - setupMergePage(); - setupOtherOptions(); - if (bShowDirMergeSettings) - setupDirectoryMergePage(); - - setupRegionalPage(); - setupIntegrationPage(); - - //setupKeysPage(); - - // Initialize all values in the dialog - resetToDefaults(); - slotApply(); - connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply())); - connect(this, SIGNAL(okClicked()), this, SLOT(slotOk())); - //helpClicked() is connected in KDiff3App::KDiff3App - connect(this, SIGNAL(defaultClicked()), this, SLOT(slotDefault())); -} - -OptionDialog::~OptionDialog( void ) -{ -} - -void OptionDialog::setupOtherOptions() -{ - new OptionToggleAction( false, "AutoAdvance", &m_bAutoAdvance, this ); - new OptionToggleAction( true, "ShowWhiteSpaceCharacters", &m_bShowWhiteSpaceCharacters, this ); - new OptionToggleAction( true, "ShowWhiteSpace", &m_bShowWhiteSpace, this ); - new OptionToggleAction( false, "ShowLineNumbers", &m_bShowLineNumbers, this ); - new OptionToggleAction( true, "HorizDiffWindowSplitting", &m_bHorizDiffWindowSplitting, this ); - new OptionToggleAction( false, "WordWrap", &m_bWordWrap, this ); - - new OptionToggleAction( true, "ShowIdenticalFiles", &m_bDmShowIdenticalFiles, this ); - - new OptionToggleAction( true, "Show Toolbar", &m_bShowToolBar, this ); - new OptionToggleAction( true, "Show Statusbar", &m_bShowStatusBar, this ); - -/* - TODO manage toolbar positioning - new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this ); -*/ - new OptionSize( QSize(600,400),"Geometry", &m_geometry, this ); - new OptionPoint( QPoint(0,22), "Position", &m_position, this ); - new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this ); - - new OptionStringList( "RecentAFiles", &m_recentAFiles, this ); - new OptionStringList( "RecentBFiles", &m_recentBFiles, this ); - new OptionStringList( "RecentCFiles", &m_recentCFiles, this ); - new OptionStringList( "RecentOutputFiles", &m_recentOutputFiles, this ); -} - -void OptionDialog::setupFontPage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem *pageItem = new KPageWidgetItem( page, i18n("Font") ); - pageItem->setHeader( i18n("Editor & Diff Output Font" ) ); - pageItem->setIcon( KIcon( "preferences-desktop-font" ) ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QFont defaultFont = -#ifdef _WIN32 - QFont("Courier New", 10 ); -#elif defined( KREPLACEMENTS_H ) - QFont("Courier", 10 ); -#else - KGlobalSettings::fixedFont(); -#endif - - OptionFontChooser* pFontChooser = new OptionFontChooser( defaultFont, "Font", &m_font, page, this ); - topLayout->addWidget( pFontChooser ); - - QGridLayout *gbox = new QGridLayout(); - topLayout->addLayout( gbox ); - int line=0; - - OptionCheckBox* pItalicDeltas = new OptionCheckBox( i18n("Italic font for deltas"), false, "ItalicForDeltas", &m_bItalicForDeltas, page, this ); - gbox->addWidget( pItalicDeltas, line, 0, 1, 2 ); - pItalicDeltas->setToolTip( i18n( - "Selects the italic version of the font for differences.\n" - "If the font doesn't support italic characters, then this does nothing.") - ); -} - - -void OptionDialog::setupColorPage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Color") ); - pageItem->setHeader( i18n("Colors Settings") ); - pageItem->setIcon( KIcon("preferences-desktop-color") ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(1,5); - topLayout->addLayout(gbox); - - QLabel* label; - int line = 0; - - int depth = QPixmap::defaultDepth(); - bool bLowColor = depth<=8; - - label = new QLabel( i18n("Editor and Diff Views:"), page ); - gbox->addWidget( label, line, 0 ); - QFont f( label->font() ); - f.setBold(true); - label->setFont(f); - ++line; - - OptionColorButton* pFgColor = new OptionColorButton( Qt::black,"FgColor", &m_fgColor, page, this ); - label = new QLabel( i18n("Foreground color:"), page ); - label->setBuddy(pFgColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pFgColor, line, 1 ); - ++line; - - OptionColorButton* pBgColor = new OptionColorButton( Qt::white, "BgColor", &m_bgColor, page, this ); - label = new QLabel( i18n("Background color:"), page ); - label->setBuddy(pBgColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pBgColor, line, 1 ); - - ++line; - - OptionColorButton* pDiffBgColor = new OptionColorButton( - bLowColor ? QColor(Qt::lightGray) : qRgb(224,224,224), "DiffBgColor", &m_diffBgColor, page, this ); - label = new QLabel( i18n("Diff background color:"), page ); - label->setBuddy(pDiffBgColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pDiffBgColor, line, 1 ); - ++line; - - OptionColorButton* pColorA = new OptionColorButton( - bLowColor ? qRgb(0,0,255) : qRgb(0,0,200)/*blue*/, "ColorA", &m_colorA, page, this ); - label = new QLabel( i18n("Color A:"), page ); - label->setBuddy(pColorA); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColorA, line, 1 ); - ++line; - - OptionColorButton* pColorB = new OptionColorButton( - bLowColor ? qRgb(0,128,0) : qRgb(0,150,0)/*green*/, "ColorB", &m_colorB, page, this ); - label = new QLabel( i18n("Color B:"), page ); - label->setBuddy(pColorB); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColorB, line, 1 ); - ++line; - - OptionColorButton* pColorC = new OptionColorButton( - bLowColor ? qRgb(128,0,128) : qRgb(150,0,150)/*magenta*/, "ColorC", &m_colorC, page, this ); - label = new QLabel( i18n("Color C:"), page ); - label->setBuddy(pColorC); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColorC, line, 1 ); - ++line; - - OptionColorButton* pColorForConflict = new OptionColorButton( Qt::red, "ColorForConflict", &m_colorForConflict, page, this ); - label = new QLabel( i18n("Conflict color:"), page ); - label->setBuddy(pColorForConflict); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColorForConflict, line, 1 ); - ++line; - - OptionColorButton* pColor = new OptionColorButton( - bLowColor ? qRgb(192,192,192) : qRgb(220,220,100), "CurrentRangeBgColor", &m_currentRangeBgColor, page, this ); - label = new QLabel( i18n("Current range background color:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - ++line; - - pColor = new OptionColorButton( - bLowColor ? qRgb(255,255,0) : qRgb(255,255,150), "CurrentRangeDiffBgColor", &m_currentRangeDiffBgColor, page, this ); - label = new QLabel( i18n("Current range diff background color:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - ++line; - - pColor = new OptionColorButton( qRgb(0xff,0xd0,0x80), "ManualAlignmentRangeColor", &m_manualHelpRangeColor, page, this ); - label = new QLabel( i18n("Color for manually aligned difference ranges:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - ++line; - - label = new QLabel( i18n("Directory Comparison View:"), page ); - gbox->addWidget( label, line, 0 ); - label->setFont(f); - ++line; - - pColor = new OptionColorButton( qRgb(0,0xd0,0), "NewestFileColor", &m_newestFileColor, page, this ); - label = new QLabel( i18n("Newest file color:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - QString dirColorTip = i18n( "Changing this color will only be effective when starting the next directory comparison."); - label->setToolTip( dirColorTip ); - ++line; - - pColor = new OptionColorButton( qRgb(0xf0,0,0), "OldestFileColor", &m_oldestFileColor, page, this ); - label = new QLabel( i18n("Oldest file color:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - label->setToolTip( dirColorTip ); - ++line; - - pColor = new OptionColorButton( qRgb(0xc0,0xc0,0), "MidAgeFileColor", &m_midAgeFileColor, page, this ); - label = new QLabel( i18n("Middle age file color:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - label->setToolTip( dirColorTip ); - ++line; - - pColor = new OptionColorButton( qRgb(0,0,0), "MissingFileColor", &m_missingFileColor, page, this ); - label = new QLabel( i18n("Color for missing files:"), page ); - label->setBuddy(pColor); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pColor, line, 1 ); - label->setToolTip( dirColorTip ); - ++line; - - topLayout->addStretch(10); -} - - -void OptionDialog::setupEditPage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Editor") ); - pageItem->setHeader( i18n("Editor Behavior") ); - pageItem->setIcon( KIcon( "accessories-text-editor") ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(1,5); - topLayout->addLayout( gbox ); - QLabel* label; - int line=0; - - OptionCheckBox* pReplaceTabs = new OptionCheckBox( i18n("Tab inserts spaces"), false, "ReplaceTabs", &m_bReplaceTabs, page, this ); - gbox->addWidget( pReplaceTabs, line, 0, 1, 2 ); - pReplaceTabs->setToolTip( i18n( - "On: Pressing tab generates the appropriate number of spaces.\n" - "Off: A tab character will be inserted.") - ); - ++line; - - OptionIntEdit* pTabSize = new OptionIntEdit( 8, "TabSize", &m_tabSize, 1, 100, page, this ); - label = new QLabel( i18n("Tab size:"), page ); - label->setBuddy( pTabSize ); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pTabSize, line, 1 ); - ++line; - - OptionCheckBox* pAutoIndentation = new OptionCheckBox( i18n("Auto indentation"), true, "AutoIndentation", &m_bAutoIndentation, page, this ); - gbox->addWidget( pAutoIndentation, line, 0, 1, 2 ); - pAutoIndentation->setToolTip( i18n( - "On: The indentation of the previous line is used for a new line.\n" - )); - ++line; - - OptionCheckBox* pAutoCopySelection = new OptionCheckBox( i18n("Auto copy selection"), false, "AutoCopySelection", &m_bAutoCopySelection, page, this ); - gbox->addWidget( pAutoCopySelection, line, 0, 1, 2 ); - pAutoCopySelection->setToolTip( i18n( - "On: Any selection is immediately written to the clipboard.\n" - "Off: You must explicitely copy e.g. via Ctrl-C." - )); - ++line; - - label = new QLabel( i18n("Line end style:"), page ); - gbox->addWidget( label, line, 0 ); - - OptionComboBox* pLineEndStyle = new OptionComboBox( eLineEndStyleAutoDetect, "LineEndStyle", &m_lineEndStyle, page, this ); - gbox->addWidget( pLineEndStyle, line, 1 ); - pLineEndStyle->insertItem( eLineEndStyleUnix, "Unix" ); - pLineEndStyle->insertItem( eLineEndStyleDos, "Dos/Windows" ); - pLineEndStyle->insertItem( eLineEndStyleAutoDetect, "Autodetect" ); - - label->setToolTip( i18n( - "Sets the line endings for when an edited file is saved.\n" - "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A") - ); - ++line; - - topLayout->addStretch(10); -} - - -void OptionDialog::setupDiffPage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Diff") ); - pageItem->setHeader( i18n("Diff Settings") ); - pageItem->setIcon( KIcon( "preferences-other" ) ); - addPage( pageItem ); - - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(1,5); - topLayout->addLayout( gbox ); - int line=0; - - QLabel* label=0; - - m_bPreserveCarriageReturn = false; - //OptionCheckBox* pPreserveCarriageReturn = new OptionCheckBox( i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_bPreserveCarriageReturn, page, this ); - //gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); - //pPreserveCarriageReturn->setToolTip( i18n( - // "Show carriage return characters '\\r' if they exist.\n" - // "Helps to compare files that were modified under different operating systems.") - // ); - //++line; - QString treatAsWhiteSpace = " ("+i18n("Treat as white space.")+")"; - - OptionCheckBox* pIgnoreNumbers = new OptionCheckBox( i18n("Ignore numbers")+treatAsWhiteSpace, false, "IgnoreNumbers", &m_bIgnoreNumbers, page, this ); - gbox->addWidget( pIgnoreNumbers, line, 0, 1, 2 ); - pIgnoreNumbers->setToolTip( i18n( - "Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" - "Might help to compare files with numeric data.") - ); - ++line; - - OptionCheckBox* pIgnoreComments = new OptionCheckBox( i18n("Ignore C/C++ comments")+treatAsWhiteSpace, false, "IgnoreComments", &m_bIgnoreComments, page, this ); - gbox->addWidget( pIgnoreComments, line, 0, 1, 2 ); - pIgnoreComments->setToolTip( i18n( "Treat C/C++ comments like white space.") - ); - ++line; - - OptionCheckBox* pIgnoreCase = new OptionCheckBox( i18n("Ignore case")+treatAsWhiteSpace, false, "IgnoreCase", &m_bIgnoreCase, page, this ); - gbox->addWidget( pIgnoreCase, line, 0, 1, 2 ); - pIgnoreCase->setToolTip( i18n( - "Treat case differences like white space changes. ('a'<=>'A')") - ); - ++line; - - label = new QLabel( i18n("Preprocessor command:"), page ); - gbox->addWidget( label, line, 0 ); - OptionLineEdit* pLE = new OptionLineEdit( "", "PreProcessorCmd", &m_PreProcessorCmd, page, this ); - gbox->addWidget( pLE, line, 1 ); - label->setToolTip( i18n("User defined pre-processing. (See the docs for details.)") ); - ++line; - - label = new QLabel( i18n("Line-matching preprocessor command:"), page ); - gbox->addWidget( label, line, 0 ); - pLE = new OptionLineEdit( "", "LineMatchingPreProcessorCmd", &m_LineMatchingPreProcessorCmd, page, this ); - gbox->addWidget( pLE, line, 1 ); - label->setToolTip( i18n("This pre-processor is only used during line matching.\n(See the docs for details.)") ); - ++line; - - OptionCheckBox* pTryHard = new OptionCheckBox( i18n("Try hard (slower)"), true, "TryHard", &m_bTryHard, page, this ); - gbox->addWidget( pTryHard, line, 0, 1, 2 ); - pTryHard->setToolTip( i18n( - "Enables the --minimal option for the external diff.\n" - "The analysis of big files will be much slower.") - ); - ++line; - - OptionCheckBox* pDiff3AlignBC = new OptionCheckBox( i18n("Align B and C for 3 input files"), false, "Diff3AlignBC", &m_bDiff3AlignBC, page, this ); - gbox->addWidget( pDiff3AlignBC, line, 0, 1, 2 ); - pDiff3AlignBC->setToolTip( i18n( - "Try to align B and C when comparing or merging three input files.\n" - "Not recommended for merging because merge might get more complicated.\n" - "(Default is off.)") - ); - ++line; - - topLayout->addStretch(10); -} - -void OptionDialog::setupMergePage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Merge") ); - pageItem->setHeader( i18n("Merge Settings") ); - pageItem->setIcon( KIcon( "plasmagik" ) ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(1,5); - topLayout->addLayout( gbox ); - int line=0; - - QLabel* label=0; - - label = new QLabel( i18n("Auto advance delay (ms):"), page ); - gbox->addWidget( label, line, 0 ); - OptionIntEdit* pAutoAdvanceDelay = new OptionIntEdit( 500, "AutoAdvanceDelay", &m_autoAdvanceDelay, 0, 2000, page, this ); - gbox->addWidget( pAutoAdvanceDelay, line, 1 ); - label->setToolTip(i18n( - "When in Auto-Advance mode the result of the current selection is shown \n" - "for the specified time, before jumping to the next conflict. Range: 0-2000 ms") - ); - ++line; - - OptionCheckBox* pShowInfoDialogs = new OptionCheckBox( i18n("Show info dialogs"), true, "ShowInfoDialogs", &m_bShowInfoDialogs, page, this ); - gbox->addWidget( pShowInfoDialogs, line, 0, 1, 2 ); - pShowInfoDialogs->setToolTip( i18n("Show a dialog with information about the number of conflicts.") ); - ++line; - - label = new QLabel( i18n("White space 2-file merge default:"), page ); - gbox->addWidget( label, line, 0 ); - OptionComboBox* pWhiteSpace2FileMergeDefault = new OptionComboBox( 0, "WhiteSpace2FileMergeDefault", &m_whiteSpace2FileMergeDefault, page, this ); - gbox->addWidget( pWhiteSpace2FileMergeDefault, line, 1 ); - pWhiteSpace2FileMergeDefault->insertItem( 0, i18n("Manual Choice") ); - pWhiteSpace2FileMergeDefault->insertItem( 1, "A" ); - pWhiteSpace2FileMergeDefault->insertItem( 2, "B" ); - label->setToolTip( i18n( - "Allow the merge algorithm to automatically select an input for " - "white-space-only changes." ) - ); - ++line; - - label = new QLabel( i18n("White space 3-file merge default:"), page ); - gbox->addWidget( label, line, 0 ); - OptionComboBox* pWhiteSpace3FileMergeDefault = new OptionComboBox( 0, "WhiteSpace3FileMergeDefault", &m_whiteSpace3FileMergeDefault, page, this ); - gbox->addWidget( pWhiteSpace3FileMergeDefault, line, 1 ); - pWhiteSpace3FileMergeDefault->insertItem( 0, i18n("Manual Choice") ); - pWhiteSpace3FileMergeDefault->insertItem( 1, "A" ); - pWhiteSpace3FileMergeDefault->insertItem( 2, "B" ); - pWhiteSpace3FileMergeDefault->insertItem( 3, "C" ); - label->setToolTip( i18n( - "Allow the merge algorithm to automatically select an input for " - "white-space-only changes." ) - ); - ++line; - - QGroupBox* pGroupBox = new QGroupBox( i18n("Automatic Merge Regular Expression") ); - gbox->addWidget( pGroupBox, line, 0, 1, 2 ); - ++line; - { - QGridLayout* gbox = new QGridLayout( pGroupBox ); - gbox->setMargin(spacingHint()); - gbox->setColumnStretch(1,10); - int line = 0; - - label = new QLabel( i18n("Auto merge regular expression:"), page ); - gbox->addWidget( label, line, 0 ); - m_pAutoMergeRegExpLineEdit = new OptionLineEdit( ".*\\$(Version|Header|Date|Author).*\\$.*", "AutoMergeRegExp", &m_autoMergeRegExp, page, this ); - gbox->addWidget( m_pAutoMergeRegExpLineEdit, line, 1 ); - s_autoMergeRegExpToolTip = i18n("Regular expression for lines where KDiff3 should automatically choose one source.\n" - "When a line with a conflict matches the regular expression then\n" - "- if available - C, otherwise B will be chosen."); - label->setToolTip( s_autoMergeRegExpToolTip ); - ++line; - - OptionCheckBox* pAutoMergeRegExp = new OptionCheckBox( i18n("Run regular expression auto merge on merge start"), false, "RunRegExpAutoMergeOnMergeStart", &m_bRunRegExpAutoMergeOnMergeStart, page, this ); - gbox->addWidget( pAutoMergeRegExp, line, 0, 1, 2 ); - pAutoMergeRegExp->setToolTip( i18n( "Run the merge for auto merge regular expressions\n" - "immediately when a merge starts.\n")); - ++line; - } - - pGroupBox = new QGroupBox( i18n("Version Control History Merging") ); - gbox->addWidget( pGroupBox, line, 0, 1, 2 ); - ++line; - { - QGridLayout* gbox = new QGridLayout( pGroupBox ); - gbox->setMargin( spacingHint() ); - gbox->setColumnStretch(1,10); - int line = 0; - - label = new QLabel( i18n("History start regular expression:"), page ); - gbox->addWidget( label, line, 0 ); - m_pHistoryStartRegExpLineEdit = new OptionLineEdit( ".*\\$Log.*\\$.*", "HistoryStartRegExp", &m_historyStartRegExp, page, this ); - gbox->addWidget( m_pHistoryStartRegExpLineEdit, line, 1 ); - s_historyStartRegExpToolTip = i18n("Regular expression for the start of the version control history entry.\n" - "Usually this line contains the \"$Log$\" keyword.\n" - "Default value: \".*\\$Log.*\\$.*\""); - label->setToolTip( s_historyStartRegExpToolTip ); - ++line; - - label = new QLabel( i18n("History entry start regular expression:"), page ); - gbox->addWidget( label, line, 0 ); - // Example line: "** \main\rolle_fsp_dev_008\1 17 Aug 2001 10:45:44 rolle" - QString historyEntryStartDefault = - "\\s*\\\\main\\\\(\\S+)\\s+" // Start with "\main\" - "([0-9]+) " // day - "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) " //month - "([0-9][0-9][0-9][0-9]) " // year - "([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)"; // time, name - - m_pHistoryEntryStartRegExpLineEdit = new OptionLineEdit( historyEntryStartDefault, "HistoryEntryStartRegExp", &m_historyEntryStartRegExp, page, this ); - gbox->addWidget( m_pHistoryEntryStartRegExpLineEdit, line, 1 ); - s_historyEntryStartRegExpToolTip = i18n("A version control history entry consists of several lines.\n" - "Specify the regular expression to detect the first line (without the leading comment).\n" - "Use parentheses to group the keys you want to use for sorting.\n" - "If left empty, then KDiff3 assumes that empty lines separate history entries.\n" - "See the documentation for details."); - label->setToolTip( s_historyEntryStartRegExpToolTip ); - ++line; - - m_pHistoryMergeSorting = new OptionCheckBox( i18n("History merge sorting"), false, "HistoryMergeSorting", &m_bHistoryMergeSorting, page, this ); - gbox->addWidget( m_pHistoryMergeSorting, line, 0, 1, 2 ); - m_pHistoryMergeSorting->setToolTip( i18n("Sort version control history by a key.") ); - ++line; - //QString branch = newHistoryEntry.cap(1); - //int day = newHistoryEntry.cap(2).toInt(); - //int month = QString("Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec").find(newHistoryEntry.cap(3))/4 + 1; - //int year = newHistoryEntry.cap(4).toInt(); - //QString time = newHistoryEntry.cap(5); - //QString name = newHistoryEntry.cap(6); - QString defaultSortKeyOrder = "4,3,2,5,1,6"; //QDate(year,month,day).toString(Qt::ISODate) +" "+ time + " " + branch + " " + name; - - label = new QLabel( i18n("History entry start sort key order:"), page ); - gbox->addWidget( label, line, 0 ); - m_pHistorySortKeyOrderLineEdit = new OptionLineEdit( defaultSortKeyOrder, "HistoryEntryStartSortKeyOrder", &m_historyEntryStartSortKeyOrder, page, this ); - gbox->addWidget( m_pHistorySortKeyOrderLineEdit, line, 1 ); - s_historyEntryStartSortKeyOrderToolTip = i18n("Each pair of parentheses used in the regular expression for the history start entry\n" - "groups a key that can be used for sorting.\n" - "Specify the list of keys (that are numbered in order of occurrence\n" - "starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" - "If left empty, then no sorting will be done.\n" - "See the documentation for details."); - label->setToolTip( s_historyEntryStartSortKeyOrderToolTip ); - m_pHistorySortKeyOrderLineEdit->setEnabled(false); - connect( m_pHistoryMergeSorting, SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, SLOT(setEnabled(bool))); - ++line; - - m_pHistoryAutoMerge = new OptionCheckBox( i18n("Merge version control history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m_bRunHistoryAutoMergeOnMergeStart, page, this ); - gbox->addWidget( m_pHistoryAutoMerge, line, 0, 1, 2 ); - m_pHistoryAutoMerge->setToolTip( i18n("Run version control history automerge on merge start.") ); - ++line; - - OptionIntEdit* pMaxNofHistoryEntries = new OptionIntEdit( -1, "MaxNofHistoryEntries", &m_maxNofHistoryEntries, -1, 1000, page, this ); - label = new QLabel( i18n("Max number of history entries:"), page ); - gbox->addWidget( label, line, 0 ); - gbox->addWidget( pMaxNofHistoryEntries, line, 1 ); - pMaxNofHistoryEntries->setToolTip( i18n("Cut off after specified number. Use -1 for infinite number of entries.") ); - ++line; - } - - QPushButton* pButton = new QPushButton( i18n("Test your regular expressions"), page ); - gbox->addWidget( pButton, line, 0 ); - connect( pButton, SIGNAL(clicked()), this, SLOT(slotHistoryMergeRegExpTester())); - ++line; - - label = new QLabel( i18n("Irrelevant merge command:"), page ); - gbox->addWidget( label, line, 0 ); - OptionLineEdit* pLE = new OptionLineEdit( "", "IrrelevantMergeCmd", &m_IrrelevantMergeCmd, page, this ); - gbox->addWidget( pLE, line, 1 ); - label->setToolTip( i18n("If specified this script is run after automerge\n" - "when no other relevant changes were detected.\n" - "Called with the parameters: filename1 filename2 filename3") ); - ++line; - - - OptionCheckBox* pAutoSaveAndQuit = new OptionCheckBox( i18n("Auto save and quit on merge without conflicts"), false, - "AutoSaveAndQuitOnMergeWithoutConflicts", &m_bAutoSaveAndQuitOnMergeWithoutConflicts, page, this ); - gbox->addWidget( pAutoSaveAndQuit, line, 0, 1, 2 ); - pAutoSaveAndQuit->setToolTip( i18n("If KDiff3 was started for a file-merge from the command line and all\n" - "conflicts are solvable without user interaction then automatically save and quit.\n" - "(Similar to command line option \"--auto\".)") ); - ++line; - - topLayout->addStretch(10); -} - -void OptionDialog::setupDirectoryMergePage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Directory") ); - pageItem->setHeader( i18n("Directory") ); - pageItem->setIcon( KIcon( "folder" ) ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(1,5); - topLayout->addLayout( gbox ); - int line=0; - - OptionCheckBox* pRecursiveDirs = new OptionCheckBox( i18n("Recursive directories"), true, "RecursiveDirs", &m_bDmRecursiveDirs, page, this ); - gbox->addWidget( pRecursiveDirs, line, 0, 1, 2 ); - pRecursiveDirs->setToolTip( i18n("Whether to analyze subdirectories or not.") ); - ++line; - QLabel* label = new QLabel( i18n("File pattern(s):"), page ); - gbox->addWidget( label, line, 0 ); - OptionLineEdit* pFilePattern = new OptionLineEdit( "*", "FilePattern", &m_DmFilePattern, page, this ); - gbox->addWidget( pFilePattern, line, 1 ); - label->setToolTip( i18n( - "Pattern(s) of files to be analyzed. \n" - "Wildcards: '*' and '?'\n" - "Several Patterns can be specified by using the separator: ';'" - )); - ++line; - - label = new QLabel( i18n("File-anti-pattern(s):"), page ); - gbox->addWidget( label, line, 0 ); - OptionLineEdit* pFileAntiPattern = new OptionLineEdit( "*.orig;*.o;*.obj", "FileAntiPattern", &m_DmFileAntiPattern, page, this ); - gbox->addWidget( pFileAntiPattern, line, 1 ); - label->setToolTip( i18n( - "Pattern(s) of files to be excluded from analysis. \n" - "Wildcards: '*' and '?'\n" - "Several Patterns can be specified by using the separator: ';'" - )); - ++line; - - label = new QLabel( i18n("Dir-anti-pattern(s):"), page ); - gbox->addWidget( label, line, 0 ); - OptionLineEdit* pDirAntiPattern = new OptionLineEdit( "CVS;.deps;.svn", "DirAntiPattern", &m_DmDirAntiPattern, page, this ); - gbox->addWidget( pDirAntiPattern, line, 1 ); - label->setToolTip( i18n( - "Pattern(s) of directories to be excluded from analysis. \n" - "Wildcards: '*' and '?'\n" - "Several Patterns can be specified by using the separator: ';'" - )); - ++line; - - OptionCheckBox* pUseCvsIgnore = new OptionCheckBox( i18n("Use .cvsignore"), false, "UseCvsIgnore", &m_bDmUseCvsIgnore, page, this ); - gbox->addWidget( pUseCvsIgnore, line, 0, 1, 2 ); - pUseCvsIgnore->setToolTip( i18n( - "Extends the antipattern to anything that would be ignored by CVS.\n" - "Via local \".cvsignore\" files this can be directory specific." - )); - ++line; - - OptionCheckBox* pFindHidden = new OptionCheckBox( i18n("Find hidden files and directories"), true, "FindHidden", &m_bDmFindHidden, page, this ); - gbox->addWidget( pFindHidden, line, 0, 1, 2 ); -#if defined(_WIN32) || defined(Q_OS_OS2) - pFindHidden->setToolTip( i18n("Finds files and directories with the hidden attribute.") ); -#else - pFindHidden->setToolTip( i18n("Finds files and directories starting with '.'.") ); -#endif - ++line; - - OptionCheckBox* pFollowFileLinks = new OptionCheckBox( i18n("Follow file links"), false, "FollowFileLinks", &m_bDmFollowFileLinks, page, this ); - gbox->addWidget( pFollowFileLinks, line, 0, 1, 2 ); - pFollowFileLinks->setToolTip( i18n( - "On: Compare the file the link points to.\n" - "Off: Compare the links." - )); - ++line; - - OptionCheckBox* pFollowDirLinks = new OptionCheckBox( i18n("Follow directory links"), false, "FollowDirLinks", &m_bDmFollowDirLinks, page, this ); - gbox->addWidget( pFollowDirLinks, line, 0, 1, 2 ); - pFollowDirLinks->setToolTip( i18n( - "On: Compare the directory the link points to.\n" - "Off: Compare the links." - )); - ++line; - - //OptionCheckBox* pShowOnlyDeltas = new OptionCheckBox( i18n("List only deltas"),false,"ListOnlyDeltas", &m_bDmShowOnlyDeltas, page, this ); - //gbox->addWidget( pShowOnlyDeltas, line, 0, 1, 2 ); - //pShowOnlyDeltas->setToolTip( i18n( - // "Files and directories without change will not appear in the list.")); - //++line; - -#if defined(_WIN32) || defined(Q_OS_OS2) - bool bCaseSensitiveFilenameComparison = false; -#else - bool bCaseSensitiveFilenameComparison = true; -#endif - OptionCheckBox* pCaseSensitiveFileNames = new OptionCheckBox( i18n("Case sensitive filename comparison"),bCaseSensitiveFilenameComparison,"CaseSensitiveFilenameComparison", &m_bDmCaseSensitiveFilenameComparison, page, this ); - gbox->addWidget( pCaseSensitiveFileNames, line, 0, 1, 2 ); - pCaseSensitiveFileNames->setToolTip( i18n( - "The directory comparison will compare files or directories when their names match.\n" - "Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)")); - ++line; - - QGroupBox* pBG = new QGroupBox( i18n("File Comparison Mode") ); - gbox->addWidget( pBG, line, 0, 1, 2 ); - - QVBoxLayout* pBGLayout = new QVBoxLayout( pBG ); - pBGLayout->setMargin(spacingHint()); - - OptionRadioButton* pBinaryComparison = new OptionRadioButton( i18n("Binary comparison"), true, "BinaryComparison", &m_bDmBinaryComparison, pBG, this ); - pBinaryComparison->setToolTip( i18n("Binary comparison of each file. (Default)") ); - pBGLayout->addWidget( pBinaryComparison ); - - OptionRadioButton* pFullAnalysis = new OptionRadioButton( i18n("Full analysis"), false, "FullAnalysis", &m_bDmFullAnalysis, pBG, this ); - pFullAnalysis->setToolTip( i18n("Do a full analysis and show statistics information in extra columns.\n" - "(Slower than a binary comparison, much slower for binary files.)") ); - pBGLayout->addWidget( pFullAnalysis ); - - OptionRadioButton* pTrustDate = new OptionRadioButton( i18n("Trust the size and modification date (unsafe)"), false, "TrustDate", &m_bDmTrustDate, pBG, this ); - pTrustDate->setToolTip( i18n("Assume that files are equal if the modification date and file length are equal.\n" - "Files with equal contents but different modification dates will appear as different.\n" - "Useful for big directories or slow networks.") ); - pBGLayout->addWidget( pTrustDate ); - - OptionRadioButton* pTrustDateFallbackToBinary = new OptionRadioButton( i18n("Trust the size and date, but use binary comparison if date does not match (unsafe)"), false, "TrustDateFallbackToBinary", &m_bDmTrustDateFallbackToBinary, pBG, this ); - pTrustDateFallbackToBinary->setToolTip( i18n("Assume that files are equal if the modification date and file length are equal.\n" - "If the dates are not equal but the sizes are, use binary comparison.\n" - "Useful for big directories or slow networks.") ); - pBGLayout->addWidget( pTrustDateFallbackToBinary ); - - OptionRadioButton* pTrustSize = new OptionRadioButton( i18n("Trust the size (unsafe)"), false, "TrustSize", &m_bDmTrustSize, pBG, this ); - pTrustSize->setToolTip( i18n("Assume that files are equal if their file lengths are equal.\n" - "Useful for big directories or slow networks when the date is modified during download.") ); - pBGLayout->addWidget( pTrustSize ); - - ++line; - - - // Some two Dir-options: Affects only the default actions. - OptionCheckBox* pSyncMode = new OptionCheckBox( i18n("Synchronize directories"), false,"SyncMode", &m_bDmSyncMode, page, this ); - gbox->addWidget( pSyncMode, line, 0, 1, 2 ); - pSyncMode->setToolTip( i18n( - "Offers to store files in both directories so that\n" - "both directories are the same afterwards.\n" - "Works only when comparing two directories without specifying a destination." ) ); - ++line; - - // Allow white-space only differences to be considered equal - OptionCheckBox* pWhiteSpaceDiffsEqual = new OptionCheckBox( i18n("White space differences considered equal"), true,"WhiteSpaceEqual", &m_bDmWhiteSpaceEqual, page, this ); - gbox->addWidget( pWhiteSpaceDiffsEqual, line, 0, 1, 2 ); - pWhiteSpaceDiffsEqual->setToolTip( i18n( - "If files differ only by white space consider them equal.\n" - "This is only active when full analysis is chosen." ) ); - connect(pFullAnalysis, SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, SLOT(setEnabled(bool))); - pWhiteSpaceDiffsEqual->setEnabled(false); - ++line; - - OptionCheckBox* pCopyNewer = new OptionCheckBox( i18n("Copy newer instead of merging (unsafe)"), false, "CopyNewer", &m_bDmCopyNewer, page, this ); - gbox->addWidget( pCopyNewer, line, 0, 1, 2 ); - pCopyNewer->setToolTip( i18n( - "Don't look inside, just take the newer file.\n" - "(Use this only if you know what you are doing!)\n" - "Only effective when comparing two directories." ) ); - ++line; - - OptionCheckBox* pCreateBakFiles = new OptionCheckBox( i18n("Backup files (.orig)"), true, "CreateBakFiles", &m_bDmCreateBakFiles, page, this ); - gbox->addWidget( pCreateBakFiles, line, 0, 1, 2 ); - pCreateBakFiles->setToolTip( i18n( - "If a file would be saved over an old file, then the old file\n" - "will be renamed with a '.orig' extension instead of being deleted.")); - ++line; - - topLayout->addStretch(10); -} -/* -static void insertCodecs(OptionComboBox* p) -{ - std::multimap m; // Using the multimap for case-insensitive sorting. - int i; - for(i=0;;++i) - { - QTextCodec* pCodec = QTextCodec::codecForIndex ( i ); - if ( pCodec != 0 ) m.insert( std::make_pair( QString(pCodec->mimeName()).toUpper(), pCodec->mimeName()) ); - else break; - } - - p->insertItem( i18n("Auto"), 0 ); - std::multimap::iterator mi; - for(mi=m.begin(), i=0; mi!=m.end(); ++mi, ++i) - p->insertItem(mi->second, i+1); -} -*/ - -// UTF8-Codec that saves a BOM -// UTF8-Codec that saves a BOM -class Utf8BOMCodec : public QTextCodec -{ - QTextCodec* m_pUtf8Codec; - class PublicTextCodec : public QTextCodec - { - public: - QString publicConvertToUnicode ( const char * p, int len, ConverterState* pState ) const - { - return convertToUnicode( p, len, pState ); - } - QByteArray publicConvertFromUnicode ( const QChar * input, int number, ConverterState * pState ) const - { - return convertFromUnicode( input, number, pState ); - } - }; -public: - Utf8BOMCodec() - { - m_pUtf8Codec = QTextCodec::codecForName("UTF-8"); - } - QByteArray name () const { return "UTF-8-BOM"; } - int mibEnum () const { return 2123; } - QByteArray convertFromUnicode ( const QChar * input, int number, ConverterState * pState ) const - { - QByteArray r; - if ( pState && pState->state_data[2]==0) // state_data[2] not used by QUtf8::convertFromUnicode (see qutfcodec.cpp) - { - r += "\xEF\xBB\xBF"; - pState->state_data[2]=1; - pState->flags |= QTextCodec::IgnoreHeader; - } - - r += ((PublicTextCodec*)m_pUtf8Codec)->publicConvertFromUnicode( input, number, pState ); - return r; - } - QString convertToUnicode ( const char * p, int len, ConverterState* pState ) const - { - return ((PublicTextCodec*)m_pUtf8Codec)->publicConvertToUnicode( p, len, pState ); - } -}; - -void OptionDialog::setupRegionalPage( void ) -{ - new Utf8BOMCodec(); - - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Regional Settings") ); - pageItem->setHeader( i18n("Regional Settings") ); - pageItem->setIcon( KIcon("locale" ) ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(1,5); - topLayout->addLayout( gbox ); - int line=0; - - QLabel* label; - -#ifdef KREPLACEMENTS_H - -static const char* countryMap[]={ -"af Afrikaans", -"ar Arabic", -"az Azerbaijani", -"be Belarusian", -"bg Bulgarian", -"bn Bengali", -"bo Tibetan", -"br Breton", -"bs Bosnian", -"ca Catalan", -"ca@valencia Catalan (Valencian)", -"cs Czech", -"cy Welsh", -"da Danish", -"de German", -"el Greek", -"en_GB British English", -"eo Esperanto", -"es Spanish", -"et Estonian", -"eu Basque", -"fa Farsi (Persian)", -"fi Finnish", -"fo Faroese", -"fr French", -"ga Irish Gaelic", -"gl Galician", -"gu Gujarati", -"he Hebrew", -"hi Hindi", -"hne Chhattisgarhi", -"hr Croatian", -"hsb Upper Sorbian", -"hu Hungarian", -"id Indonesian", -"is Icelandic", -"it Italian", -"ja Japanese", -"ka Georgian", -"ko Korean", -"ku Kurdish", -"lo Lao", -"lt Lithuanian", -"lv Latvian", -"mi Maori", -"mk Macedonian", -"ml Malayalam" -"mn Mongolian", -"ms Malay", -"mt Maltese", -"nb Norwegian Bookmal", -"nds Low Saxon", -"nl Dutch", -"nn Norwegian Nynorsk", -"nso Northern Sotho", -"oc Occitan", -"pl Polish", -"pt Portuguese", -"pt_BR Brazilian Portuguese", -"ro Romanian", -"ru Russian", -"rw Kinyarwanda", -"se Northern Sami", -"sk Slovak", -"sl Slovenian", -"sq Albanian", -"sr Serbian", -"sr@Latn Serbian", -"ss Swati", -"sv Swedish", -"ta Tamil", -"tg Tajik", -"th Thai", -"tr Turkish", -"uk Ukrainian", -"uz Uzbek", -"ven Venda", -"vi Vietnamese", -"wa Walloon", -"xh Xhosa", -"zh_CN Chinese Simplified", -"zh_TW Chinese Traditional", -"zu Zulu" -}; - - label = new QLabel( i18n("Language (restart required)"), page ); - gbox->addWidget( label, line, 0 ); - OptionComboBox* pLanguage = new OptionComboBox( 0, "Language", &m_language, page, this ); - gbox->addWidget( pLanguage, line, 1 ); - pLanguage->addItem( "Auto" ); // Must not translate, won't work otherwise! - pLanguage->addItem( "en_orig" ); - -#if !defined(_WIN32) && !defined(Q_OS_OS2) - // Read directory: Find all kdiff3_*.qm-files and insert the found files here - QDir localeDir( "/usr/share/locale" ); // See also kreplacements.cpp: getTranslationDir() - QStringList dirList = localeDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - - for( int i = 0; iaddItem( languageId ); - } - - label->setToolTip( i18n( - "Choose the language of the GUI strings or \"Auto\".\n" - "For a change of language to take place, quit and restart KDiff3.") - ); - ++line; -/* - label = new QLabel( i18n("Codec for file contents"), page ); - gbox->addWidget( label, line, 0 ); - OptionComboBox* pFileCodec = new OptionComboBox( 0, "FileCodec", &m_fileCodec, page, this ); - gbox->addWidget( pFileCodec, line, 1 ); - insertCodecs( pFileCodec ); - label->setToolTip( i18n( - "Choose the codec that should be used for your input files\n" - "or \"Auto\" if unsure." ) - ); - ++line; -*/ -#endif - - m_pSameEncoding = new OptionCheckBox( i18n("Use the same encoding for everything:"), true, "SameEncoding", &m_bSameEncoding, page, this ); - gbox->addWidget( m_pSameEncoding, line, 0, 1, 2 ); - m_pSameEncoding->setToolTip( i18n( - "Enable this allows to change all encodings by changing the first only.\n" - "Disable this if different individual settings are needed." - ) ); - ++line; - - label = new QLabel( i18n("Note: Local Encoding is ") + "\"" + QTextCodec::codecForLocale()->name() + "\"", page ); - gbox->addWidget( label, line, 0 ); - ++line; - - label = new QLabel( i18n("File Encoding for A:"), page ); - gbox->addWidget( label, line, 0 ); - m_pEncodingAComboBox = new OptionEncodingComboBox( "EncodingForA", &m_pEncodingA, page, this ); - gbox->addWidget( m_pEncodingAComboBox, line, 1 ); - - QString autoDetectToolTip = i18n( - "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" - "If the file is not Unicode then the selected encoding will be used as fallback.\n" - "(Unicode detection depends on the first bytes of a file.)" - ); - m_pAutoDetectUnicodeA = new OptionCheckBox( i18n("Auto Detect Unicode"), true, "AutoDetectUnicodeA", &m_bAutoDetectUnicodeA, page, this ); - gbox->addWidget( m_pAutoDetectUnicodeA, line, 2 ); - m_pAutoDetectUnicodeA->setToolTip( autoDetectToolTip ); - ++line; - - label = new QLabel( i18n("File Encoding for B:"), page ); - gbox->addWidget( label, line, 0 ); - m_pEncodingBComboBox = new OptionEncodingComboBox( "EncodingForB", &m_pEncodingB, page, this ); - gbox->addWidget( m_pEncodingBComboBox, line, 1 ); - m_pAutoDetectUnicodeB = new OptionCheckBox( i18n("Auto Detect Unicode"), true, "AutoDetectUnicodeB", &m_bAutoDetectUnicodeB, page, this ); - gbox->addWidget( m_pAutoDetectUnicodeB, line, 2 ); - m_pAutoDetectUnicodeB->setToolTip( autoDetectToolTip ); - ++line; - - label = new QLabel( i18n("File Encoding for C:"), page ); - gbox->addWidget( label, line, 0 ); - m_pEncodingCComboBox = new OptionEncodingComboBox( "EncodingForC", &m_pEncodingC, page, this ); - gbox->addWidget( m_pEncodingCComboBox, line, 1 ); - m_pAutoDetectUnicodeC = new OptionCheckBox( i18n("Auto Detect Unicode"), true, "AutoDetectUnicodeC", &m_bAutoDetectUnicodeC, page, this ); - gbox->addWidget( m_pAutoDetectUnicodeC, line, 2 ); - m_pAutoDetectUnicodeC->setToolTip( autoDetectToolTip ); - ++line; - - label = new QLabel( i18n("File Encoding for Merge Output and Saving:"), page ); - gbox->addWidget( label, line, 0 ); - m_pEncodingOutComboBox = new OptionEncodingComboBox( "EncodingForOutput", &m_pEncodingOut, page, this ); - gbox->addWidget( m_pEncodingOutComboBox, line, 1 ); - m_pAutoSelectOutEncoding = new OptionCheckBox( i18n("Auto Select"), true, "AutoSelectOutEncoding", &m_bAutoSelectOutEncoding, page, this ); - gbox->addWidget( m_pAutoSelectOutEncoding, line, 2 ); - m_pAutoSelectOutEncoding->setToolTip( i18n( - "If enabled then the encoding from the input files is used.\n" - "In ambiguous cases a dialog will ask the user to choose the encoding for saving." - ) ); - ++line; - label = new QLabel( i18n("File Encoding for Preprocessor Files:"), page ); - gbox->addWidget( label, line, 0 ); - m_pEncodingPPComboBox = new OptionEncodingComboBox( "EncodingForPP", &m_pEncodingPP, page, this ); - gbox->addWidget( m_pEncodingPPComboBox, line, 1 ); - ++line; - - connect(m_pSameEncoding, SIGNAL(toggled(bool)), this, SLOT(slotEncodingChanged())); - connect(m_pEncodingAComboBox, SIGNAL(activated(int)), this, SLOT(slotEncodingChanged())); - connect(m_pAutoDetectUnicodeA, SIGNAL(toggled(bool)), this, SLOT(slotEncodingChanged())); - connect(m_pAutoSelectOutEncoding, SIGNAL(toggled(bool)), this, SLOT(slotEncodingChanged())); - - OptionCheckBox* pRightToLeftLanguage = new OptionCheckBox( i18n("Right To Left Language"), false, "RightToLeftLanguage", &m_bRightToLeftLanguage, page, this ); - gbox->addWidget( pRightToLeftLanguage, line, 0, 1, 2 ); - pRightToLeftLanguage->setToolTip( i18n( - "Some languages are read from right to left.\n" - "This setting will change the viewer and editor accordingly.")); - ++line; - - - topLayout->addStretch(10); -} - -#ifdef _WIN32 -#include "ccInstHelper.cpp" -#endif - -void OptionDialog::setupIntegrationPage( void ) -{ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Integration") ); - pageItem->setHeader( i18n("Integration Settings") ); - pageItem->setIcon( KIcon( "preferences-desktop-launch-feedback" ) ); - addPage( pageItem ); - - QVBoxLayout *topLayout = new QVBoxLayout( page ); - topLayout->setMargin( 5 ); - topLayout->setSpacing( spacingHint() ); - - QGridLayout *gbox = new QGridLayout(); - gbox->setColumnStretch(2,5); - topLayout->addLayout( gbox ); - int line=0; - - QLabel* label; - label = new QLabel( i18n("Command line options to ignore:"), page ); - gbox->addWidget( label, line, 0 ); - OptionLineEdit* pIgnorableCmdLineOptions = new OptionLineEdit( "-u;-query;-html;-abort", "IgnorableCmdLineOptions", &m_ignorableCmdLineOptions, page, this ); - gbox->addWidget( pIgnorableCmdLineOptions, line, 1, 1, 2 ); - label->setToolTip( i18n( - "List of command line options that should be ignored when KDiff3 is used by other tools.\n" - "Several values can be specified if separated via ';'\n" - "This will suppress the \"Unknown option\" error." - )); - ++line; - - - OptionCheckBox* pEscapeKeyQuits = new OptionCheckBox( i18n("Quit also via Escape key"), false, "EscapeKeyQuits", &m_bEscapeKeyQuits, page, this ); - gbox->addWidget( pEscapeKeyQuits, line, 0, 1, 2 ); - pEscapeKeyQuits->setToolTip( i18n( - "Fast method to exit.\n" - "For those who are used to using the Escape key." ) ); - ++line; - -#ifdef _WIN32 - QPushButton* pIntegrateWithClearCase = new QPushButton( i18n("Integrate with ClearCase"), page); - gbox->addWidget( pIntegrateWithClearCase, line, 0 ); - pIntegrateWithClearCase->setToolTip( i18n( - "Integrate with Rational ClearCase from IBM.\n" - "Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" - "(Only enabled when ClearCase \"bin\" directory is in the path.)")); - connect(pIntegrateWithClearCase, SIGNAL(clicked()),this, SLOT(slotIntegrateWithClearCase()) ); - pIntegrateWithClearCase->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 ); - - QPushButton* pRemoveClearCaseIntegration = new QPushButton( i18n("Remove ClearCase Integration"), page); - gbox->addWidget( pRemoveClearCaseIntegration, line, 1 ); - pRemoveClearCaseIntegration->setToolTip( i18n( - "Restore the old \"map\" file from before doing the ClearCase integration.")); - connect(pRemoveClearCaseIntegration, SIGNAL(clicked()),this, SLOT(slotRemoveClearCaseIntegration()) ); - pRemoveClearCaseIntegration->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 ); - - ++line; -#endif - - topLayout->addStretch(10); -} - -void OptionDialog::slotIntegrateWithClearCase() -{ -#ifdef _WIN32 - char kdiff3CommandPath[1000]; - GetModuleFileNameA( 0, kdiff3CommandPath, sizeof(kdiff3CommandPath)-1 ); - integrateWithClearCase( "install", kdiff3CommandPath ); -#endif -} - -void OptionDialog::slotRemoveClearCaseIntegration() -{ -#ifdef _WIN32 - char kdiff3CommandPath[1000]; - GetModuleFileNameA( 0, kdiff3CommandPath, sizeof(kdiff3CommandPath)-1 ); - integrateWithClearCase( "uninstall", kdiff3CommandPath ); -#endif -} - -void OptionDialog::slotEncodingChanged() -{ - if ( m_pSameEncoding->isChecked() ) - { - m_pEncodingBComboBox->setEnabled( false ); - m_pEncodingBComboBox->setCurrentIndex( m_pEncodingAComboBox->currentIndex() ); - m_pEncodingCComboBox->setEnabled( false ); - m_pEncodingCComboBox->setCurrentIndex( m_pEncodingAComboBox->currentIndex() ); - m_pEncodingOutComboBox->setEnabled( false ); - m_pEncodingOutComboBox->setCurrentIndex( m_pEncodingAComboBox->currentIndex() ); - m_pEncodingPPComboBox->setEnabled( false ); - m_pEncodingPPComboBox->setCurrentIndex( m_pEncodingAComboBox->currentIndex() ); - m_pAutoDetectUnicodeB->setEnabled( false ); - m_pAutoDetectUnicodeB->setCheckState( m_pAutoDetectUnicodeA->checkState() ); - m_pAutoDetectUnicodeC->setEnabled( false ); - m_pAutoDetectUnicodeC->setCheckState( m_pAutoDetectUnicodeA->checkState() ); - m_pAutoSelectOutEncoding->setEnabled( false ); - m_pAutoSelectOutEncoding->setCheckState( m_pAutoDetectUnicodeA->checkState() ); - } - else - { - m_pEncodingBComboBox->setEnabled( true ); - m_pEncodingCComboBox->setEnabled( true ); - m_pEncodingOutComboBox->setEnabled( true ); - m_pEncodingPPComboBox->setEnabled( true ); - m_pAutoDetectUnicodeB->setEnabled( true ); - m_pAutoDetectUnicodeC->setEnabled( true ); - m_pAutoSelectOutEncoding->setEnabled( true ); - m_pEncodingOutComboBox->setEnabled( m_pAutoSelectOutEncoding->checkState()==Qt::Unchecked ); - } -} - -void OptionDialog::setupKeysPage( void ) -{ - //QVBox *page = addVBoxPage( i18n("Keys"), i18n("KeyDialog" ), - // BarIcon("fonts", KIconLoader::SizeMedium ) ); - - //QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); - // new KFontChooser( page,"font",false/*onlyFixed*/,QStringList(),false,6 ); - //m_pKeyDialog=new KKeyDialog( false, 0 ); - //topLayout->addWidget( m_pKeyDialog ); -} - -void OptionDialog::slotOk( void ) -{ - slotApply(); - - // My system returns variable width fonts even though I - // disabled this. Even QFont::fixedPitch() doesn't work. - QFontMetrics fm(m_font); - if ( fm.width('W')!=fm.width('i') ) - { - int result = KMessageBox::warningYesNo(this, i18n( - "You selected a variable width font.\n\n" - "Because this program doesn't handle variable width fonts\n" - "correctly, you might experience problems while editing.\n\n" - "Do you want to continue or do you want to select another font."), - i18n("Incompatible Font"), - KGuiItem( i18n("Continue at Own Risk") ), - KGuiItem( i18n("Select Another Font")) ); - if (result==KMessageBox::No) - return; - } - - accept(); -} - - -/** Copy the values from the widgets to the public variables.*/ -void OptionDialog::slotApply( void ) -{ - std::list::iterator i; - for(i=m_optionItemList.begin(); i!=m_optionItemList.end(); ++i) - { - (*i)->apply(); - } - - emit applyDone(); - -#ifdef _WIN32 - QString locale = m_language; - if ( locale == "Auto" || locale.isEmpty() ) - locale = QLocale::system().name().left(2); - int spacePos = locale.indexOf(' '); - if (spacePos>0) locale = locale.left(spacePos); - QSettings settings("HKEY_CURRENT_USER\\Software\\KDiff3\\diff-ext", QSettings::NativeFormat); - settings.setValue( "Language", locale ); -#endif -} - -/** Set the default values in the widgets only, while the - public variables remain unchanged. */ -void OptionDialog::slotDefault() -{ - int result = KMessageBox::warningContinueCancel(this, i18n("This resets all options. Not only those of the current topic.") ); - if ( result==KMessageBox::Cancel ) return; - else resetToDefaults(); -} - -void OptionDialog::resetToDefaults() -{ - std::list::iterator i; - for(i=m_optionItemList.begin(); i!=m_optionItemList.end(); ++i) - { - (*i)->setToDefault(); - } - - slotEncodingChanged(); -} - -/** Initialise the widgets using the values in the public varibles. */ -void OptionDialog::setState() -{ - std::list::iterator i; - for(i=m_optionItemList.begin(); i!=m_optionItemList.end(); ++i) - { - (*i)->setToCurrent(); - } - - slotEncodingChanged(); -} - -class ConfigValueMap : public ValueMap -{ -private: - KConfigGroup m_config; -public: - ConfigValueMap( const KConfigGroup& config ) : m_config( config ){ } - - void writeEntry(const QString& s, const QFont& v ){ m_config.writeEntry(s,v); } - void writeEntry(const QString& s, const QColor& v ){ m_config.writeEntry(s,v); } - void writeEntry(const QString& s, const QSize& v ){ m_config.writeEntry(s,v); } - void writeEntry(const QString& s, const QPoint& v ){ m_config.writeEntry(s,v); } - void writeEntry(const QString& s, int v ) { m_config.writeEntry(s,v); } - void writeEntry(const QString& s, bool v ) { m_config.writeEntry(s,v); } - void writeEntry(const QString& s, const QString& v ){ m_config.writeEntry(s,v); } - void writeEntry(const QString& s, const char* v ) { m_config.writeEntry(s,v); } - - QFont readFontEntry (const QString& s, const QFont* defaultVal ) { return m_config.readEntry(s,*defaultVal); } - QColor readColorEntry(const QString& s, const QColor* defaultVal ){ return m_config.readEntry(s,*defaultVal); } - QSize readSizeEntry (const QString& s, const QSize* defaultVal ) { return m_config.readEntry(s,*defaultVal); } - QPoint readPointEntry(const QString& s, const QPoint* defaultVal) { return m_config.readEntry(s,*defaultVal); } - bool readBoolEntry (const QString& s, bool defaultVal ) { return m_config.readEntry(s,defaultVal); } - int readNumEntry (const QString& s, int defaultVal ) { return m_config.readEntry(s,defaultVal); } - QString readStringEntry(const QString& s, const QString& defaultVal){ return m_config.readEntry(s,defaultVal); } -#ifdef KREPLACEMENTS_H - void writeEntry(const QString& s, const QStringList& v, char separator ){ m_config.writeEntry(s,v,separator); } - QStringList readListEntry (const QString& s, const QStringList& def, char separator ) { return m_config.readEntry(s, def ,separator ); } -#else - void writeEntry(const QString& s, const QStringList& v, char separator ){ m_config.writeEntry(s,v); } - QStringList readListEntry (const QString& s, const QStringList& def, char separator ) { return m_config.readEntry(s, def ); } -#endif -}; - - -void OptionDialog::saveOptions( KSharedConfigPtr config ) -{ - // No i18n()-Translations here! - - ConfigValueMap cvm(config->group(KDIFF3_CONFIG_GROUP)); - std::list::iterator i; - for(i=m_optionItemList.begin(); i!=m_optionItemList.end(); ++i) - { - (*i)->write(&cvm); - } -} - -void OptionDialog::readOptions( KSharedConfigPtr config ) -{ - // No i18n()-Translations here! - - ConfigValueMap cvm(config->group(KDIFF3_CONFIG_GROUP)); - std::list::iterator i; - for(i=m_optionItemList.begin(); i!=m_optionItemList.end(); ++i) - { - (*i)->read(&cvm); - } - - setState(); -} - -QString OptionDialog::parseOptions( const QStringList& optionList ) -{ - QString result; - QStringList::const_iterator i; - for ( i=optionList.begin(); i!=optionList.end(); ++i ) - { - QString s = *i; - - int pos = s.indexOf('='); - if( pos > 0 ) // seems not to have a tag - { - QString key = s.left(pos); - QString val = s.mid(pos+1); - std::list::iterator j; - bool bFound = false; - for(j=m_optionItemList.begin(); j!=m_optionItemList.end(); ++j) - { - if ( (*j)->getSaveName()==key ) - { - ValueMap config; - config.writeEntry( key, val ); // Write the value as a string and - (*j)->read(&config); // use the internal conversion from string to the needed value. - bFound = true; - break; - } - } - if ( ! bFound ) - { - result += "No config item named \"" + key + "\"\n"; - } - } - else - { - result += "No '=' found in \"" + s + "\"\n"; - } - } - return result; -} - -QString OptionDialog::calcOptionHelp() -{ - ValueMap config; - std::list::iterator j; - for(j=m_optionItemList.begin(); j!=m_optionItemList.end(); ++j) - { - (*j)->write( &config ); - } - return config.getAsString(); -} - -void OptionDialog::slotHistoryMergeRegExpTester() -{ - RegExpTester dlg(this, s_autoMergeRegExpToolTip, s_historyStartRegExpToolTip, - s_historyEntryStartRegExpToolTip, s_historyEntryStartSortKeyOrderToolTip ); - dlg.init(m_pAutoMergeRegExpLineEdit->currentText(), m_pHistoryStartRegExpLineEdit->currentText(), - m_pHistoryEntryStartRegExpLineEdit->currentText(), m_pHistorySortKeyOrderLineEdit->currentText()); - if ( dlg.exec() ) - { - m_pAutoMergeRegExpLineEdit->setEditText( dlg.autoMergeRegExp() ); - m_pHistoryStartRegExpLineEdit->setEditText( dlg.historyStartRegExp() ); - m_pHistoryEntryStartRegExpLineEdit->setEditText( dlg.historyEntryStartRegExp() ); - m_pHistorySortKeyOrderLineEdit->setEditText( dlg.historySortKeyOrder() ); - } -} - - -//#include "optiondialog.moc" Index: trunk/extragear/utils/kdiff3/src/smalldialogs.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/smalldialogs.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/smalldialogs.cpp (nonexistent) @@ -1,594 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005-2007 by Joachim Eibl * - * joachim.eibl at gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "smalldialogs.h" -#include "optiondialog.h" -#include "diff.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -// OpenDialog ************************************************************** - -OpenDialog::OpenDialog( - QWidget* pParent, const QString& n1, const QString& n2, const QString& n3, - bool bMerge, const QString& outputName, const char* slotConfigure, OptionDialog* pOptions ) -: QDialog( pParent ) -{ - setObjectName("OpenDialog"); - setModal(true); - m_pOptions = pOptions; - - QVBoxLayout* v = new QVBoxLayout( this ); - v->setMargin(5); - QGridLayout* h = new QGridLayout(); - v->addLayout(h); - h->setSpacing( 5 ); - h->setColumnStretch( 1, 10 ); - - QLabel* label = new QLabel( i18n("A (Base):"), this ); - - m_pLineA = new QComboBox(); - m_pLineA->setEditable(true); - m_pLineA->insertItems( 0, m_pOptions->m_recentAFiles ); - m_pLineA->setEditText( KUrl(n1).prettyUrl() ); - m_pLineA->setMinimumWidth( 200 ); - QPushButton * button = new QPushButton( i18n("File..."), this ); - connect( button, SIGNAL(clicked()), this, SLOT( selectFileA() ) ); - QPushButton * button2 = new QPushButton( i18n("Dir..."), this ); - connect( button2, SIGNAL(clicked()), this, SLOT( selectDirA() ) ); - connect( m_pLineA, SIGNAL(editTextChanged(const QString&)), this, SLOT(inputFilenameChanged() ) ); - - h->addWidget( label, 0, 0 ); - h->addWidget( m_pLineA, 0, 1 ); - h->addWidget( button, 0, 2 ); - h->addWidget( button2, 0, 3 ); - - label = new QLabel( "B:", this ); - m_pLineB = new QComboBox(); - m_pLineB->setEditable(true); - m_pLineB->insertItems( 0, m_pOptions->m_recentBFiles ); - m_pLineB->setEditText( KUrl(n2).prettyUrl() ); - m_pLineB->setMinimumWidth( 200 ); - button = new QPushButton( i18n("File..."), this ); - connect( button, SIGNAL(clicked()), this, SLOT( selectFileB() ) ); - button2 = new QPushButton( i18n("Dir..."), this ); - connect( button2, SIGNAL(clicked()), this, SLOT( selectDirB() ) ); - connect( m_pLineB, SIGNAL(editTextChanged(const QString&)), this, SLOT(inputFilenameChanged() ) ); - - h->addWidget( label, 1, 0 ); - h->addWidget( m_pLineB, 1, 1 ); - h->addWidget( button, 1, 2 ); - h->addWidget( button2, 1, 3 ); - - label = new QLabel( i18n("C (Optional):"), this ); - m_pLineC= new QComboBox(); - m_pLineC->setEditable(true); - m_pLineC->insertItems( 0, m_pOptions->m_recentCFiles ); - m_pLineC->setEditText( KUrl(n3).prettyUrl() ); - m_pLineC->setMinimumWidth( 200 ); - button = new QPushButton( i18n("File..."), this ); - connect( button, SIGNAL(clicked()), this, SLOT( selectFileC() ) ); - button2 = new QPushButton( i18n("Dir..."), this ); - connect( button2, SIGNAL(clicked()), this, SLOT( selectDirC() ) ); - connect( m_pLineC, SIGNAL(editTextChanged(const QString&)), this, SLOT(inputFilenameChanged() ) ); - - h->addWidget( label, 2, 0 ); - h->addWidget( m_pLineC, 2, 1 ); - h->addWidget( button, 2, 2 ); - h->addWidget( button2, 2, 3 ); - - m_pMerge = new QCheckBox( i18n("Merge"), this ); - h->addWidget( m_pMerge, 3, 0 ); - - QHBoxLayout* hl = new QHBoxLayout(); - h->addLayout( hl, 3, 1 ); - hl->addStretch(2); - button = new QPushButton(i18n("Swap/Copy Names ..."), this); - //button->setToggleButton(false); - hl->addWidget( button ); - - QMenu* m = new QMenu(this); - m->addAction( i18n("Swap %1<->%2", QString("A"),QString("B") )); - m->addAction( i18n("Swap %1<->%2",QString("B"),QString("C") )); - m->addAction( i18n("Swap %1<->%2",QString("C"),QString("A") )); - m->addAction( i18n("Copy %1->Output",QString("A") )); - m->addAction( i18n("Copy %1->Output",QString("B") )); - m->addAction( i18n("Copy %1->Output",QString("C") )); - m->addAction( i18n("Swap %1<->Output",QString("A") )); - m->addAction( i18n("Swap %1<->Output",QString("B") )); - m->addAction( i18n("Swap %1<->Output",QString("C") )); - connect( m, SIGNAL(triggered(QAction*)), this, SLOT(slotSwapCopyNames(QAction*))); - button->setMenu(m); - - - hl->addStretch(2); - - label = new QLabel( i18n("Output (optional):"), this ); - m_pLineOut = new QComboBox(); - m_pLineOut->setEditable(true); - m_pLineOut->insertItems( 0, m_pOptions->m_recentOutputFiles ); - m_pLineOut->setEditText( KUrl(outputName).prettyUrl() ); - m_pLineOut->setMinimumWidth( 200 ); - button = new QPushButton( i18n("File..."), this ); - connect( button, SIGNAL(clicked()), this, SLOT( selectOutputName() ) ); - button2 = new QPushButton( i18n("Dir..."), this ); - connect( button2, SIGNAL(clicked()), this, SLOT( selectOutputDir() ) ); - connect( m_pMerge, SIGNAL(stateChanged(int)), this, SLOT(internalSlot(int)) ); - connect( this, SIGNAL(internalSignal(bool)), m_pLineOut, SLOT(setEnabled(bool)) ); - connect( this, SIGNAL(internalSignal(bool)), button, SLOT(setEnabled(bool)) ); - connect( this, SIGNAL(internalSignal(bool)), button2, SLOT(setEnabled(bool)) ); - - m_pMerge->setChecked( !bMerge ); - m_pMerge->setChecked( bMerge ); -// m_pLineOutput->setEnabled( bMerge ); - -// button->setEnabled( bMerge ); - - h->addWidget( label, 4, 0 ); - h->addWidget( m_pLineOut, 4, 1 ); - h->addWidget( button, 4, 2 ); - h->addWidget( button2, 4, 3 ); - - h->addItem(new QSpacerItem(200, 0), 0, 1); - - QHBoxLayout* l = new QHBoxLayout(); - v->addLayout( l ); - l->setSpacing(5); - - button = new QPushButton( i18n("Configure..."), this ); - connect( button, SIGNAL(clicked()), pParent, slotConfigure ); - l->addWidget( button, 1 ); - - l->addStretch(1); - - button = new QPushButton( i18n("&OK"), this ); - button->setDefault( true ); - connect( button, SIGNAL(clicked()), this, SLOT( accept() ) ); - l->addWidget( button, 1 ); - - button = new QPushButton( i18n("&Cancel"), this ); - connect( button, SIGNAL(clicked()), this, SLOT( reject() ) ); - l->addWidget( button,1 ); - - QSize sh = sizeHint(); - setFixedHeight( sh.height() ); - m_bInputFileNameChanged = false; - -#ifdef KREPLACEMENTS_H - m_pLineA->lineEdit()->installEventFilter( this ); - m_pLineB->lineEdit()->installEventFilter( this ); - m_pLineC->lineEdit()->installEventFilter( this ); - m_pLineOut->lineEdit()->installEventFilter( this ); -#endif -} - -// Eventfilter: Only needed under Windows. -// Without this, files dropped in the line edit have URL-encoding. -// This eventfilter decodes the filenames as needed by KDiff3. -bool OpenDialog::eventFilter(QObject* o, QEvent* e) -{ - if ( e->type()==QEvent::DragEnter ) - { - QDragEnterEvent* d = static_cast(e); - d->setAccepted( d->mimeData()->hasUrls() ); - return true; - } - if (e->type()==QEvent::Drop) - { - QDropEvent* d = static_cast(e); - - if ( !d->mimeData()->hasUrls() ) - return false; - - QList lst = d->mimeData()->urls(); - - if ( lst.count() > 0 ) - { - static_cast(o)->setText( QDir::toNativeSeparators( lst[0].toLocalFile() ) ); - static_cast(o)->setFocus(); - } - - return true; - } - return false; -} - - -void OpenDialog::selectURL( QComboBox* pLine, bool bDir, int i, bool bSave ) -{ - QString current = pLine->currentText(); - if (current.isEmpty() && i>3 ){ current = m_pLineC->currentText(); } - if (current.isEmpty() ){ current = m_pLineB->currentText(); } - if (current.isEmpty() ){ current = m_pLineA->currentText(); } - KUrl newURL = bDir ? KFileDialog::getExistingDirectoryUrl( current, this) - : bSave ? KFileDialog::getSaveUrl( current, 0, this) - : KFileDialog::getOpenUrl( current, 0, this); - if ( !newURL.isEmpty() ) - { - pLine->setEditText( newURL.url() ); - } - // newURL won't be modified if nothing was selected. -} - -void OpenDialog::selectFileA() { selectURL( m_pLineA, false, 1, false ); } -void OpenDialog::selectFileB() { selectURL( m_pLineB, false, 2, false ); } -void OpenDialog::selectFileC() { selectURL( m_pLineC, false, 3, false ); } -void OpenDialog::selectOutputName(){ selectURL( m_pLineOut, false, 4, true ); } -void OpenDialog::selectDirA() { selectURL( m_pLineA, true, 1, false ); } -void OpenDialog::selectDirB() { selectURL( m_pLineB, true, 2, false ); } -void OpenDialog::selectDirC() { selectURL( m_pLineC, true, 3, false ); } -void OpenDialog::selectOutputDir() { selectURL( m_pLineOut, true, 4, true ); } - -void OpenDialog::internalSlot(int i) -{ - emit internalSignal(i!=0); -} - -// Clear the output-filename when any input-filename changed, -// because users forgot to change the output and accidently overwrote it with -// wrong data during a merge. -void OpenDialog::inputFilenameChanged() -{ - if(!m_bInputFileNameChanged) - { - m_bInputFileNameChanged=true; - m_pLineOut->clearEditText(); - } -} - -static void fixCurrentText( QComboBox* pCB ) -{ - QString s = pCB->currentText(); - - int pos = s.indexOf( '\n' ); - if ( pos>=0 ) - s=s.left(pos); - pos = s.indexOf( '\r' ); - if ( pos>=0 ) - s=s.left(pos); - - pCB->setEditText( s ); -} - -void OpenDialog::accept() -{ - int maxNofRecentFiles = 10; - fixCurrentText( m_pLineA ); - - QString s = m_pLineA->currentText(); - s = QUrl::fromLocalFile(s).toLocalFile(); - QStringList* sl = &m_pOptions->m_recentAFiles; - // If an item exist, remove it from the list and reinsert it at the beginning. - sl->removeAll(s); - if ( !s.isEmpty() ) sl->prepend( s ); - if (sl->count()>maxNofRecentFiles) sl->erase( sl->begin()+maxNofRecentFiles, sl->end() ); - - fixCurrentText( m_pLineB ); - s = m_pLineB->currentText(); - s = QUrl::fromLocalFile(s).toLocalFile(); - sl = &m_pOptions->m_recentBFiles; - sl->removeAll(s); - if ( !s.isEmpty() ) sl->prepend( s ); - if (sl->count()>maxNofRecentFiles) sl->erase( sl->begin()+maxNofRecentFiles, sl->end() ); - - fixCurrentText( m_pLineC ); - s = m_pLineC->currentText(); - s = QUrl::fromLocalFile(s).toLocalFile(); - sl = &m_pOptions->m_recentCFiles; - sl->removeAll(s); - if ( !s.isEmpty() ) sl->prepend( s ); - if (sl->count()>maxNofRecentFiles) sl->erase( sl->begin()+maxNofRecentFiles, sl->end() ); - - fixCurrentText( m_pLineOut ); - s = m_pLineOut->currentText(); - s = QUrl::fromLocalFile(s).toLocalFile(); - sl = &m_pOptions->m_recentOutputFiles; - sl->removeAll(s); - if ( !s.isEmpty() ) sl->prepend( s ); - if (sl->count()>maxNofRecentFiles) sl->erase( sl->begin()+maxNofRecentFiles, sl->end() ); - - QDialog::accept(); -} - -void OpenDialog::slotSwapCopyNames( QAction* pAction ) // id selected in the popup menu -{ - int id = pAction->parentWidget()->actions().indexOf(pAction); - QComboBox* cb1=0; - QComboBox* cb2=0; - switch(id) - { - case 0: cb1=m_pLineA; cb2=m_pLineB; break; - case 1: cb1=m_pLineB; cb2=m_pLineC; break; - case 2: cb1=m_pLineC; cb2=m_pLineA; break; - case 3: cb1=m_pLineA; cb2=m_pLineOut; break; - case 4: cb1=m_pLineB; cb2=m_pLineOut; break; - case 5: cb1=m_pLineC; cb2=m_pLineOut; break; - case 6: cb1=m_pLineA; cb2=m_pLineOut; break; - case 7: cb1=m_pLineB; cb2=m_pLineOut; break; - case 8: cb1=m_pLineC; cb2=m_pLineOut; break; - } - if ( cb1 && cb2 ) - { - QString t1 = cb1->currentText(); - QString t2 = cb2->currentText(); - cb2->setEditText(t1); - if ( id<=2 || id>=6 ) - { - cb1->setEditText( t2 ); - } - } -} - -// FindDialog ********************************************* - -FindDialog::FindDialog(QWidget* pParent) -: QDialog( pParent ) -{ - QGridLayout* layout = new QGridLayout( this ); - layout->setMargin(5); - layout->setSpacing(5); - - int line=0; - layout->addWidget( new QLabel(i18n("Search text:"),this), line, 0, 1, 2 ); - ++line; - - m_pSearchString = new QLineEdit( this ); - layout->addWidget( m_pSearchString, line, 0, 1, 2 ); - ++line; - - m_pCaseSensitive = new QCheckBox(i18n("Case sensitive"),this); - layout->addWidget( m_pCaseSensitive, line, 1 ); - - m_pSearchInA = new QCheckBox(i18n("Search A"),this); - layout->addWidget( m_pSearchInA, line, 0 ); - m_pSearchInA->setChecked( true ); - ++line; - - m_pSearchInB = new QCheckBox(i18n("Search B"),this); - layout->addWidget( m_pSearchInB, line, 0 ); - m_pSearchInB->setChecked( true ); - ++line; - - m_pSearchInC = new QCheckBox(i18n("Search C"),this); - layout->addWidget( m_pSearchInC, line, 0 ); - m_pSearchInC->setChecked( true ); - ++line; - - m_pSearchInOutput = new QCheckBox(i18n("Search output"),this); - layout->addWidget( m_pSearchInOutput, line, 0 ); - m_pSearchInOutput->setChecked( true ); - ++line; - - QPushButton* pButton = new QPushButton( i18n("&Search"), this ); - layout->addWidget( pButton, line, 0 ); - connect( pButton, SIGNAL(clicked()), this, SLOT(accept())); - - pButton = new QPushButton( i18n("&Cancel"), this ); - layout->addWidget( pButton, line, 1 ); - connect( pButton, SIGNAL(clicked()), this, SLOT(reject())); - - hide(); -} - - -RegExpTester::RegExpTester( QWidget* pParent, const QString& autoMergeRegExpToolTip, - const QString& historyStartRegExpToolTip, const QString& historyEntryStartRegExpToolTip, const QString& historySortKeyOrderToolTip ) -: QDialog( pParent) -{ - int line=0; - setWindowTitle(i18n("Regular Expression Tester")); - QGridLayout* pGrid = new QGridLayout( this ); - pGrid->setSpacing(5); - pGrid->setMargin(5); - - QLabel* l = new QLabel(i18n("Auto merge regular expression:"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( autoMergeRegExpToolTip ); - m_pAutoMergeRegExpEdit = new QLineEdit(this); - pGrid->addWidget(m_pAutoMergeRegExpEdit,line,1); - connect( m_pAutoMergeRegExpEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("Example auto merge line:"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( i18n("To test auto merge, copy a line as used in your files.") ); - m_pAutoMergeExampleEdit = new QLineEdit(this); - pGrid->addWidget(m_pAutoMergeExampleEdit,line,1); - connect( m_pAutoMergeExampleEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("Match result:"), this); - pGrid->addWidget(l,line,0); - m_pAutoMergeMatchResult = new QLineEdit(this); - m_pAutoMergeMatchResult->setReadOnly(true); - pGrid->addWidget(m_pAutoMergeMatchResult,line,1); - ++line; - - pGrid->addItem( new QSpacerItem(100,20), line, 0 ); - pGrid->setRowStretch( line, 5); - ++line; - - l = new QLabel(i18n("History start regular expression:"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( historyStartRegExpToolTip ); - m_pHistoryStartRegExpEdit = new QLineEdit(this); - pGrid->addWidget(m_pHistoryStartRegExpEdit,line,1); - connect( m_pHistoryStartRegExpEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("Example history start line (with leading comment):"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( i18n("Copy a history start line as used in your files,\n" - "including the leading comment.") ); - m_pHistoryStartExampleEdit = new QLineEdit(this); - pGrid->addWidget(m_pHistoryStartExampleEdit,line,1); - connect( m_pHistoryStartExampleEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("Match result:"), this); - pGrid->addWidget(l,line,0); - m_pHistoryStartMatchResult = new QLineEdit(this); - m_pHistoryStartMatchResult->setReadOnly(true); - pGrid->addWidget(m_pHistoryStartMatchResult,line,1); - ++line; - - pGrid->addItem( new QSpacerItem(100,20), line, 0 ); - pGrid->setRowStretch( line, 5); - ++line; - - l = new QLabel(i18n("History entry start regular expression:"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( historyEntryStartRegExpToolTip ); - m_pHistoryEntryStartRegExpEdit = new QLineEdit(this); - pGrid->addWidget(m_pHistoryEntryStartRegExpEdit,line,1); - connect( m_pHistoryEntryStartRegExpEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("History sort key order:"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( historySortKeyOrderToolTip ); - m_pHistorySortKeyOrderEdit = new QLineEdit(this); - pGrid->addWidget(m_pHistorySortKeyOrderEdit,line,1); - connect( m_pHistorySortKeyOrderEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("Example history entry start line (without leading comment):"), this); - pGrid->addWidget(l,line,0); - l->setToolTip( i18n("Copy a history entry start line as used in your files,\n" - "but omit the leading comment.") ); - m_pHistoryEntryStartExampleEdit = new QLineEdit(this); - pGrid->addWidget(m_pHistoryEntryStartExampleEdit,line,1); - connect( m_pHistoryEntryStartExampleEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc())); - ++line; - - l = new QLabel(i18n("Match result:"), this); - pGrid->addWidget(l,line,0); - m_pHistoryEntryStartMatchResult = new QLineEdit(this); - m_pHistoryEntryStartMatchResult->setReadOnly(true); - pGrid->addWidget(m_pHistoryEntryStartMatchResult,line,1); - ++line; - - l = new QLabel(i18n("Sort key result:"), this); - pGrid->addWidget(l,line,0); - m_pHistorySortKeyResult = new QLineEdit(this); - m_pHistorySortKeyResult->setReadOnly(true); - pGrid->addWidget(m_pHistorySortKeyResult,line,1); - ++line; - - QPushButton* pButton = new QPushButton(i18n("OK"), this); - pGrid->addWidget(pButton,line,0); - connect( pButton, SIGNAL(clicked()), this, SLOT(accept())); - - pButton = new QPushButton(i18n("Cancel"), this); - pGrid->addWidget(pButton,line,1); - connect( pButton, SIGNAL(clicked()), this, SLOT(reject())); - - resize( 800, sizeHint().height() ); -} - -void RegExpTester::init( const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString historySortKeyOrder ) -{ - m_pAutoMergeRegExpEdit->setText( autoMergeRegExp ); - m_pHistoryStartRegExpEdit->setText( historyStartRegExp ); - m_pHistoryEntryStartRegExpEdit->setText( historyEntryStartRegExp ); - m_pHistorySortKeyOrderEdit->setText( historySortKeyOrder ); -} - -QString RegExpTester::autoMergeRegExp() -{ - return m_pAutoMergeRegExpEdit->text(); -} - -QString RegExpTester::historyStartRegExp() -{ - return m_pHistoryStartRegExpEdit->text(); -} - -QString RegExpTester::historyEntryStartRegExp() -{ - return m_pHistoryEntryStartRegExpEdit->text(); -} - -QString RegExpTester::historySortKeyOrder() -{ - return m_pHistorySortKeyOrderEdit->text(); -} - -void RegExpTester::slotRecalc() -{ - QRegExp autoMergeRegExp( m_pAutoMergeRegExpEdit->text() ); - if ( autoMergeRegExp.exactMatch( m_pAutoMergeExampleEdit->text() ) ) - { - m_pAutoMergeMatchResult->setText( i18n("Match success.") ); - } - else - { - m_pAutoMergeMatchResult->setText( i18n("Match failed.") ); - } - - QRegExp historyStartRegExp( m_pHistoryStartRegExpEdit->text() ); - if ( historyStartRegExp.exactMatch( m_pHistoryStartExampleEdit->text() ) ) - { - m_pHistoryStartMatchResult->setText( i18n("Match success.") ); - } - else - { - m_pHistoryStartMatchResult->setText( i18n("Match failed.") ); - } - - - QStringList parenthesesGroups; - bool bSuccess = findParenthesesGroups( m_pHistoryEntryStartRegExpEdit->text(), parenthesesGroups ); - if ( ! bSuccess ) - { - m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing parentheses do not match in regular expression.") ); - m_pHistorySortKeyResult->setText( "" ); - return; - } - QRegExp historyEntryStartRegExp( m_pHistoryEntryStartRegExpEdit->text() ); - QString s = m_pHistoryEntryStartExampleEdit->text(); - - if ( historyEntryStartRegExp.exactMatch( s ) ) - { - m_pHistoryEntryStartMatchResult->setText( i18n("Match success.") ); - QString key = calcHistorySortKey( m_pHistorySortKeyOrderEdit->text(),historyEntryStartRegExp,parenthesesGroups); - m_pHistorySortKeyResult->setText(key); - } - else - { - m_pHistoryEntryStartMatchResult->setText( i18n("Match failed.") ); - m_pHistorySortKeyResult->setText( "" ); - } -} - -//#include "smalldialogs.moc" Index: trunk/extragear/utils/kdiff3/src/hi32-app-kdiff3.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/kdiff3/src/hi32-app-kdiff3.png =================================================================== --- trunk/extragear/utils/kdiff3/src/hi32-app-kdiff3.png (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/hi32-app-kdiff3.png (nonexistent) Property changes on: trunk/extragear/utils/kdiff3/src/hi32-app-kdiff3.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/kdiff3/src/pdiff.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/pdiff.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/pdiff.cpp (nonexistent) @@ -1,2366 +0,0 @@ -/*************************************************************************** - pdiff.cpp - Implementation for class KDiff3App - --------------- - begin : Mon March 18 20:04:50 CET 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "difftextwindow.h" -#include "mergeresultwindow.h" -#include "directorymergewindow.h" -#include "smalldialogs.h" - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - - -#include - -#include "kdiff3.h" -#include "optiondialog.h" -#include "fileaccess.h" -#ifdef _WIN32 -#include -#else -#include -#include -#endif - -#include "gnudiff_diff.h" - -bool g_bIgnoreWhiteSpace = true; -bool g_bIgnoreTrivialMatches = true; - - -bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList ) -{ - ProgressProxy pp; - static GnuDiff gnuDiff; // All values are initialized with zeros. - - pp.setCurrent(0); - - diffList.clear(); - if ( p1[0].pLine==0 || p2[0].pLine==0 || size1==0 || size2==0 ) - { - Diff d( 0,0,0); - if ( p1[0].pLine==0 && p2[0].pLine==0 && size1 == size2 ) - d.nofEquals = size1; - else - { - d.diff1=size1; - d.diff2=size2; - } - - diffList.push_back(d); - } - else - { - GnuDiff::comparison comparisonInput; - memset( &comparisonInput, 0, sizeof(comparisonInput) ); - comparisonInput.parent = 0; - comparisonInput.file[0].buffer = p1[0].pLine;//ptr to buffer - comparisonInput.file[0].buffered = (p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size); // size of buffer - comparisonInput.file[1].buffer = p2[0].pLine;//ptr to buffer - comparisonInput.file[1].buffered = (p2[size2-1].pLine-p2[0].pLine+p2[size2-1].size); // size of buffer - - gnuDiff.ignore_white_space = GnuDiff::IGNORE_ALL_SPACE; // I think nobody needs anything else ... - gnuDiff.bIgnoreWhiteSpace = true; - gnuDiff.bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers; - gnuDiff.minimal = m_pOptionDialog->m_bTryHard; - gnuDiff.ignore_case = false; - GnuDiff::change* script = gnuDiff.diff_2_files( &comparisonInput ); - - int equalLinesAtStart = comparisonInput.file[0].prefix_lines; - int currentLine1 = 0; - int currentLine2 = 0; - GnuDiff::change* p=0; - for (GnuDiff::change* e = script; e; e = p) - { - Diff d(0,0,0); - d.nofEquals = e->line0 - currentLine1; - assert( d.nofEquals == e->line1 - currentLine2 ); - d.diff1 = e->deleted; - d.diff2 = e->inserted; - currentLine1 += d.nofEquals + d.diff1; - currentLine2 += d.nofEquals + d.diff2; - diffList.push_back(d); - - p = e->link; - free (e); - } - - if ( diffList.empty() ) - { - Diff d(0,0,0); - d.nofEquals = min2(size1,size2); - d.diff1 = size1 - d.nofEquals; - d.diff2 = size2 - d.nofEquals; - diffList.push_back(d); -/* Diff d(0,0,0); - d.nofEquals = equalLinesAtStart; - if ( gnuDiff.files[0].missing_newline != gnuDiff.files[1].missing_newline ) - { - d.diff1 = gnuDiff.files[0].missing_newline ? 0 : 1; - d.diff2 = gnuDiff.files[1].missing_newline ? 0 : 1; - ++d.nofEquals; - } - else if ( !gnuDiff.files[0].missing_newline ) - { - ++d.nofEquals; - } - diffList.push_back(d); -*/ - } - else - { - diffList.front().nofEquals += equalLinesAtStart; - currentLine1 += equalLinesAtStart; - currentLine2 += equalLinesAtStart; - - int nofEquals = min2(size1-currentLine1,size2-currentLine2); - if ( nofEquals==0 ) - { - diffList.back().diff1 += size1-currentLine1; - diffList.back().diff2 += size2-currentLine2; - } - else - { - Diff d( nofEquals,size1-currentLine1-nofEquals,size2-currentLine2-nofEquals); - diffList.push_back(d); - } - - /* - if ( gnuDiff.files[0].missing_newline != gnuDiff.files[1].missing_newline ) - { - diffList.back().diff1 += gnuDiff.files[0].missing_newline ? 0 : 1; - diffList.back().diff2 += gnuDiff.files[1].missing_newline ? 0 : 1; - } - else if ( !gnuDiff.files[0].missing_newline ) - { - ++ diffList.back().nofEquals; - } - */ - } - } - -#ifndef NDEBUG - // Verify difflist - { - int l1=0; - int l2=0; - DiffList::iterator i; - for( i = diffList.begin(); i!=diffList.end(); ++i ) - { - l1+= i->nofEquals + i->diff1; - l2+= i->nofEquals + i->diff2; - } - - //if( l1!=p1-p1start || l2!=p2-p2start ) - if( l1!=size1 || l2!=size2 ) - assert( false ); - } -#endif - - pp.setCurrent(1.0); - - return true; -} - -bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList, - int winIdx1, int winIdx2 ) -{ - diffList.clear(); - DiffList diffList2; - - int l1begin = 0; - int l2begin = 0; - ManualDiffHelpList::const_iterator i; - for( i = m_manualDiffHelpList.begin(); i!=m_manualDiffHelpList.end(); ++i ) - { - const ManualDiffHelpEntry& mdhe = *i; - - int l1end = winIdx1 == 1 ? mdhe.lineA1 : winIdx1==2 ? mdhe.lineB1 : mdhe.lineC1 ; - int l2end = winIdx2 == 1 ? mdhe.lineA1 : winIdx2==2 ? mdhe.lineB1 : mdhe.lineC1 ; - - if ( l1end>=0 && l2end>=0 ) - { - runDiff( p1+l1begin, l1end-l1begin, p2+l2begin, l2end-l2begin, diffList2 ); - diffList.splice( diffList.end(), diffList2 ); - l1begin = l1end; - l2begin = l2end; - - l1end = winIdx1 == 1 ? mdhe.lineA2 : winIdx1==2 ? mdhe.lineB2 : mdhe.lineC2 ; - l2end = winIdx2 == 1 ? mdhe.lineA2 : winIdx2==2 ? mdhe.lineB2 : mdhe.lineC2 ; - - if ( l1end>=0 && l2end>=0 ) - { - ++l1end; // point to line after last selected line - ++l2end; - runDiff( p1+l1begin, l1end-l1begin, p2+l2begin, l2end-l2begin, diffList2 ); - diffList.splice( diffList.end(), diffList2 ); - l1begin = l1end; - l2begin = l2end; - } - } - } - runDiff( p1+l1begin, size1-l1begin, p2+l2begin, size2-l2begin, diffList2 ); - diffList.splice( diffList.end(), diffList2 ); - return true; -} - -void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles ) -{ - ProgressProxy pp; - // When doing a full analysis in the directory-comparison, then the statistics-results - // will be stored in the given TotalDiffStatus. Otherwise it will be 0. - bool bGUI = pTotalDiffStatus == 0; - if (pTotalDiffStatus==0) - pTotalDiffStatus = &m_totalDiffStatus; - - bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn; - - bool bVisibleMergeResultWindow = ! m_outputFilename.isEmpty(); - if ( bVisibleMergeResultWindow && bGUI ) - { - bPreserveCarriageReturn = false; - - QString msg; - - if ( !m_pOptionDialog->m_PreProcessorCmd.isEmpty() ) - { - msg += "- " + i18n("PreprocessorCmd: ") + m_pOptionDialog->m_PreProcessorCmd + "\n"; - } - if ( !msg.isEmpty() ) - { - int result = KMessageBox::warningYesNo( this, - i18n("The following option(s) you selected might change data:\n") + msg + - i18n("\nMost likely this is not wanted during a merge.\n" - "Do you want to disable these settings or continue with these settings active?"), - i18n("Option Unsafe for Merging"), - KGuiItem( i18n("Use These Options During Merge") ), - KGuiItem( i18n("Disable Unsafe Options") ) - ); - - if (result == KMessageBox::No ) - { - m_pOptionDialog->m_PreProcessorCmd = ""; - } - } - } - - // Because of the progressdialog paintevents can occur, but data is invalid, - // so painting must be suppressed. - if (m_pDiffTextWindow1) m_pDiffTextWindow1->setPaintingAllowed( false ); - if (m_pDiffTextWindow2) m_pDiffTextWindow2->setPaintingAllowed( false ); - if (m_pDiffTextWindow3) m_pDiffTextWindow3->setPaintingAllowed( false ); - if (m_pOverview) m_pOverview->setPaintingAllowed( false ); - if (m_pMergeResultWindow) m_pMergeResultWindow->setPaintingAllowed( false ); - - m_diff3LineList.clear(); - - if ( bLoadFiles ) - { - m_manualDiffHelpList.clear(); - - if( m_sd3.isEmpty() ) - pp.setMaxNofSteps( 4 ); // Read 2 files, 1 comparison, 1 finediff - else - pp.setMaxNofSteps( 9 ); // Read 3 files, 3 comparisons, 3 finediffs - - // First get all input data. - pp.setInformation(i18n("Loading A")); - m_sd1.readAndPreprocess(m_pOptionDialog->m_pEncodingA, m_pOptionDialog->m_bAutoDetectUnicodeA ); - pp.step(); - - pp.setInformation(i18n("Loading B")); - m_sd2.readAndPreprocess(m_pOptionDialog->m_pEncodingB, m_pOptionDialog->m_bAutoDetectUnicodeB ); - pp.step(); - } - else - { - if( m_sd3.isEmpty() ) - pp.setMaxNofSteps( 2 ); // 1 comparison, 1 finediff - else - pp.setMaxNofSteps( 6 ); // 3 comparisons, 3 finediffs - } - - pTotalDiffStatus->reset(); - // Run the diff. - if ( m_sd3.isEmpty() ) - { - pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 ); - pp.setInformation(i18n("Diff: A <-> B")); - - runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 ); - - pp.step(); - - pp.setInformation(i18n("Linediff: A <-> B")); - calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList ); - fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB ); - if ( m_sd1.getSizeBytes()==0 ) pTotalDiffStatus->bTextAEqB=false; - - pp.step(); - } - else - { - if (bLoadFiles) - { - pp.setInformation(i18n("Loading C")); - m_sd3.readAndPreprocess(m_pOptionDialog->m_pEncodingC, m_pOptionDialog->m_bAutoDetectUnicodeC ); - pp.step(); - } - - pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 ); - pTotalDiffStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 ); - pTotalDiffStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 ); - - pp.setInformation(i18n("Diff: A <-> B")); - runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 ); - pp.step(); - pp.setInformation(i18n("Diff: B <-> C")); - runDiff( m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_sd3.getLineDataForDiff(), m_sd3.getSizeLines(), m_diffList23,2,3 ); - pp.step(); - pp.setInformation(i18n("Diff: A <-> C")); - runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd3.getLineDataForDiff(), m_sd3.getSizeLines(), m_diffList13,1,3 ); - pp.step(); - - calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList ); - calcDiff3LineListUsingAC( &m_diffList13, m_diff3LineList ); - correctManualDiffAlignment( m_diff3LineList, &m_manualDiffHelpList ); - calcDiff3LineListTrim( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff(), &m_manualDiffHelpList ); - - if ( m_pOptionDialog->m_bDiff3AlignBC ) - { - calcDiff3LineListUsingBC( &m_diffList23, m_diff3LineList ); - correctManualDiffAlignment( m_diff3LineList, &m_manualDiffHelpList ); - calcDiff3LineListTrim( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff(), &m_manualDiffHelpList ); - } - debugLineCheck( m_diff3LineList, m_sd1.getSizeLines(), 1 ); - debugLineCheck( m_diff3LineList, m_sd2.getSizeLines(), 2 ); - debugLineCheck( m_diff3LineList, m_sd3.getSizeLines(), 3 ); - - pp.setInformation(i18n("Linediff: A <-> B")); - fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB ); - pp.step(); - pp.setInformation(i18n("Linediff: B <-> C")); - fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDiffStatus->bTextBEqC ); - pp.step(); - pp.setInformation(i18n("Linediff: A <-> C")); - fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqC ); - pp.step(); - if ( m_sd1.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextAEqC=false; } - if ( m_sd2.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextBEqC=false; } - } - m_diffBufferInfo.init( &m_diff3LineList, &m_diff3LineVector, - m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), - m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), - m_sd3.getLineDataForDiff(), m_sd3.getSizeLines() ); - calcWhiteDiff3Lines( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff() ); - calcDiff3LineVector( m_diff3LineList, m_diff3LineVector ); - - // Calc needed lines for display - m_neededLines = m_diff3LineList.size(); - - QList oldHeights; - if ( m_pDirectoryMergeSplitter->isVisible() ) - oldHeights = m_pMainSplitter->sizes(); - - initView(); - - if ( m_pDirectoryMergeSplitter->isVisible() ) - { - if (oldHeights.count() < 2) - oldHeights.append(0); - if (oldHeights[1]==0) // Distribute the available space evenly between the two widgets. - { - oldHeights[1] = oldHeights[0]/2; - oldHeights[0] -= oldHeights[1]; - } - if ( oldHeights[0]==0 && oldHeights[1]==0 ) - { - oldHeights[1] = 100; - oldHeights[0] = 100; - } - m_pMainSplitter->setSizes( oldHeights ); - } - - m_pMainWidget->setVisible( bGUI ); - - m_bTripleDiff = ! m_sd3.isEmpty(); - - m_pMergeResultWindowTitle->setEncodings( m_sd1.getEncoding(), m_sd2.getEncoding(), m_sd3.getEncoding() ); - if ( ! m_pOptionDialog->m_bAutoSelectOutEncoding ) - m_pMergeResultWindowTitle->setEncoding( m_pOptionDialog->m_pEncodingOut ); - - m_pMergeResultWindowTitle->setLineEndStyles( m_sd1.getLineEndStyle(), m_sd2.getLineEndStyle(), m_sd3.getLineEndStyle() ); - - if ( bGUI ) - { - const ManualDiffHelpList* pMDHL = &m_manualDiffHelpList; - m_pDiffTextWindow1->init( m_sd1.getAliasName(), m_sd1.getEncoding(), m_sd1.getLineEndStyle(), - m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff ); - m_pDiffTextWindow2->init( m_sd2.getAliasName(), m_sd2.getEncoding(), m_sd2.getLineEndStyle(), - m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff ); - m_pDiffTextWindow3->init( m_sd3.getAliasName(), m_sd3.getEncoding(), m_sd3.getLineEndStyle(), - m_sd3.getLineDataForDisplay(), m_sd3.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff ); - - m_pDiffTextWindowFrame3->setVisible(m_bTripleDiff); - } - - m_bOutputModified = bVisibleMergeResultWindow; - - m_pMergeResultWindow->init( - m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(), - m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(), - m_bTripleDiff ? m_sd3.getLineDataForDisplay() : 0, m_sd3.getSizeLines(), - &m_diff3LineList, - pTotalDiffStatus - ); - m_pMergeResultWindowTitle->setFileName( m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename ); - - if ( !bGUI ) - { - // We now have all needed information. The rest below is only for GUI-activation. - m_sd1.reset(); - m_sd2.reset(); - m_sd3.reset(); - return; - } - - m_pOverview->init(&m_diff3LineList, m_bTripleDiff ); - m_pDiffVScrollBar->setValue( 0 ); - m_pHScrollBar->setValue( 0 ); - m_pMergeVScrollBar->setValue( 0 ); - - m_pDiffTextWindow1->setPaintingAllowed( true ); - m_pDiffTextWindow2->setPaintingAllowed( true ); - m_pDiffTextWindow3->setPaintingAllowed( true ); - m_pOverview->setPaintingAllowed( true ); - m_pMergeResultWindow->setPaintingAllowed( true ); - - - if ( !bVisibleMergeResultWindow ) - m_pMergeWindowFrame->hide(); - else - m_pMergeWindowFrame->show(); - - setHScrollBarRange(); - - // Try to create a meaningful but not too long caption - if ( !isPart() ) - { - // 1. If the filenames are equal then show only one filename - QString caption; - QString a1 = m_sd1.getAliasName(); - QString a2 = m_sd2.getAliasName(); - QString a3 = m_sd3.getAliasName(); - QString f1, f2, f3; - int p1,p2,p3; - if ( !a1.isEmpty() && (p1=a1.lastIndexOf('/'))>=0 ) - f1 = a1.mid( p1+1 ); - if ( !a2.isEmpty() && (p2=a2.lastIndexOf('/'))>=0 ) - f2 = a2.mid( p2+1 ); - if ( !a3.isEmpty() && (p3=a3.lastIndexOf('/'))>=0 ) - f3 = a3.mid( p3+1 ); - if ( !f1.isEmpty() ) - { - if ( ( f2.isEmpty() && f3.isEmpty() ) || - (f2.isEmpty() && f1==f3) || ( f3.isEmpty() && f1==f2 ) || (f1==f2 && f1==f3)) - caption = ".../"+f1; - } - else if ( ! f2.isEmpty() ) - { - if ( f3.isEmpty() || f2==f3 ) - caption = ".../"+f2; - } - else if ( ! f3.isEmpty() ) - caption = ".../"+f3; - - // 2. If the files don't have the same name then show all names - if ( caption.isEmpty() && (!f1.isEmpty() || !f2.isEmpty() || !f3.isEmpty()) ) - { - caption = ( f1.isEmpty()? QString("") : QString(".../")+f1 ); - caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? QString("") : QString(".../")+f2 ); - caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? QString("") : QString(".../")+f3 ) ; - } - - m_pKDiff3Shell->setWindowTitle( caption.isEmpty() ? QString("KDiff3") : caption+QString(" - KDiff3")); - } - - if ( bLoadFiles ) - { - if ( bVisibleMergeResultWindow && !bAuto ) - m_pMergeResultWindow->showNrOfConflicts(); - else if ( !bAuto && - // Avoid showing this message during startup without parameters. - !( m_sd1.getAliasName().isEmpty() && m_sd2.getAliasName().isEmpty() && m_sd3.getAliasName().isEmpty() ) && - ( m_sd1.isValid() && m_sd2.isValid() && m_sd3.isValid() ) - ) - { - QString totalInfo; - if ( pTotalDiffStatus->bBinaryAEqB && pTotalDiffStatus->bBinaryAEqC ) - totalInfo += i18n("All input files are binary equal."); - else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC ) - totalInfo += i18n("All input files contain the same text, but are not binary equal."); - else { - if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("B")); - else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n",QString("A"),QString("B")); - if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("C")); - else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n",QString("A"),QString("C")); - if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("B"),QString("C")); - else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n",QString("B"),QString("C")); - } - - if ( !totalInfo.isEmpty() ) - KMessageBox::information( this, totalInfo ); - } - - if ( bVisibleMergeResultWindow && (!m_sd1.isText() || !m_sd2.isText() || !m_sd3.isText()) ) - { - KMessageBox::information( this, i18n( - "Some inputfiles don't seem to be pure textfiles.\n" - "Note that the KDiff3-merge was not meant for binary data.\n" - "Continue at your own risk.") ); - } - if ( m_sd1.isIncompleteConversion() || m_sd2.isIncompleteConversion() || m_sd3.isIncompleteConversion() ) - { - QString files; - if ( m_sd1.isIncompleteConversion() ) - files += "A"; - if ( m_sd2.isIncompleteConversion() ) - files += files.isEmpty() ? "B" : ", B"; - if ( m_sd3.isIncompleteConversion() ) - files += files.isEmpty() ? "C" : ", C"; - - KMessageBox::information( this, i18n( - "Some input characters could not be converted to valid unicode.\n" - "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" - "Don't save the result if unsure. Continue at your own risk.\n" - "Affected input files are in %1.").arg(files) ); - } - } - - QTimer::singleShot( 10, this, SLOT(slotAfterFirstPaint()) ); - - if ( bVisibleMergeResultWindow && m_pMergeResultWindow ) - { - m_pMergeResultWindow->setFocus(); - } - else if(m_pDiffTextWindow1) - { - m_pDiffTextWindow1->setFocus(); - } -} - - -void KDiff3App::setHScrollBarRange() -{ - int w1 = m_pDiffTextWindow1!=0 && m_pDiffTextWindow1->isVisible() ? m_pDiffTextWindow1->getNofColumns() : 0; - int w2 = m_pDiffTextWindow2!=0 && m_pDiffTextWindow2->isVisible() ? m_pDiffTextWindow2->getNofColumns() : 0; - int w3 = m_pDiffTextWindow3!=0 && m_pDiffTextWindow3->isVisible() ? m_pDiffTextWindow3->getNofColumns() : 0; - - int wm = m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() ? m_pMergeResultWindow->getNofColumns() : 0; - - int v1 = m_pDiffTextWindow1!=0 && m_pDiffTextWindow1->isVisible() ? m_pDiffTextWindow1->getNofVisibleColumns() : 0; - int v2 = m_pDiffTextWindow2!=0 && m_pDiffTextWindow2->isVisible() ? m_pDiffTextWindow2->getNofVisibleColumns() : 0; - int v3 = m_pDiffTextWindow3!=0 && m_pDiffTextWindow3->isVisible() ? m_pDiffTextWindow3->getNofVisibleColumns() : 0; - int vm = m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() ? m_pMergeResultWindow->getNofVisibleColumns() : 0; - - // Find the minimum, but don't consider 0. - int pageStep = 0; - if ( (pageStep==0 || pageStep>v1) && v1>0 ) - pageStep = v1; - if ( (pageStep==0 || pageStep>v2) && v2>0 ) - pageStep = v2; - if ( (pageStep==0 || pageStep>v3) && v3>0 ) - pageStep = v3; - if ( (pageStep==0 || pageStep>vm) && vm>0 ) - pageStep = vm; - - int rangeMax = 0; - if ( w1>v1 && w1-v1>rangeMax && v1>0 ) - rangeMax = w1-v1; - if ( w2>v2 && w2-v2>rangeMax && v2>0 ) - rangeMax = w2-v2; - if ( w3>v3 && w3-v3>rangeMax && v3>0 ) - rangeMax = w3-v3; - if ( wm>vm && wm-vm>rangeMax && vm>0 ) - rangeMax = wm-vm; - - m_pHScrollBar->setRange(0, rangeMax ); - m_pHScrollBar->setPageStep( pageStep ); -} - -void KDiff3App::resizeDiffTextWindow(int /*newWidth*/, int newHeight) -{ - m_DTWHeight = newHeight; - - recalcWordWrap(); - - m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) ); - m_pDiffVScrollBar->setPageStep( newHeight ); - m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); - - setHScrollBarRange(); -} - -void KDiff3App::resizeMergeResultWindow() -{ - MergeResultWindow* p = m_pMergeResultWindow; - m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) ); - m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() ); - - setHScrollBarRange(); -} - -void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY ) -{ - if ( deltaY!= 0 ) - { - m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->value() + deltaY ); - m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); - } - if ( deltaX!= 0) - m_pHScrollBar->QScrollBar::setValue( m_pHScrollBar->value() + deltaX ); -} - -void KDiff3App::scrollMergeResultWindow( int deltaX, int deltaY ) -{ - if ( deltaY!= 0 ) - m_pMergeVScrollBar->setValue( m_pMergeVScrollBar->value() + deltaY ); - if ( deltaX!= 0) - m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX ); -} - -void KDiff3App::setDiff3Line( int line ) -{ - m_pDiffVScrollBar->setValue( line ); -} - -void KDiff3App::sourceMask( int srcMask, int enabledMask ) -{ - chooseA->blockSignals(true); - chooseB->blockSignals(true); - chooseC->blockSignals(true); - chooseA->setChecked( (srcMask & 1) != 0 ); - chooseB->setChecked( (srcMask & 2) != 0 ); - chooseC->setChecked( (srcMask & 4) != 0 ); - chooseA->blockSignals(false); - chooseB->blockSignals(false); - chooseC->blockSignals(false); - chooseA->setEnabled( (enabledMask & 1) != 0 ); - chooseB->setEnabled( (enabledMask & 2) != 0 ); - chooseC->setEnabled( (enabledMask & 4) != 0 ); -} - - - -// Function uses setMinSize( sizeHint ) before adding the widget. -// void addWidget(QBoxLayout* layout, QWidget* widget); -template -void addWidget( L* layout, W* widget) -{ - QSize s = widget->sizeHint(); - widget->setMinimumSize( QSize(max2(s.width(),0),max2(s.height(),0) ) ); - layout->addWidget( widget ); -} - -void KDiff3App::initView() -{ - // set the main widget here - if ( m_pMainWidget != 0 ) - { - return; - //delete m_pMainWidget; - } - m_pMainWidget = new QWidget(); // Contains vertical splitter and horiz scrollbar - m_pMainSplitter->addWidget( m_pMainWidget ); - m_pMainWidget->setObjectName("MainWidget"); - QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget); - pVLayout->setMargin(0); - pVLayout->setSpacing(0); - - QSplitter* pVSplitter = new QSplitter(); - pVSplitter->setObjectName("VSplitter"); - pVSplitter->setOpaqueResize(false); - pVSplitter->setOrientation( Qt::Vertical ); - pVLayout->addWidget( pVSplitter ); - pVSplitter->show(); - - QWidget* pDiffWindowFrame = new QWidget(); // Contains diff windows, overview and vert scrollbar - pDiffWindowFrame->setObjectName("DiffWindowFrame"); - QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame ); - pDiffHLayout->setMargin(0); - pDiffHLayout->setSpacing(0); - //pDiffWindowFrame->show(); - pVSplitter->addWidget(pDiffWindowFrame); - - m_pDiffWindowSplitter = new QSplitter(); - m_pDiffWindowSplitter->setObjectName("DiffWindowSplitter"); - m_pDiffWindowSplitter->setOpaqueResize(false); - - m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); - pDiffHLayout->addWidget( m_pDiffWindowSplitter ); - //m_pDiffWindowSplitter->show(); - - m_pOverview = new Overview( m_pOptionDialog ); - m_pOverview->setObjectName("Overview"); - pDiffHLayout->addWidget(m_pOverview); - connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) ); - //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint())); - - m_pDiffVScrollBar = new QScrollBar( Qt::Vertical, pDiffWindowFrame ); - pDiffHLayout->addWidget( m_pDiffVScrollBar ); - - m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 ); - m_pDiffWindowSplitter->addWidget(m_pDiffTextWindowFrame1); - //m_pDiffTextWindowFrame1->show(); - m_pDiffTextWindowFrame2 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 2 ); - m_pDiffWindowSplitter->addWidget(m_pDiffTextWindowFrame2); - //m_pDiffTextWindowFrame2->show(); - m_pDiffTextWindowFrame3 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 3 ); - m_pDiffWindowSplitter->addWidget(m_pDiffTextWindowFrame3); - m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow(); - m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow(); - m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow(); - connect(m_pDiffTextWindowFrame1, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int))); - connect(m_pDiffTextWindowFrame2, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int))); - connect(m_pDiffTextWindowFrame3, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int))); - - // Merge window - m_pMergeWindowFrame = new QWidget( pVSplitter ); - m_pMergeWindowFrame->setObjectName("MergeWindowFrame"); - pVSplitter->addWidget(m_pMergeWindowFrame); - QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame ); - pMergeHLayout->setMargin(0); - pMergeHLayout->setSpacing(0); - QVBoxLayout* pMergeVLayout = new QVBoxLayout(); - pMergeHLayout->addLayout( pMergeVLayout, 1 ); - - m_pMergeResultWindowTitle = new WindowTitleWidget(m_pOptionDialog); - pMergeVLayout->addWidget( m_pMergeResultWindowTitle ); - - m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() ); - pMergeVLayout->addWidget( m_pMergeResultWindow, 1 ); - - m_pMergeVScrollBar = new QScrollBar( Qt::Vertical, m_pMergeWindowFrame ); - pMergeHLayout->addWidget( m_pMergeVScrollBar ); - - m_pMainSplitter->addWidget(m_pMainWidget); - - autoAdvance->setEnabled(true); - - QList sizes = pVSplitter->sizes(); - int total = sizes[0] + sizes[1]; - if ( total<10 ) - total = 100; - sizes[0]=total/2; sizes[1]=total/2; - pVSplitter->setSizes( sizes ); - - QList 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 - - QHBoxLayout* pHScrollBarLayout = new QHBoxLayout(); - pVLayout->addLayout( pHScrollBarLayout ); - m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, &m_pOptionDialog->m_bRightToLeftLanguage ); - pHScrollBarLayout->addWidget( m_pHScrollBar ); - m_pCornerWidget = new QWidget( m_pMainWidget ); - pHScrollBarLayout->addWidget( m_pCornerWidget ); - - - connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pOverview, SLOT(setFirstLine(int))); - connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int))); - connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow1, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int))); - m_pDiffTextWindow1->installEventFilter( this ); - - connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int))); - connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow2, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int))); - m_pDiffTextWindow2->installEventFilter( this ); - - connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int))); - connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow3, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int))); - m_pDiffTextWindow3->installEventFilter( this ); - - - MergeResultWindow* p = m_pMergeResultWindow; - connect( m_pMergeVScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstLine(int))); - - connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), p, SLOT(setFirstColumn(int))); - connect( p, SIGNAL(scroll(int,int)), this, SLOT(scrollMergeResultWindow(int,int))); - connect( p, SIGNAL(sourceMask(int,int)), this, SLOT(sourceMask(int,int))); - connect( p, SIGNAL( resizeSignal() ),this, SLOT(resizeMergeResultWindow())); - connect( p, SIGNAL( selectionEnd() ), this, SLOT( slotSelectionEnd() ) ); - connect( p, SIGNAL( newSelection() ), this, SLOT( slotSelectionStart() ) ); - connect( p, SIGNAL( modifiedChanged(bool) ), this, SLOT( slotOutputModified(bool) ) ); - connect( p, SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, SLOT( slotSetModified(bool) ) ); - connect( p, SIGNAL( updateAvailabilities() ), this, SLOT( slotUpdateAvailabilities() ) ); - connect( p, SIGNAL( showPopupMenu(const QPoint&) ), this, SLOT(showPopupMenu(const QPoint&))); - connect( p, SIGNAL( noRelevantChangesDetected() ), this, SLOT(slotNoRelevantChangesDetected())); - sourceMask(0,0); - - - connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, SLOT(setFastSelectorRange(int,int))); - connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, SLOT(setFastSelectorRange(int,int))); - connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, SLOT(setFastSelectorRange(int,int))); - connect(m_pDiffTextWindow1, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow2, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow3, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow1, SIGNAL(gotFocus()), p, SLOT(updateSourceMask())); - connect(m_pDiffTextWindow2, SIGNAL(gotFocus()), p, SLOT(updateSourceMask())); - connect(m_pDiffTextWindow3, SIGNAL(gotFocus()), p, SLOT(updateSourceMask())); - connect(m_pDirectoryMergeInfo, SIGNAL(gotFocus()), p, SLOT(updateSourceMask())); - - connect( m_pDiffTextWindow1, SIGNAL( resizeSignal(int,int) ),this, SLOT(resizeDiffTextWindow(int,int))); - // The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one. - connect( m_pDiffTextWindow2, SIGNAL( resizeSignal(int,int) ),this, SLOT(slotRecalcWordWrap())); - connect( m_pDiffTextWindow3, SIGNAL( resizeSignal(int,int) ),this, SLOT(slotRecalcWordWrap())); - - m_pDiffTextWindow1->setFocus(); - m_pMainWidget->setMinimumSize(50,50); - m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() ); - showWindowA->setChecked( true ); - showWindowB->setChecked( true ); - showWindowC->setChecked( true ); -} - -static int calcManualDiffFirstDiff3LineIdx( const Diff3LineVector& d3lv, const ManualDiffHelpEntry& mdhe ) -{ - unsigned int i; - for( i = 0; i=0 && mdhe.lineA1==d3l.lineA) || - (mdhe.lineB1>=0 && mdhe.lineB1==d3l.lineB) || - (mdhe.lineC1>=0 && mdhe.lineC1==d3l.lineC) ) - return i; - } - return -1; -} - -void KDiff3App::slotAfterFirstPaint() -{ - int newHeight = m_pDiffTextWindow1->getNofVisibleLines(); - /*int newWidth = m_pDiffTextWindow1->getNofVisibleColumns();*/ - m_DTWHeight = newHeight; - - recalcWordWrap(); - - m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) ); - m_pDiffVScrollBar->setPageStep( newHeight ); - m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); - - int d3l=-1; - if ( ! m_manualDiffHelpList.empty() ) - d3l = calcManualDiffFirstDiff3LineIdx( m_diff3LineVector, m_manualDiffHelpList.front() ); - if ( d3l>=0 && m_pDiffTextWindow1 ) - { - int line = m_pDiffTextWindow1->convertDiff3LineIdxToLine( d3l ); - m_pDiffVScrollBar->setValue( max2(0,line-1) ); - } - else - { - m_pMergeResultWindow->slotGoTop(); - if ( ! m_outputFilename.isEmpty() && ! m_pMergeResultWindow->isUnsolvedConflictAtCurrent() ) - m_pMergeResultWindow->slotGoNextUnsolvedConflict(); - } - - if (m_pCornerWidget) - m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() ); - - slotUpdateAvailabilities(); - setUpdatesEnabled(true); - // Workaround for a Qt-bug - QList treeViews = findChildren(); - foreach( QTreeView* pTreeView, treeViews ) - { - pTreeView->setUpdatesEnabled(true); - } -} - -void KDiff3App::resizeEvent(QResizeEvent* e) -{ - QSplitter::resizeEvent(e); - if (m_pCornerWidget) - m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() ); -} - - -bool KDiff3App::eventFilter( QObject* o, QEvent* e ) -{ - if( o == m_pMergeResultWindow ) - { - if ( e->type() == QEvent::KeyPress ) - { // key press - QKeyEvent *k = (QKeyEvent*)e; - if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ControlModifier)!=0 ) - { - slotEditCopy(); - return true; - } - if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 ) - { - slotEditPaste(); - return true; - } - if (k->key()==Qt::Key_Delete && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 ) - { - slotEditCut(); - return true; - } - if ( k->key()==Qt::Key_Escape && m_pKDiff3Shell && m_pOptionDialog->m_bEscapeKeyQuits ) - { - m_pKDiff3Shell->close(); - return true; - } - } - return QSplitter::eventFilter( o, e ); // standard event processing - } - - if ( e->type() == QEvent::KeyPress ) // key press - { - QKeyEvent *k = (QKeyEvent*)e; - if ( k->key()==Qt::Key_Escape && m_pKDiff3Shell && m_pOptionDialog->m_bEscapeKeyQuits ) - { - m_pKDiff3Shell->close(); - return true; - } - - bool bCtrl = (k->QInputEvent::modifiers() & Qt::ControlModifier) != 0; - if (k->key()==Qt::Key_Insert && bCtrl ) - { - slotEditCopy(); - return true; - } - if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 ) - { - slotEditPaste(); - return true; - } - int deltaX=0; - int deltaY=0; - int pageSize = m_DTWHeight; - switch( k->key() ) - { - case Qt::Key_Down: if (!bCtrl) ++deltaY; break; - case Qt::Key_Up: if (!bCtrl) --deltaY; break; - case Qt::Key_PageDown: if (!bCtrl) deltaY+=pageSize; break; - case Qt::Key_PageUp: if (!bCtrl) deltaY-=pageSize; break; - case Qt::Key_Left: if (!bCtrl) --deltaX; break; - case Qt::Key_Right: if (!bCtrl) ++deltaX; break; - case Qt::Key_Home: if ( bCtrl ) m_pDiffVScrollBar->setValue( 0 ); - else m_pHScrollBar->setValue( 0 ); - break; - case Qt::Key_End: if ( bCtrl ) m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->maximum() ); - else m_pHScrollBar->setValue( m_pHScrollBar->maximum() ); - break; - default: break; - } - - scrollDiffTextWindow( deltaX, deltaY ); - - return true; // eat event - } - else if (e->type() == QEvent::Wheel ) // wheel event - { - QWheelEvent *w = (QWheelEvent*)e; - w->accept(); - - int deltaX=0; - - int d=w->delta(); - int deltaY = -d/120 * QApplication::wheelScrollLines(); - - scrollDiffTextWindow( deltaX, deltaY ); - return true; - } - else if (e->type() == QEvent::Drop ) - { - QDropEvent* pDropEvent = static_cast(e); - pDropEvent->accept(); - - if ( pDropEvent->mimeData()->hasUrls() ) - { -#ifdef KREPLACEMENTS_H - QList urlList = pDropEvent->mimeData()->urls(); - if ( canContinue() && !urlList.isEmpty() ) - { - raise(); - QString filename = urlList.first().toLocalFile(); - if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename ); - else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename ); - else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename ); - init(); - } -#else - KUrl::List urlList = KUrl::List::fromMimeData( pDropEvent->mimeData() ); - if ( canContinue() && !urlList.isEmpty() ) - { - raise(); - FileAccess fa( urlList.first().url() ); - if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa ); - else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa ); - else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa ); - init(); - } -#endif - } - else if ( pDropEvent->mimeData()->hasText() ) - { - QString text = pDropEvent->mimeData()->text(); - if ( canContinue() ) - { - raise(); - if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text); - else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text); - else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text); - init(); - } - } - - return true; - } - return QSplitter::eventFilter( o, e ); // standard event processing -} - - - - -void KDiff3App::slotFileOpen() -{ - if ( !canContinue() ) return; - - if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() ) - { - int result = KMessageBox::warningYesNo(this, - i18n("You are currently doing a directory merge. Are you sure, you want to abort?"), - i18n("Warning"), - KGuiItem( i18n("Abort") ), - KGuiItem( i18n("Continue Merging") ) ); - if ( result!=KMessageBox::Yes ) - return; - } - - - slotStatusMsg(i18n("Opening files...")); - - for(;;) - { - OpenDialog d(this, - QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameA() : m_sd1.isFromBuffer() ? QString("") : m_sd1.getAliasName() ), - QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameB() : m_sd2.isFromBuffer() ? QString("") : m_sd2.getAliasName() ), - QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? QString("") : m_sd3.getAliasName() ), - m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(), - QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? QString("") : m_outputFilename ), - SLOT(slotConfigure()), m_pOptionDialog ); - int status = d.exec(); - if ( status == QDialog::Accepted ) - { - m_sd1.setFilename( d.m_pLineA->currentText() ); - m_sd2.setFilename( d.m_pLineB->currentText() ); - m_sd3.setFilename( d.m_pLineC->currentText() ); - - if( d.m_pMerge->isChecked() ) - { - if ( d.m_pLineOut->currentText().isEmpty() ) - { - m_outputFilename = "unnamed.txt"; - m_bDefaultFilename = true; - } - else - { - m_outputFilename = d.m_pLineOut->currentText(); - m_bDefaultFilename = false; - } - } - else - m_outputFilename = ""; - - bool bSuccess = improveFilenames(false); - if ( !bSuccess ) - continue; - - if ( m_bDirCompare ) - { - m_pDirectoryMergeSplitter->show(); - if ( m_pMainWidget!=0 ) - { - m_pMainWidget->hide(); - } - break; - } - else - { - m_pDirectoryMergeSplitter->hide(); - init(); - - if ( (! m_sd1.isEmpty() && !m_sd1.hasData()) || - (! m_sd2.isEmpty() && !m_sd2.hasData()) || - (! m_sd3.isEmpty() && !m_sd3.hasData()) ) - { - QString text( i18n("Opening of these files failed:") ); - text += "\n\n"; - if ( ! m_sd1.isEmpty() && !m_sd1.hasData() ) - text += " - " + m_sd1.getAliasName() + "\n"; - if ( ! m_sd2.isEmpty() && !m_sd2.hasData() ) - text += " - " + m_sd2.getAliasName() + "\n"; - if ( ! m_sd3.isEmpty() && !m_sd3.hasData() ) - text += " - " + m_sd3.getAliasName() + "\n"; - - KMessageBox::sorry( this, text, i18n("File open error") ); - continue; - } - } - } - break; - } - - slotUpdateAvailabilities(); - slotStatusMsg(i18n("Ready.")); -} - -void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn, - QString an1, QString an2, QString an3, TotalDiffStatus* pTotalDiffStatus ) -{ - if ( !canContinue() ) return; - - if(fn1=="" && fn2=="" && fn3=="" && ofn=="" && m_pMainWidget!=0 ) - { - m_pMainWidget->hide(); - return; - } - - slotStatusMsg(i18n("Opening files...")); - - m_sd1.setFilename( fn1 ); - m_sd2.setFilename( fn2 ); - m_sd3.setFilename( fn3 ); - - m_sd1.setAliasName( an1 ); - m_sd2.setAliasName( an2 ); - m_sd3.setAliasName( an3 ); - - if ( ! ofn.isEmpty() ) - { - m_outputFilename = ofn; - m_bDefaultFilename = false; - } - else - { - m_outputFilename = ""; - m_bDefaultFilename = true; - } - - bool bDirCompare = m_bDirCompare; - improveFilenames(true); // Create new window for KDiff3 for directory comparison. - - if( m_bDirCompare ) - { - } - else - { - m_bDirCompare = bDirCompare; // Don't allow this to change here. - init( false, pTotalDiffStatus ); - - if ( pTotalDiffStatus!=0 ) - return; - - if ( (! m_sd1.isEmpty() && ! m_sd1.hasData()) || - (! m_sd2.isEmpty() && ! m_sd2.hasData()) || - (! m_sd3.isEmpty() && ! m_sd3.hasData()) ) - { - QString text( i18n("Opening of these files failed:") ); - text += "\n\n"; - if ( ! m_sd1.isEmpty() && !m_sd1.hasData() ) - text += " - " + m_sd1.getAliasName() + "\n"; - if ( ! m_sd2.isEmpty() && !m_sd2.hasData() ) - text += " - " + m_sd2.getAliasName() + "\n"; - if ( ! m_sd3.isEmpty() && !m_sd3.hasData() ) - text += " - " + m_sd3.getAliasName() + "\n"; - - KMessageBox::sorry( this, text, i18n("File open error") ); - } - else - { - if ( m_pDirectoryMergeWindow!=0 && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) - { - slotDirViewToggle(); - } - } - } - slotStatusMsg(i18n("Ready.")); -} - - -void KDiff3App::slotFileNameChanged(const QString& fileName, int winIdx) -{ - QString fn1 = m_sd1.getFilename(); - QString an1 = m_sd1.getAliasName(); - QString fn2 = m_sd2.getFilename(); - QString an2 = m_sd2.getAliasName(); - QString fn3 = m_sd3.getFilename(); - QString an3 = m_sd3.getAliasName(); - if (winIdx==1) { fn1 = fileName; an1 = ""; } - if (winIdx==2) { fn2 = fileName; an2 = ""; } - if (winIdx==3) { fn3 = fileName; an3 = ""; } - - slotFileOpen2( fn1, fn2, fn3, m_outputFilename, an1, an2, an3, 0 ); -} - - -void KDiff3App::slotEditCut() -{ - slotStatusMsg(i18n("Cutting selection...")); - - QString s; - if ( m_pMergeResultWindow!=0 ) - { - s = m_pMergeResultWindow->getSelection(); - m_pMergeResultWindow->deleteSelection(); - - m_pMergeResultWindow->update(); - } - - if ( !s.isNull() ) - { - QApplication::clipboard()->setText( s, QClipboard::Clipboard ); - } - - slotStatusMsg(i18n("Ready.")); -} - -void KDiff3App::slotEditCopy() -{ - slotStatusMsg(i18n("Copying selection to clipboard...")); - QString s; - if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection(); - if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection(); - if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection(); - if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection(); - if ( !s.isNull() ) - { - QApplication::clipboard()->setText( s, QClipboard::Clipboard ); - } - - slotStatusMsg(i18n("Ready.")); -} - -void KDiff3App::slotEditPaste() -{ - slotStatusMsg(i18n("Inserting clipboard contents...")); - - if ( m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() ) - { - m_pMergeResultWindow->pasteClipboard(false); - } - else if ( canContinue() ) - { - if ( m_pDiffTextWindow1->hasFocus() ) - { - m_sd1.setData( QApplication::clipboard()->text(QClipboard::Clipboard) ); - init(); - } - else if ( m_pDiffTextWindow2->hasFocus() ) - { - m_sd2.setData( QApplication::clipboard()->text(QClipboard::Clipboard) ); - init(); - } - else if ( m_pDiffTextWindow3->hasFocus() ) - { - m_sd3.setData( QApplication::clipboard()->text(QClipboard::Clipboard) ); - init(); - } - } - - slotStatusMsg(i18n("Ready.")); -} - -void KDiff3App::slotEditSelectAll() -{ - int l=0,p=0; // needed as dummy return values - if ( m_pMergeResultWindow && m_pMergeResultWindow->hasFocus() ) { m_pMergeResultWindow->setSelection( 0,0,m_pMergeResultWindow->getNofLines(),0); } - else if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->hasFocus() ) { m_pDiffTextWindow1 ->setSelection( 0,0,m_pDiffTextWindow1->getNofLines(),0,l,p); } - else if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->hasFocus() ) { m_pDiffTextWindow2 ->setSelection( 0,0,m_pDiffTextWindow2->getNofLines(),0,l,p); } - else if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->hasFocus() ) { m_pDiffTextWindow3 ->setSelection( 0,0,m_pDiffTextWindow3->getNofLines(),0,l,p); } - - slotStatusMsg(i18n("Ready.")); -} - -void KDiff3App::slotGoCurrent() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoCurrent(); -} -void KDiff3App::slotGoTop() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoTop(); -} -void KDiff3App::slotGoBottom() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoBottom(); -} -void KDiff3App::slotGoPrevUnsolvedConflict() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevUnsolvedConflict(); -} -void KDiff3App::slotGoNextUnsolvedConflict() -{ - m_bTimerBlock = false; - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextUnsolvedConflict(); -} -void KDiff3App::slotGoPrevConflict() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevConflict(); -} -void KDiff3App::slotGoNextConflict() -{ - m_bTimerBlock = false; - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextConflict(); -} -void KDiff3App::slotGoPrevDelta() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevDelta(); -} -void KDiff3App::slotGoNextDelta() -{ - if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextDelta(); -} - -void KDiff3App::choose( int choice ) -{ - if (!m_bTimerBlock ) - { - if ( m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->hasFocus() ) - { - if (choice==A) m_pDirectoryMergeWindow->slotCurrentChooseA(); - if (choice==B) m_pDirectoryMergeWindow->slotCurrentChooseB(); - if (choice==C) m_pDirectoryMergeWindow->slotCurrentChooseC(); - - chooseA->setChecked(false); - chooseB->setChecked(false); - chooseC->setChecked(false); - } - else if ( m_pMergeResultWindow ) - { - m_pMergeResultWindow->choose( choice ); - if ( autoAdvance->isChecked() ) - { - m_bTimerBlock = true; - QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) ); - } - } - } -} - -void KDiff3App::slotChooseA() { choose( A ); } -void KDiff3App::slotChooseB() { choose( B ); } -void KDiff3App::slotChooseC() { choose( C ); } - -// bConflictsOnly automatically choose for conflicts only (true) or for everywhere -static void mergeChooseGlobal( MergeResultWindow* pMRW, int selector, bool bConflictsOnly, bool bWhiteSpaceOnly ) -{ - if ( pMRW ) - { - pMRW->chooseGlobal(selector, bConflictsOnly, bWhiteSpaceOnly ); - } -} - -void KDiff3App::slotChooseAEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, A, false, false ); } -void KDiff3App::slotChooseBEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, B, false, false ); } -void KDiff3App::slotChooseCEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, C, false, false ); } -void KDiff3App::slotChooseAForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, A, true, false ); } -void KDiff3App::slotChooseBForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, B, true, false ); } -void KDiff3App::slotChooseCForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, C, true, false ); } -void KDiff3App::slotChooseAForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, A, true, true ); } -void KDiff3App::slotChooseBForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, B, true, true ); } -void KDiff3App::slotChooseCForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, C, true, true ); } - - -void KDiff3App::slotAutoSolve() -{ - if (m_pMergeResultWindow ) - { - m_pMergeResultWindow->slotAutoSolve(); - // m_pMergeWindowFrame->show(); incompatible with bPreserveCarriageReturn - m_pMergeResultWindow->showNrOfConflicts(); - slotUpdateAvailabilities(); - } -} - -void KDiff3App::slotUnsolve() -{ - if (m_pMergeResultWindow ) - { - m_pMergeResultWindow->slotUnsolve(); - } -} - -void KDiff3App::slotMergeHistory() -{ - if (m_pMergeResultWindow ) - { - m_pMergeResultWindow->slotMergeHistory(); - } -} - -void KDiff3App::slotRegExpAutoMerge() -{ - if (m_pMergeResultWindow ) - { - m_pMergeResultWindow->slotRegExpAutoMerge(); - } -} - -void KDiff3App::slotSplitDiff() -{ - int firstLine = -1; - int lastLine = -1; - DiffTextWindow* pDTW=0; - if ( m_pDiffTextWindow1 ) { pDTW=m_pDiffTextWindow1; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); } - if ( firstLine<0 && m_pDiffTextWindow2 ) { pDTW=m_pDiffTextWindow2; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); } - if ( firstLine<0 && m_pDiffTextWindow3 ) { pDTW=m_pDiffTextWindow3; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); } - if ( pDTW && firstLine>=0 && m_pMergeResultWindow) - { - pDTW->resetSelection(); - - m_pMergeResultWindow->slotSplitDiff( firstLine, lastLine ); - } -} - -void KDiff3App::slotJoinDiffs() -{ - int firstLine = -1; - int lastLine = -1; - DiffTextWindow* pDTW=0; - if ( m_pDiffTextWindow1 ) { pDTW=m_pDiffTextWindow1; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); } - if ( firstLine<0 && m_pDiffTextWindow2 ) { pDTW=m_pDiffTextWindow2; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); } - if ( firstLine<0 && m_pDiffTextWindow3 ) { pDTW=m_pDiffTextWindow3; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); } - if ( pDTW && firstLine>=0 && m_pMergeResultWindow) - { - pDTW->resetSelection(); - - m_pMergeResultWindow->slotJoinDiffs( firstLine, lastLine ); - } -} - -void KDiff3App::slotConfigure() -{ - m_pOptionDialog->setState(); - m_pOptionDialog->incrementInitialSize ( QSize(0,40) ); - m_pOptionDialog->exec(); - slotRefresh(); -} - -void KDiff3App::slotConfigureKeys() -{ - KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this); -} - -void KDiff3App::slotRefresh() -{ - if (m_pDiffTextWindow1!=0) - { - m_pDiffTextWindow1->setFont(m_pOptionDialog->m_font); - m_pDiffTextWindow1->update(); - } - if (m_pDiffTextWindow2!=0) - { - m_pDiffTextWindow2->setFont(m_pOptionDialog->m_font); - m_pDiffTextWindow2->update(); - } - if (m_pDiffTextWindow3!=0) - { - m_pDiffTextWindow3->setFont(m_pOptionDialog->m_font); - m_pDiffTextWindow3->update(); - } - if (m_pMergeResultWindow!=0) - { - m_pMergeResultWindow->setFont(m_pOptionDialog->m_font); - m_pMergeResultWindow->update(); - } - if (m_pHScrollBar!=0) - { - m_pHScrollBar->setAgain(); - } - if ( m_pDiffWindowSplitter!=0 ) - { - m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); - } - if ( m_pDirectoryMergeWindow ) - { - m_pDirectoryMergeWindow->updateFileVisibilities(); - } -} - -void KDiff3App::slotSelectionStart() -{ - //editCopy->setEnabled( false ); - //editCut->setEnabled( false ); - - const QObject* s = sender(); - if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection(); - if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection(); - if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection(); - if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection(); -} - -void KDiff3App::slotSelectionEnd() -{ - //const QObject* s = sender(); - //editCopy->setEnabled(true); - //editCut->setEnabled( s==m_pMergeResultWindow ); - if ( m_pOptionDialog->m_bAutoCopySelection ) - { - slotEditCopy(); - } - else - { - QClipboard *clipBoard = QApplication::clipboard(); - - if (clipBoard->supportsSelection ()) - { - QString s; - if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection(); - if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection(); - if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection(); - if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection(); - if ( !s.isNull() ) - { - clipBoard->setText( s, QClipboard::Selection ); - } - } - } -} - -void KDiff3App::slotClipboardChanged() -{ - QString s = QApplication::clipboard()->text(); - //editPaste->setEnabled(!s.isEmpty()); -} - -void KDiff3App::slotOutputModified(bool bModified) -{ - if ( bModified && !m_bOutputModified ) - { - m_bOutputModified=true; - slotUpdateAvailabilities(); - } -} - -void KDiff3App::slotAutoAdvanceToggled() -{ - m_pOptionDialog->m_bAutoAdvance = autoAdvance->isChecked(); -} - -void KDiff3App::slotWordWrapToggled() -{ - m_pOptionDialog->m_bWordWrap = wordWrap->isChecked(); - recalcWordWrap(); -} - -void KDiff3App::slotRecalcWordWrap() -{ - recalcWordWrap(); -} - -void KDiff3App::recalcWordWrap(int nofVisibleColumns) // nofVisibleColumns is >=0 only for printing, otherwise the really visible width is used -{ - bool bPrinting = nofVisibleColumns>=0; - int firstD3LIdx = 0; - if( m_pDiffTextWindow1 ) - firstD3LIdx = m_pDiffTextWindow1->convertLineToDiff3LineIdx( m_pDiffTextWindow1->getFirstLine() ); - - // Convert selection to D3L-coords (converting back happens in DiffTextWindow::recalcWordWrap() - if ( m_pDiffTextWindow1 ) - m_pDiffTextWindow1->convertSelectionToD3LCoords(); - if ( m_pDiffTextWindow2 ) - m_pDiffTextWindow2->convertSelectionToD3LCoords(); - if ( m_pDiffTextWindow3 ) - m_pDiffTextWindow3->convertSelectionToD3LCoords(); - - - if ( !m_diff3LineList.empty() && m_pOptionDialog->m_bWordWrap ) - { - Diff3LineList::iterator i; - int sumOfLines=0; - for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i ) - { - Diff3Line& d3l = *i; - d3l.linesNeededForDisplay = 1; - d3l.sumLinesNeededForDisplay = sumOfLines; - sumOfLines += d3l.linesNeededForDisplay; - } - - // Let every window calc how many lines will be needed. - if ( m_pDiffTextWindow1 ) - m_pDiffTextWindow1->recalcWordWrap(true,0,nofVisibleColumns); - if ( m_pDiffTextWindow2 ) - m_pDiffTextWindow2->recalcWordWrap(true,0,nofVisibleColumns); - if ( m_pDiffTextWindow3 ) - m_pDiffTextWindow3->recalcWordWrap(true,0,nofVisibleColumns); - - sumOfLines=0; - for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i ) - { - Diff3Line& d3l = *i; - d3l.sumLinesNeededForDisplay = sumOfLines; - sumOfLines += d3l.linesNeededForDisplay; - } - - // Finish the initialisation: - if ( m_pDiffTextWindow1 ) - m_pDiffTextWindow1->recalcWordWrap(true,sumOfLines,nofVisibleColumns); - if ( m_pDiffTextWindow2 ) - m_pDiffTextWindow2->recalcWordWrap(true,sumOfLines,nofVisibleColumns); - if ( m_pDiffTextWindow3 ) - m_pDiffTextWindow3->recalcWordWrap(true,sumOfLines,nofVisibleColumns); - - m_neededLines = sumOfLines; - } - else - { - m_neededLines = m_diff3LineVector.size(); - if ( m_pDiffTextWindow1 ) - m_pDiffTextWindow1->recalcWordWrap(false,0,0); - if ( m_pDiffTextWindow2 ) - m_pDiffTextWindow2->recalcWordWrap(false,0,0); - if ( m_pDiffTextWindow3 ) - m_pDiffTextWindow3->recalcWordWrap(false,0,0); - } - if (bPrinting) - return; - - if (m_pOverview) - m_pOverview->slotRedraw(); - if ( m_pDiffTextWindow1 ) - { - m_pDiffTextWindow1->setFirstLine( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) ); - m_pDiffTextWindow1->update(); - } - if ( m_pDiffTextWindow2 ) - { - m_pDiffTextWindow2->setFirstLine( m_pDiffTextWindow2->convertDiff3LineIdxToLine( firstD3LIdx ) ); - m_pDiffTextWindow2->update(); - } - if ( m_pDiffTextWindow3 ) - { - m_pDiffTextWindow3->setFirstLine( m_pDiffTextWindow3->convertDiff3LineIdxToLine( firstD3LIdx ) ); - m_pDiffTextWindow3->update(); - } - - if ( m_pDiffVScrollBar ) - m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - m_DTWHeight) ); - if ( m_pDiffTextWindow1 ) - { - m_pDiffVScrollBar->setValue( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) ); - - setHScrollBarRange(); - m_pHScrollBar->setValue(0); - } -} - -void KDiff3App::slotShowWhiteSpaceToggled() -{ - m_pOptionDialog->m_bShowWhiteSpaceCharacters = showWhiteSpaceCharacters->isChecked(); - m_pOptionDialog->m_bShowWhiteSpace = showWhiteSpace->isChecked(); - showWhiteSpaceCharacters->setEnabled( showWhiteSpace->isChecked() ); - if ( m_pDiffTextWindow1!=0 ) - m_pDiffTextWindow1->update(); - if ( m_pDiffTextWindow2!=0 ) - m_pDiffTextWindow2->update(); - if ( m_pDiffTextWindow3!=0 ) - m_pDiffTextWindow3->update(); - if ( m_pOverview!=0 ) - m_pOverview->slotRedraw(); -} - -void KDiff3App::slotShowLineNumbersToggled() -{ - m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked(); - if ( m_pDiffTextWindow1!=0 ) - m_pDiffTextWindow1->update(); - if ( m_pDiffTextWindow2!=0 ) - m_pDiffTextWindow2->update(); - if ( m_pDiffTextWindow3!=0 ) - m_pDiffTextWindow3->update(); -} - -/// Return true for success, else false -bool KDiff3App::improveFilenames( bool bCreateNewInstance ) -{ - m_bDirCompare = false; - - FileAccess f1(m_sd1.getFilename()); - FileAccess f2(m_sd2.getFilename()); - FileAccess f3(m_sd3.getFilename()); - FileAccess f4(m_outputFilename); - - if ( f1.isFile() && f1.exists() ) - { - if ( f2.isDir() ) - { - f2.addPath( f1.fileName() ); - if ( f2.isFile() && f2.exists() ) - m_sd2.setFileAccess( f2 ); - } - if ( f3.isDir() ) - { - f3.addPath( f1.fileName() ); - if ( f3.isFile() && f3.exists() ) - m_sd3.setFileAccess( f3 ); - } - if ( f4.isDir() ) - { - f4.addPath( f1.fileName() ); - if ( f4.isFile() && f4.exists() ) - m_outputFilename = f4.absoluteFilePath(); - } - } - else if ( f1.isDir() ) - { - m_bDirCompare = true; - if (bCreateNewInstance) - { - emit createNewInstance( f1.absoluteFilePath(), f2.absoluteFilePath(), f3.absoluteFilePath() ); - } - else - { - FileAccess destDir; - if (!m_bDefaultFilename) destDir = f4; - m_pDirectoryMergeSplitter->show(); - if (m_pMainWidget!=0) m_pMainWidget->hide(); - setUpdatesEnabled(true); - - bool bSuccess = m_pDirectoryMergeWindow->init( - f1, f2, f3, - destDir, // Destdirname - !m_outputFilename.isEmpty() - ); - - m_bDirCompare = true; // This seems redundant but it might have been reset during full analysis. - - if (bSuccess) - { - m_sd1.reset(); - if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,eLineEndStyleDos,0,0,0,0,false); - m_sd2.reset(); - if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,eLineEndStyleDos,0,0,0,0,false); - m_sd3.reset(); - if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,eLineEndStyleDos,0,0,0,0,false); - } - slotUpdateAvailabilities(); - return bSuccess; - } - } - return true; -} - -void KDiff3App::slotReload() -{ - if ( !canContinue() ) return; - - init(); -} - -bool KDiff3App::canContinue() -{ - // First test if anything must be saved. - if(m_bOutputModified) - { - int result = KMessageBox::warningYesNoCancel(this, - i18n("The merge result hasn't been saved."), - i18n("Warning"), - KGuiItem( i18n("Save && Continue") ), - KGuiItem( i18n("Continue Without Saving") ) ); - if ( result==KMessageBox::Cancel ) - return false; - else if ( result==KMessageBox::Yes ) - { - slotFileSave(); - if ( m_bOutputModified ) - { - KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") ); - return false; - } - } - } - - m_bOutputModified = false; - return true; -} - -void KDiff3App::slotCheckIfCanContinue( bool* pbContinue ) -{ - if (pbContinue!=0) *pbContinue = canContinue(); -} - - -void KDiff3App::slotDirShowBoth() -{ - if( dirShowBoth->isChecked() ) - { - if ( m_pDirectoryMergeSplitter ) - m_pDirectoryMergeSplitter->setVisible( m_bDirCompare ); - - if ( m_pMainWidget!=0 ) - m_pMainWidget->show(); - } - else - { - bool bTextDataAvailable = ( m_sd1.hasData() || m_sd2.hasData() || m_sd3.hasData() ); - if ( m_pMainWidget!=0 && bTextDataAvailable ) - { - m_pMainWidget->show(); - m_pDirectoryMergeSplitter->hide(); - } - else if ( m_bDirCompare ) - { - m_pDirectoryMergeSplitter->show(); - } - } - - slotUpdateAvailabilities(); -} - - -void KDiff3App::slotDirViewToggle() -{ - if ( m_bDirCompare ) - { - if( ! m_pDirectoryMergeSplitter->isVisible() ) - { - m_pDirectoryMergeSplitter->show(); - if (m_pMainWidget!=0) - m_pMainWidget->hide(); - } - else - { - if (m_pMainWidget!=0) - { - m_pDirectoryMergeSplitter->hide(); - m_pMainWidget->show(); - } - } - } - slotUpdateAvailabilities(); -} - -void KDiff3App::slotShowWindowAToggled() -{ - if ( m_pDiffTextWindow1!=0 ) - { - m_pDiffTextWindowFrame1->setVisible( showWindowA->isChecked() ); - slotUpdateAvailabilities(); - } -} - -void KDiff3App::slotShowWindowBToggled() -{ - if ( m_pDiffTextWindow2!=0 ) - { - m_pDiffTextWindowFrame2->setVisible( showWindowB->isChecked() ); - slotUpdateAvailabilities(); - } -} - -void KDiff3App::slotShowWindowCToggled() -{ - if ( m_pDiffTextWindow3!=0 ) - { - m_pDiffTextWindowFrame3->setVisible( showWindowC->isChecked() ); - slotUpdateAvailabilities(); - } -} - -void KDiff3App::slotEditFind() -{ - m_pFindDialog->currentLine = 0; - m_pFindDialog->currentPos = 0; - m_pFindDialog->currentWindow = 1; - - if ( QDialog::Accepted == m_pFindDialog->exec() ) - { - slotEditFindNext(); - } -} - -void KDiff3App::slotEditFindNext() -{ - QString s = m_pFindDialog->m_pSearchString->text(); - if ( s.isEmpty() ) - { - slotEditFind(); - return; - } - - bool bDirDown = true; - bool bCaseSensitive = m_pFindDialog->m_pCaseSensitive->isChecked(); - - int d3vLine = m_pFindDialog->currentLine; - int posInLine = m_pFindDialog->currentPos; - int l=0; - int p=0; - if ( m_pFindDialog->currentWindow == 1 ) - { - if ( m_pFindDialog->m_pSearchInA->isChecked() && m_pDiffTextWindow1!=0 && - m_pDiffTextWindow1->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) - { - m_pDiffTextWindow1->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(), l, p ); - m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2); - m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) ); - m_pFindDialog->currentLine = d3vLine; - m_pFindDialog->currentPos = posInLine + 1; - return; - } - m_pFindDialog->currentWindow = 2; - m_pFindDialog->currentLine = 0; - m_pFindDialog->currentPos = 0; - } - - d3vLine = m_pFindDialog->currentLine; - posInLine = m_pFindDialog->currentPos; - if ( m_pFindDialog->currentWindow == 2 ) - { - if ( m_pFindDialog->m_pSearchInB->isChecked() && m_pDiffTextWindow2!=0 && - m_pDiffTextWindow2->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) - { - m_pDiffTextWindow2->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(),l,p ); - m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2); - m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) ); - m_pFindDialog->currentLine = d3vLine; - m_pFindDialog->currentPos = posInLine + 1; - return; - } - m_pFindDialog->currentWindow = 3; - m_pFindDialog->currentLine = 0; - m_pFindDialog->currentPos = 0; - } - - d3vLine = m_pFindDialog->currentLine; - posInLine = m_pFindDialog->currentPos; - if ( m_pFindDialog->currentWindow == 3 ) - { - if ( m_pFindDialog->m_pSearchInC->isChecked() && m_pDiffTextWindow3!=0 && - m_pDiffTextWindow3->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) - { - m_pDiffTextWindow3->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(),l,p ); - m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2); - m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) ); - m_pFindDialog->currentLine = d3vLine; - m_pFindDialog->currentPos = posInLine + 1; - return; - } - m_pFindDialog->currentWindow = 4; - m_pFindDialog->currentLine = 0; - m_pFindDialog->currentPos = 0; - } - - d3vLine = m_pFindDialog->currentLine; - posInLine = m_pFindDialog->currentPos; - if ( m_pFindDialog->currentWindow == 4 ) - { - if ( m_pFindDialog->m_pSearchInOutput->isChecked() && m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() && - m_pMergeResultWindow->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) - { - m_pMergeResultWindow->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() ); - m_pMergeVScrollBar->setValue(d3vLine - m_pMergeVScrollBar->pageStep()/2); - m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) ); - m_pFindDialog->currentLine = d3vLine; - m_pFindDialog->currentPos = posInLine + 1; - return; - } - m_pFindDialog->currentWindow = 5; - m_pFindDialog->currentLine = 0; - m_pFindDialog->currentPos = 0; - } - - KMessageBox::information(this,i18n("Search complete."),i18n("Search Complete")); - m_pFindDialog->currentWindow = 1; - m_pFindDialog->currentLine = 0; - m_pFindDialog->currentPos = 0; -} - -void KDiff3App::slotMergeCurrentFile() -{ - if ( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() ) - { - m_pDirectoryMergeWindow->mergeCurrentFile(); - } - else if ( m_pMainWidget != 0 && m_pMainWidget->isVisible() ) - { - if ( !canContinue() ) return; - if ( m_outputFilename.isEmpty() ) - { - if ( !m_sd3.isEmpty() && !m_sd3.isFromBuffer() ) - { - m_outputFilename = m_sd3.getFilename(); - } - else if ( !m_sd2.isEmpty() && !m_sd2.isFromBuffer() ) - { - m_outputFilename = m_sd2.getFilename(); - } - else if ( !m_sd1.isEmpty() && !m_sd1.isFromBuffer() ) - { - m_outputFilename = m_sd1.getFilename(); - } - else - { - m_outputFilename = "unnamed.txt"; - m_bDefaultFilename = true; - } - } - init(); - } -} - -void KDiff3App::slotWinFocusNext() -{ - QWidget* focus = qApp->focusWidget(); - if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) - { - slotDirViewToggle(); - } - - std::list visibleWidgetList; - if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1); - if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2); - if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3); - if ( m_pMergeResultWindow && m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow); - if ( m_bDirCompare /*m_pDirectoryMergeWindow->isVisible()*/ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow); - //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList()); - - std::list::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus); - ++i; - if ( i==visibleWidgetList.end() ) - i = visibleWidgetList.begin(); - if ( i!=visibleWidgetList.end() ) - { - if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() ) - { - slotDirViewToggle(); - } - (*i)->setFocus(); - } -} - -void KDiff3App::slotWinFocusPrev() -{ - QWidget* focus = qApp->focusWidget(); - if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) - { - slotDirViewToggle(); - } - - std::list visibleWidgetList; - if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1); - if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2); - if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3); - if ( m_pMergeResultWindow && m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow); - if (m_bDirCompare /* m_pDirectoryMergeWindow->isVisible() */ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow); - //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList()); - - std::list::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus); - if ( i==visibleWidgetList.begin() ) - i=visibleWidgetList.end(); - --i; - if ( i!=visibleWidgetList.end() ) - { - if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() ) - { - slotDirViewToggle(); - } - (*i)->setFocus(); - } -} - -void KDiff3App::slotWinToggleSplitterOrientation() -{ - if ( m_pDiffWindowSplitter!=0 ) - { - m_pDiffWindowSplitter->setOrientation( - m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical - ); - - m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal; - } -} - -void KDiff3App::slotOverviewNormal() -{ - if ( m_pOverview != 0 ) - m_pOverview->setOverviewMode( Overview::eOMNormal ); - if ( m_pMergeResultWindow !=0 ) - m_pMergeResultWindow->setOverviewMode( Overview::eOMNormal ); - slotUpdateAvailabilities(); -} - -void KDiff3App::slotOverviewAB() -{ - if ( m_pOverview != 0 ) - m_pOverview->setOverviewMode( Overview::eOMAvsB ); - m_pMergeResultWindow->setOverviewMode( Overview::eOMAvsB ); - slotUpdateAvailabilities(); -} - -void KDiff3App::slotOverviewAC() -{ - if ( m_pOverview != 0 ) - m_pOverview->setOverviewMode( Overview::eOMAvsC ); - if ( m_pMergeResultWindow !=0 ) - m_pMergeResultWindow->setOverviewMode( Overview::eOMAvsC ); - slotUpdateAvailabilities(); -} - -void KDiff3App::slotOverviewBC() -{ - if ( m_pOverview != 0 ) - m_pOverview->setOverviewMode( Overview::eOMBvsC ); - if ( m_pMergeResultWindow !=0 ) - m_pMergeResultWindow->setOverviewMode( Overview::eOMBvsC ); - slotUpdateAvailabilities(); -} - -void KDiff3App::slotNoRelevantChangesDetected() -{ - if ( m_bTripleDiff && ! m_outputFilename.isEmpty() ) - { - //KMessageBox::information( this, "No relevant changes detected", "KDiff3" ); - if (!m_pOptionDialog->m_IrrelevantMergeCmd.isEmpty()) - { - QString cmd = m_pOptionDialog->m_IrrelevantMergeCmd + " \"" + m_sd1.getAliasName()+ "\" \"" + m_sd2.getAliasName() + "\" \"" + m_sd3.getAliasName(); - QProcess process; - process.start( cmd ); - process.waitForFinished(-1); - //::system( cmd.local8Bit() ); - } - } -} - -static void insertManualDiffHelp( ManualDiffHelpList* pManualDiffHelpList, int winIdx, int firstLine, int lastLine ) -{ - // The manual diff help list must be sorted and compact. - // "Compact" means that upper items can't be empty if lower items contain data. - - // First insert the new item without regarding compactness. - // If the new item overlaps with previous items then the previous items will be removed. - - ManualDiffHelpEntry mdhe; - mdhe.firstLine( winIdx ) = firstLine; - mdhe.lastLine( winIdx ) = lastLine; - - ManualDiffHelpList::iterator i; - for( i=pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i ) - { - int& l1 = i->firstLine( winIdx ); - int& l2 = i->lastLine( winIdx ); - if (l1>=0 && l2>=0) - { - if ( (firstLine<=l1 && lastLine>=l1) || (firstLine <=l2 && lastLine>=l2) ) - { - // overlap - l1 = -1; - l2 = -1; - } - if ( firstLineinsert( i, mdhe ); - break; - } - } - } - if ( i == pManualDiffHelpList->end() ) - { - pManualDiffHelpList->insert( i, mdhe ); - } - - // Now make the list compact - for( int wIdx=1; wIdx<=3; ++wIdx ) - { - ManualDiffHelpList::iterator iEmpty = pManualDiffHelpList->begin(); - for( i=pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i ) - { - if ( iEmpty->firstLine(wIdx) >= 0 ) - { - ++iEmpty; - continue; - } - if ( i->firstLine(wIdx)>=0 ) // Current item is not empty -> move it to the empty place - { - iEmpty->firstLine(wIdx) = i->firstLine(wIdx); - iEmpty->lastLine(wIdx) = i->lastLine(wIdx); - i->firstLine(wIdx) = -1; - i->lastLine(wIdx) = -1; - ++iEmpty; - } - } - } - pManualDiffHelpList->remove( ManualDiffHelpEntry() ); // Remove all completely empty items. -} - -void KDiff3App::slotAddManualDiffHelp() -{ - int firstLine = -1; - int lastLine = -1; - int winIdx = -1; - if ( m_pDiffTextWindow1 ) { m_pDiffTextWindow1->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=1; } - if ( firstLine<0 && m_pDiffTextWindow2 ) { m_pDiffTextWindow2->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=2; } - if ( firstLine<0 && m_pDiffTextWindow3 ) { m_pDiffTextWindow3->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=3; } - - if ( firstLine<0 || lastLine <0 || lastLineisChecked() ) - { - if ( m_pDirectoryMergeSplitter!=0 ) - m_pDirectoryMergeSplitter->setVisible( m_bDirCompare ); - - if ( m_pMainWidget!=0 && !m_pMainWidget->isVisible() && - bTextDataAvailable && !m_pDirectoryMergeWindow->isScanning() - ) - m_pMainWidget->show(); - } - - - bool bDiffWindowVisible = m_pMainWidget != 0 && m_pMainWidget->isVisible(); - bool bMergeEditorVisible = m_pMergeWindowFrame !=0 && m_pMergeWindowFrame->isVisible(); - - m_pDirectoryMergeWindow->updateAvailabilities( m_bDirCompare, bDiffWindowVisible, chooseA, chooseB, chooseC ); - - dirShowBoth->setEnabled( m_bDirCompare ); - dirViewToggle->setEnabled( - m_bDirCompare && - ((!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && m_pMainWidget->isVisible()) || - (m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && !m_pMainWidget->isVisible() && bTextDataAvailable) ) - ); - - bool bDirWindowHasFocus = m_pDirectoryMergeSplitter->isVisible() && m_pDirectoryMergeWindow->hasFocus(); - - showWhiteSpaceCharacters->setEnabled( bDiffWindowVisible ); - autoAdvance->setEnabled( bMergeEditorVisible ); - autoSolve->setEnabled( bMergeEditorVisible && m_bTripleDiff ); - unsolve->setEnabled( bMergeEditorVisible ); - if ( !bDirWindowHasFocus ) - { - chooseA->setEnabled( bMergeEditorVisible ); - chooseB->setEnabled( bMergeEditorVisible ); - chooseC->setEnabled( bMergeEditorVisible && m_bTripleDiff ); - } - chooseAEverywhere->setEnabled( bMergeEditorVisible ); - chooseBEverywhere->setEnabled( bMergeEditorVisible ); - chooseCEverywhere->setEnabled( bMergeEditorVisible && m_bTripleDiff ); - chooseAForUnsolvedConflicts->setEnabled( bMergeEditorVisible ); - chooseBForUnsolvedConflicts->setEnabled( bMergeEditorVisible ); - chooseCForUnsolvedConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff ); - chooseAForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible ); - chooseBForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible ); - chooseCForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff ); - mergeHistory->setEnabled( bMergeEditorVisible ); - mergeRegExp->setEnabled( bMergeEditorVisible ); - showWindowA->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow2->isVisible() || m_pDiffTextWindow3->isVisible() ) ); - showWindowB->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow3->isVisible() )); - showWindowC->setEnabled( bDiffWindowVisible && m_bTripleDiff && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow2->isVisible() ) ); - editFind->setEnabled( bDiffWindowVisible ); - editFindNext->setEnabled( bDiffWindowVisible ); - m_pFindDialog->m_pSearchInC->setEnabled( m_bTripleDiff ); - m_pFindDialog->m_pSearchInOutput->setEnabled( bMergeEditorVisible ); - - bool bSavable = bMergeEditorVisible && m_pMergeResultWindow->getNrOfUnsolvedConflicts()==0; - fileSave->setEnabled( m_bOutputModified && bSavable ); - fileSaveAs->setEnabled( bSavable ); - - goTop->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() ); - goBottom->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() ); - goCurrent->setEnabled( bDiffWindowVisible ); - goPrevUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictAboveCurrent() ); - goNextUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictBelowCurrent() ); - goPrevConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictAboveCurrent() ); - goNextConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictBelowCurrent() ); - goPrevDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() ); - goNextDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() ); - - overviewModeNormal->setEnabled( m_bTripleDiff && bDiffWindowVisible ); - overviewModeAB->setEnabled( m_bTripleDiff && bDiffWindowVisible ); - overviewModeAC->setEnabled( m_bTripleDiff && bDiffWindowVisible ); - overviewModeBC->setEnabled( m_bTripleDiff && bDiffWindowVisible ); - Overview::e_OverviewMode overviewMode = m_pOverview==0 ? Overview::eOMNormal : m_pOverview->getOverviewMode(); - overviewModeNormal->setChecked( overviewMode == Overview::eOMNormal ); - overviewModeAB->setChecked( overviewMode == Overview::eOMAvsB ); - overviewModeAC->setChecked( overviewMode == Overview::eOMAvsC ); - overviewModeBC->setChecked( overviewMode == Overview::eOMBvsC ); - - winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=0 ); -} Index: trunk/extragear/utils/kdiff3/src/lo32-app-kdiff3.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/kdiff3/src/lo32-app-kdiff3.png =================================================================== --- trunk/extragear/utils/kdiff3/src/lo32-app-kdiff3.png (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/lo32-app-kdiff3.png (nonexistent) Property changes on: trunk/extragear/utils/kdiff3/src/lo32-app-kdiff3.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/kdiff3/src/kdiff3.ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/kdiff3/src/kdiff3.ico =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3.ico (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3.ico (nonexistent) Property changes on: trunk/extragear/utils/kdiff3/src/kdiff3.ico ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/kdiff3/src/directorymergewindow.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/directorymergewindow.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/directorymergewindow.cpp (nonexistent) @@ -1,3091 +0,0 @@ -/*************************************************************************** - directorymergewindow.cpp - ----------------- - begin : Sat Oct 19 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "directorymergewindow.h" -#include "optiondialog.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -//#include - -#include "guiutils.h" - -static bool conflictingFileTypes(MergeFileInfos& mfi); - -class StatusInfo : public QDialog -{ - QTextEdit* m_pTextEdit; -public: - StatusInfo(QWidget* pParent) : QDialog( pParent ) - { - QVBoxLayout* pVLayout = new QVBoxLayout( this ); - m_pTextEdit = new QTextEdit(this); - pVLayout->addWidget( m_pTextEdit ); - setObjectName("StatusInfo"); - setWindowFlags(Qt::Dialog); - m_pTextEdit->setWordWrapMode(QTextOption::NoWrap); - m_pTextEdit->setReadOnly(true); - QPushButton* pClose = new QPushButton(tr("Close")); - connect( pClose, SIGNAL(clicked()), this, SLOT(accept())); - pVLayout->addWidget(pClose); - } - - bool isEmpty(){ - return m_pTextEdit->toPlainText().isEmpty(); - } - - void addText(const QString& s ) - { - m_pTextEdit->append(s); - } - - void clear() - { - m_pTextEdit->clear(); - } - - void setVisible(bool bVisible) - { - if (bVisible) - { - m_pTextEdit->moveCursor ( QTextCursor::End ); - m_pTextEdit->moveCursor ( QTextCursor::StartOfLine ); - m_pTextEdit->ensureCursorVisible(); - } - - QDialog::setVisible(bVisible); - if ( bVisible ) - setWindowState( windowState() | Qt::WindowMaximized ); - } -}; - - -class TempRemover -{ -public: - TempRemover( const QString& origName, FileAccess& fa ); - ~TempRemover(); - QString name() { return m_name; } - bool success() { return m_bSuccess; } -private: - QString m_name; - bool m_bTemp; - bool m_bSuccess; -}; -TempRemover::TempRemover(const QString& origName, FileAccess& fa) -{ - if ( fa.isLocal() ) - { - m_name = origName; - m_bTemp = false; - m_bSuccess = true; - } - else - { - m_name = FileAccess::tempFileName(); - m_bSuccess = fa.copyFile( m_name ); - m_bTemp = m_bSuccess; - } -} -TempRemover::~TempRemover() -{ - if ( m_bTemp && ! m_name.isEmpty() ) - FileAccess::removeTempFile(m_name); -} - -void DirectoryMergeWindow::fastFileComparison( - FileAccess& fi1, FileAccess& fi2, - bool& bEqual, bool& bError, QString& status ) -{ - ProgressProxy pp; - status = ""; - bEqual = false; - bError = true; - - if ( !m_bFollowFileLinks ) - { - if ( fi1.isSymLink() != fi2.isSymLink() ) - { - status = i18n("Mix of links and normal files."); - return; - } - else if ( fi1.isSymLink() && fi2.isSymLink() ) - { - bError = false; - bEqual = fi1.readLink() == fi2.readLink(); - status = i18n("Link: "); - return; - } - } - - if ( fi1.size()!=fi2.size() ) - { - bEqual = false; - status = i18n("Size. "); - return; - } - else if ( m_pOptions->m_bDmTrustSize ) - { - bEqual = true; - return; - } - - if ( m_pOptions->m_bDmTrustDate ) - { - bEqual = ( fi1.lastModified() == fi2.lastModified() && fi1.size()==fi2.size() ); - bError = false; - status = i18n("Date & Size: "); - return; - } - - if ( m_pOptions->m_bDmTrustDateFallbackToBinary ) - { - bEqual = ( fi1.lastModified() == fi2.lastModified() && fi1.size()==fi2.size() ); - if ( bEqual ) - { - bError = false; - status = i18n("Date & Size: "); - return; - } - } - - QString fileName1 = fi1.absoluteFilePath(); - QString fileName2 = fi2.absoluteFilePath(); - TempRemover tr1( fileName1, fi1 ); - if ( !tr1.success() ) - { - status = i18n("Creating temp copy of %1 failed.",fileName1); - return; - } - TempRemover tr2( fileName2, fi2 ); - if ( !tr2.success() ) - { - status = i18n("Creating temp copy of %1 failed.",fileName2); - return; - } - - std::vector buf1(100000); - std::vector buf2(buf1.size()); - - QFile file1( tr1.name() ); - - if ( ! file1.open(QIODevice::ReadOnly) ) - { - status = i18n("Opening %1 failed.",fileName1); - return; - } - - QFile file2( tr2.name() ); - - if ( ! file2.open(QIODevice::ReadOnly) ) - { - status = i18n("Opening %1 failed.",fileName2); - return; - } - - pp.setInformation( i18n("Comparing file..."), 0, false ); - typedef qint64 t_FileSize; - t_FileSize fullSize = file1.size(); - t_FileSize sizeLeft = fullSize; - - while( sizeLeft>0 && ! pp.wasCancelled() ) - { - int len = min2( sizeLeft, (t_FileSize)buf1.size() ); - if( len != file1.read( &buf1[0], len ) ) - { - status = i18n("Error reading from %1",fileName1); - return; - } - - if( len != file2.read( &buf2[0], len ) ) - { - status = i18n("Error reading from %1",fileName2); - return; - } - - if ( memcmp( &buf1[0], &buf2[0], len ) != 0 ) - { - bError = false; - return; - } - sizeLeft-=len; - pp.setCurrent(double(fullSize-sizeLeft)/fullSize, false ); - } - - // If the program really arrives here, then the files are really equal. - bError = false; - bEqual = true; -} - -static int s_NameCol = 0; -static int s_ACol = 1; -static int s_BCol = 2; -static int s_CCol = 3; -static int s_OpCol = 4; -static int s_OpStatusCol = 5; -static int s_UnsolvedCol = 6; // Nr of unsolved conflicts (for 3 input files) -static int s_SolvedCol = 7; // Nr of auto-solvable conflicts (for 3 input files) -static int s_NonWhiteCol = 8; // Nr of nonwhite deltas (for 2 input files) -static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files) - -// Previously Q3ListViewItem::paintCell(p,cg,column,width,align); -class DirectoryMergeWindow::DirMergeItemDelegate : public QItemDelegate -{ - DirectoryMergeWindow* m_pDMW; -public: - DirMergeItemDelegate(DirectoryMergeWindow* pParent) - : QItemDelegate(pParent), m_pDMW(pParent) - { - } - void paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const - { - int column = index.column(); - if (column == s_ACol || column == s_BCol || column == s_CCol ) - { - QVariant value = index.data( Qt::DecorationRole ); - QPixmap icon; - if ( value.isValid() ) - { - if (value.type() == QVariant::Icon) - { - icon = qvariant_cast(value).pixmap(16,16); - //icon = qvariant_cast(value); - //decorationRect = QRect(QPoint(0, 0), icon.actualSize(option.decorationSize, iconMode, iconState)); - } - else - { - icon = qvariant_cast(value); - //decorationRect = QRect(QPoint(0, 0), option.decorationSize).intersected(pixmap.rect()); - } - } - - int x = option.rect.left(); - int y = option.rect.top(); - //QPixmap icon = value.value(); //pixmap(column); - if ( !icon.isNull() ) - { - int yOffset = (sizeHint(option,index).height() - icon.height()) / 2; - p->drawPixmap( x+2, y+yOffset, icon ); - - QTreeWidgetItem* pTWI = reinterpret_cast( index.internalPointer() ); - DirMergeItem* pDMI = static_cast(pTWI); - int i = pDMI==m_pDMW->m_pSelection1Item && column == m_pDMW->m_selection1Column ? 1 : - pDMI==m_pDMW->m_pSelection2Item && column == m_pDMW->m_selection2Column ? 2 : - pDMI==m_pDMW->m_pSelection3Item && column == m_pDMW->m_selection3Column ? 3 : - 0; - if ( i!=0 ) - { - OptionDialog* pOD = m_pDMW->m_pOptions; - QColor c ( i==1 ? pOD->m_colorA : i==2 ? pOD->m_colorB : pOD->m_colorC ); - p->setPen( c );// highlight() ); - p->drawRect( x+2, y+yOffset, icon.width(), icon.height()); - p->setPen( QPen( c, 0, Qt::DotLine) ); - p->drawRect( x+1, y+yOffset-1, icon.width()+2, icon.height()+2); - p->setPen( Qt::white ); - QString s( QChar('A'+i-1) ); - p->drawText( x+2 + (icon.width() - p->fontMetrics().width(s))/2, - y+yOffset + (icon.height() + p->fontMetrics().ascent())/2-1, - s ); - } - else - { - p->setPen( m_pDMW->palette().background().color() ); - p->drawRect( x+1, y+yOffset-1, icon.width()+2, icon.height()+2); - } - return; - } - } - QStyleOptionViewItem option2 = option; - if ( column>=s_UnsolvedCol ) - { - option2.displayAlignment = Qt::AlignRight; - } - QItemDelegate::paint( p, option2, index ); - } -}; - - -DirectoryMergeWindow::DirectoryMergeWindow( QWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader ) - : QTreeWidget( pParent ) -{ - setItemDelegate( new DirMergeItemDelegate(this) ); - connect( this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(onDoubleClick(QTreeWidgetItem*))); - connect( this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(onCurrentChanged(QTreeWidgetItem*))); - connect( this, SIGNAL(expanded(const QModelIndex&)), this, SLOT(onExpanded())); - m_pOptions = pOptions; - m_pIconLoader = pIconLoader; - m_pDirectoryMergeInfo = 0; - m_bSimulatedMergeStarted=false; - m_bRealMergeStarted=false; - m_bError = false; - m_bSyncMode = false; - m_pStatusInfo = new StatusInfo(this); - m_pStatusInfo->hide(); - m_bScanning = false; - m_pSelection1Item = 0; - m_pSelection2Item = 0; - m_pSelection3Item = 0; - m_bCaseSensitive = true; - - QStringList sl; - sl << i18n("Name") << "A" << "B" << "C" << i18n("Operation") << i18n("Status") - << i18n("Unsolved") << i18n("Solved") << i18n("Nonwhite") << i18n("White") << ""; - setHeaderLabels(sl); - - //TODO setColumnAlignment( s_UnsolvedCol, Qt::AlignRight ); - //setColumnAlignment( s_SolvedCol, Qt::AlignRight ); - //setColumnAlignment( s_NonWhiteCol, Qt::AlignRight ); - //setColumnAlignment( s_WhiteCol, Qt::AlignRight ); -} - -DirectoryMergeWindow::~DirectoryMergeWindow() -{ -} - - -int DirectoryMergeWindow::totalColumnWidth() -{ - int w=0; - for (int i=0; itoImage().convertToFormat(QImage::Format_ARGB32); - QImage img2 = pm2->toImage().convertToFormat(QImage::Format_ARGB32); - - for (int y = 0; y < img1.height(); y++) - { - quint32 *line1 = reinterpret_cast(img1.scanLine(y)); - quint32 *line2 = reinterpret_cast(img2.scanLine(y)); - for (int x = 0; x < img1.width(); x++) - { - if ( qAlpha( line2[x] ) >0 ) - line1[x] = (line2[x] | 0xff000000); - } - } - return QPixmap::fromImage(img1); -} - -// like pixCombiner but let the pm1 color shine through -static QPixmap pixCombiner2( const QPixmap* pm1, const QPixmap* pm2 ) -{ - QPixmap pix=*pm1; - QPainter p(&pix); - p.setOpacity(0.5); - p.drawPixmap( 0,0,*pm2 ); - p.end(); - - return pix; -} - -static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles, - int& nofDirs, int& nofEqualFiles, int& nofManualMerges ) -{ - if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC ) - { - ++nofDirs; - } - else - { - ++nofFiles; - if ( i->m_pMFI->m_bEqualAB && (!bThreeDirs || i->m_pMFI->m_bEqualAC )) - { - ++nofEqualFiles; - } - else - { - if ( i->m_pMFI->m_eMergeOperation==eMergeABCToDest || i->m_pMFI->m_eMergeOperation==eMergeABToDest ) - ++nofManualMerges; - } - } - for( int childIdx=0; childIdxchildCount(); ++childIdx ) - calcDirStatus( bThreeDirs, static_cast(i->child(childIdx)), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); -} - -static QString sortString(const QString& s, bool bCaseSensitive) -{ - if (bCaseSensitive) - return s; - else - return s.toUpper(); -} - -struct t_ItemInfo -{ - bool bExpanded; - bool bOperationComplete; - QString status; - e_MergeOperation eMergeOperation; -}; - -bool DirectoryMergeWindow::init - ( - FileAccess& dirA, - FileAccess& dirB, - FileAccess& dirC, - FileAccess& dirDest, - bool bDirectoryMerge, - bool bReload - ) -{ - if ( m_pOptions->m_bDmFullAnalysis ) - { - // A full analysis uses the same ressources that a normal text-diff/merge uses. - // So make sure that the user saves his data first. - bool bCanContinue=false; - checkIfCanContinue( &bCanContinue ); - if ( !bCanContinue ) - return false; - startDiffMerge("","","","","","","",0); // hide main window - } - - show(); - setUpdatesEnabled(true); - - std::map expandedDirsMap; - - if ( bReload ) - { - // Remember expandes items - QTreeWidgetItemIterator it( this ); - while ( *it ) - { - DirMergeItem* pDMI = static_cast( *it ); - t_ItemInfo& ii = expandedDirsMap[ pDMI->m_pMFI->m_subPath ]; - ii.bExpanded = pDMI->isExpanded(); - ii.bOperationComplete = pDMI->m_pMFI->m_bOperationComplete; - ii.status = pDMI->text( s_OpStatusCol ); - ii.eMergeOperation = pDMI->m_pMFI->m_eMergeOperation; - ++it; - } - } - - ProgressProxy pp; - m_bFollowDirLinks = m_pOptions->m_bDmFollowDirLinks; - m_bFollowFileLinks = m_pOptions->m_bDmFollowFileLinks; - m_bSimulatedMergeStarted=false; - m_bRealMergeStarted=false; - m_bError=false; - m_bDirectoryMerge = bDirectoryMerge; - m_pSelection1Item = 0; - m_pSelection2Item = 0; - m_pSelection3Item = 0; - m_bCaseSensitive = m_pOptions->m_bDmCaseSensitiveFilenameComparison; - - clear(); - - m_mergeItemList.clear(); - m_currentItemForOperation = m_mergeItemList.end(); - - m_dirA = dirA; - m_dirB = dirB; - m_dirC = dirC; - m_dirDest = dirDest; - - if ( !bReload ) - { - m_pDirShowIdenticalFiles->setChecked(true); - m_pDirShowDifferentFiles->setChecked(true); - m_pDirShowFilesOnlyInA->setChecked(true); - m_pDirShowFilesOnlyInB->setChecked(true); - m_pDirShowFilesOnlyInC->setChecked(true); - } - - // Check if all input directories exist and are valid. The dest dir is not tested now. - // The test will happen only when we are going to write to it. - if ( !m_dirA.isDir() || !m_dirB.isDir() || - (m_dirC.isValid() && !m_dirC.isDir()) ) - { - QString text( i18n("Opening of directories failed:") ); - text += "\n\n"; - if ( !dirA.isDir() ) - { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n",m_dirA.prettyAbsPath()); } - - if ( !dirB.isDir() ) - { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n",m_dirB.prettyAbsPath()); } - - if ( m_dirC.isValid() && !m_dirC.isDir() ) - { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n",m_dirC.prettyAbsPath()); } - - KMessageBox::sorry( this, text, i18n("Directory Open Error") ); - return false; - } - - if ( m_dirC.isValid() && - (m_dirDest.prettyAbsPath() == m_dirA.prettyAbsPath() || m_dirDest.prettyAbsPath()==m_dirB.prettyAbsPath() ) ) - { - KMessageBox::error(this, - i18n( "The destination directory must not be the same as A or B when " - "three directories are merged.\nCheck again before continuing."), - i18n("Parameter Warning")); - return false; - } - - m_bScanning = true; - statusBarMessage(i18n("Scanning directories...")); - - m_bSyncMode = m_pOptions->m_bDmSyncMode && !m_dirC.isValid() && !m_dirDest.isValid(); - - if ( m_dirDest.isValid() ) - m_dirDestInternal = m_dirDest; - else - m_dirDestInternal = m_dirC.isValid() ? m_dirC : m_dirB; - - QString origCurrentDirectory = QDir::currentPath(); - - m_fileMergeMap.clear(); - t_DirectoryList::iterator i; - - // calc how many directories will be read: - double nofScans = ( m_dirA.isValid() ? 1 : 0 )+( m_dirB.isValid() ? 1 : 0 )+( m_dirC.isValid() ? 1 : 0 ); - int currentScan = 0; - -//TODO setColumnWidthMode(s_UnsolvedCol, Q3ListView::Manual); -// setColumnWidthMode(s_SolvedCol, Q3ListView::Manual); -// setColumnWidthMode(s_WhiteCol, Q3ListView::Manual); -// setColumnWidthMode(s_NonWhiteCol, Q3ListView::Manual); - setColumnHidden( s_CCol, !m_dirC.isValid() ); - setColumnHidden( s_WhiteCol, !m_pOptions->m_bDmFullAnalysis ); - setColumnHidden( s_NonWhiteCol, !m_pOptions->m_bDmFullAnalysis ); - setColumnHidden( s_UnsolvedCol, !m_pOptions->m_bDmFullAnalysis ); - setColumnHidden( s_SolvedCol, !( m_pOptions->m_bDmFullAnalysis && m_dirC.isValid() ) ); - - bool bListDirSuccessA = true; - bool bListDirSuccessB = true; - bool bListDirSuccessC = true; - if ( m_dirA.isValid() ) - { - pp.setInformation(i18n("Reading Directory A")); - pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); - ++currentScan; - - t_DirectoryList dirListA; - bListDirSuccessA = m_dirA.listDir( &dirListA, - m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, - m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, - m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, - m_pOptions->m_bDmUseCvsIgnore); - - for (i=dirListA.begin(); i!=dirListA.end();++i ) - { - MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(), m_bCaseSensitive)]; - //std::cout <filePath()<m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, - m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, - m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, - m_pOptions->m_bDmUseCvsIgnore); - - for (i=dirListB.begin(); i!=dirListB.end();++i ) - { - MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(), m_bCaseSensitive)]; - mfi.m_bExistsInB = true; - mfi.m_fileInfoB = *i; - } - } - - e_MergeOperation eDefaultMergeOp; - if ( m_dirC.isValid() ) - { - pp.setInformation(i18n("Reading Directory C")); - pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); - ++currentScan; - - t_DirectoryList dirListC; - bListDirSuccessC = m_dirC.listDir( &dirListC, - m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, - m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, - m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, - m_pOptions->m_bDmUseCvsIgnore); - - for (i=dirListC.begin(); i!=dirListC.end();++i ) - { - MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(),m_bCaseSensitive)]; - mfi.m_bExistsInC = true; - mfi.m_fileInfoC = *i; - } - - eDefaultMergeOp = eMergeABCToDest; - } - else - eDefaultMergeOp = m_bSyncMode ? eMergeToAB : eMergeABToDest; - - bool bContinue = true; - if ( !bListDirSuccessA || !bListDirSuccessB || !bListDirSuccessC ) - { - QString s = i18n("Some subdirectories were not readable in"); - if ( !bListDirSuccessA ) s += "\nA: " + m_dirA.prettyAbsPath(); - if ( !bListDirSuccessB ) s += "\nB: " + m_dirB.prettyAbsPath(); - if ( !bListDirSuccessC ) s += "\nC: " + m_dirC.prettyAbsPath(); - s+="\n"; - s+= i18n("Check the permissions of the subdirectories."); - bContinue = KMessageBox::Continue == KMessageBox::warningContinueCancel( this, s ); - } - - if ( bContinue ) - { - prepareListView(pp); - - updateFileVisibilities(); - - for( int childIdx = 0; childIdx( topLevelItem(childIdx) ); - calcSuggestedOperation( *pDMI->m_pMFI, eDefaultMergeOp ); - } - } - - sortItems(0,Qt::AscendingOrder); - - for (int i=0;i(pParent); - if (pSplitter!=0) - { - QList sizes = pSplitter->sizes(); - int total = sizes[0] + sizes[1]; - if ( total < 10 ) - total = 100; - sizes[0]=total*6/10; - sizes[1]=total - sizes[0]; - pSplitter->setSizes( sizes ); - } - - QDir::setCurrent(origCurrentDirectory); - - m_bScanning = false; - statusBarMessage(i18n("Ready.")); - - if ( bContinue ) - { - // Generate a status report - int nofFiles=0; - int nofDirs=0; - int nofEqualFiles=0; - int nofManualMerges=0; - for( int childIdx = 0; childIdx(topLevelItem(childIdx)), - nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); - - QString s; - 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 ); - if ( topLevelItemCount()>0 ) - { - topLevelItem(0)->setSelected(true); - setCurrentItem( topLevelItem(0) ); - } - } - - if ( bReload ) - { - // Remember expanded items - QTreeWidgetItemIterator it( this ); - while ( *it ) - { - DirMergeItem* pDMI = static_cast( *it ); - std::map::iterator i = expandedDirsMap.find( pDMI->m_pMFI->m_subPath ); - if ( i!=expandedDirsMap.end() ) - { - t_ItemInfo& ii = i->second; - pDMI->setExpanded( ii.bExpanded ); - //pDMI->m_pMFI->setMergeOperation( ii.eMergeOperation, false ); unsafe, might have changed - pDMI->m_pMFI->m_bOperationComplete = ii.bOperationComplete; - pDMI->setText( s_OpStatusCol, ii.status ); - } - ++it; - } - } - return true; -} - -void DirectoryMergeWindow::onExpanded() -{ - resizeColumnToContents(s_NameCol); -} - - -void DirectoryMergeWindow::slotChooseAEverywhere(){ setAllMergeOperations( eCopyAToDest ); } - -void DirectoryMergeWindow::slotChooseBEverywhere(){ setAllMergeOperations( eCopyBToDest ); } - -void DirectoryMergeWindow::slotChooseCEverywhere(){ setAllMergeOperations( eCopyCToDest ); } - -void DirectoryMergeWindow::slotAutoChooseEverywhere() -{ - e_MergeOperation eDefaultMergeOp = m_dirC.isValid() ? eMergeABCToDest : - m_bSyncMode ? eMergeToAB : eMergeABToDest; - setAllMergeOperations(eDefaultMergeOp ); -} - -void DirectoryMergeWindow::slotNoOpEverywhere(){ setAllMergeOperations(eNoOperation); } - -static void setListViewItemOpen( QTreeWidgetItem* p, bool bOpen ) -{ - if ( p->childCount() > 0 ) - { - for( int childIdx=0; childIdxchildCount(); ++childIdx ) - setListViewItemOpen( p->child(childIdx), bOpen ); - - p->setExpanded( bOpen ); - } -} - -void DirectoryMergeWindow::slotFoldAllSubdirs() -{ - for( int i=0; i(pLVI); - MergeFileInfos& mfi = *pDMI->m_pMFI; - - mfi.setMergeOperation(eMergeOp ); -} - -// Merge current item (merge mode) -void DirectoryMergeWindow::slotCurrentDoNothing() { setMergeOperation(currentItem(), eNoOperation ); } -void DirectoryMergeWindow::slotCurrentChooseA() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyAToB : eCopyAToDest ); } -void DirectoryMergeWindow::slotCurrentChooseB() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyBToA : eCopyBToDest ); } -void DirectoryMergeWindow::slotCurrentChooseC() { setMergeOperation(currentItem(), eCopyCToDest ); } -void DirectoryMergeWindow::slotCurrentMerge() -{ - bool bThreeDirs = m_dirC.isValid(); - setMergeOperation(currentItem(), bThreeDirs ? eMergeABCToDest : eMergeABToDest ); -} -void DirectoryMergeWindow::slotCurrentDelete() { setMergeOperation(currentItem(), eDeleteFromDest ); } -// Sync current item -void DirectoryMergeWindow::slotCurrentCopyAToB() { setMergeOperation(currentItem(), eCopyAToB ); } -void DirectoryMergeWindow::slotCurrentCopyBToA() { setMergeOperation(currentItem(), eCopyBToA ); } -void DirectoryMergeWindow::slotCurrentDeleteA() { setMergeOperation(currentItem(), eDeleteA ); } -void DirectoryMergeWindow::slotCurrentDeleteB() { setMergeOperation(currentItem(), eDeleteB ); } -void DirectoryMergeWindow::slotCurrentDeleteAAndB() { setMergeOperation(currentItem(), eDeleteAB ); } -void DirectoryMergeWindow::slotCurrentMergeToA() { setMergeOperation(currentItem(), eMergeToA ); } -void DirectoryMergeWindow::slotCurrentMergeToB() { setMergeOperation(currentItem(), eMergeToB ); } -void DirectoryMergeWindow::slotCurrentMergeToAAndB() { setMergeOperation(currentItem(), eMergeToAB ); } - - -void DirectoryMergeWindow::keyPressEvent( QKeyEvent* e ) -{ - if ( (e->QInputEvent::modifiers() & Qt::ControlModifier)!=0 ) - { - bool bThreeDirs = m_dirC.isValid(); - - QTreeWidgetItem* lvi = currentItem(); - DirMergeItem* pDMI = lvi==0 ? 0 : static_cast(lvi); - MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI; - - if ( pMFI==0 ) return; - bool bMergeMode = bThreeDirs || !m_bSyncMode; - bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI); - - if ( bMergeMode ) - { - switch(e->key()) - { - case Qt::Key_1: if(pMFI->m_bExistsInA){ slotCurrentChooseA(); } return; - case Qt::Key_2: if(pMFI->m_bExistsInB){ slotCurrentChooseB(); } return; - case Qt::Key_3: if(pMFI->m_bExistsInC){ slotCurrentChooseC(); } return; - case Qt::Key_Space: slotCurrentDoNothing(); return; - case Qt::Key_4: if ( !bFTConflict ) { slotCurrentMerge(); } return; - case Qt::Key_Delete: slotCurrentDelete(); return; - default: break; - } - } - else - { - switch(e->key()) - { - case Qt::Key_1: if(pMFI->m_bExistsInA){ slotCurrentCopyAToB(); } return; - case Qt::Key_2: if(pMFI->m_bExistsInB){ slotCurrentCopyBToA(); } return; - case Qt::Key_Space: slotCurrentDoNothing(); return; - case Qt::Key_4: if ( !bFTConflict ) { slotCurrentMergeToAAndB(); } return; - case Qt::Key_Delete: if( pMFI->m_bExistsInA && pMFI->m_bExistsInB ) slotCurrentDeleteAAndB(); - else if( pMFI->m_bExistsInA ) slotCurrentDeleteA(); - else if( pMFI->m_bExistsInB ) slotCurrentDeleteB(); - return; - default: break; - } - } - } - else if ( e->key()==Qt::Key_Return || e->key()==Qt::Key_Enter ) - { - onDoubleClick( currentItem() ); - return; - } - - QTreeWidget::keyPressEvent(e); -} - -void DirectoryMergeWindow::focusInEvent(QFocusEvent*) -{ - updateAvailabilities(); -} -void DirectoryMergeWindow::focusOutEvent(QFocusEvent*) -{ - updateAvailabilities(); -} - -void DirectoryMergeWindow::setAllMergeOperations( e_MergeOperation eDefaultOperation ) -{ - if ( KMessageBox::Yes == KMessageBox::warningYesNo(this, - i18n("This affects all merge operations."), - i18n("Changing All Merge Operations"), - KStandardGuiItem::cont(), - KStandardGuiItem::cancel() ) ) - { - for( int i=0; i( topLevelItem(i) ); - calcSuggestedOperation( *pDMI->m_pMFI, eDefaultOperation ); - } - } -} - - -void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi ) -{ - std::map dateMap; - - if( mfi.m_bExistsInA ) - { - mfi.m_bLinkA = mfi.m_fileInfoA.isSymLink(); - mfi.m_bDirA = mfi.m_fileInfoA.isDir(); - dateMap[ mfi.m_fileInfoA.lastModified() ] = 0; - } - if( mfi.m_bExistsInB ) - { - mfi.m_bLinkB = mfi.m_fileInfoB.isSymLink(); - mfi.m_bDirB = mfi.m_fileInfoB.isDir(); - dateMap[ mfi.m_fileInfoB.lastModified() ] = 1; - } - if( mfi.m_bExistsInC ) - { - mfi.m_bLinkC = mfi.m_fileInfoC.isSymLink(); - mfi.m_bDirC = mfi.m_fileInfoC.isDir(); - dateMap[ mfi.m_fileInfoC.lastModified() ] = 2; - } - - if ( m_pOptions->m_bDmFullAnalysis ) - { - if( (mfi.m_bExistsInA && mfi.m_bDirA) || (mfi.m_bExistsInB && mfi.m_bDirB) || (mfi.m_bExistsInC && mfi.m_bDirC) ) - { - // If any input is a directory, don't start any comparison. - mfi.m_bEqualAB=mfi.m_bExistsInA && mfi.m_bExistsInB; - mfi.m_bEqualAC=mfi.m_bExistsInA && mfi.m_bExistsInC; - mfi.m_bEqualBC=mfi.m_bExistsInB && mfi.m_bExistsInC; - } - else - { - emit startDiffMerge( - mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : QString(""), - mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : QString(""), - mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : QString(""), - "", - "","","",&mfi.m_totalDiffStatus - ); - int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts + - mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts; - - if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0) - { - mfi.m_bEqualAB = mfi.m_bExistsInA && mfi.m_bExistsInB; - mfi.m_bEqualAC = mfi.m_bExistsInA && mfi.m_bExistsInC; - mfi.m_bEqualBC = mfi.m_bExistsInB && mfi.m_bExistsInC; - } - else - { - mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB; - mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC; - mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC; - } - } - } - else - { - bool bError; - QString eqStatus; - if( mfi.m_bExistsInA && mfi.m_bExistsInB ) - { - if( mfi.m_bDirA ) mfi.m_bEqualAB=true; - else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus ); - } - if( mfi.m_bExistsInA && mfi.m_bExistsInC ) - { - if( mfi.m_bDirA ) mfi.m_bEqualAC=true; - else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus ); - } - if( mfi.m_bExistsInB && mfi.m_bExistsInC ) - { - if (mfi.m_bEqualAB && mfi.m_bEqualAC) - mfi.m_bEqualBC = true; - else - { - if( mfi.m_bDirB ) mfi.m_bEqualBC=true; - else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus ); - } - } - } - - if (mfi.m_bLinkA!=mfi.m_bLinkB) mfi.m_bEqualAB=false; - if (mfi.m_bLinkA!=mfi.m_bLinkC) mfi.m_bEqualAC=false; - if (mfi.m_bLinkB!=mfi.m_bLinkC) mfi.m_bEqualBC=false; - - if (mfi.m_bDirA!=mfi.m_bDirB) mfi.m_bEqualAB=false; - if (mfi.m_bDirA!=mfi.m_bDirC) mfi.m_bEqualAC=false; - if (mfi.m_bDirB!=mfi.m_bDirC) mfi.m_bEqualBC=false; - - assert(eNew==0 && eMiddle==1 && eOld==2); - - // The map automatically sorts the keys. - int age = eNew; - std::map::reverse_iterator i; - for( i=dateMap.rbegin(); i!=dateMap.rend(); ++i ) - { - int n = i->second; - if ( n==0 && mfi.m_ageA==eNotThere ) - { - mfi.m_ageA = (e_Age)age; ++age; - if ( mfi.m_bEqualAB ) { mfi.m_ageB = mfi.m_ageA; ++age; } - if ( mfi.m_bEqualAC ) { mfi.m_ageC = mfi.m_ageA; ++age; } - } - else if ( n==1 && mfi.m_ageB==eNotThere ) - { - mfi.m_ageB = (e_Age)age; ++age; - if ( mfi.m_bEqualAB ) { mfi.m_ageA = mfi.m_ageB; ++age; } - if ( mfi.m_bEqualBC ) { mfi.m_ageC = mfi.m_ageB; ++age; } - } - else if ( n==2 && mfi.m_ageC==eNotThere) - { - mfi.m_ageC = (e_Age)age; ++age; - if ( mfi.m_bEqualAC ) { mfi.m_ageA = mfi.m_ageC; ++age; } - if ( mfi.m_bEqualBC ) { mfi.m_ageB = mfi.m_ageC; ++age; } - } - } - - // The checks below are necessary when the dates of the file are equal but the - // files are not. One wouldn't expect this to happen, yet it happens sometimes. - if ( mfi.m_bExistsInC && mfi.m_ageC==eNotThere ) - { - mfi.m_ageC = (e_Age)age; ++age; - mfi.m_bConflictingAges = true; - } - if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere ) - { - mfi.m_ageB = (e_Age)age; ++age; - mfi.m_bConflictingAges = true; - } - if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere ) - { - mfi.m_ageA = (e_Age)age; ++age; - mfi.m_bConflictingAges = true; - } - - if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld ) - { - if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld; - if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld; - if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld; - } -} - -static QPixmap* s_pm_dir; -static QPixmap* s_pm_file; - -static QPixmap* pmNotThere; -static QPixmap* pmNew; -static QPixmap* pmOld; -static QPixmap* pmMiddle; - -static QPixmap* pmLink; - -static QPixmap* pmDirLink; -static QPixmap* pmFileLink; - -static QPixmap* pmNewLink; -static QPixmap* pmOldLink; -static QPixmap* pmMiddleLink; - -static QPixmap* pmNewDir; -static QPixmap* pmMiddleDir; -static QPixmap* pmOldDir; - -static QPixmap* pmNewDirLink; -static QPixmap* pmMiddleDirLink; -static QPixmap* pmOldDirLink; - - -static QPixmap colorToPixmap(QColor c) -{ - QPixmap pm(16,16); - QPainter p(&pm); - p.setPen( Qt::black ); - p.setBrush( c ); - p.drawRect(0,0,pm.width(),pm.height()); - return pm; -} - -static void initPixmaps( QColor newest, QColor oldest, QColor middle, QColor notThere ) -{ - if (pmNew==0) - { - pmNotThere = new QPixmap; - pmNew = new QPixmap; - pmOld = new QPixmap; - pmMiddle = new QPixmap; - - #include "xpm/link_arrow.xpm" - pmLink = new QPixmap(link_arrow); - - pmDirLink = new QPixmap; - pmFileLink = new QPixmap; - - pmNewLink = new QPixmap; - pmOldLink = new QPixmap; - pmMiddleLink = new QPixmap; - - pmNewDir = new QPixmap; - pmMiddleDir = new QPixmap; - pmOldDir = new QPixmap; - - pmNewDirLink = new QPixmap; - pmMiddleDirLink = new QPixmap; - pmOldDirLink = new QPixmap; - } - - - *pmNotThere = colorToPixmap(notThere); - *pmNew = colorToPixmap(newest); - *pmOld = colorToPixmap(oldest); - *pmMiddle = colorToPixmap(middle); - - *pmDirLink = pixCombiner( s_pm_dir, pmLink); - *pmFileLink = pixCombiner( s_pm_file, pmLink ); - - *pmNewLink = pixCombiner( pmNew, pmLink); - *pmOldLink = pixCombiner( pmOld, pmLink); - *pmMiddleLink = pixCombiner( pmMiddle, pmLink); - - *pmNewDir = pixCombiner2( pmNew, s_pm_dir); - *pmMiddleDir = pixCombiner2( pmMiddle, s_pm_dir); - *pmOldDir = pixCombiner2( pmOld, s_pm_dir); - - *pmNewDirLink = pixCombiner( pmNewDir, pmLink); - *pmMiddleDirLink = pixCombiner( pmMiddleDir, pmLink); - *pmOldDirLink = pixCombiner( pmOldDir, pmLink); -} - - -static void setOnePixmap( QTreeWidgetItem* pLVI, int col, e_Age eAge, bool bLink, bool bDir ) -{ - static QPixmap* ageToPm[]= { pmNew, pmMiddle, pmOld, pmNotThere, s_pm_file }; - static QPixmap* ageToPmLink[]= { pmNewLink, pmMiddleLink, pmOldLink, pmNotThere, pmFileLink }; - static QPixmap* ageToPmDir[]= { pmNewDir, pmMiddleDir, pmOldDir, pmNotThere, s_pm_dir }; - static QPixmap* ageToPmDirLink[]={ pmNewDirLink, pmMiddleDirLink, pmOldDirLink, pmNotThere, pmDirLink }; - - QPixmap** ppPm = bDir ? ( bLink ? ageToPmDirLink : ageToPmDir ): - ( bLink ? ageToPmLink : ageToPm ); - - pLVI->setIcon( col, *ppPm[eAge] ); -} - -static void setPixmaps( MergeFileInfos& mfi, bool bCheckC ) -{ - setOnePixmap( mfi.m_pDMI, s_NameCol, eAgeEnd, - mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC, - mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC - ); - - if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ) - { - mfi.m_ageA=eNotThere; - mfi.m_ageB=eNotThere; - mfi.m_ageC=eNotThere; - int age = eNew; - if ( mfi.m_bExistsInC ) - { - mfi.m_ageC = (e_Age)age; - if (mfi.m_bEqualAC) mfi.m_ageA = (e_Age)age; - if (mfi.m_bEqualBC) mfi.m_ageB = (e_Age)age; - ++age; - } - if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere ) - { - mfi.m_ageB = (e_Age)age; - if (mfi.m_bEqualAB) mfi.m_ageA = (e_Age)age; - ++age; - } - if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere ) - { - mfi.m_ageA = (e_Age)age; - } - if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld ) - { - if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld; - if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld; - if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld; - } - } - - setOnePixmap( mfi.m_pDMI, s_ACol, mfi.m_ageA, mfi.m_bLinkA, mfi.m_bDirA ); - setOnePixmap( mfi.m_pDMI, s_BCol, mfi.m_ageB, mfi.m_bLinkB, mfi.m_bDirB ); - if ( bCheckC ) - setOnePixmap( mfi.m_pDMI, s_CCol, mfi.m_ageC, mfi.m_bLinkC, mfi.m_bDirC ); -} - -static QTreeWidgetItem* nextSibling(const QTreeWidgetItem* p) -{ - QTreeWidgetItem* pParent = p->parent(); - if ( pParent ) - { - int currentIdx = pParent->indexOfChild( const_cast(p) ); - if ( currentIdx+1 < pParent->childCount() ) - return pParent->child(currentIdx+1); - } - else - { - QTreeWidget* pParentTreeWidget = p->treeWidget(); - if ( pParentTreeWidget ) - { - int currentIdx = pParentTreeWidget->indexOfTopLevelItem( const_cast(p) ); - if ( currentIdx+1 < pParentTreeWidget->topLevelItemCount() ) - return pParentTreeWidget->topLevelItem(currentIdx+1); - } - } - return 0; -} - -// Iterate through the complete tree. Start by specifying QListView::firstChild(). -static QTreeWidgetItem* treeIterator( QTreeWidgetItem* p, bool bVisitChildren=true, bool bFindInvisible=false ) -{ - if( p!=0 ) - { - do - { - if ( bVisitChildren && p->childCount() != 0 ) p = p->child(0); - else - { - QTreeWidgetItem* pNextSibling = nextSibling(p); - if ( pNextSibling ) - p = pNextSibling; - else - { - p = p->parent(); - while ( p!=0 ) - { - QTreeWidgetItem* pNextSibling = nextSibling(p); - if( pNextSibling ) { p = pNextSibling; break; } - else { p = p->parent(); } - } - } - } - } - while( p && p->isHidden() && !bFindInvisible ); - } - return p; -} - -void DirectoryMergeWindow::prepareListView( ProgressProxy& pp ) -{ - static bool bFirstTime = true; - if (bFirstTime) - { - #include "xpm/file.xpm" - #include "xpm/folder.xpm" - // FIXME specify correct icon loader group - s_pm_dir = new QPixmap( m_pIconLoader->loadIcon("folder", KIconLoader::NoGroup, KIconLoader::Small ) ); - if (s_pm_dir->size()!=QSize(16,16)) - { - delete s_pm_dir; - s_pm_dir = new QPixmap( folder_pm ); - } - s_pm_file= new QPixmap( file_pm ); - bFirstTime=false; - } - - clear(); - initPixmaps( m_pOptions->m_newestFileColor, m_pOptions->m_oldestFileColor, - m_pOptions->m_midAgeFileColor, m_pOptions->m_missingFileColor ); - - setRootIsDecorated( true ); - - bool bCheckC = m_dirC.isValid(); - - std::map::iterator j; - int nrOfFiles = m_fileMergeMap.size(); - int currentIdx = 1; - QTime t; - t.start(); - for( j=m_fileMergeMap.begin(); j!=m_fileMergeMap.end(); ++j ) - { - MergeFileInfos& mfi = j->second; - - mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() : - mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() : - mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : - QString(""); - - // const QString& fileName = j->first; - const QString& fileName = mfi.m_subPath; - - pp.setInformation( - i18n("Processing ") + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles) - +"\n" + fileName, double(currentIdx) / nrOfFiles, false ); - if ( pp.wasCancelled() ) break; - ++currentIdx; - - // The comparisons and calculations for each file take place here. - compareFilesAndCalcAges( mfi ); - - // Get dirname from fileName: Search for "/" from end: - int pos = fileName.lastIndexOf('/'); - QString dirPart; - QString filePart; - if (pos==-1) - { - // Top dir - filePart = fileName; - } - else - { - dirPart = fileName.left(pos); - filePart = fileName.mid(pos+1); - } - - if ( dirPart.isEmpty() ) // Top level - { - new DirMergeItem( this, filePart, &mfi ); - } - else - { - MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // parent - assert(dirMfi.m_pDMI!=0); - new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); - mfi.m_pParent = &dirMfi; - - // Equality for parent dirs is set in updateFileVisibilities() - } - - setPixmaps( mfi, bCheckC ); - } -} - -static bool conflictingFileTypes(MergeFileInfos& mfi) -{ - // Now check if file/dir-types fit. - if ( mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC ) - { - if ( (mfi.m_bExistsInA && ! mfi.m_bLinkA) || - (mfi.m_bExistsInB && ! mfi.m_bLinkB) || - (mfi.m_bExistsInC && ! mfi.m_bLinkC) ) - { - return true; - } - } - - if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ) - { - if ( (mfi.m_bExistsInA && ! mfi.m_bDirA) || - (mfi.m_bExistsInB && ! mfi.m_bDirB) || - (mfi.m_bExistsInC && ! mfi.m_bDirC) ) - { - return true; - } - } - return false; -} - -void DirectoryMergeWindow::calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultMergeOp ) -{ - bool bCheckC = m_dirC.isValid(); - bool bCopyNewer = m_pOptions->m_bDmCopyNewer; - bool bOtherDest = !( (m_dirDestInternal.absoluteFilePath() == m_dirA.absoluteFilePath()) || - (m_dirDestInternal.absoluteFilePath() == m_dirB.absoluteFilePath()) || - (bCheckC && m_dirDestInternal.absoluteFilePath() == m_dirC.absoluteFilePath()) ); - - - if ( eDefaultMergeOp == eMergeABCToDest && !bCheckC ) { eDefaultMergeOp = eMergeABToDest; } - if ( eDefaultMergeOp == eMergeToAB && bCheckC ) { assert(false); } - - if ( eDefaultMergeOp == eMergeToA || eDefaultMergeOp == eMergeToB || - eDefaultMergeOp == eMergeABCToDest || eDefaultMergeOp == eMergeABToDest || eDefaultMergeOp == eMergeToAB ) - { - if ( !bCheckC ) - { - if ( mfi.m_bEqualAB ) - { - mfi.setMergeOperation( bOtherDest ? eCopyBToDest : eNoOperation ); - } - else if ( mfi.m_bExistsInA && mfi.m_bExistsInB ) - { - if ( !bCopyNewer || mfi.m_bDirA ) - mfi.setMergeOperation( eDefaultMergeOp ); - else if ( bCopyNewer && mfi.m_bConflictingAges ) - { - mfi.setMergeOperation( eConflictingAges ); - } - else - { - if ( mfi.m_ageA == eNew ) - mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyAToB : eCopyAToDest ); - else - mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyBToA : eCopyBToDest ); - } - } - else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB ) - { - if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyBToDest ); - else if ( eDefaultMergeOp==eMergeToB ) mfi.setMergeOperation( eNoOperation ); - else mfi.setMergeOperation( eCopyBToA ); - } - else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB ) - { - if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyAToDest ); - else if ( eDefaultMergeOp==eMergeToA ) mfi.setMergeOperation( eNoOperation ); - else mfi.setMergeOperation( eCopyAToB ); - } - else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB ) - { - mfi.setMergeOperation( eNoOperation ); assert(false); - } - } - else - { - if ( mfi.m_bEqualAB && mfi.m_bEqualAC ) - { - mfi.setMergeOperation( bOtherDest ? eCopyCToDest : eNoOperation ); - } - else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC) - { - if ( mfi.m_bEqualAB ) - mfi.setMergeOperation( eCopyCToDest ); - else if ( mfi.m_bEqualAC ) - mfi.setMergeOperation( eCopyBToDest ); - else if ( mfi.m_bEqualBC ) - mfi.setMergeOperation( eCopyCToDest ); - else - mfi.setMergeOperation( eMergeABCToDest ); - } - else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC ) - { - if ( mfi.m_bEqualAB ) - mfi.setMergeOperation( eDeleteFromDest ); - else - mfi.setMergeOperation( eChangedAndDeleted ); - } - else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) - { - if ( mfi.m_bEqualAC ) - mfi.setMergeOperation( eDeleteFromDest ); - else - mfi.setMergeOperation( eChangedAndDeleted ); - } - else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC ) - { - if ( mfi.m_bEqualBC ) - mfi.setMergeOperation( eCopyCToDest ); - else - mfi.setMergeOperation( eMergeABCToDest ); - } - else if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) - { - mfi.setMergeOperation( eCopyCToDest ); - } - else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC ) - { - mfi.setMergeOperation( eCopyBToDest ); - } - else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC) - { - mfi.setMergeOperation( eDeleteFromDest ); - } - else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC ) - { - mfi.setMergeOperation( eNoOperation ); assert(false); - } - } - - // Now check if file/dir-types fit. - if ( conflictingFileTypes(mfi) ) - { - mfi.setMergeOperation( eConflictingFileTypes ); - } - } - else - { - e_MergeOperation eMO = eDefaultMergeOp; - switch ( eDefaultMergeOp ) - { - case eConflictingFileTypes: - case eChangedAndDeleted: - case eConflictingAges: - case eDeleteA: - case eDeleteB: - case eDeleteAB: - case eDeleteFromDest: - case eNoOperation: break; - case eCopyAToB: if ( !mfi.m_bExistsInA ) { eMO = eDeleteB; } break; - case eCopyBToA: if ( !mfi.m_bExistsInB ) { eMO = eDeleteA; } break; - case eCopyAToDest: if ( !mfi.m_bExistsInA ) { eMO = eDeleteFromDest; } break; - case eCopyBToDest: if ( !mfi.m_bExistsInB ) { eMO = eDeleteFromDest; } break; - case eCopyCToDest: if ( !mfi.m_bExistsInC ) { eMO = eDeleteFromDest; } break; - - case eMergeToA: - case eMergeToB: - case eMergeToAB: - case eMergeABCToDest: - case eMergeABToDest: - default: - assert(false); - } - mfi.setMergeOperation( eMO ); - } -} - -void DirectoryMergeWindow::onDoubleClick( QTreeWidgetItem* lvi ) -{ - if (lvi==0) return; - - if ( m_bDirectoryMerge ) - mergeCurrentFile(); - else - compareCurrentFile(); -} - -void DirectoryMergeWindow::onCurrentChanged(QTreeWidgetItem* lvi) -{ - if ( lvi==0 ) return; - - DirMergeItem* pDMI = static_cast(lvi); - - MergeFileInfos& mfi = *pDMI->m_pMFI; - assert( mfi.m_pDMI==pDMI ); - - m_pDirectoryMergeInfo->setInfo( m_dirA, m_dirB, m_dirC, m_dirDestInternal, mfi ); -} - -void DirectoryMergeWindow::mousePressEvent( QMouseEvent* e ) -{ - QTreeWidget::mousePressEvent(e); - int c = columnAt( e->x() ); - QTreeWidgetItem* lvi = itemAt( e->pos() ); - QPoint p = e->globalPos(); - if ( lvi==0 ) return; - - DirMergeItem* pDMI = static_cast(lvi); - - MergeFileInfos& mfi = *pDMI->m_pMFI; - assert( mfi.m_pDMI==pDMI ); - - if ( c==s_OpCol ) - { - bool bThreeDirs = m_dirC.isValid(); - - KMenu m(this); - if ( bThreeDirs ) - { - m.addAction( m_pDirCurrentDoNothing ); - int count=0; - if ( mfi.m_bExistsInA ) { m.addAction( m_pDirCurrentChooseA ); ++count; } - if ( mfi.m_bExistsInB ) { m.addAction( m_pDirCurrentChooseB ); ++count; } - if ( mfi.m_bExistsInC ) { m.addAction( m_pDirCurrentChooseC ); ++count; } - if ( !conflictingFileTypes(mfi) && count>1 ) m.addAction( m_pDirCurrentMerge ); - m.addAction( m_pDirCurrentDelete ); - } - else if ( m_bSyncMode ) - { - m.addAction( m_pDirCurrentSyncDoNothing ); - if ( mfi.m_bExistsInA ) m.addAction( m_pDirCurrentSyncCopyAToB ); - if ( mfi.m_bExistsInB ) m.addAction( m_pDirCurrentSyncCopyBToA ); - if ( mfi.m_bExistsInA ) m.addAction( m_pDirCurrentSyncDeleteA ); - if ( mfi.m_bExistsInB ) m.addAction( m_pDirCurrentSyncDeleteB ); - if ( mfi.m_bExistsInA && mfi.m_bExistsInB ) - { - m.addAction( m_pDirCurrentSyncDeleteAAndB ); - if ( !conflictingFileTypes(mfi)) - { - m.addAction( m_pDirCurrentSyncMergeToA ); - m.addAction( m_pDirCurrentSyncMergeToB ); - m.addAction( m_pDirCurrentSyncMergeToAAndB ); - } - } - } - else - { - m.addAction( m_pDirCurrentDoNothing ); - if ( mfi.m_bExistsInA ) { m.addAction( m_pDirCurrentChooseA ); } - if ( mfi.m_bExistsInB ) { m.addAction( m_pDirCurrentChooseB ); } - if ( !conflictingFileTypes(mfi) && mfi.m_bExistsInA && mfi.m_bExistsInB ) m.addAction( m_pDirCurrentMerge ); - m.addAction( m_pDirCurrentDelete ); - } - - m.exec( p ); - } - else if ( c == s_ACol || c==s_BCol || c==s_CCol ) - { - QString itemPath; - if ( c == s_ACol && mfi.m_bExistsInA ){ itemPath = fullNameA(mfi); } - else if ( c == s_BCol && mfi.m_bExistsInB ){ itemPath = fullNameB(mfi); } - else if ( c == s_CCol && mfi.m_bExistsInC ){ itemPath = fullNameC(mfi); } - - if (!itemPath.isEmpty()) - { - selectItemAndColumn( pDMI, c, e->button()==Qt::RightButton ); - } - } -} - -void DirectoryMergeWindow::contextMenuEvent(QContextMenuEvent* e) -{ - QTreeWidgetItem* lvi = itemAt( e->pos() ); - int c = columnAt( e->x() ); - QPoint p = e->globalPos(); - if ( lvi==0 ) return; - - DirMergeItem* pDMI = static_cast(lvi); - - MergeFileInfos& mfi = *pDMI->m_pMFI; - assert( mfi.m_pDMI==pDMI ); - if ( c == s_ACol || c==s_BCol || c==s_CCol ) - { - QString itemPath; - if ( c == s_ACol && mfi.m_bExistsInA ){ itemPath = fullNameA(mfi); } - else if ( c == s_BCol && mfi.m_bExistsInB ){ itemPath = fullNameB(mfi); } - else if ( c == s_CCol && mfi.m_bExistsInC ){ itemPath = fullNameC(mfi); } - - if (!itemPath.isEmpty()) - { - selectItemAndColumn(pDMI, c, true); - KMenu m(this); - m.addAction( m_pDirCompareExplicit ); - m.addAction( m_pDirMergeExplicit ); - -#ifndef _WIN32 - m.exec( p ); -#else - void showShellContextMenu( const QString&, QPoint, QWidget*, QMenu* ); - showShellContextMenu( itemPath, p, this, &m ); -#endif - } - } -} - -static QString getFileName( DirMergeItem* pDMI, int column ) -{ - if ( pDMI != 0 ) - { - MergeFileInfos& mfi = *pDMI->m_pMFI; - return column == s_ACol ? mfi.m_fileInfoA.absoluteFilePath() : - column == s_BCol ? mfi.m_fileInfoB.absoluteFilePath() : - column == s_CCol ? mfi.m_fileInfoC.absoluteFilePath() : - QString(""); - } - return ""; -} - -static bool isDir( DirMergeItem* pDMI, int column ) -{ - if ( pDMI != 0 ) - { - MergeFileInfos& mfi = *pDMI->m_pMFI; - return column == s_ACol ? mfi.m_bDirA : - column == s_BCol ? mfi.m_bDirB : - mfi.m_bDirC; - } - return false; -} - - -void DirectoryMergeWindow::selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu) -{ - if ( bContextMenu && ( - (pDMI==m_pSelection1Item && c==m_selection1Column) || - (pDMI==m_pSelection2Item && c==m_selection2Column) || - (pDMI==m_pSelection3Item && c==m_selection3Column) ) ) - return; - - DirMergeItem* pOld1=m_pSelection1Item; - DirMergeItem* pOld2=m_pSelection2Item; - DirMergeItem* pOld3=m_pSelection3Item; - - bool bReset = false; - - if ( m_pSelection1Item ) - { - if (isDir( m_pSelection1Item, m_selection1Column )!=isDir( pDMI, c )) - bReset = true; - } - - if ( bReset || m_pSelection3Item!=0 || - (pDMI==m_pSelection1Item && c==m_selection1Column) || - (pDMI==m_pSelection2Item && c==m_selection2Column) || - (pDMI==m_pSelection3Item && c==m_selection3Column)) - { - m_pSelection1Item = 0; - m_pSelection2Item = 0; - m_pSelection3Item = 0; - } - else if ( m_pSelection1Item==0 ) - { - m_pSelection1Item = pDMI; - m_selection1Column = c; - m_pSelection2Item = 0; - m_pSelection3Item = 0; - } - else if ( m_pSelection2Item==0 ) - { - m_pSelection2Item = pDMI; - m_selection2Column = c; - m_pSelection3Item = 0; - } - else if ( m_pSelection3Item==0 ) - { - m_pSelection3Item = pDMI; - m_selection3Column = c; - } - if (pOld1) dataChanged( indexFromItem( pOld1, s_ACol ), indexFromItem( pOld1, s_CCol ) ); - if (pOld2) dataChanged( indexFromItem( pOld2, s_ACol ), indexFromItem( pOld2, s_CCol ) ); - if (pOld3) dataChanged( indexFromItem( pOld3, s_ACol ), indexFromItem( pOld3, s_CCol ) ); - if (m_pSelection1Item) dataChanged( indexFromItem( m_pSelection1Item, s_ACol ), indexFromItem( m_pSelection1Item, s_CCol ) ); - if (m_pSelection2Item) dataChanged( indexFromItem( m_pSelection2Item, s_ACol ), indexFromItem( m_pSelection2Item, s_CCol ) ); - if (m_pSelection3Item) dataChanged( indexFromItem( m_pSelection3Item, s_ACol ), indexFromItem( m_pSelection3Item, s_CCol ) ); - emit updateAvailabilities(); -} - -DirMergeItem::DirMergeItem( QTreeWidget* pParent, const QString& fileName, MergeFileInfos* pMFI ) -: QTreeWidgetItem( pParent, QStringList() << fileName << "" << "" << "" << i18n("To do.") << "" ) -{ - init(pMFI); -} - -DirMergeItem::DirMergeItem( DirMergeItem* pParent, const QString& fileName, MergeFileInfos* pMFI ) -: QTreeWidgetItem( pParent, QStringList() << fileName << "" << "" << "" << i18n("To do.") << "" ) -{ - init(pMFI); -} - - -void DirMergeItem::init(MergeFileInfos* pMFI) -{ - pMFI->m_pDMI = this; - m_pMFI = pMFI; - TotalDiffStatus& tds = pMFI->m_totalDiffStatus; - if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC ) - { - } - else - { - setText( s_UnsolvedCol, QString::number( tds.nofUnsolvedConflicts ) ); - setText( s_SolvedCol, QString::number( tds.nofSolvedConflicts ) ); - setText( s_NonWhiteCol, QString::number( tds.nofUnsolvedConflicts + tds.nofSolvedConflicts - tds.nofWhitespaceConflicts ) ); - setText( s_WhiteCol, QString::number( tds.nofWhitespaceConflicts ) ); - } - setSizeHint( s_ACol, QSize(17,17) ); // Iconsize - setSizeHint( s_BCol, QSize(17,17) ); // Iconsize - setSizeHint( s_CCol, QSize(17,17) ); // Iconsize -} - -bool DirMergeItem::operator<(const QTreeWidgetItem& i) const -{ - int col = treeWidget()->sortColumn(); - const DirMergeItem* pDMI = static_cast(&i); - bool bDir1 = m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC; - bool bDir2 = pDMI->m_pMFI->m_bDirA || pDMI->m_pMFI->m_bDirB || pDMI->m_pMFI->m_bDirC; - if ( m_pMFI==0 || pDMI->m_pMFI==0 || bDir1 == bDir2 ) - { - if(col==s_UnsolvedCol || col==s_SolvedCol || col==s_NonWhiteCol || col==s_WhiteCol) - return text(col).toInt() > i.text(col).toInt(); - else if ( col == s_NameCol ) - return text(col).compare( i.text(col), Qt::CaseInsensitive )<0; - else - return QTreeWidgetItem::operator<(i); - - } - else - return bDir1; -} - - -DirMergeItem::~DirMergeItem() -{ - m_pMFI->m_pDMI = 0; -} - -void MergeFileInfos::setMergeOperation( e_MergeOperation eMOp, bool bRecursive ) -{ - if ( eMOp != m_eMergeOperation ) - { - m_bOperationComplete = false; - m_pDMI->setText( s_OpStatusCol, "" ); - } - - m_eMergeOperation = eMOp; - QString s; - bool bDir = m_bDirA || m_bDirB || m_bDirC; - if( m_pDMI!=0 ) - { - switch( m_eMergeOperation ) - { - case eNoOperation: s=""; m_pDMI->setText(s_OpCol,""); break; - case eCopyAToB: s=i18n("Copy A to B"); break; - case eCopyBToA: s=i18n("Copy B to A"); break; - case eDeleteA: s=i18n("Delete A"); break; - case eDeleteB: s=i18n("Delete B"); break; - case eDeleteAB: s=i18n("Delete A & B"); break; - case eMergeToA: s=i18n("Merge to A"); break; - case eMergeToB: s=i18n("Merge to B"); break; - case eMergeToAB: s=i18n("Merge to A & B"); break; - case eCopyAToDest: s="A"; break; - case eCopyBToDest: s="B"; break; - case eCopyCToDest: s="C"; break; - case eDeleteFromDest: s=i18n("Delete (if exists)"); break; - case eMergeABCToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; - case eMergeABToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; - case eConflictingFileTypes: s=i18n("Error: Conflicting File Types"); break; - case eChangedAndDeleted: s=i18n("Error: Changed and Deleted"); break; - case eConflictingAges: s=i18n("Error: Dates are equal but files are not."); break; - default: assert(false); break; - } - m_pDMI->setText(s_OpCol,s); - - if ( bRecursive ) - { - e_MergeOperation eChildrenMergeOp = m_eMergeOperation; - if ( eChildrenMergeOp == eConflictingFileTypes ) eChildrenMergeOp = eMergeABCToDest; - for( int childIdx=0; childIdxchildCount(); ++childIdx ) - { - QTreeWidgetItem* p = m_pDMI->child(childIdx); - DirMergeItem* pDMI = static_cast( p ); - DirectoryMergeWindow* pDMW = static_cast( p->treeWidget() ); - pDMW->calcSuggestedOperation( *pDMI->m_pMFI, eChildrenMergeOp ); - } - } - } -} - -void DirectoryMergeWindow::compareCurrentFile() -{ - if (!canContinue()) return; - - if ( m_bRealMergeStarted ) - { - KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); - return; - } - - if ( currentItem() != 0 ) - { - DirMergeItem* pDMI = static_cast( currentItem() ); - MergeFileInfos& mfi = *pDMI->m_pMFI; - if ( !(mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC) ) - { - emit startDiffMerge( - mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : QString(""), - mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : QString(""), - mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : QString(""), - "", - "","","",0 - ); - } - } - emit updateAvailabilities(); -} - - -void DirectoryMergeWindow::slotCompareExplicitlySelectedFiles() -{ - if ( ! isDir(m_pSelection1Item,m_selection1Column) && !canContinue() ) return; - - if ( m_bRealMergeStarted ) - { - KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); - return; - } - - emit startDiffMerge( - getFileName( m_pSelection1Item, m_selection1Column ), - getFileName( m_pSelection2Item, m_selection2Column ), - getFileName( m_pSelection3Item, m_selection3Column ), - "", - "","","",0 - ); - m_pSelection1Item=0; - m_pSelection2Item=0; - m_pSelection3Item=0; - - emit updateAvailabilities(); - update(); -} - -void DirectoryMergeWindow::slotMergeExplicitlySelectedFiles() -{ - if ( ! isDir(m_pSelection1Item,m_selection1Column) && !canContinue() ) return; - - if ( m_bRealMergeStarted ) - { - KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); - return; - } - - QString fn1 = getFileName( m_pSelection1Item, m_selection1Column ); - QString fn2 = getFileName( m_pSelection2Item, m_selection2Column ); - QString fn3 = getFileName( m_pSelection3Item, m_selection3Column ); - - emit startDiffMerge( fn1, fn2, fn3, - fn3.isEmpty() ? fn2 : fn3, - "","","",0 - ); - m_pSelection1Item=0; - m_pSelection2Item=0; - m_pSelection3Item=0; - - emit updateAvailabilities(); - update(); -} - -bool DirectoryMergeWindow::isFileSelected() -{ - if ( currentItem() != 0 ) - { - DirMergeItem* pDMI = static_cast( currentItem() ); - MergeFileInfos& mfi = *pDMI->m_pMFI; - return ! (mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC || conflictingFileTypes(mfi) ); - } - return false; -} - -void DirectoryMergeWindow::mergeResultSaved(const QString& fileName) -{ - DirMergeItem* pCurrentItemForOperation = (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) - ? 0 - : *m_currentItemForOperation; - - if ( pCurrentItemForOperation!=0 && pCurrentItemForOperation->m_pMFI==0 ) - { - KMessageBox::error( this, i18n("This should never happen: \n\nmergeResultSaved: m_pMFI=0\n\nIf you know how to reproduce this, please contact the program author."),i18n("Program Error") ); - return; - } - if ( pCurrentItemForOperation!=0 && fileName == fullNameDest(*pCurrentItemForOperation->m_pMFI) ) - { - if ( pCurrentItemForOperation->m_pMFI->m_eMergeOperation==eMergeToAB ) - { - MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI; - bool bSuccess = copyFLD( fullNameB(mfi), fullNameA(mfi) ); - if (!bSuccess) - { - KMessageBox::error(this, i18n("An error occurred while copying.\n"), i18n("Error") ); - m_pStatusInfo->setWindowTitle(i18n("Merge Error")); - m_pStatusInfo->exec(); - //if ( m_pStatusInfo->firstChild()!=0 ) - // m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() ); - m_bError = true; - pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") ); - mfi.m_eMergeOperation = eCopyBToA; - return; - } - } - pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Done.") ); - pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; - if ( m_mergeItemList.size()==1 ) - { - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - } - } - - emit updateAvailabilities(); -} - -bool DirectoryMergeWindow::canContinue() -{ - bool bCanContinue=false; - checkIfCanContinue( &bCanContinue ); - if ( bCanContinue && !m_bError ) - { - DirMergeItem* pCurrentItemForOperation = - (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) ? 0 : *m_currentItemForOperation; - - if ( pCurrentItemForOperation!=0 && ! pCurrentItemForOperation->m_pMFI->m_bOperationComplete ) - { - pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Not saved.") ); - pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; - if ( m_mergeItemList.size()==1 ) - { - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - } - } - } - return bCanContinue; -} - -bool DirectoryMergeWindow::executeMergeOperation( MergeFileInfos& mfi, bool& bSingleFileMerge ) -{ - bool bCreateBackups = m_pOptions->m_bDmCreateBakFiles; - // First decide destname - QString destName; - switch( mfi.m_eMergeOperation ) - { - case eNoOperation: break; - case eDeleteAB: break; - case eMergeToAB: // let the user save in B. In mergeResultSaved() the file will be copied to A. - case eMergeToB: - case eDeleteB: - case eCopyAToB: destName = fullNameB(mfi); break; - case eMergeToA: - case eDeleteA: - case eCopyBToA: destName = fullNameA(mfi); break; - case eMergeABToDest: - case eMergeABCToDest: - case eCopyAToDest: - case eCopyBToDest: - case eCopyCToDest: - case eDeleteFromDest: destName = fullNameDest(mfi); break; - default: - KMessageBox::error( this, i18n("Unknown merge operation. (This must never happen!)"), i18n("Error") ); - assert(false); - } - - bool bSuccess = false; - bSingleFileMerge = false; - switch( mfi.m_eMergeOperation ) - { - case eNoOperation: bSuccess = true; break; - case eCopyAToDest: - case eCopyAToB: bSuccess = copyFLD( fullNameA(mfi), destName ); break; - case eCopyBToDest: - case eCopyBToA: bSuccess = copyFLD( fullNameB(mfi), destName ); break; - case eCopyCToDest: bSuccess = copyFLD( fullNameC(mfi), destName ); break; - case eDeleteFromDest: - case eDeleteA: - case eDeleteB: bSuccess = deleteFLD( destName, bCreateBackups ); break; - case eDeleteAB: bSuccess = deleteFLD( fullNameA(mfi), bCreateBackups ) && - deleteFLD( fullNameB(mfi), bCreateBackups ); break; - case eMergeABToDest: - case eMergeToA: - case eMergeToAB: - case eMergeToB: bSuccess = mergeFLD( fullNameA(mfi), fullNameB(mfi), "", - destName, bSingleFileMerge ); - break; - case eMergeABCToDest:bSuccess = mergeFLD( - mfi.m_bExistsInA ? fullNameA(mfi) : QString(""), - mfi.m_bExistsInB ? fullNameB(mfi) : QString(""), - mfi.m_bExistsInC ? fullNameC(mfi) : QString(""), - destName, bSingleFileMerge ); - break; - default: - KMessageBox::error( this, i18n("Unknown merge operation."), i18n("Error") ); - assert(false); - } - - return bSuccess; -} - - -// Check if the merge can start, and prepare the m_mergeItemList which then contains all -// items that must be merged. -void DirectoryMergeWindow::prepareMergeStart( QTreeWidgetItem* pBegin, QTreeWidgetItem* pEnd, bool bVerbose ) -{ - if ( bVerbose ) - { - int status = KMessageBox::warningYesNoCancel(this, - i18n("The merge is about to begin.\n\n" - "Choose \"Do it\" if you have read the instructions and know what you are doing.\n" - "Choosing \"Simulate it\" will tell you what would happen.\n\n" - "Be aware that this program still has beta status " - "and there is NO WARRANTY whatsoever! Make backups of your vital data!"), - i18n("Starting Merge"), - KGuiItem( i18n("Do It") ), - KGuiItem( i18n("Simulate It") ) ); - if (status==KMessageBox::Yes) m_bRealMergeStarted = true; - else if (status==KMessageBox::No ) m_bSimulatedMergeStarted = true; - else return; - } - else - { - m_bRealMergeStarted = true; - } - - m_mergeItemList.clear(); - if (pBegin == 0) - return; - - for( QTreeWidgetItem* p = pBegin; p!= pEnd; p = treeIterator( p ) ) - { - DirMergeItem* pDMI = static_cast(p); - - if ( pDMI && ! pDMI->m_pMFI->m_bOperationComplete ) - { - m_mergeItemList.push_back(pDMI); - - if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingFileTypes ) - { - scrollToItem( pDMI, QAbstractItemView::EnsureVisible ); - pDMI->setSelected( true ); - KMessageBox::error(this, i18n("The highlighted item has a different type in the different directories. Select what to do."), i18n("Error")); - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - return; - } - if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingAges ) - { - scrollToItem ( pDMI, QAbstractItemView::EnsureVisible ); - pDMI->setSelected( true ); - KMessageBox::error(this, i18n("The modification dates of the file are equal but the files are not. Select what to do."), i18n("Error")); - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - return; - } - if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eChangedAndDeleted ) - { - scrollToItem( pDMI, QAbstractItemView::EnsureVisible ); - pDMI->setSelected( true ); - KMessageBox::error(this, i18n("The highlighted item was changed in one directory and deleted in the other. Select what to do."), i18n("Error")); - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - return; - } - } - } - - m_currentItemForOperation = m_mergeItemList.begin(); - return; -} - -void DirectoryMergeWindow::slotRunOperationForCurrentItem() -{ - if ( ! canContinue() ) return; - - bool bVerbose = false; - if ( m_mergeItemList.empty() ) - { - QTreeWidgetItem* pBegin = currentItem(); - QTreeWidgetItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no children) - - prepareMergeStart( pBegin, pEnd, bVerbose ); - mergeContinue(true, bVerbose); - } - else - mergeContinue(false, bVerbose); -} - -void DirectoryMergeWindow::slotRunOperationForAllItems() -{ - if ( ! canContinue() ) return; - - bool bVerbose = true; - if ( m_mergeItemList.empty() ) - { - QTreeWidgetItem* pBegin = topLevelItemCount()>0 ? topLevelItem(0) : 0; - - prepareMergeStart( pBegin, 0, bVerbose ); - mergeContinue(true, bVerbose); - } - else - mergeContinue(false, bVerbose); -} - -void DirectoryMergeWindow::mergeCurrentFile() -{ - if (!canContinue()) return; - - if ( m_bRealMergeStarted ) - { - KMessageBox::sorry(this,i18n("This operation is currently not possible because directory merge is currently running."),i18n("Operation Not Possible")); - return; - } - - if ( isFileSelected() ) - { - DirMergeItem* pDMI = static_cast( currentItem() ); - if ( pDMI != 0 ) - { - MergeFileInfos& mfi = *pDMI->m_pMFI; - m_mergeItemList.clear(); - m_mergeItemList.push_back( pDMI ); - m_currentItemForOperation=m_mergeItemList.begin(); - bool bDummy=false; - mergeFLD( - mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : QString(""), - mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : QString(""), - mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : QString(""), - fullNameDest(mfi), - bDummy - ); - } - } - emit updateAvailabilities(); -} - - -// When bStart is true then m_currentItemForOperation must still be processed. -// When bVerbose is true then a messagebox will tell when the merge is complete. -void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose) -{ - ProgressProxy pp; - if ( m_mergeItemList.empty() ) - return; - - int nrOfItems = 0; - int nrOfCompletedItems = 0; - int nrOfCompletedSimItems = 0; - - // Count the number of completed items (for the progress bar). - for( MergeItemList::iterator i = m_mergeItemList.begin(); i!=m_mergeItemList.end(); ++i ) - { - DirMergeItem* pDMI = *i; - ++nrOfItems; - if ( pDMI->m_pMFI->m_bOperationComplete ) - ++nrOfCompletedItems; - if ( pDMI->m_pMFI->m_bSimOpComplete ) - ++nrOfCompletedSimItems; - } - - m_pStatusInfo->hide(); - m_pStatusInfo->clear(); - - DirMergeItem* pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; - - bool bContinueWithCurrentItem = bStart; // true for first item, else false - bool bSkipItem = false; - if ( !bStart && m_bError && pCurrentItemForOperation!=0 ) - { - int status = KMessageBox::warningYesNoCancel(this, - i18n("There was an error in the last step.\n" - "Do you want to continue with the item that caused the error or do you want to skip this item?"), - i18n("Continue merge after an error"), - KGuiItem( i18n("Continue With Last Item") ), - KGuiItem( i18n("Skip Item") ) ); - if (status==KMessageBox::Yes) bContinueWithCurrentItem = true; - else if (status==KMessageBox::No ) bSkipItem = true; - else return; - m_bError = false; - } - - bool bSuccess = true; - bool bSingleFileMerge = false; - bool bSim = m_bSimulatedMergeStarted; - while( bSuccess ) - { - if ( pCurrentItemForOperation==0 ) - { - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - break; - } - - if ( pCurrentItemForOperation!=0 && !bContinueWithCurrentItem ) - { - if ( bSim ) - { - if( pCurrentItemForOperation->childCount()==0 ) - { - pCurrentItemForOperation->m_pMFI->m_bSimOpComplete = true; - } - } - else - { - if( pCurrentItemForOperation->childCount()==0 ) - { - if( !pCurrentItemForOperation->m_pMFI->m_bOperationComplete ) - { - pCurrentItemForOperation->setText( s_OpStatusCol, bSkipItem ? i18n("Skipped.") : i18n("Done.") ); - pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; - bSkipItem = false; - } - } - else - { - pCurrentItemForOperation->setText( s_OpStatusCol, i18n("In progress...") ); - } - } - } - - if ( ! bContinueWithCurrentItem ) - { - // Depth first - QTreeWidgetItem* pPrevItem = pCurrentItemForOperation; - ++m_currentItemForOperation; - pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; - if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->parent()!=pPrevItem->parent()) && pPrevItem->parent()!=0 ) - { - // Check if the parent may be set to "Done" - QTreeWidgetItem* pParent = pPrevItem->parent(); - bool bDone = true; - while ( bDone && pParent!=0 ) - { - for( int childIdx = 0; childIdxchildCount(); ++childIdx ) - { - DirMergeItem* pDMI = static_cast(pParent->child(childIdx)); - if ( (!bSim && ! pDMI->m_pMFI->m_bOperationComplete) || (bSim && pDMI->m_pMFI->m_bSimOpComplete) ) - { - bDone=false; - break; - } - } - if ( bDone ) - { - if (bSim) - static_cast(pParent)->m_pMFI->m_bSimOpComplete = bDone; - else - { - pParent->setText( s_OpStatusCol, i18n("Done.") ); - static_cast(pParent)->m_pMFI->m_bOperationComplete = bDone; - } - } - pParent = pParent->parent(); - } - } - } - - if ( pCurrentItemForOperation == 0 ) // end? - { - if ( m_bRealMergeStarted ) - { - if (bVerbose) - { - KMessageBox::information( this, i18n("Merge operation complete."), i18n("Merge Complete") ); - } - m_bRealMergeStarted = false; - m_pStatusInfo->setWindowTitle(i18n("Merge Complete")); - } - if ( m_bSimulatedMergeStarted ) - { - m_bSimulatedMergeStarted = false; - QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0; - for( ; p!=0; p=treeIterator(p) ) - { - static_cast(p)->m_pMFI->m_bSimOpComplete = false; - } - m_pStatusInfo->setWindowTitle(i18n("Simulated merge complete: Check if you agree with the proposed operations.")); - m_pStatusInfo->exec(); - } - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - return; - } - - MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI; - - pp.setInformation( mfi.m_subPath, - bSim ? double(nrOfCompletedSimItems)/nrOfItems : double(nrOfCompletedItems)/nrOfItems, - false // bRedrawUpdate - ); - - bSuccess = executeMergeOperation( mfi, bSingleFileMerge ); // Here the real operation happens. - - if ( bSuccess ) - { - if(bSim) ++nrOfCompletedSimItems; - else ++nrOfCompletedItems; - bContinueWithCurrentItem = false; - } - - if( pp.wasCancelled() ) - break; - } // end while - - //g_pProgressDialog->hide(); - - setCurrentItem( pCurrentItemForOperation ); - scrollToItem( pCurrentItemForOperation, EnsureVisible ); - if ( !bSuccess && !bSingleFileMerge ) - { - KMessageBox::error(this, i18n("An error occurred. Press OK to see detailed information.\n"), i18n("Error") ); - m_pStatusInfo->setWindowTitle(i18n("Merge Error")); - m_pStatusInfo->exec(); - //if ( m_pStatusInfo->firstChild()!=0 ) - // m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() ); - m_bError = true; - pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") ); - } - else - { - m_bError = false; - } - emit updateAvailabilities(); - - if ( m_currentItemForOperation==m_mergeItemList.end() ) - { - m_mergeItemList.clear(); - m_bRealMergeStarted=false; - } -} - -bool DirectoryMergeWindow::deleteFLD( const QString& name, bool bCreateBackup ) -{ - FileAccess fi(name, true); - if ( !fi.exists() ) - return true; - - if ( bCreateBackup ) - { - bool bSuccess = renameFLD( name, name+".orig" ); - if (!bSuccess) - { - m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.",name) ); - return false; - } - } - else - { - if ( fi.isDir() && !fi.isSymLink() ) - m_pStatusInfo->addText(i18n("delete directory recursively( %1 )",name)); - else - m_pStatusInfo->addText(i18n("delete( %1 )",name)); - - if ( m_bSimulatedMergeStarted ) - { - return true; - } - - if ( fi.isDir() && !fi.isSymLink() )// recursive directory delete only for real dirs, not symlinks - { - t_DirectoryList dirList; - bool bSuccess = fi.listDir( &dirList, false, true, "*", "", "", false, false ); // not recursive, find hidden files - - if ( !bSuccess ) - { - // No Permission to read directory or other error. - m_pStatusInfo->addText( i18n("Error: delete dir operation failed while trying to read the directory.") ); - return false; - } - - t_DirectoryList::iterator it; // create list iterator - - for ( it=dirList.begin(); it!=dirList.end(); ++it ) // for each file... - { - FileAccess& fi2 = *it; - if ( fi2.fileName() == "." || fi2.fileName()==".." ) - continue; - bSuccess = deleteFLD( fi2.absoluteFilePath(), false ); - if (!bSuccess) break; - } - if (bSuccess) - { - bSuccess = FileAccess::removeDir( name ); - if ( !bSuccess ) - { - m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.",name)); - return false; - } - } - } - else - { - bool bSuccess = FileAccess::removeFile( name ); - if ( !bSuccess ) - { - m_pStatusInfo->addText( i18n("Error: delete operation failed.") ); - return false; - } - } - } - return true; -} - -bool DirectoryMergeWindow::mergeFLD( const QString& nameA,const QString& nameB,const QString& nameC,const QString& nameDest, bool& bSingleFileMerge ) -{ - FileAccess fi(nameA); - if (fi.isDir()) - { - return makeDir(nameDest); - } - - // Make sure that the dir exists, into which we will save the file later. - int pos=nameDest.lastIndexOf('/'); - if ( pos>0 ) - { - QString parentName = nameDest.left(pos); - bool bSuccess = makeDir(parentName, true /*quiet*/); - if (!bSuccess) - return false; - } - - m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)",nameA,nameB,nameC,nameDest)); - if ( m_bSimulatedMergeStarted ) - { - m_pStatusInfo->addText(i18n(" Note: After a manual merge the user should continue by pressing F7.") ); - return true; - } - - bSingleFileMerge = true; - (*m_currentItemForOperation)->setText( s_OpStatusCol, i18n("In progress...") ); - scrollToItem( *m_currentItemForOperation, EnsureVisible ); - - emit startDiffMerge( nameA, nameB, nameC, nameDest, "","","",0 ); - - return false; -} - -bool DirectoryMergeWindow::copyFLD( const QString& srcName, const QString& destName ) -{ - if ( srcName == destName ) - return true; - - FileAccess fi( srcName ); - FileAccess faDest(destName, true); - if ( faDest.exists() && !( fi.isDir() && faDest.isDir() && (fi.isSymLink()==faDest.isSymLink())) ) - { - bool bSuccess = deleteFLD( destName, m_pOptions->m_bDmCreateBakFiles ); - if ( !bSuccess ) - { - m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed." - "Deleting existing destination failed.",srcName,destName)); - return false; - } - } - - - if ( fi.isSymLink() && ((fi.isDir() && !m_bFollowDirLinks) || (!fi.isDir() && !m_bFollowFileLinks)) ) - { - m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )",srcName,destName)); -#if defined(_WIN32) || defined(Q_OS_OS2) - // What are links? -#else - if ( m_bSimulatedMergeStarted ) - { - return true; - } - FileAccess destFi(destName); - if ( !destFi.isLocal() || !fi.isLocal() ) - { - m_pStatusInfo->addText(i18n("Error: copyLink failed: Remote links are not yet supported.")); - return false; - } - QString linkTarget = fi.readLink(); - bool bSuccess = FileAccess::symLink( linkTarget, destName ); - if (!bSuccess) - m_pStatusInfo->addText(i18n("Error: copyLink failed.")); - return bSuccess; -#endif - } - - if ( fi.isDir() ) - { - if ( faDest.exists() ) - return true; - else - { - bool bSuccess = makeDir( destName ); - return bSuccess; - } - } - - int pos=destName.lastIndexOf('/'); - if ( pos>0 ) - { - QString parentName = destName.left(pos); - bool bSuccess = makeDir(parentName, true /*quiet*/); - if (!bSuccess) - return false; - } - - m_pStatusInfo->addText(i18n("copy( %1 -> %2 )",srcName,destName)); - - if ( m_bSimulatedMergeStarted ) - { - return true; - } - - FileAccess faSrc ( srcName ); - bool bSuccess = faSrc.copyFile( destName ); - if (! bSuccess ) m_pStatusInfo->addText( faSrc.getStatusText() ); - return bSuccess; -} - -// Rename is not an operation that can be selected by the user. -// It will only be used to create backups. -// Hence it will delete an existing destination without making a backup (of the old backup.) -bool DirectoryMergeWindow::renameFLD( const QString& srcName, const QString& destName ) -{ - if ( srcName == destName ) - return true; - - if ( FileAccess(destName, true).exists() ) - { - bool bSuccess = deleteFLD( destName, false /*no backup*/ ); - if (!bSuccess) - { - m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): " - "Cannot delete existing destination." ,srcName,destName)); - return false; - } - } - - m_pStatusInfo->addText(i18n("rename( %1 -> %2 )",srcName,destName)); - if ( m_bSimulatedMergeStarted ) - { - return true; - } - - bool bSuccess = FileAccess( srcName ).rename( destName ); - if (!bSuccess) - { - m_pStatusInfo->addText( i18n("Error: Rename failed.") ); - return false; - } - - return true; -} - -bool DirectoryMergeWindow::makeDir( const QString& name, bool bQuiet ) -{ - FileAccess fi(name, true); - if( fi.exists() && fi.isDir() ) - return true; - - if( fi.exists() && !fi.isDir() ) - { - bool bSuccess = deleteFLD( name, true ); - if (!bSuccess) - { - m_pStatusInfo->addText( i18n("Error during makeDir of %1. " - "Cannot delete existing file." ,name)); - return false; - } - } - - int pos=name.lastIndexOf('/'); - if ( pos>0 ) - { - QString parentName = name.left(pos); - bool bSuccess = makeDir(parentName,true); - if (!bSuccess) - return false; - } - - if ( ! bQuiet ) - m_pStatusInfo->addText(i18n("makeDir( %1 )",name)); - - if ( m_bSimulatedMergeStarted ) - { - return true; - } - - bool bSuccess = FileAccess::makeDir( name ); - if ( bSuccess == false ) - { - m_pStatusInfo->addText( i18n("Error while creating directory.") ); - return false; - } - return true; -} - - -DirectoryMergeInfo::DirectoryMergeInfo( QWidget* pParent ) -: QFrame(pParent) -{ - QVBoxLayout *topLayout = new QVBoxLayout( this ); - topLayout->setMargin(0); - - QGridLayout *grid = new QGridLayout(); - topLayout->addLayout(grid); - grid->setColumnStretch(1,10); - - int line=0; - - m_pA = new QLabel("A",this); grid->addWidget( m_pA,line, 0 ); - m_pInfoA = new QLabel(this); grid->addWidget( m_pInfoA,line,1 ); ++line; - m_pB = new QLabel("B",this); grid->addWidget( m_pB,line, 0 ); - m_pInfoB = new QLabel(this); grid->addWidget( m_pInfoB,line,1 ); ++line; - m_pC = new QLabel("C",this); grid->addWidget( m_pC,line, 0 ); - m_pInfoC = new QLabel(this); grid->addWidget( m_pInfoC,line,1 ); ++line; - m_pDest = new QLabel(i18n("Dest"),this); grid->addWidget( m_pDest,line, 0 ); - m_pInfoDest = new QLabel(this); grid->addWidget( m_pInfoDest,line,1 ); ++line; - - m_pInfoList = new QTreeWidget(this); topLayout->addWidget( m_pInfoList ); - m_pInfoList->setHeaderLabels( QStringList() << i18n("Dir") << i18n("Type") << i18n("Size") - << i18n("Attr") << i18n("Last Modification") << i18n("Link-Destination") ); - setMinimumSize( 100,100 ); - - m_pInfoList->installEventFilter(this); - m_pInfoList->setRootIsDecorated( false ); -} - -bool DirectoryMergeInfo::eventFilter(QObject*o, QEvent* e) -{ - if ( e->type()==QEvent::FocusIn && o==m_pInfoList ) - emit gotFocus(); - return false; -} - -static void addListViewItem( QTreeWidget* pListView, const QString& dir, - const QString& basePath, FileAccess& fi ) -{ - if ( basePath.isEmpty() ) - { - return; - } - else - { - if ( fi.exists() ) - { - QString dateString = fi.lastModified().toString("yyyy-MM-dd hh:mm:ss"); - - new QTreeWidgetItem( - pListView, - QStringList() << dir << - QString( fi.isDir() ? i18n("Dir") : i18n("File") ) + (fi.isSymLink() ? "-Link" : "") << - QString::number(fi.size()) << - QString(fi.isReadable() ? "r" : " ") + (fi.isWritable()?"w" : " ") -#ifdef _WIN32 - /*Future: Use GetFileAttributes()*/ << -#else - + (fi.isExecutable()?"x" : " ") << -#endif - dateString << - QString(fi.isSymLink() ? (" -> " + fi.readLink()) : QString("")) - ); - } - else - { - new QTreeWidgetItem( - pListView, - QStringList() << dir << - i18n("not available") << - "" << - "" << - "" << - "" - ); - } - } -} - -void DirectoryMergeInfo::setInfo( - const FileAccess& dirA, - const FileAccess& dirB, - const FileAccess& dirC, - const FileAccess& dirDest, - MergeFileInfos& mfi ) -{ - bool bHideDest = false; - if ( dirA.absoluteFilePath()==dirDest.absoluteFilePath() ) - { - m_pA->setText( i18n("A (Dest): ") ); bHideDest=true; - } - else - m_pA->setText( !dirC.isValid() ? QString("A: ") : i18n("A (Base): ")); - - m_pInfoA->setText( dirA.prettyAbsPath() ); - - if ( dirB.absoluteFilePath()==dirDest.absoluteFilePath() ) - { - m_pB->setText( i18n("B (Dest): ") ); bHideDest=true; - } - else - m_pB->setText( "B: " ); - m_pInfoB->setText( dirB.prettyAbsPath() ); - - if ( dirC.absoluteFilePath()==dirDest.absoluteFilePath() ) - { - m_pC->setText( i18n("C (Dest): ") ); bHideDest=true; - } - else - m_pC->setText( "C: " ); - m_pInfoC->setText( dirC.prettyAbsPath() ); - - m_pDest->setText( i18n("Dest: ") ); m_pInfoDest->setText( dirDest.prettyAbsPath() ); - - if (!dirC.isValid()) { m_pC->hide(); m_pInfoC->hide(); } - else { m_pC->show(); m_pInfoC->show(); } - - if (!dirDest.isValid()||bHideDest) { m_pDest->hide(); m_pInfoDest->hide(); } - else { m_pDest->show(); m_pInfoDest->show(); } - - m_pInfoList->clear(); - addListViewItem( m_pInfoList, "A", dirA.prettyAbsPath(), mfi.m_fileInfoA ); - addListViewItem( m_pInfoList, "B", dirB.prettyAbsPath(), mfi.m_fileInfoB ); - addListViewItem( m_pInfoList, "C", dirC.prettyAbsPath(), mfi.m_fileInfoC ); - if (!bHideDest) - { - FileAccess fiDest( dirDest.prettyAbsPath() + "/" + mfi.m_subPath, true ); - addListViewItem( m_pInfoList, i18n("Dest"), dirDest.prettyAbsPath(), fiDest ); - } - for (int i=0;icolumnCount();++i) - m_pInfoList->resizeColumnToContents ( i ); -} - -QTextStream& operator<<( QTextStream& ts, MergeFileInfos& mfi ) -{ - ts << "{\n"; - ValueMap vm; - vm.writeEntry( "SubPath", mfi.m_subPath ); - vm.writeEntry( "ExistsInA", mfi.m_bExistsInA ); - vm.writeEntry( "ExistsInB", mfi.m_bExistsInB ); - vm.writeEntry( "ExistsInC", mfi.m_bExistsInC ); - vm.writeEntry( "EqualAB", mfi.m_bEqualAB ); - vm.writeEntry( "EqualAC", mfi.m_bEqualAC ); - vm.writeEntry( "EqualBC", mfi.m_bEqualBC ); - //DirMergeItem* m_pDMI; - //MergeFileInfos* m_pParent; - vm.writeEntry( "MergeOperation", (int) mfi.m_eMergeOperation ); - vm.writeEntry( "DirA", mfi.m_bDirA ); - vm.writeEntry( "DirB", mfi.m_bDirB ); - vm.writeEntry( "DirC", mfi.m_bDirC ); - vm.writeEntry( "LinkA", mfi.m_bLinkA ); - vm.writeEntry( "LinkB", mfi.m_bLinkB ); - vm.writeEntry( "LinkC", mfi.m_bLinkC ); - vm.writeEntry( "OperationComplete", mfi.m_bOperationComplete ); - //bool m_bSimOpComplete ); - - vm.writeEntry( "AgeA", (int) mfi.m_ageA ); - vm.writeEntry( "AgeB", (int) mfi.m_ageB ); - vm.writeEntry( "AgeC", (int) mfi.m_ageC ); - vm.writeEntry( "ConflictingAges", mfi.m_bConflictingAges ); // Equal age but files are not! - - //FileAccess m_fileInfoA; - //FileAccess m_fileInfoB; - //FileAccess m_fileInfoC; - - //TotalDiffStatus m_totalDiffStatus; - - vm.save(ts); - - ts << "}\n"; - - return ts; -} - -void DirectoryMergeWindow::slotSaveMergeState() -{ - //slotStatusMsg(i18n("Saving Directory Merge State ...")); - - //QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); - QString s = KFileDialog::getSaveFileName( QDir::currentPath(), 0, this, i18n("Save Directory Merge State As...") ); - if(!s.isEmpty()) - { - m_dirMergeStateFilename = s; - - - QFile file(m_dirMergeStateFilename); - bool bSuccess = file.open( QIODevice::WriteOnly ); - if ( bSuccess ) - { - QTextStream ts( &file ); - - QTreeWidgetItemIterator it( this ); - while ( *it ) { - DirMergeItem* item = static_cast(*it); - MergeFileInfos* pMFI = item->m_pMFI; - ts << *pMFI; - ++it; - } - } - } - - //slotStatusMsg(i18n("Ready.")); - -} - -void DirectoryMergeWindow::slotLoadMergeState() -{ -} - -void DirectoryMergeWindow::updateFileVisibilities() -{ - bool bShowIdentical = m_pDirShowIdenticalFiles->isChecked(); - bool bShowDifferent = m_pDirShowDifferentFiles->isChecked(); - bool bShowOnlyInA = m_pDirShowFilesOnlyInA->isChecked(); - bool bShowOnlyInB = m_pDirShowFilesOnlyInB->isChecked(); - bool bShowOnlyInC = m_pDirShowFilesOnlyInC->isChecked(); - bool bThreeDirs = m_dirC.isValid(); - m_pSelection1Item = 0; - m_pSelection2Item = 0; - m_pSelection3Item = 0; - - // in first run set all dirs to equal and determine if they are not equal. - // on second run don't change the equal-status anymore; it is needed to - // set the visibility (when bShowIdentical is false). - for( int loop=0; loop<2; ++loop ) - { - QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0; - while(p) - { - DirMergeItem* pDMI = static_cast(p); - MergeFileInfos* pMFI = pDMI->m_pMFI; - bool bDir = pMFI->m_bDirA || pMFI->m_bDirB || pMFI->m_bDirC; - if ( loop==0 && bDir ) - { - bool bChange = false; - if ( !pMFI->m_bEqualAB ){ pMFI->m_bEqualAB = true; bChange=true; } - if ( !pMFI->m_bEqualBC ){ pMFI->m_bEqualBC = true; bChange=true; } - if ( !pMFI->m_bEqualAC ){ pMFI->m_bEqualAC = true; bChange=true; } - - if ( bChange ) - setPixmaps( *pMFI, bThreeDirs ); - } - bool bExistsEverywhere = pMFI->m_bExistsInA && pMFI->m_bExistsInB && (pMFI->m_bExistsInC || !bThreeDirs); - int existCount = int(pMFI->m_bExistsInA) + int(pMFI->m_bExistsInB) + int(pMFI->m_bExistsInC); - bool bVisible = - ( bShowIdentical && bExistsEverywhere && pMFI->m_bEqualAB && (pMFI->m_bEqualAC || !bThreeDirs) ) - || ( (bShowDifferent||bDir) && existCount>=2 && (!pMFI->m_bEqualAB || !(pMFI->m_bEqualAC || !bThreeDirs))) - || ( bShowOnlyInA && pMFI->m_bExistsInA && !pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) - || ( bShowOnlyInB && !pMFI->m_bExistsInA && pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) - || ( bShowOnlyInC && !pMFI->m_bExistsInA && !pMFI->m_bExistsInB && pMFI->m_bExistsInC ); - - QString fileName = pMFI->m_subPath.section( '/', -1 ); - bVisible = bVisible && ( - (bDir && ! wildcardMultiMatch( m_pOptions->m_DmDirAntiPattern, fileName, m_bCaseSensitive )) - || (wildcardMultiMatch( m_pOptions->m_DmFilePattern, fileName, m_bCaseSensitive ) - && !wildcardMultiMatch( m_pOptions->m_DmFileAntiPattern, fileName, m_bCaseSensitive )) ); - - p->setHidden(!bVisible); - - bool bEqual = bThreeDirs ? pMFI->m_bEqualAB && pMFI->m_bEqualAC : pMFI->m_bEqualAB; - if ( !bEqual && bVisible && loop==0 ) // Set all parents to "not equal" - { - MergeFileInfos* p2 = pMFI->m_pParent; - while(p2!=0) - { - bool bChange = false; - if ( !pMFI->m_bEqualAB && p2->m_bEqualAB ){ p2->m_bEqualAB = false; bChange=true; } - if ( !pMFI->m_bEqualAC && p2->m_bEqualAC ){ p2->m_bEqualAC = false; bChange=true; } - if ( !pMFI->m_bEqualBC && p2->m_bEqualBC ){ p2->m_bEqualBC = false; bChange=true; } - - if ( bChange ) - setPixmaps( *p2, bThreeDirs ); - else - break; - - p2 = p2->m_pParent; - } - } - p = treeIterator( p, true, true ); - } - } -} - -void DirectoryMergeWindow::slotShowIdenticalFiles() { m_pOptions->m_bDmShowIdenticalFiles=m_pDirShowIdenticalFiles->isChecked(); - updateFileVisibilities(); } -void DirectoryMergeWindow::slotShowDifferentFiles() { updateFileVisibilities(); } -void DirectoryMergeWindow::slotShowFilesOnlyInA() { updateFileVisibilities(); } -void DirectoryMergeWindow::slotShowFilesOnlyInB() { updateFileVisibilities(); } -void DirectoryMergeWindow::slotShowFilesOnlyInC() { updateFileVisibilities(); } - -void DirectoryMergeWindow::slotSynchronizeDirectories() { } -void DirectoryMergeWindow::slotChooseNewerFiles() { } - -void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac ) -{ -#include "xpm/startmerge.xpm" -#include "xpm/showequalfiles.xpm" -#include "xpm/showfilesonlyina.xpm" -#include "xpm/showfilesonlyinb.xpm" -#include "xpm/showfilesonlyinc.xpm" - DirectoryMergeWindow* p = this; - - m_pDirStartOperation = KDiff3::createAction< KAction >(i18n("Start/Continue Directory Merge"), KShortcut( Qt::Key_F7 ), p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); - m_pDirRunOperationForCurrentItem = KDiff3::createAction< KAction >(i18n("Run Operation for Current Item"), KShortcut( Qt::Key_F6 ), p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); - m_pDirCompareCurrent = KDiff3::createAction< KAction >(i18n("Compare Selected File"), p, SLOT(compareCurrentFile()), ac, "dir_compare_current"); - m_pDirMergeCurrent = KDiff3::createAction< KAction >(i18n("Merge Current File"), QIcon(QPixmap(startmerge)), i18n("Merge\nFile"), pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current"); - m_pDirFoldAll = KDiff3::createAction< KAction >(i18n("Fold All Subdirs"), p, SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); - m_pDirUnfoldAll = KDiff3::createAction< KAction >(i18n("Unfold All Subdirs"), p, SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); - m_pDirRescan = KDiff3::createAction< KAction >(i18n("Rescan"), KShortcut( Qt::SHIFT+Qt::Key_F5 ), p, SLOT(reload()), ac, "dir_rescan"); - m_pDirSaveMergeState = 0; //KDiff3::createAction< KAction >(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); - m_pDirLoadMergeState = 0; //KDiff3::createAction< KAction >(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); - m_pDirChooseAEverywhere = KDiff3::createAction< KAction >(i18n("Choose A for All Items"), p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); - m_pDirChooseBEverywhere = KDiff3::createAction< KAction >(i18n("Choose B for All Items"), p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); - m_pDirChooseCEverywhere = KDiff3::createAction< KAction >(i18n("Choose C for All Items"), p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); - m_pDirAutoChoiceEverywhere = KDiff3::createAction< KAction >(i18n("Auto-Choose Operation for All Items"), p, SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); - m_pDirDoNothingEverywhere = KDiff3::createAction< KAction >(i18n("No Operation for All Items"), p, SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); - -// m_pDirSynchronizeDirectories = KDiff3::createAction< KToggleAction >(i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -// m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); - - m_pDirShowIdenticalFiles = KDiff3::createAction< KToggleAction >(i18n("Show Identical Files"), QIcon(QPixmap(showequalfiles)), i18n("Identical\nFiles"), this, SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); - m_pDirShowDifferentFiles = KDiff3::createAction< KToggleAction >(i18n("Show Different Files"), this, SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); - m_pDirShowFilesOnlyInA = KDiff3::createAction< KToggleAction >(i18n("Show Files only in A"), QIcon(QPixmap(showfilesonlyina)), i18n("Files\nonly in A"), this, SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); - m_pDirShowFilesOnlyInB = KDiff3::createAction< KToggleAction >(i18n("Show Files only in B"), QIcon(QPixmap(showfilesonlyinb)), i18n("Files\nonly in B"), this, SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); - m_pDirShowFilesOnlyInC = KDiff3::createAction< KToggleAction >(i18n("Show Files only in C"), QIcon(QPixmap(showfilesonlyinc)), i18n("Files\nonly in C"), this, SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); - - m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles ); - - m_pDirCompareExplicit = KDiff3::createAction< KAction >(i18n("Compare Explicitly Selected Files"), p, SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); - m_pDirMergeExplicit = KDiff3::createAction< KAction >(i18n("Merge Explicitly Selected Files"), p, SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); - - m_pDirCurrentDoNothing = KDiff3::createAction< KAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); - m_pDirCurrentChooseA = KDiff3::createAction< KAction >(i18n("A"), p, SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); - m_pDirCurrentChooseB = KDiff3::createAction< KAction >(i18n("B"), p, SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); - m_pDirCurrentChooseC = KDiff3::createAction< KAction >(i18n("C"), p, SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); - m_pDirCurrentMerge = KDiff3::createAction< KAction >(i18n("Merge"), p, SLOT(slotCurrentMerge()), ac, "dir_current_merge"); - m_pDirCurrentDelete = KDiff3::createAction< KAction >(i18n("Delete (if exists)"), p, SLOT(slotCurrentDelete()), ac, "dir_current_delete"); - - m_pDirCurrentSyncDoNothing = KDiff3::createAction< KAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); - m_pDirCurrentSyncCopyAToB = KDiff3::createAction< KAction >(i18n("Copy A to B"), p, SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); - m_pDirCurrentSyncCopyBToA = KDiff3::createAction< KAction >(i18n("Copy B to A"), p, SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); - m_pDirCurrentSyncDeleteA = KDiff3::createAction< KAction >(i18n("Delete A"), p, SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); - m_pDirCurrentSyncDeleteB = KDiff3::createAction< KAction >(i18n("Delete B"), p, SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); - m_pDirCurrentSyncDeleteAAndB = KDiff3::createAction< KAction >(i18n("Delete A && B"), p, SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); - m_pDirCurrentSyncMergeToA = KDiff3::createAction< KAction >(i18n("Merge to A"), p, SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); - m_pDirCurrentSyncMergeToB = KDiff3::createAction< KAction >(i18n("Merge to B"), p, SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); - m_pDirCurrentSyncMergeToAAndB = KDiff3::createAction< KAction >(i18n("Merge to A && B"), p, SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); -} - - -void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible, - KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC ) -{ - m_pDirStartOperation->setEnabled( bDirCompare ); - m_pDirRunOperationForCurrentItem->setEnabled( bDirCompare ); - m_pDirFoldAll->setEnabled( bDirCompare ); - m_pDirUnfoldAll->setEnabled( bDirCompare ); - - m_pDirCompareCurrent->setEnabled( bDirCompare && isVisible() && isFileSelected() ); - - m_pDirMergeCurrent->setEnabled( (bDirCompare && isVisible() && isFileSelected()) - || bDiffWindowVisible ); - - m_pDirRescan->setEnabled( bDirCompare ); - - m_pDirAutoChoiceEverywhere->setEnabled( bDirCompare && isVisible() ); - m_pDirDoNothingEverywhere->setEnabled( bDirCompare && isVisible() ); - m_pDirChooseAEverywhere->setEnabled( bDirCompare && isVisible() ); - m_pDirChooseBEverywhere->setEnabled( bDirCompare && isVisible() ); - m_pDirChooseCEverywhere->setEnabled( bDirCompare && isVisible() ); - - bool bThreeDirs = m_dirC.isValid(); - - QTreeWidgetItem* lvi = currentItem(); - DirMergeItem* pDMI = lvi==0 ? 0 : static_cast(lvi); - MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI; - - bool bItemActive = bDirCompare && isVisible() && pMFI!=0;// && hasFocus(); - bool bMergeMode = bThreeDirs || !m_bSyncMode; - bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI); - - bool bDirWindowHasFocus = isVisible() && hasFocus(); - - m_pDirShowIdenticalFiles->setEnabled( bDirCompare && isVisible() ); - m_pDirShowDifferentFiles->setEnabled( bDirCompare && isVisible() ); - m_pDirShowFilesOnlyInA->setEnabled( bDirCompare && isVisible() ); - m_pDirShowFilesOnlyInB->setEnabled( bDirCompare && isVisible() ); - m_pDirShowFilesOnlyInC->setEnabled( bDirCompare && isVisible() && bThreeDirs ); - - m_pDirCompareExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=0 ); - m_pDirMergeExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=0 ); - - m_pDirCurrentDoNothing->setEnabled( bItemActive && bMergeMode ); - m_pDirCurrentChooseA->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInA ); - m_pDirCurrentChooseB->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInB ); - m_pDirCurrentChooseC->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInC ); - m_pDirCurrentMerge->setEnabled( bItemActive && bMergeMode && !bFTConflict ); - m_pDirCurrentDelete->setEnabled( bItemActive && bMergeMode ); - if ( bDirWindowHasFocus ) - { - chooseA->setEnabled( bItemActive && pMFI->m_bExistsInA ); - chooseB->setEnabled( bItemActive && pMFI->m_bExistsInB ); - chooseC->setEnabled( bItemActive && pMFI->m_bExistsInC ); - chooseA->setChecked( false ); - chooseB->setChecked( false ); - chooseC->setChecked( false ); - } - - m_pDirCurrentSyncDoNothing->setEnabled( bItemActive && !bMergeMode ); - m_pDirCurrentSyncCopyAToB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA ); - m_pDirCurrentSyncCopyBToA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB ); - m_pDirCurrentSyncDeleteA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA ); - m_pDirCurrentSyncDeleteB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB ); - m_pDirCurrentSyncDeleteAAndB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB && pMFI->m_bExistsInB ); - m_pDirCurrentSyncMergeToA->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); - m_pDirCurrentSyncMergeToB->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); - m_pDirCurrentSyncMergeToAAndB->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); -} - - -//#include "directorymergewindow.moc" Index: trunk/extragear/utils/kdiff3/src/kreplacements/kglobal.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kglobal.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kglobal.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kapplication.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kapplication.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kapplication.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kparts/mainwindow.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kparts/mainwindow.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kparts/mainwindow.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kparts/factory.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kparts/factory.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kparts/factory.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kparts/part.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kparts/part.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kparts/part.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/ShellContextMenu.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/ShellContextMenu.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/ShellContextMenu.cpp (nonexistent) @@ -1,494 +0,0 @@ -/*************************************************************************** - ShellContextMenu.cpp - description - ------------------- - begin : Sat Mar 4 2006 - copyright : (C) 2005-2007 by Joachim Eibl - email : joachim dot eibl at gmx dot de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -// ShellContextMenu.cpp: Implementierung der Klasse CShellContextMenu. -// -////////////////////////////////////////////////////////////////////// -#ifdef _WIN32 -#include -#include -#include -#include -#include -#include -#include -#include -#include "ShellContextMenu.h" - -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - -////////////////////////////////////////////////////////////////////// -// Konstruktion/Destruktion -////////////////////////////////////////////////////////////////////// - -#define MIN_ID 100 -#define MAX_ID 10000 - - -void showShellContextMenu( const QString& itemPath, QPoint pt, QWidget* pParentWidget, QMenu* pMenu ) -{ - CShellContextMenu scm; - scm.SetObjects(QDir::toNativeSeparators(QDir::cleanPath(itemPath))); - int id = scm.ShowContextMenu (pParentWidget, pt, pMenu); - if (id>=1) - pMenu->actions().value(id-1)->trigger(); -} - -IContextMenu2 * g_IContext2 = NULL; -IContextMenu3 * g_IContext3 = NULL; - -CShellContextMenu::CShellContextMenu() -{ - m_psfFolder = NULL; - m_pidlArray = NULL; - m_hMenu = NULL; -} - -CShellContextMenu::~CShellContextMenu() -{ - // free all allocated datas - if (m_psfFolder && bDelete) - m_psfFolder->Release (); - m_psfFolder = NULL; - FreePIDLArray (m_pidlArray); - m_pidlArray = NULL; - - if (m_hMenu) - DestroyMenu( m_hMenu ); -} - - - -// this functions determines which version of IContextMenu is avaibale for those objects (always the highest one) -// and returns that interface -BOOL CShellContextMenu::GetContextMenu (void ** ppContextMenu, int & iMenuType) -{ - *ppContextMenu = NULL; - LPCONTEXTMENU icm1 = NULL; - - if ( m_psfFolder==0 ) - return FALSE; - - // first we retrieve the normal IContextMenu interface (every object should have it) - m_psfFolder->GetUIObjectOf (NULL, nItems, (LPCITEMIDLIST *) m_pidlArray, IID_IContextMenu, NULL, (void**) &icm1); - - if (icm1) - { // since we got an IContextMenu interface we can now obtain the higher version interfaces via that - if (icm1->QueryInterface (IID_IContextMenu3, ppContextMenu) == NOERROR) - iMenuType = 3; - else if (icm1->QueryInterface (IID_IContextMenu2, ppContextMenu) == NOERROR) - iMenuType = 2; - - if (*ppContextMenu) - icm1->Release(); // we can now release version 1 interface, cause we got a higher one - else - { - iMenuType = 1; - *ppContextMenu = icm1; // since no higher versions were found - } // redirect ppContextMenu to version 1 interface - } - else - return (FALSE); // something went wrong - - return (TRUE); // success -} - - -LRESULT CALLBACK CShellContextMenu::HookWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - case WM_MENUCHAR: // only supported by IContextMenu3 - if (g_IContext3) - { - LRESULT lResult = 0; - g_IContext3->HandleMenuMsg2 (message, wParam, lParam, &lResult); - return (lResult); - } - break; - - case WM_DRAWITEM: - case WM_MEASUREITEM: - if (wParam) - break; // if wParam != 0 then the message is not menu-related - - case WM_INITMENUPOPUP: - if (g_IContext2) - g_IContext2->HandleMenuMsg (message, wParam, lParam); - else // version 3 - g_IContext3->HandleMenuMsg (message, wParam, lParam); - return (message == WM_INITMENUPOPUP ? 0 : TRUE); // inform caller that we handled WM_INITPOPUPMENU by ourself - break; - - default: - break; - } - - // call original WndProc of window to prevent undefined bevhaviour of window - return ::CallWindowProc ((WNDPROC) GetProp ( hWnd, TEXT ("OldWndProc")), hWnd, message, wParam, lParam); -} - - -UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMenu* pMenu ) -{ - 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 - - if (!GetContextMenu ((void**) &pContextMenu, iMenuType)) - return (0); // something went wrong - - if (!m_hMenu) - { - DestroyMenu( m_hMenu ); - m_hMenu = CreatePopupMenu (); - } - - int i; - QList actionList = pMenu->actions(); - for( i=0; itext(); - if (!s.isEmpty()) - AppendMenuW( m_hMenu, MF_STRING, i+1, (LPCWSTR)s.utf16() ); - } - AppendMenuW( m_hMenu, MF_SEPARATOR, i+1, L"" ); - - // lets fill the our popupmenu - pContextMenu->QueryContextMenu (m_hMenu, GetMenuItemCount (m_hMenu), MIN_ID, MAX_ID, CMF_NORMAL | CMF_EXPLORE); - - // subclass window to handle menurelated messages in CShellContextMenu - WNDPROC OldWndProc; - if (iMenuType > 1) // only subclass if its version 2 or 3 - { - OldWndProc = (WNDPROC) SetWindowLongPtr (hWnd, GWLP_WNDPROC, (LONG_PTR) HookWndProc); - if (iMenuType == 2) - g_IContext2 = (LPCONTEXTMENU2) pContextMenu; - else // version 3 - g_IContext3 = (LPCONTEXTMENU3) pContextMenu; - } - else - OldWndProc = NULL; - - UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, pParentWidget->winId(), 0); - - if (OldWndProc) // unsubclass - SetWindowLongPtr (hWnd, GWLP_WNDPROC, (LONG_PTR) OldWndProc); - - if (idCommand >= MIN_ID && idCommand <= MAX_ID) // see if returned idCommand belongs to shell menu entries - { - InvokeCommand (pContextMenu, idCommand - MIN_ID); // execute related command - idCommand = 0; - } - - pContextMenu->Release(); - g_IContext2 = NULL; - g_IContext3 = NULL; - - return (idCommand); -} - - -void CShellContextMenu::InvokeCommand (LPCONTEXTMENU pContextMenu, UINT idCommand) -{ - CMINVOKECOMMANDINFO cmi = {0}; - cmi.cbSize = sizeof (CMINVOKECOMMANDINFO); - cmi.lpVerb = (LPSTR) MAKEINTRESOURCE (idCommand); - cmi.nShow = SW_SHOWNORMAL; - - pContextMenu->InvokeCommand (&cmi); -} - - -void CShellContextMenu::SetObjects(const QString& strObject) -{ - // only one object is passed - QStringList strArray; - strArray << strObject; // create a CStringArray with one element - - SetObjects (strArray); // and pass it to SetObjects (CStringArray &strArray) - // for further processing -} - - -void CShellContextMenu::SetObjects(const QStringList &strList) -{ - // free all allocated datas - if (m_psfFolder && bDelete) - m_psfFolder->Release (); - m_psfFolder = NULL; - FreePIDLArray (m_pidlArray); - m_pidlArray = NULL; - - // get IShellFolder interface of Desktop (root of shell namespace) - IShellFolder * psfDesktop = NULL; - SHGetDesktopFolder (&psfDesktop); // needed to obtain full qualified pidl - - // ParseDisplayName creates a PIDL from a file system path relative to the IShellFolder interface - // but since we use the Desktop as our interface and the Desktop is the namespace root - // that means that it's a fully qualified PIDL, which is what we need - LPITEMIDLIST pidl = NULL; - - psfDesktop->ParseDisplayName (NULL, 0, (LPOLESTR)strList[0].utf16(), NULL, &pidl, NULL); - - // now we need the parent IShellFolder interface of pidl, and the relative PIDL to that interface - LPITEMIDLIST pidlItem = NULL; // relative pidl - SHBindToParentEx (pidl, IID_IShellFolder, (void **) &m_psfFolder, NULL); - free (pidlItem); - // get interface to IMalloc (need to free the PIDLs allocated by the shell functions) - LPMALLOC lpMalloc = NULL; - SHGetMalloc (&lpMalloc); - lpMalloc->Free (pidl); - - // now we have the IShellFolder interface to the parent folder specified in the first element in strArray - // since we assume that all objects are in the same folder (as it's stated in the MSDN) - // we now have the IShellFolder interface to every objects parent folder - - IShellFolder * psfFolder = NULL; - nItems = strList.size (); - for (int i = 0; i < nItems; i++) - { - pidl=0; - psfDesktop->ParseDisplayName (NULL, 0, (LPOLESTR)strList[i].utf16(), NULL, &pidl, NULL); - if (pidl) - { - m_pidlArray = (LPITEMIDLIST *) realloc (m_pidlArray, (i + 1) * sizeof (LPITEMIDLIST)); - // get relative pidl via SHBindToParent - SHBindToParentEx (pidl, IID_IShellFolder, (void **) &psfFolder, (LPCITEMIDLIST *) &pidlItem); - m_pidlArray[i] = CopyPIDL (pidlItem); // copy relative pidl to pidlArray - free (pidlItem); - lpMalloc->Free (pidl); // free pidl allocated by ParseDisplayName - psfFolder->Release (); - } - } - lpMalloc->Release (); - psfDesktop->Release (); - - bDelete = TRUE; // indicates that m_psfFolder should be deleted by CShellContextMenu -} - - -// only one full qualified PIDL has been passed -void CShellContextMenu::SetObjects(LPITEMIDLIST /*pidl*/) -{ -/* - // free all allocated datas - if (m_psfFolder && bDelete) - m_psfFolder->Release (); - m_psfFolder = NULL; - FreePIDLArray (m_pidlArray); - m_pidlArray = NULL; - - // full qualified PIDL is passed so we need - // its parent IShellFolder interface and its relative PIDL to that - LPITEMIDLIST pidlItem = NULL; - SHBindToParent ((LPCITEMIDLIST) pidl, IID_IShellFolder, (void **) &m_psfFolder, (LPCITEMIDLIST *) &pidlItem); - - m_pidlArray = (LPITEMIDLIST *) malloc (sizeof (LPITEMIDLIST)); // allocate ony for one elemnt - m_pidlArray[0] = CopyPIDL (pidlItem); - - - // now free pidlItem via IMalloc interface (but not m_psfFolder, that we need later - LPMALLOC lpMalloc = NULL; - SHGetMalloc (&lpMalloc); - lpMalloc->Free (pidlItem); - lpMalloc->Release(); - - nItems = 1; - bDelete = TRUE; // indicates that m_psfFolder should be deleted by CShellContextMenu -*/ -} - - -// IShellFolder interface with a relative pidl has been passed -void CShellContextMenu::SetObjects(IShellFolder *psfFolder, LPITEMIDLIST pidlItem) -{ - // free all allocated datas - if (m_psfFolder && bDelete) - m_psfFolder->Release (); - m_psfFolder = NULL; - FreePIDLArray (m_pidlArray); - m_pidlArray = NULL; - - m_psfFolder = psfFolder; - - m_pidlArray = (LPITEMIDLIST *) malloc (sizeof (LPITEMIDLIST)); - m_pidlArray[0] = CopyPIDL (pidlItem); - - nItems = 1; - bDelete = FALSE; // indicates wheter m_psfFolder should be deleted by CShellContextMenu -} - -void CShellContextMenu::SetObjects(IShellFolder * psfFolder, LPITEMIDLIST *pidlArray, int nItemCount) -{ - // free all allocated datas - if (m_psfFolder && bDelete) - m_psfFolder->Release (); - m_psfFolder = NULL; - FreePIDLArray (m_pidlArray); - m_pidlArray = NULL; - - m_psfFolder = psfFolder; - - m_pidlArray = (LPITEMIDLIST *) malloc (nItemCount * sizeof (LPITEMIDLIST)); - - for (int i = 0; i < nItemCount; i++) - m_pidlArray[i] = CopyPIDL (pidlArray[i]); - - nItems = nItemCount; - bDelete = FALSE; // indicates wheter m_psfFolder should be deleted by CShellContextMenu -} - - -void CShellContextMenu::FreePIDLArray(LPITEMIDLIST *pidlArray) -{ - if (!pidlArray) - return; - - int iSize = _msize (pidlArray) / sizeof (LPITEMIDLIST); - - for (int i = 0; i < iSize; i++) - free (pidlArray[i]); - free (pidlArray); -} - - -LPITEMIDLIST CShellContextMenu::CopyPIDL (LPCITEMIDLIST pidl, int cb) -{ - if (cb == -1) - cb = GetPIDLSize (pidl); // Calculate size of list. - - LPITEMIDLIST pidlRet = (LPITEMIDLIST) calloc (cb + sizeof (USHORT), sizeof (BYTE)); - if (pidlRet) - CopyMemory(pidlRet, pidl, cb); - - return (pidlRet); -} - - -UINT CShellContextMenu::GetPIDLSize (LPCITEMIDLIST pidl) -{ - if (!pidl) - return 0; - int nSize = 0; - LPITEMIDLIST pidlTemp = (LPITEMIDLIST) pidl; - while (pidlTemp->mkid.cb) - { - nSize += pidlTemp->mkid.cb; - pidlTemp = (LPITEMIDLIST) (((LPBYTE) pidlTemp) + pidlTemp->mkid.cb); - } - return nSize; -} - -HMENU CShellContextMenu::GetMenu() -{ - if (!m_hMenu) - { - m_hMenu = CreatePopupMenu(); // create the popupmenu (its empty) - } - return (m_hMenu); -} - - -// this is workaround function for the Shell API Function SHBindToParent -// SHBindToParent is not available under Win95/98 -HRESULT CShellContextMenu::SHBindToParentEx (LPCITEMIDLIST pidl, REFIID riid, VOID **ppv, LPCITEMIDLIST *ppidlLast) -{ - HRESULT hr = 0; - if (!pidl || !ppv) - return E_POINTER; - - int nCount = GetPIDLCount (pidl); - if (nCount == 0) // desktop pidl of invalid pidl - return E_POINTER; - - IShellFolder * psfDesktop = NULL; - SHGetDesktopFolder (&psfDesktop); - if (nCount == 1) // desktop pidl - { - if ((hr = psfDesktop->QueryInterface(riid, ppv)) == S_OK) - { - if (ppidlLast) - *ppidlLast = CopyPIDL (pidl); - } - psfDesktop->Release (); - return hr; - } - - LPBYTE pRel = GetPIDLPos (pidl, nCount - 1); - LPITEMIDLIST pidlParent = NULL; - pidlParent = CopyPIDL (pidl, pRel - (LPBYTE) pidl); - IShellFolder * psfFolder = NULL; - - if ((hr = psfDesktop->BindToObject (pidlParent, NULL, IID_IShellFolder, (void **) &psfFolder)) != S_OK) - { - free (pidlParent); - psfDesktop->Release (); - return hr; - } - if ((hr = psfFolder->QueryInterface (riid, ppv)) == S_OK) - { - if (ppidlLast) - *ppidlLast = CopyPIDL ((LPCITEMIDLIST) pRel); - } - free (pidlParent); - psfFolder->Release (); - psfDesktop->Release (); - return hr; -} - - -LPBYTE CShellContextMenu::GetPIDLPos (LPCITEMIDLIST pidl, int nPos) -{ - if (!pidl) - return 0; - int nCount = 0; - - BYTE * pCur = (BYTE *) pidl; - while (((LPCITEMIDLIST) pCur)->mkid.cb) - { - if (nCount == nPos) - return pCur; - nCount++; - pCur += ((LPCITEMIDLIST) pCur)->mkid.cb; // + sizeof(pidl->mkid.cb); - } - if (nCount == nPos) - return pCur; - return NULL; -} - - -int CShellContextMenu::GetPIDLCount (LPCITEMIDLIST pidl) -{ - if (!pidl) - return 0; - - int nCount = 0; - BYTE* pCur = (BYTE *) pidl; - while (((LPCITEMIDLIST) pCur)->mkid.cb) - { - nCount++; - pCur += ((LPCITEMIDLIST) pCur)->mkid.cb; - } - return nCount; -} - -#endif - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kcolorbutton.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kcolorbutton.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kcolorbutton.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kconfig.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kconfig.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kconfig.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kmainwindow.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kmainwindow.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kmainwindow.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kstandarddirs.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kstandarddirs.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kstandarddirs.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kiconloader.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kiconloader.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kiconloader.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kmenu.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kmenu.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kmenu.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kstatusbar.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kstatusbar.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kstatusbar.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kprogressdialog.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kprogressdialog.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kprogressdialog.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kunload.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kunload.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kunload.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kaboutdata.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kaboutdata.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kaboutdata.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/ktoolbar.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/ktoolbar.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/ktoolbar.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/ktoggleaction.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/ktoggleaction.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/ktoggleaction.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kshortcutsdialog.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kshortcutsdialog.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kshortcutsdialog.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kaccel.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kaccel.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kaccel.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kmenubar.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kmenubar.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kmenubar.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kdialogbase.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kdialogbase.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kdialogbase.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kprinter.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kprinter.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kprinter.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kpagedialog.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kpagedialog.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kpagedialog.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kfiledialog.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kfiledialog.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kfiledialog.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kstandardaction.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kstandardaction.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kstandardaction.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kio/job.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kio/job.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kio/job.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kio/global.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kio/global.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kio/global.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kio/jobclasses.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kio/jobclasses.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kio/jobclasses.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kaction.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kaction.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kaction.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/README =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/README (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/README (nonexistent) @@ -1,30 +0,0 @@ -About the "kreplacements"-directory: -==================================== - -I want to be able to compile and use KDiff3 without KDE too. -Since KDiff3 is a KDE program, which uses many KDE-classes and -functions there must be some replacement. - -In many cases this is just the corresponding Qt-class, but often -I wrote something myself. For several very KDE-specific functions -there is no real replacement, but only stub functions that allow -the program to compile and link. - -This stuff is not intended to be used for anything else but KDiff3. -Think of it rather as a big hack, that only has the advantage -that I need not mess up the normal program with many ugly -#ifdef/#endif-clauses. - -Most include files in this directory only include kreplacements.h -where the actual declarations are. The implementions are in -kreplacements.cpp. - -The *.moc-files are dummies. The new KDE-philosophy seems to be -that *.moc-files are directly included into the sources. -The Qt-philosophy still is to generate moc*.cpp files which will -be compiled seperately. With these dummy-moc-files both versions -can be compiled. - - -Joachim -(2003-10-02) Index: trunk/extragear/utils/kdiff3/src/kreplacements/kprogress.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kprogress.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kprogress.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kreplacements.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kreplacements.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kreplacements.h (nonexistent) @@ -1,629 +0,0 @@ -/*************************************************************************** - kreplacements.h - description - ------------------- - begin : Sat Aug 3 2002 - copyright : (C) 2002-2006 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef KREPLACEMENTS_H -#define KREPLACEMENTS_H -#ifndef __OS2__ -#pragma once -#endif - -#include "common.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -//Added by qt3to4: -#include -#include -#include -#include - -class QTabWidget; -class QLabel; - -#include -#include - -QString getTranslationDir(const QString&); - -class KMainWindow; -class KAction; -class KIcon; - -typedef QString KGuiItem; - -inline QString i18n( const char* x ){ return QObject::tr(x); } - -template -inline QString i18n (const char *text, const A1 &a1) -{ return QObject::tr(text).arg(a1); } - -template -inline QString i18n (const char *text, const A1 &a1, const A2 &a2) -{ return QObject::tr(text).arg(a1).arg(a2); } - -template -inline QString i18n (const char *text, const A1 &a1, const A2 &a2, const A3 &a3) -{ return QObject::tr(text).arg(a1).arg(a2).arg(a3); } - -template -inline QString i18n (const char *text, const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4) -{ return QObject::tr(text).arg(a1).arg(a2).arg(a3).arg(a4); } - - -typedef QString KLocalizedString; -#define ki18n(x) QObject::tr(x) -#define I18N_NOOP(x) x -#define RESTORE(x) -#define _UNLOAD(x) - -class KUrl -{ -public: - KUrl(){} - KUrl(const QString& s){ m_s = s; } - static KUrl fromPathOrUrl( const QString& s ){ return KUrl(s); } - QString url() const { return m_s; } - bool isEmpty() const { return m_s.isEmpty(); } - QString prettyUrl() const { return m_s; } - bool isLocalFile() const { return true; } - bool isRelative() const { return true; } - bool isValid() const { return true; } - QString path() const { return m_s; } - void setPath( const QString& s ){ m_s=s; } - QString fileName() const { return m_s; } // not really needed - void addPath( const QString& s ){ m_s += "/" + s; } -private: - QString m_s; -}; - -typedef QString KGuiItem; - -class KStandardGuiItem -{ -public: - static QString cont() { return i18n("Continue"); } - static QString cancel() { return i18n("Cancel"); } - static QString quit() { return i18n("Quit"); } -}; - -class KMessageBox -{ -public: - static void error( QWidget* parent, const QString& text, const QString& caption=QString() ); - static int warningContinueCancel( QWidget* parent, const QString& text, const QString& caption=QString(), - const QString& button1=QString("Continue") ); - static void sorry( QWidget* parent, const QString& text, const QString& caption=QString() ); - static void information( QWidget* parent, const QString& text, const QString& caption=QString() ); - static int warningYesNo( QWidget* parent, const QString& text, const QString& caption, - const QString& button1, const QString& button2 ); - static int warningYesNoCancel( - QWidget* parent, const QString& text, const QString& caption, - const QString& button1, const QString& button2 ); - - enum {Cancel=-1, No=0, Yes=1, Continue=1}; -}; - - - -typedef QMenu KMenu; - -class KPageWidgetItem : public QObject -{ -public: - QWidget* m_pWidget; - QString m_title; - - KPageWidgetItem( QWidget* pPage, const QString& title ) - { - m_pWidget = pPage; - m_title = title; - } - void setHeader( const QString& ) {} - void setIcon( const KIcon& ) {} -}; - - -class KPageDialog : public QDialog -{ - Q_OBJECT - QTabWidget* m_pTabWidget; -public: - KPageDialog( QWidget* parent ); - ~KPageDialog(); - - void incrementInitialSize ( const QSize& ); - void setHelp(const QString& helpfilename, const QString& ); - enum {IconList, Help, Default, Apply, Ok, Cancel }; - - int BarIcon(const QString& iconName, int ); - - void addPage( KPageWidgetItem* ); - QFrame* addPage( const QString& name, const QString& info, int ); - int spacingHint(); - - enum FaceType { List }; - void setFaceType(FaceType){} - void setButtons(int){} - void setDefaultButton(int){} - void showButtonSeparator(bool){} -private slots: - void slotHelpClicked(); -signals: - void applyClicked(); - void okClicked(); - void helpClicked(); - void defaultClicked(); -}; - -class KFileDialog //: public QFileDialog -{ -public: - static KUrl getSaveUrl( const QString &startDir=QString::null, - const QString &filter=QString::null, - QWidget *parent=0, const QString &caption=QString::null); - static KUrl getOpenUrl( const QString & startDir = QString::null, - const QString & filter = QString::null, - QWidget * parent = 0, - const QString & caption = QString::null ); - static KUrl getExistingDirectoryUrl( const QString & startDir = QString::null, - QWidget * parent = 0, - const QString & caption = QString::null ); - static QString getSaveFileName (const QString &startDir=QString::null, - const QString &filter=QString::null, - QWidget *parent=0, - const QString &caption=QString::null); -}; - -typedef QStatusBar KStatusBar; - -class KToolBar : public QToolBar -{ -public: - KToolBar(QMainWindow* parent); - - enum BarPosition {Top, Bottom, Left, Right}; - BarPosition barPos(); - void setBarPos(BarPosition); -private: - QMainWindow* m_pMainWindow; -}; - -class KActionCollection -{ -public: - KMainWindow* m_pMainWindow; - KActionCollection( KMainWindow* p){ m_pMainWindow=p; } - void addAction(const QString& name, QAction* ); - KAction* addAction(const QString& name ); -}; - -typedef QKeySequence KShortcut; - -class KShortcutsEditor -{ -public: - enum { LetterShortcutsAllowed }; -}; - -class KShortcutsDialog -{ -public: - static void configure(KActionCollection*){} - static void configureKeys(KActionCollection*, const QString&){} - static void configure(KActionCollection*, int, QWidget*){} -}; - -namespace KParts -{ - class ReadWritePart; -} - -class KMainWindow : public QMainWindow -{ - Q_OBJECT -private: - KActionCollection m_actionCollection; -protected: - virtual bool queryClose() = 0; - virtual bool queryExit() = 0; -public: - QMenu* fileMenu; - QMenu* editMenu; - QMenu* directoryMenu; - QMenu* dirCurrentItemMenu; - QMenu* dirCurrentSyncItemMenu; - QMenu* movementMenu; - QMenu* mergeMenu; - QMenu* diffMenu; - QMenu* windowsMenu; - QMenu* settingsMenu; - QMenu* helpMenu; - - KToolBar* m_pToolBar; - - KMainWindow( QWidget* parent ); - KToolBar* toolBar(const QString& s = QString::null); - KActionCollection* actionCollection(); - void createGUI(); - void createGUI(KParts::ReadWritePart*){createGUI();} - - QList* memberList; -public slots: - void appHelpActivated(); - void slotAbout(); -}; - -class KConfigGroupData : public ValueMap, public QSharedData -{ -public: - QString m_fileName; - ~KConfigGroupData(); -}; - -class KConfigGroup -{ -private: - QExplicitlySharedDataPointer d; -public: - KConfigGroup(const KConfigGroup*, const QString& ){} - KConfigGroup(); - ~KConfigGroup(); - void readConfigFile(const QString& configFileName); - - void setGroup(const QString&); - KConfigGroup& group( const QString& groupName ); - - template void writeEntry(const QString& s, const T& v){ d->writeEntry(s,v); } - void writeEntry(const QString& s, const QStringList& v, char separator ){ d->writeEntry(s,v,separator); } - void writeEntry(const QString& s, const char* v){ d->writeEntry(s,v); } - - template T readEntry (const QString& s, const T& defaultVal ){ return d->readEntry(s,defaultVal); } - QString readEntry (const QString& s, const char* defaultVal ){ return d->readEntry(s,defaultVal); } - QStringList readEntry (const QString& s, const QStringList& defaultVal, char separator='|' ){ return d->readEntry(s,defaultVal,separator); } -}; - -typedef KConfigGroup* KSharedConfigPtr; - -class KAction : public QAction -{ - Q_OBJECT -public: - KAction( KActionCollection* actionCollection ); - KAction(const QString& text, KActionCollection* actionCollection ); - KAction(const QString& text, const QIcon& icon, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); - KAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); - void setStatusText(const QString&); - void plug(QMenu*); - void setIcon( const QIcon& icon ); -}; - -class KToggleAction : public KAction -{ -public: - KToggleAction(KActionCollection* actionCollection); - KToggleAction(const QString& text, const QIcon& icon, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu=true); - KToggleAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu=true); - KToggleAction(const QString& text, const QIcon& icon, int accel, KActionCollection* actionCollection, const char* name, bool bMenu=true); - void setChecked(bool); -}; - - -class KStandardAction -{ -public: - static KAction* open( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* save( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* saveAs( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* print( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* quit( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* cut( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* copy( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* paste( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* selectAll( QWidget* parent, const char* slot, KActionCollection* ); - static KToggleAction* showToolbar( QWidget* parent, const char* slot, KActionCollection* ); - static KToggleAction* showStatusbar( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* preferences( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* about( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* aboutQt( KActionCollection* ); - static KAction* help( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* find( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* findNext( QWidget* parent, const char* slot, KActionCollection* ); - static KAction* keyBindings( QWidget* parent, const char* slot, KActionCollection* ); -}; - -class KIcon -{ -public: - enum {SizeMedium,Small}; - KIcon( const QString& ) {} -}; - -class KFontChooser : public QWidget -{ - Q_OBJECT - QFont m_font; - QPushButton* m_pSelectFont; - QLabel* m_pLabel; - QWidget* m_pParent; -public: - KFontChooser( QWidget* pParent ); - QFont font(); - void setFont( const QFont&, bool ); -private slots: - void slotSelectFont(); -}; - -class KColorButton : public QPushButton -{ - Q_OBJECT - QColor m_color; -public: - KColorButton(QWidget* parent); - QColor color(); - void setColor(const QColor&); - virtual void paintEvent(QPaintEvent* e); -public slots: - void slotClicked(); -}; - -#ifndef QT_NO_PRINTER -class KPrinter : public QPrinter -{ -public: - KPrinter(); - enum e_PageSelection {ApplicationSide}; - QList pageList(); - void setCurrentPage(int); - void setPageSelection(e_PageSelection); -}; -#endif - -class KStandardDirs -{ -public: - QString findResource(const QString& resource, const QString& appName); -}; - -class KCmdLineOptions -{ -public: - KCmdLineOptions& add( const QString& name, const QString& description = 0 ); -}; - -#define KCmdLineLastOption {0,0,0} - -class KAboutData -{ -public: - enum LicenseKey { License_GPL, License_GPL_V2, License_Unknown }; - - //KAboutData( const QString& name, const QString& appName, const QString& version, - // const QString& description, int licence, - // const QString& copyright, int w, const QString& homepage, const QString& email); - - KAboutData (const QByteArray &appName, const QByteArray &catalogName, const KLocalizedString &programName, - const QByteArray &version, const KLocalizedString &shortDescription, LicenseKey licenseType, - const KLocalizedString ©rightStatement, const KLocalizedString &text, - const QByteArray &homePageAddress, const QByteArray &bugsEmailAddress); - KAboutData( const QString& name, const QString& appName, const QString& appName2, const QString& version ); - void addAuthor(const QString& name, const QString& task=0, const QString& email=0, const QString& weblink=0); - void addCredit(const QString& name, const QString& task=0, const QString& email=0, const QString& weblink=0); - - struct AboutDataEntry - { - AboutDataEntry(const QString& name, const QString& task, const QString& email, const QString& weblink) - : m_name(name), m_task(task), m_email(email), m_weblink(weblink) - {} - QString m_name; - QString m_task; - QString m_email; - QString m_weblink; - }; - - std::list m_authorList; - std::list m_creditList; -}; - -typedef QList QCStringList; - -class KCmdLineArgs -{ -public: - static KCmdLineArgs* parsedArgs(); - static void init( int argc, char**argv, KAboutData* ); - static void addCmdLineOptions( const KCmdLineOptions& options ); // Add our own options. - - int count(); - QString arg(int); - KUrl url(int i){ return KUrl(arg(i)); } - void clear(); - QString getOption(const QString&); - QStringList getOptionList( const QString& ); - bool isSet(const QString&); -}; - -class KIconLoader -{ -public: - enum { Small, NoGroup }; - QPixmap loadIcon(const QString& name, int, int =0); - static KIconLoader* global() { return 0; } -}; - -class KApplication : public QApplication -{ - KConfigGroup m_config; - KIconLoader m_iconLoader; -public: - KApplication(); - static KApplication* kApplication(); - KIconLoader* iconLoader(); - KConfigGroup* config(); - bool isRestored(); -}; - -extern KApplication* kapp; - -class KLibFactory : public QObject -{ - Q_OBJECT -public: - QObject* create(QObject*,const QString&,const QString&); -}; - -class KLibLoader -{ -public: - static KLibLoader* self(); - KLibFactory* factory(const QString&); -}; - -class KEditToolBar : public QDialog -{ -public: - KEditToolBar( int ){} -}; - -class KGlobal -{ -public: - static KConfigGroup* config() { return 0; } -}; - -class KJobUiDelegate -{ -public: - void showErrorMessage() {} -}; - -class KJob : public QObject -{ -public: - bool error() {return false;} - enum KillVerbosity { Quietly }; - bool kill( KillVerbosity ){return false;} - KJobUiDelegate* uiDelegate() {return 0;} -}; - -namespace KIO -{ - enum { Overwrite, DefaultFlags, Resume, HideProgressInfo, NoReload }; - enum UDSEntry {}; - typedef QList UDSEntryList; - class Job : public KJob - { - }; - class SimpleJob : public KJob {}; - SimpleJob* mkdir( KUrl ); - SimpleJob* rmdir( KUrl ); - SimpleJob* file_delete( KUrl, int ); - class FileCopyJob : public KJob {}; - FileCopyJob* file_move( KUrl, KUrl, int, int ); - FileCopyJob* file_copy( KUrl, KUrl, int, int ); - class CopyJob : public KJob {}; - CopyJob* link( KUrl, KUrl, bool ); - class ListJob : public KJob {}; - ListJob* listRecursive( KUrl, bool, bool ); - ListJob* listDir( KUrl, bool, bool ); - class StatJob : public KJob { - public: - enum {SourceSide,DestinationSide}; - UDSEntry statResult(){ return (UDSEntry)0; } - }; - StatJob* stat( KUrl, bool, int, int ); - class TransferJob : public KJob {}; - TransferJob* get( KUrl, int ); - TransferJob* put( KUrl, int, int ); -}; - -typedef QProgressBar KProgress; - -class KInstance : public QObject -{ -public: - KInstance(KAboutData*){} -}; - -class KComponentData : public QObject -{ -public: - KComponentData(KAboutData*){} - KConfigGroup* config() {return 0;} -}; - -namespace KParts -{ - class MainWindow : public KMainWindow - { - public: - MainWindow( QWidget* parent=0 ) : KMainWindow(parent) {} - void setXMLFile(const QString&){} - void setAutoSaveSettings(){} - void saveMainWindowSettings(KConfigGroup&){} - void applyMainWindowSettings(KConfigGroup&){} - int factory(){return 0;} - }; - - class Part : public QObject - { - public: - KActionCollection* actionCollection(); - KApplication* instance(); - void setWidget( QWidget* w ){ m_pWidget=w; } - QWidget* widget(){return m_pWidget;} - void setXMLFile(const QString&){} - private: - QWidget* m_pWidget; - }; - - class ReadOnlyPart : public Part - { - public: - ReadOnlyPart(){} - ReadOnlyPart(QObject*,const QString&){} - QString localFilePath() {return QString(); } - void setComponentData(const KComponentData&){} // actually member of PartBase - KComponentData& componentData() { return *(KComponentData*)0;} - QString m_file; - }; - - class ReadWritePart : public ReadOnlyPart - { - public: - ReadWritePart(QObject*){} - void setReadWrite(bool){} - }; - - class Factory : public KLibFactory - { - Q_OBJECT - public: - virtual KParts::Part* createPartObject( QWidget* /*parentWidget*/, const char * /*widgetName*/, - QObject* /*parent*/, const char * /*name*/, - const char* /*classname*/, const QStringList& /*args*/ ){return 0;} - }; -}; -#endif - - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kinstance.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kinstance.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kinstance.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/konq_popupmenu.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/konq_popupmenu.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/konq_popupmenu.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kmessagebox.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kmessagebox.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kmessagebox.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kcmdlineargs.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kcmdlineargs.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kcmdlineargs.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/ktemporaryfile.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/ktemporaryfile.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/ktemporaryfile.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kfontdialog.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kfontdialog.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kfontdialog.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/ShellContextMenu.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/ShellContextMenu.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/ShellContextMenu.h (nonexistent) @@ -1,60 +0,0 @@ -/*************************************************************************** - ShellContextMenu.h - description - ------------------- - begin : Sat Mar 4 2006 - copyright : (C) 2005-2007 by Joachim Eibl - email : joachim dot eibl at gmx dot de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -// ShellContextMenu.h: Schnittstelle fr die Klasse CShellContextMenu. -// -////////////////////////////////////////////////////////////////////// - -#ifndef SHELLCONTEXTMENU_H -#define SHELLCONTEXTMENU_H - -///////////////////////////////////////////////////////////////////// -// class to show shell contextmenu of files/folders/shell objects -// developed by R. Engels 2003 -///////////////////////////////////////////////////////////////////// - -class CShellContextMenu -{ -public: - HMENU GetMenu (); - void SetObjects (IShellFolder * psfFolder, LPITEMIDLIST pidlItem); - void SetObjects (IShellFolder * psfFolder, LPITEMIDLIST * pidlArray, int nItemCount); - void SetObjects (LPITEMIDLIST pidl); - void SetObjects (const QString& strObject); - void SetObjects (const QStringList& strList); - UINT ShowContextMenu (QWidget* pParent, QPoint pt, QMenu* pMenu); - CShellContextMenu(); - virtual ~CShellContextMenu(); - -private: - int nItems; - BOOL bDelete; - HMENU m_hMenu; - IShellFolder * m_psfFolder; - LPITEMIDLIST * m_pidlArray; - - void InvokeCommand (LPCONTEXTMENU pContextMenu, UINT idCommand); - BOOL GetContextMenu (void ** ppContextMenu, int & iMenuType); - HRESULT SHBindToParentEx (LPCITEMIDLIST pidl, REFIID riid, VOID **ppv, LPCITEMIDLIST *ppidlLast); - static LRESULT CALLBACK HookWndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); - void FreePIDLArray (LPITEMIDLIST * pidlArray); - LPITEMIDLIST CopyPIDL (LPCITEMIDLIST pidl, int cb = -1); - UINT GetPIDLSize (LPCITEMIDLIST pidl); - LPBYTE GetPIDLPos (LPCITEMIDLIST pidl, int nPos); - int GetPIDLCount (LPCITEMIDLIST pidl); -}; - -#endif Index: trunk/extragear/utils/kdiff3/src/kreplacements/kreplacements.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kreplacements.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kreplacements.cpp (nonexistent) @@ -1,1224 +0,0 @@ -/*************************************************************************** - kreplacements.cpp - description - ------------------- - begin : Sat Aug 3 2002 - copyright : (C) 2002-2006 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - - -#include "kreplacements.h" -#include "common.h" - -#include - -#include //namespace -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - - -static QString s_copyright; -static QString s_email; -static QString s_description; -static QString s_appName; -static QString s_version; -static QString s_homepage; -static KAboutData* s_pAboutData; - - -#ifdef _WIN32 -#include -#include -#endif - -static void showHelp() -{ - #if defined(_WIN32) || defined(Q_OS_OS2) - QString exePath = QCoreApplication::applicationDirPath(); - - QFileInfo helpFile( exePath + "\\doc\\en\\index.html" ); - if ( ! helpFile.exists() ) { helpFile.setFile( exePath + "\\..\\doc\\en\\index.html" ); } - if ( ! helpFile.exists() ) { helpFile.setFile( exePath + "\\doc\\index.html" ); } - if ( ! helpFile.exists() ) { helpFile.setFile( exePath + "\\..\\doc\\index.html" ); } - if ( ! helpFile.exists() ) - { - QMessageBox::warning( 0, "KDiff3 documentation not found", - "Couldn't find the documentation. \n\n" - "The documentation can also be found at the homepage:\n\n " - " http://kdiff3.sourceforge.net/"); - return; - } - -#ifndef Q_OS_OS2 - char buf[256]; - HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf ); - if ( (quintptr)hi<=32 ) - { -#endif - static QTextBrowser* pBrowser = 0; - if (pBrowser==0) - { - pBrowser = new QTextBrowser( 0 ); - pBrowser->setMinimumSize( 600, 400 ); - } - pBrowser->setSource(QUrl("file:///"+helpFile.filePath())); - pBrowser->show(); -#ifndef Q_OS_OS2 - } - else - { - QFileInfo prog( buf ); - QProcess::startDetached ( prog.filePath(), QStringList( "file:///"+helpFile.absoluteFilePath() ) ); - } -#endif - #else - static QTextBrowser* pBrowser = 0; - if (pBrowser==0) - { - pBrowser = new QTextBrowser( 0 ); - pBrowser->setMinimumSize( 600, 400 ); - } - pBrowser->setSource(QUrl("file://usr/local/share/doc/kdiff3/en/index.html")); - pBrowser->show(); - #endif -} - -QString getTranslationDir(const QString& locale) -{ - #if defined(_WIN32) || defined(Q_OS_OS2) - QString exePath; - exePath = QCoreApplication::applicationDirPath(); - return exePath+"/translations"; - #else - return (QString)"/usr/share/locale/" + locale + "/LC_MESSAGES"; - #endif -} - -// static -void KMessageBox::error( QWidget* parent, const QString& text, const QString& caption ) -{ - QMessageBox::critical( parent, caption, text ); -} - -int KMessageBox::warningContinueCancel( QWidget* parent, const QString& text, const QString& caption, - const QString& button1 ) -{ - return 0 == QMessageBox::warning( parent, caption, text, button1, "Cancel" ) ? Continue : Cancel; -} - -void KMessageBox::sorry( QWidget* parent, const QString& text, const QString& caption ) -{ - QMessageBox::information( parent, caption, text ); -} - -void KMessageBox::information( QWidget* parent, const QString& text, const QString& caption ) -{ - QMessageBox::information( parent, caption, text ); -} - -int KMessageBox::warningYesNo( QWidget* parent, const QString& text, const QString& caption, - const QString& button1, const QString& button2 ) -{ - return 0 == QMessageBox::warning( parent, caption, text, button1, button2, QString::null, 1, 1 ) ? Yes : No; -} - -int KMessageBox::warningYesNoCancel( QWidget* parent, const QString& text, const QString& caption, - const QString& button1, const QString& button2 ) -{ - int val = QMessageBox::warning( parent, caption, text, - button1, button2, i18n("Cancel") ); - if ( val==0 ) return Yes; - if ( val==1 ) return No; - else return Cancel; -} - - -KPageDialog::KPageDialog( QWidget* parent ) -: QDialog( parent ) -{ - setModal(true); - QVBoxLayout *pMainLayout = new QVBoxLayout(this); - m_pTabWidget = new QTabWidget(); - pMainLayout->addWidget(m_pTabWidget,1); - - QHBoxLayout* pButtonLayout = new QHBoxLayout(); - pMainLayout->addLayout( pButtonLayout ); - - pButtonLayout->addStretch(1); - QPushButton* pOk = new QPushButton( i18n("OK") ); - connect( pOk, SIGNAL( clicked() ), this, SIGNAL(okClicked()) ); - pButtonLayout->addWidget( pOk ); - - QPushButton* pHelp = new QPushButton( i18n("Help") ); - connect( pHelp, SIGNAL( clicked() ), this, SLOT(slotHelpClicked())); - pButtonLayout->addWidget( pHelp ); - - QPushButton* pDefaults = new QPushButton( i18n("Defaults") ); - connect( pDefaults, SIGNAL( clicked() ), this, SIGNAL(defaultClicked()) ); - pButtonLayout->addWidget( pDefaults ); - - QPushButton* pCancel = new QPushButton( i18n("Cancel") ); - connect( pCancel, SIGNAL( clicked() ), this, SLOT(reject())); - pButtonLayout->addWidget( pCancel ); -} - -KPageDialog::~KPageDialog() -{ -} - -void KPageDialog::incrementInitialSize ( const QSize& ) -{ -} - -void KPageDialog::setHelp(const QString&, const QString& ) -{ -} - -void KPageDialog::slotHelpClicked() -{ - showHelp(); -} - -int KPageDialog::BarIcon(const QString& /*iconName*/, int ) -{ - return 0; // Not used for replacement. -} - - -QFrame* KPageDialog::addPage( const QString& name, const QString& /*info*/, int ) -{ - QFrame* p = new QFrame(); - p->setObjectName( name ); - m_pTabWidget->addTab( p, name ); - return p; -} - -void KPageDialog::addPage( KPageWidgetItem * p ) -{ - m_pTabWidget->addTab( p->m_pWidget, p->m_title ); -} - -int KPageDialog::spacingHint() -{ - return 3; -} - -KUrl KFileDialog::getSaveUrl( const QString &startDir, - const QString &filter, - QWidget *parent, const QString &caption) -{ - QString s = QFileDialog::getSaveFileName(parent, caption, startDir, filter, 0/*, QFileDialog::DontUseNativeDialog*/); - return KUrl(s); -} - -KUrl KFileDialog::getOpenUrl( const QString & startDir, - const QString & filter, - QWidget * parent, - const QString & caption ) -{ - QString s = QFileDialog::getOpenFileName(parent, caption, startDir, filter ); - return KUrl(s); -} - -KUrl KFileDialog::getExistingDirectoryUrl( const QString & startDir, - QWidget * parent, - const QString & caption) -{ - QString s = QFileDialog::getExistingDirectory(parent, caption, startDir); - return KUrl(s); -} - -QString KFileDialog::getSaveFileName (const QString &startDir, - const QString &filter, - QWidget *parent, - const QString &caption) -{ - return QFileDialog::getSaveFileName( parent, caption, startDir, filter ); -} - - -KToolBar::BarPosition KToolBar::barPos() -{ - if ( m_pMainWindow->toolBarArea(this)==Qt::LeftToolBarArea ) return Left; - if ( m_pMainWindow->toolBarArea(this)==Qt::RightToolBarArea ) return Right; - if ( m_pMainWindow->toolBarArea(this)==Qt::BottomToolBarArea ) return Bottom; - if ( m_pMainWindow->toolBarArea(this)==Qt::TopToolBarArea ) return Top; - return Top; -} - -void KToolBar::setBarPos(BarPosition bp) -{ - if ( bp == Left ) m_pMainWindow->addToolBar ( Qt::LeftToolBarArea, this ); - else if ( bp == Right ) m_pMainWindow->addToolBar ( Qt::RightToolBarArea, this ); - else if ( bp == Bottom ) m_pMainWindow->addToolBar ( Qt::BottomToolBarArea, this ); - else if ( bp == Top ) m_pMainWindow->addToolBar ( Qt::TopToolBarArea, this ); -} - -KToolBar::KToolBar( QMainWindow* parent ) -: QToolBar( parent ) -{ - m_pMainWindow = parent; -} - - -KMainWindow::KMainWindow( QWidget* parent ) -: QMainWindow( parent ), m_actionCollection(this) -{ - fileMenu = menuBar()->addMenu( i18n("&File") ); - editMenu = menuBar()->addMenu(i18n("&Edit") ); - directoryMenu = menuBar()->addMenu(i18n("&Directory") ); - dirCurrentItemMenu = 0; - dirCurrentSyncItemMenu = 0; - movementMenu = menuBar()->addMenu(i18n("&Movement") ); - diffMenu = menuBar()->addMenu(i18n("D&iffview") ); - mergeMenu = menuBar()->addMenu(i18n("&Merge") ); - windowsMenu = menuBar()->addMenu(i18n("&Window") ); - settingsMenu = menuBar()->addMenu(i18n("&Settings") ); - helpMenu = menuBar()->addMenu(i18n("&Help") ); - - m_pToolBar = new KToolBar(this); - addToolBar( m_pToolBar ); - - memberList = new QList; - memberList->append(this); -} - -KToolBar* KMainWindow::toolBar(const QString&) -{ - return m_pToolBar; -} - -KActionCollection* KMainWindow::actionCollection() -{ - return &m_actionCollection; -} - -void KMainWindow::createGUI() -{ - KStandardAction::help(this, SLOT(appHelpActivated()), actionCollection()); - KStandardAction::about(this, SLOT(slotAbout()), actionCollection()); - KStandardAction::aboutQt(actionCollection()); -} - -void KMainWindow::slotAbout() -{ - QDialog d; - QVBoxLayout* l = new QVBoxLayout( &d ); - QTabWidget* pTabWidget = new QTabWidget; - l->addWidget( pTabWidget ); - - QPushButton* pOkButton = new QPushButton(i18n("OK")); - connect( pOkButton, SIGNAL(clicked()), &d, SLOT(accept())); - l->addWidget( pOkButton ); - - d.setWindowTitle("About " + s_appName); - QTextBrowser* tb1 = new QTextBrowser(); - tb1->setWordWrapMode( QTextOption::NoWrap ); - tb1->setText( - s_appName + " Version " + s_version + - "\n\n" + s_description + - "\n\n" + s_copyright + - "\n\nHomepage: " + s_homepage + - "\n\nLicence: GNU GPL Version 2" - ); - pTabWidget->addTab(tb1,i18n("&About")); - - std::list::iterator i; - - QString s2; - for( i=s_pAboutData->m_authorList.begin(); i!=s_pAboutData->m_authorList.end(); ++i ) - { - if ( !i->m_name.isEmpty() ) s2 += i->m_name + "\n"; - if ( !i->m_task.isEmpty() ) s2 += " " + i->m_task + "\n"; - if ( !i->m_email.isEmpty() ) s2 += " " + i->m_email + "\n"; - if ( !i->m_weblink.isEmpty() ) s2 += " " + i->m_weblink + "\n"; - s2 += "\n"; - } - QTextBrowser* tb2 = new QTextBrowser(); - tb2->setWordWrapMode( QTextOption::NoWrap ); - tb2->setText(s2); - pTabWidget->addTab(tb2,i18n("A&uthor")); - - QString s3; - for( i=s_pAboutData->m_creditList.begin(); i!=s_pAboutData->m_creditList.end(); ++i ) - { - if ( !i->m_name.isEmpty() ) s3 += i->m_name + "\n"; - if ( !i->m_task.isEmpty() ) s3 += " " + i->m_task + "\n"; - if ( !i->m_email.isEmpty() ) s3 += " " + i->m_email + "\n"; - if ( !i->m_weblink.isEmpty() ) s3 += " " + i->m_weblink + "\n"; - s3 += "\n"; - } - QTextBrowser* tb3 = new QTextBrowser(); - tb3->setWordWrapMode( QTextOption::NoWrap ); - tb3->setText(s3); - pTabWidget->addTab(tb3,i18n("&Thanks To")); - - d.resize(400,300); - d.exec(); -/* - QMessageBox::information( - this, - "About " + s_appName, - s_appName + " Version " + s_version + - "\n\n" + s_description + - "\n\n" + s_copyright + - "\n\nHomepage: " + s_homepage + - "\n\nLicence: GNU GPL Version 2" - ); -*/ -} - -void KMainWindow::appHelpActivated() -{ - showHelp(); -} - - -QString KStandardDirs::findResource(const QString& resource, const QString& /*appName*/) -{ - if (resource=="config") - { - QString home = QDir::homePath(); - return home + "/.kdiff3rc"; - } - return QString(); -} - -KConfigGroupData::~KConfigGroupData() -{ - QFile f(m_fileName); - if ( f.open( QIODevice::WriteOnly | QIODevice::Text ) ) - { // file opened successfully - QTextStream t( &f ); // use a text stream - save(t); - f.close(); - } -} - -KConfigGroup::KConfigGroup() -{ - d = new KConfigGroupData; -} - -void KConfigGroup::readConfigFile( const QString& configFileName ) -{ - if ( !configFileName.isEmpty() ) - { - d->m_fileName = configFileName; - } - else - { - d->m_fileName = KStandardDirs().findResource("config","kdiff3rc"); - } - - QFile f( d->m_fileName ); - if ( f.open(QIODevice::ReadOnly) ) - { // file opened successfully - QTextStream t( &f ); // use a text stream - d->load(t); - f.close(); - } -} - -KConfigGroup::~KConfigGroup() -{ -} - -void KConfigGroup::setGroup(const QString&) -{ -} - -KConfigGroup& KConfigGroup::group( const QString& ) -{ - KApplication* pKApp = static_cast(QApplication::instance()); - return *pKApp->config(); -} - -static void initAction( QAction* pAction, QObject* receiver, const char* slot, KActionCollection* actionCollection, - const QString& name, bool bToggle, bool bMenu) -{ - QString n(name); - KMainWindow* p = actionCollection->m_pMainWindow; - if( slot!=0 ) - { - if (!bToggle) - QObject::connect(pAction, SIGNAL(triggered()), receiver, slot); - else - { - QObject::connect(pAction, SIGNAL(toggled(bool)), receiver, slot); - } - } - - if (bMenu) - { - if( n[0]=='g') p->movementMenu->addAction( pAction ); - else if( n.left(16)=="dir_current_sync") - { - if ( p->dirCurrentItemMenu==0 ) - { - p->dirCurrentItemMenu = p->directoryMenu->addMenu( i18n("Current Item Merge Operation") ); - p->dirCurrentSyncItemMenu = p->directoryMenu->addMenu( i18n("Current Item Sync Operation") ); - } - p->dirCurrentItemMenu->addAction( pAction ); - } - else if( n.left(11)=="dir_current") - { - if ( p->dirCurrentItemMenu==0 ) - { - p->dirCurrentItemMenu = p->directoryMenu->addMenu( i18n("Current Item Merge Operation") ); - p->dirCurrentSyncItemMenu = p->directoryMenu->addMenu( i18n("Current Item Sync Operation") ); - } - p->dirCurrentSyncItemMenu->addAction( pAction ); - } - else if( n.left(4)=="diff") p->diffMenu->addAction( pAction ); - else if( name[0]=='d') p->directoryMenu->addAction( pAction ); - else if( name[0]=='f') p->fileMenu->addAction( pAction ); - else if( name[0]=='w') p->windowsMenu->addAction( pAction ); - else p->mergeMenu->addAction( pAction ); - } -} - -KAction::KAction(const QString& name, KActionCollection* actionCollection ) -: QAction ( actionCollection->m_pMainWindow ) -{ - initAction( this, 0,0, actionCollection, name, false, true ); -} - -KAction::KAction( KActionCollection* actionCollection ) -: QAction ( actionCollection->m_pMainWindow ) -{ -} - -KAction::KAction(const QString& text, const QIcon& icon, int accel, - QObject* receiver, const char* slot, KActionCollection* actionCollection, - const char* name, bool bToggle, bool bMenu - ) -: QAction ( icon, text, actionCollection->m_pMainWindow ) -{ - setObjectName(name); - setShortcut( accel ); - setCheckable( bToggle ); - KMainWindow* p = actionCollection->m_pMainWindow; - if ( !icon.isNull() && p ) p->m_pToolBar->addAction( this ); - - initAction(this, receiver,slot,actionCollection,name,bToggle,bMenu); -} - -KAction::KAction(const QString& text, int accel, - QObject* receiver, const char* slot, KActionCollection* actionCollection, - const char* name, bool bToggle, bool bMenu - ) -: QAction ( text, actionCollection->m_pMainWindow ) -{ - setObjectName(name); - setShortcut( accel ); - setCheckable( bToggle ); - initAction(this,receiver,slot,actionCollection,name,bToggle,bMenu); -} - -void KAction::setStatusText(const QString&) -{ -} - -void KAction::plug(QMenu* menu) -{ - menu->addAction( this ); -} - -void KAction::setIcon( const QIcon& icon ) -{ - QAction::setIcon(icon); - if ( !icon.isNull() ) - { - KMainWindow* pMW = static_cast( parent() ); - pMW->toolBar()->addAction(this); - } -} - - -KToggleAction::KToggleAction( KActionCollection* actionCollection ) -: KAction( actionCollection ) -{ - setCheckable(true); -} - -KToggleAction::KToggleAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu) -: KAction( text, accel, receiver, slot, actionCollection, name, true, bMenu) -{ -} - -KToggleAction::KToggleAction(const QString& text, const QIcon& icon, int accel, KActionCollection* actionCollection, const char* name, bool bMenu) -: KAction( text, icon, accel, 0, 0, actionCollection, name, true, bMenu) -{ -} - -void KToggleAction::setChecked(bool bChecked) -{ - blockSignals( true ); - QAction::setChecked( bChecked ); - blockSignals( false ); -} - - -//static -KAction* KStandardAction::open( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - #include "../xpm/fileopen.xpm" - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Open"), QIcon(QPixmap(fileopen)), Qt::CTRL+Qt::Key_O, parent, slot, actionCollection, "open", false, false); - if(p){ p->fileMenu->addAction( a ); } - return a; -} - -KAction* KStandardAction::save( QWidget* parent, const char* slot, KActionCollection* actionCollection ) -{ - #include "../xpm/filesave.xpm" - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Save"), QIcon(QPixmap(filesave)), Qt::CTRL+Qt::Key_S, parent, slot, actionCollection, "save", false, false); - if(p){ p->fileMenu->addAction( a ); } - return a; -} - -KAction* KStandardAction::saveAs( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false); - if(p) p->fileMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::print( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - #include "../xpm/fileprint.xpm" - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Print..."), QIcon(QPixmap(fileprint)),Qt::CTRL+Qt::Key_P, parent, slot, actionCollection, "print", false, false); - if(p) p->fileMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::quit( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Quit"), Qt::CTRL+Qt::Key_Q, parent, slot, actionCollection, "quit", false, false); - if(p) p->fileMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::cut( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Cut"), Qt::CTRL+Qt::Key_X, parent, slot, actionCollection, "cut", false, false ); - if(p) p->editMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::copy( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Copy"), Qt::CTRL+Qt::Key_C, parent, slot, actionCollection, "copy", false, false ); - if(p) p->editMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::paste( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Paste"), Qt::CTRL+Qt::Key_V, parent, slot, actionCollection, "paste", false, false ); - if(p) p->editMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::selectAll( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Select All"), Qt::CTRL+Qt::Key_A, parent, slot, actionCollection, "selectall", false, false ); - if(p) p->editMenu->addAction( a ); - return a; -} - -KToggleAction* KStandardAction::showToolbar( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KToggleAction* a = new KToggleAction( i18n("Show Toolbar"), 0, parent, slot, actionCollection, "showtoolbar", false ); - if(p) p->settingsMenu->addAction( a ); - return a; -} - -KToggleAction* KStandardAction::showStatusbar( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KToggleAction* a = new KToggleAction( i18n("Show &Status Bar"), 0, parent, slot, actionCollection, "showstatusbar", false ); - if(p) p->settingsMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::preferences( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("&Configure %1...",QString("KDiff3")), 0, parent, slot, actionCollection, "settings", false, false ); - if(p) p->settingsMenu->addAction( a ); - return a; -} -KAction* KStandardAction::keyBindings( QWidget*, const char*, KActionCollection*) -{ - return 0; -} - -KAction* KStandardAction::about( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("About")+" KDiff3", 0, parent, slot, actionCollection, "about_kdiff3", false, false ); - if(p) p->helpMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::aboutQt( KActionCollection* actionCollection ) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("About")+" Qt", 0, qApp, SLOT(aboutQt()), actionCollection, "about_qt", false, false ); - if(p) p->helpMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::help( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Help"), Qt::Key_F1, parent, slot, actionCollection, "help-contents", false, false ); - if(p) p->helpMenu->addAction( a ); - return a; -} -KAction* KStandardAction::find( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Find"), Qt::CTRL+Qt::Key_F, parent, slot, actionCollection, "edit-find", false, false ); - if(p) p->editMenu->addAction( a ); - return a; -} - -KAction* KStandardAction::findNext( QWidget* parent, const char* slot, KActionCollection* actionCollection) -{ - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Find Next"), Qt::Key_F3, parent, slot, actionCollection, "findNext", false, false ); - if(p) p->editMenu->addAction( a ); - return a; -} - -KAction* KActionCollection::addAction(const QString& name ) -{ - return new KAction( name, this ); -} - -void KActionCollection::addAction( const QString& name, QAction* pAction ) -{ - initAction( pAction, 0,0,this,name,false,true); -} - -KFontChooser::KFontChooser( QWidget* pParent ) -: QWidget(pParent) -{ - m_pParent = pParent; - QVBoxLayout* pLayout = new QVBoxLayout( this ); - m_pSelectFont = new QPushButton(i18n("Select Font"), this ); - connect(m_pSelectFont, SIGNAL(clicked()), this, SLOT(slotSelectFont())); - pLayout->addWidget(m_pSelectFont); - - m_pLabel = new QLabel( "", this ); - m_pLabel->setFont( m_font ); - m_pLabel->setMinimumWidth(200); - m_pLabel->setText( "The quick brown fox jumps over the river\n" - "but the little red hen escapes with a shiver.\n" - ":-)"); - pLayout->addWidget(m_pLabel); -} - -QFont KFontChooser::font() -{ - return m_font;//QFont("courier",10); -} - -void KFontChooser::setFont( const QFont& font, bool ) -{ - m_font = font; - m_pLabel->setFont( m_font ); - //update(); -} - -void KFontChooser::slotSelectFont() -{ - for(;;) - { - bool bOk; - m_font = QFontDialog::getFont(&bOk, m_font ); - m_pLabel->setFont( m_font ); - QFontMetrics fm(m_font); - - // Variable width font. - if ( fm.width('W')!=fm.width('i') ) - { - int result = KMessageBox::warningYesNo(m_pParent, i18n( - "You selected a variable width font.\n\n" - "Because this program doesn't handle variable width fonts\n" - "correctly, you might experience problems while editing.\n\n" - "Do you want to continue or do you want to select another font."), - i18n("Incompatible font."), - i18n("Continue at my own risk"), i18n("Select another font")); - if (result==KMessageBox::Yes) - return; - } - else - return; - } -} - - -KColorButton::KColorButton(QWidget* parent) -: QPushButton(parent) -{ - connect( this, SIGNAL(clicked()), this, SLOT(slotClicked())); -} - -QColor KColorButton::color() -{ - return m_color; -} - -void KColorButton::setColor( const QColor& color ) -{ - m_color = color; - update(); -} - -void KColorButton::paintEvent( QPaintEvent* e ) -{ - QPushButton::paintEvent(e); - QPainter p(this); - - int w = width(); - int h = height(); - p.fillRect( 10, 5, w-20, h-10, m_color ); - p.drawRect( 10, 5, w-20, h-10 ); -} - -void KColorButton::slotClicked() -{ - // Under Windows ChooseColor() should be used. (Nicer if few colors exist.) - QColor c = QColorDialog::getColor ( m_color, this ); - if ( c.isValid() ) m_color = c; - update(); -} - -#ifndef QT_NO_PRINTER -KPrinter::KPrinter() -{ -} -QList KPrinter::pageList() -{ - QList vl; - int to = toPage(); - for(int i=fromPage(); i<=to; ++i) - { - vl.push_back(i); - } - return vl; -} -void KPrinter::setCurrentPage(int) -{ -} -void KPrinter::setPageSelection(e_PageSelection) -{ -} -#endif - -QPixmap KIconLoader::loadIcon( const QString&, int, int ) -{ - return QPixmap(); -} - -KAboutData::KAboutData(const QByteArray &appName, const QByteArray & /*catalogName*/, const KLocalizedString & /*programName*/, - const QByteArray &version, const KLocalizedString &shortDescription, LicenseKey /*licenseType*/, - const KLocalizedString ©rightStatement, const KLocalizedString & /*text*/, - const QByteArray &homePageAddress, const QByteArray &bugsEmailAddress) -{ - s_copyright = copyrightStatement; - s_email = bugsEmailAddress; - s_appName = appName; - s_description = shortDescription; - s_version = version; - s_homepage = homePageAddress; -} - -KAboutData::KAboutData( const QString& /*name*/, const QString& /*appName*/, const QString& /*appName2*/, const QString& /*version*/ ) -{ -} - -void KAboutData::addAuthor(const QString& name, const QString& task, const QString& email, const QString& weblink) -{ - m_authorList.push_back( AboutDataEntry( name, task, email, weblink) ); -} - -void KAboutData::addCredit(const QString& name, const QString& task, const QString& email, const QString& weblink) -{ - m_creditList.push_back( AboutDataEntry( name, task, email, weblink) ); -} - -/* Option structure: e.g.: - { "m", 0, 0 }, - { "merge", I18N_NOOP("Automatically merge the input."), 0 }, - { "o", 0, 0 }, - { "output file", I18N_NOOP("Output file. Implies -m. E.g.: -o newfile.txt"), 0 }, - { "+[File1]", I18N_NOOP("file1 to open (base)"), 0 }, - { "+[File2]", I18N_NOOP("file2 to open"), 0 }, - { "+[File3]", I18N_NOOP("file3 to open"), 0 }, -*/ -//////////////// -static KCmdLineArgs s_cmdLineArgs; -static int s_argc; -static char** s_argv; - -struct KCmdLineOptionsItem -{ - QString name; - QString description; - int def; -}; -static QList s_options; - -static std::vector s_vOption; -static std::vector s_vArg; - -KCmdLineOptions& KCmdLineOptions::add( const QString& name, const QString& description ) -{ - KCmdLineOptionsItem i; - i.name = name; - i.description = description; - i.def = 0; - s_options.push_back(i); - return *this; -} - -KCmdLineArgs* KCmdLineArgs::parsedArgs() // static -{ - return &s_cmdLineArgs; -} - -void KCmdLineArgs::init( int argc, char**argv, KAboutData* pAboutData ) // static -{ - s_argc = argc; - s_argv = argv; - s_pAboutData = pAboutData; -} - -void KCmdLineArgs::addCmdLineOptions( const KCmdLineOptions& /*options*/ ) // static -{ - //s_pOptions = &options; -} - -int KCmdLineArgs::count() -{ - return s_vArg.size(); -} - -QString KCmdLineArgs::arg(int idx) -{ - return s_vArg[idx]; -} - -void KCmdLineArgs::clear() -{ -} - -QString KCmdLineArgs::getOption( const QString& s ) -{ - // Find the option - int j=0; - for( j=0; j<(int)s_vOption.size(); ++j ) - { - QString optName = s_options[j].name; - int pos = optName.indexOf( ' ' ); - int len = pos==-1 ? optName.length() : pos; - - if( s == optName.left( len ) ) - { - return s_vOption[j].isEmpty() ? QString() : s_vOption[j].last(); - } - } - assert(false); - return QString(); -} - -QStringList KCmdLineArgs::getOptionList( const QString& s ) -{ - // Find the option - int j=0; - for( j=0; j<(int)s_vOption.size(); ++j ) - { - QString optName = s_options[j].name; - int pos = optName.indexOf( ' ' ); - int len = pos==-1 ? optName.length() : pos; - - if( s == optName.left( len ) ) - { - return s_vOption[j]; - } - } - - assert(false); - return QStringList(); -} - -bool KCmdLineArgs::isSet(const QString& s) -{ - // Find the option - int j=0; - for( j=0; j<(int)s_vOption.size(); ++j ) - { - QString optName = s_options[j].name; - if( s == optName ) - { - return ! s_vOption[j].isEmpty(); - } - } - assert(false); - return false; -} - - -/////////////////// -KApplication* kapp; - -KApplication::KApplication() -: QApplication( s_argc,s_argv ) -{ - kapp = this; - - //setStyle( new QWindowsStyle ); // doesn't show checkmarks on checkable icons in menu - - int nofOptions=0; - int nofArgs=0; - int i=0; - while( i < s_options.size() ) - { - if ( s_options[i].name[0]=='[' ) - nofArgs++; - else - nofOptions++; - - ++i; - } - - QStringList args = QCoreApplication::arguments(); - // First find the option "-config" or "--config" to allow loading of options - QString configFileName; - for( i=1; i0 && ( (arg[1]=='-' && len2-2==len && optName.left(len) == arg.mid(2,len)) || - (len2-1==len && optName.left(len) == arg.mid(1,len)) )) - { - if (s_options[j].description == 0) // alias, because without description. - { - ++j; - optName = s_options[j].name; - pos = optName.indexOf( ' ' ); - } - if (pos!=-1){ ++i; s_vOption[j].append( args[i] ); } //use param - else { s_vOption[j].append("1"); } //set state - break; - } - } - if (j==nofOptions) - { - QString s; - s = QString("Unknown option: ") + arg + "\n"; - s += "If KDiff3 should ignore this option, run KDiff3 normally and edit\n" - "the \"Command line options to ignore\" in the \"Integration Settings\".\n\n"; - - s += "KDiff3-Usage when starting via commandline: \n"; - s += "- Comparing 2 files:\t\tkdiff3 file1 file2\n"; - s += "- Merging 2 files: \t\tkdiff3 file1 file2 -o outputfile\n"; - s += "- Comparing 3 files:\t\tkdiff3 file1 file2 file3\n"; - s += "- Merging 3 files: \t\tkdiff3 file1 file2 file3 -o outputfile\n"; - s += " Note that file1 will be treated as base of file2 and file3.\n"; - s += "\n"; - s += "If you start without arguments, then a dialog will appear\n"; - s += "where you can select your files via a filebrowser.\n"; - s += "\n"; - - s += "Options:\n"; - - j=0; - int pos=s.length(); - for( j=0; j1 ) s += "-"; - } - s += s_options[j].name; - s += QString().fill(' ', minMaxLimiter( 20 - ((int)s.length()-pos), 3, 20 ) ); - s += s_options[j].description; - s +="\n"; - pos=s.length(); - } - else - { - s += "-"; - if ( s_options[j].name.length()>1 ) s += "-"; - s += s_options[j].name; - s += ", "; - } - } - - s += "\n"+i18n("For more documentation, see the help-menu or the subdirectory doc.")+"\n"; -#if defined(_WIN32) || defined(Q_OS_OS2) - // A windows program has no console - if ( 0==QMessageBox::information(0, i18n("KDiff3-Usage"), s, i18n("Ignore"),i18n("Exit") ) ) - continue; -#else - std::cerr << s.toLatin1().constData() << std::endl; -#endif - - ::exit(-1); - } - } - else - s_vArg.push_back( arg ); - } -} - -KConfigGroup* KApplication::config() -{ - return &m_config; -} - -bool KApplication::isRestored() -{ - return false; -} - -KApplication* KApplication::kApplication() -{ - return kapp; -} - -KIconLoader* KApplication::iconLoader() -{ - return &m_iconLoader; -} - - -namespace KIO -{ - SimpleJob* mkdir( KUrl ){return 0;} - SimpleJob* rmdir( KUrl ){return 0;} - SimpleJob* file_delete( KUrl, int ){return 0;} - FileCopyJob* file_move( KUrl, KUrl, int, int ) {return 0;} - FileCopyJob* file_copy( KUrl, KUrl, int, int ) {return 0;} - CopyJob* link( KUrl, KUrl, bool ) {return 0;} - ListJob* listRecursive( KUrl, bool, bool ){return 0;} - ListJob* listDir( KUrl, bool, bool ){return 0;} - StatJob* stat( KUrl, bool, int, int ){return 0;} - TransferJob* get( KUrl, int ){return (TransferJob*)0;} - TransferJob* put( KUrl, int, int ){return (TransferJob*)0;} -}; - -KActionCollection* KParts::Part::actionCollection() -{ - return 0; -} - -KApplication* KParts::Part::instance() -{ - return kapp; -} - - -KLibLoader* KLibLoader::self() -{ - static KLibLoader ll; - return ≪ -} - -extern "C" void* init_libkdiff3part(); -KLibFactory* KLibLoader::factory(QString const&) -{ - return (KLibFactory*) init_libkdiff3part(); -} - -QObject* KLibFactory::create(QObject* pParent, const QString& name, const QString& classname ) -{ - KParts::Factory* f = dynamic_cast(this); - if (f!=0) - return f->createPartObject( (QWidget*)pParent, name.toAscii(), - pParent, name.toAscii(), - classname.toAscii(), QStringList() ); - else - return 0; -} - - - - -//#include "kreplacements.moc" Index: trunk/extragear/utils/kdiff3/src/kreplacements/kcomponentdata.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kcomponentdata.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kcomponentdata.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/klibloader.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/klibloader.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/klibloader.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/config-kdiff3.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/config-kdiff3.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/config-kdiff3.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kedittoolbar.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kedittoolbar.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kedittoolbar.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kurl.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kurl.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kurl.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/kactioncollection.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/kactioncollection.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/kactioncollection.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kreplacements/klocale.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kreplacements/klocale.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kreplacements/klocale.h (nonexistent) @@ -1,2 +0,0 @@ -#include "kreplacements.h" - Index: trunk/extragear/utils/kdiff3/src/kdiff3_shell.rc =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3_shell.rc (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3_shell.rc (nonexistent) @@ -1,128 +0,0 @@ - - - - &File - - - &Directory - - - - - - - - - - - - - - - - - - - - - - Current Item Merge Operation - - - - - - - - Current Item Sync Operation - - - - - - - - - - - - &Movement - - - - - - - - - - - D&iffview - - - - - - - - - - - - &Merge - - - - - - - - - - - - - - - - - - - - - - &Window - - - - - - - - - - -Main Toolbar - - - - - - - - - - - - - - - - - - - - - - Index: trunk/extragear/utils/kdiff3/src/xpm/showequalfiles.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showequalfiles.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showequalfiles.xpm (nonexistent) @@ -1,23 +0,0 @@ -/* XPM */ -static const char *showequalfiles[]={ -"16 16 4 1", -"# c None", -"a c None", -". c #000000", -"b c #00ff00", -"...........##aaa", -".bbbb.bbbb.##aaa", -".bbbb.bbbb.##aaa", -".bbbb.bbbb.##aaa", -".bbbb.bbbb.##aaa", -"...........##aaa", -"aaaaaaaaaaaaaaaa", -"................", -"aaaaaaaaaaaaaaaa", -"................", -".bbbb.bbbb.bbbb.", -".bbbb.bbbb.bbbb.", -".bbbb.bbbb.bbbb.", -".bbbb.bbbb.bbbb.", -"................", -"aaaaaaaaaaaaaaaa"}; Index: trunk/extragear/utils/kdiff3/src/xpm/file.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/file.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/file.xpm (nonexistent) @@ -1,24 +0,0 @@ -/* XPM */ -static const char *file_pm[]={ -"16 16 5 1", -". c None", -"# c #000000", -"c c #c0c0c0", -"b c #dcdcdc", -"a c #ffffff", -"..#########.....", -"..#aaaaaabb#....", -"..#aaaaaacab#...", -"..#aaaaaacaab#..", -"..#aaaaaac####..", -"..#aaaaaaaccc#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..############.."}; Index: trunk/extragear/utils/kdiff3/src/xpm/fileopen.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/fileopen.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/fileopen.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *fileopen[] = { -" 16 13 5 1", -". c #040404", -"# c #808304", -"a c None", -"b c #f3f704", -"c c #f3f7f3", -"aaaaaaaaa...aaaa", -"aaaaaaaa.aaa.a.a", -"aaaaaaaaaaaaa..a", -"a...aaaaaaaa...a", -".bcb.......aaaaa", -".cbcbcbcbc.aaaaa", -".bcbcbcbcb.aaaaa", -".cbcb...........", -".bcb.#########.a", -".cb.#########.aa", -".b.#########.aaa", -"..#########.aaaa", -"...........aaaaa" -}; Index: trunk/extragear/utils/kdiff3/src/xpm/startmerge.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/startmerge.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/startmerge.xpm (nonexistent) @@ -1,25 +0,0 @@ -/* XPM */ -static const char *startmerge[]={ -"16 16 6 1", -". c None", -"# c #000000", -"b c #0000ff", -"c c #00ffff", -"d c #ff0000", -"a c #ffff00", -".......##.......", -"......#aa#......", -"......#aa#......", -"...b.b.##.b.b...", -"...bb......bb...", -"...bbb....bbb...", -".##..........##.", -"#cc#........#cc#", -"#cc#........#cc#", -".##.b.b..b.b.##.", -".....bb..bb.....", -"....bbb..bbb....", -".......##.......", -"......#dd#......", -"......#dd#......", -".......##......."}; Index: trunk/extragear/utils/kdiff3/src/xpm/showlinenumbers.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showlinenumbers.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showlinenumbers.xpm (nonexistent) @@ -1,21 +0,0 @@ -/* XPM */ -static const char *showlinenumbers[]={ -"16 16 2 1", -". c None", -"# c #000040", -"................", -"................", -"................", -"................", -"...#...##..###..", -"..##..#..#....#.", -"...#.....#....#.", -"...#....#...##..", -"...#...#......#.", -"...#..#.......#.", -"..###.####.###..", -"................", -"................", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyinc.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyinc.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyinc.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *showfilesonlyinc[]={ -"16 16 3 1", -". c None", -"# c #000000", -"a c #00ff00", -"................", -"................", -"................", -"................", -"................", -"################", -"###########aaaa#", -"###########aaaa#", -"###########aaaa#", -"###########aaaa#", -"################", -"................", -"................", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyinb.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyinb.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyinb.xpm (nonexistent) @@ -1,23 +0,0 @@ -/* XPM */ -static const char *showfilesonlyinb[]={ -"16 16 4 1", -"# c None", -"a c None", -". c #000000", -"b c #00ff00", -"...........##aaa", -"......bbbb.##aaa", -"......bbbb.##aaa", -"......bbbb.##aaa", -"......bbbb.##aaa", -"...........##aaa", -"aaaaaaaaaaaaaaaa", -"................", -"aaaaaaaaaaaaaaaa", -"................", -"......bbbb......", -"......bbbb......", -"......bbbb......", -"......bbbb......", -"................", -"aaaaaaaaaaaaaaaa"}; Index: trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyina.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyina.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showfilesonlyina.xpm (nonexistent) @@ -1,23 +0,0 @@ -/* XPM */ -static const char *showfilesonlyina[]={ -"16 16 4 1", -"# c None", -"a c None", -". c #000000", -"b c #00ff00", -"...........##aaa", -".bbbb......##aaa", -".bbbb......##aaa", -".bbbb......##aaa", -".bbbb......##aaa", -"...........##aaa", -"aaaaaaaaaaaaaaaa", -"................", -"aaaaaaaaaaaaaaaa", -"................", -".bbbb...........", -".bbbb...........", -".bbbb...........", -".bbbb...........", -"................", -"aaaaaaaaaaaaaaaa"}; Index: trunk/extragear/utils/kdiff3/src/xpm/showwhitespace.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showwhitespace.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showwhitespace.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *showwhitespace[]={ -"16 16 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"................", -"................", -"..############..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..#aaaaaaaaaa#..", -"..############..", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/iconA.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/iconA.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/iconA.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *iconA[]={ -"16 16 3 1", -" c #0080FF", -"# c #000000", -". c None", -"................", -"................", -"......###.......", -".....# #......", -"....# # #.....", -"...# #.# #....", -"...# #...# #....", -"...# #...# #....", -"...# ##### #....", -"...# #....", -"...# ##### #....", -"...# #...# #....", -"...###...###....", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/downend.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/downend.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/downend.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *downend[]={ -"16 16 3 1", -" c #0080ff", -"# c #000000", -". c None", -"................", -"................", -"................", -"................", -"................", -"..############..", -"...# #...", -"....# #....", -".....# #.....", -"......# #......", -".......##.......", -"..############..", -"................", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/iconB.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/iconB.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/iconB.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *iconB[]={ -"16 16 3 1", -" c #0080FF", -"# c #000000", -". c None", -"................", -"................", -"...#######......", -"...# #.....", -"...# #### #....", -"...# #...# #....", -"...# #### #....", -"...# #.....", -"...# #### #....", -"...# #...# #....", -"...# #### #....", -"...# #.....", -"...#######......", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/autoadvance.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/autoadvance.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/autoadvance.xpm (nonexistent) @@ -1,25 +0,0 @@ -/* XPM */ -static const char *autoadvance[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -". c #0080FF", -"# c #000000", -" c None", -/* pixels */ -" ## # # ### # ", -"# # # # # # #", -"# # # # # # #", -"#### # # # # #", -"# # ### # # ", -" ", -" ", -" ######## ", -" #....# ", -" #..# ", -" ## ", -" ######## ", -" #....# ", -" #..# ", -" ## ", -" " -}; Index: trunk/extragear/utils/kdiff3/src/xpm/down1arrow.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/down1arrow.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/down1arrow.xpm (nonexistent) @@ -1,25 +0,0 @@ -/* XPM */ -static const char *down1arrow[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -" c #0080ff", -"# c #000000", -". c None", -/* pixels */ -"................", -"................", -"................", -"................", -"................", -"..############..", -"...# #...", -"....# #....", -".....# #.....", -"......# #......", -".......##.......", -"................", -"................", -"................", -"................", -"................" -}; Index: trunk/extragear/utils/kdiff3/src/xpm/iconC.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/iconC.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/iconC.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *iconC[]={ -"16 16 3 1", -" c #0080FF", -"# c #000000", -". c None", -"................", -"................", -"......####......", -".....# #.....", -"....# ### #....", -"...# #...##....", -"...# #..........", -"...# #..........", -"...# #..........", -"...# #..........", -"...# #...##....", -"....# ### #....", -".....# #.....", -"......####......", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/down2arrow.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/down2arrow.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/down2arrow.xpm (nonexistent) @@ -1,25 +0,0 @@ -/* XPM */ -static const char *down2arrow[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -" c #0080ff", -"# c #000000", -". c None", -/* pixels */ -"................", -"................", -"..############..", -"...# #...", -"....# #....", -".....# #.....", -"......# #......", -".......##.......", -"..############..", -"...# #...", -"....# #....", -".....# #.....", -"......# #......", -".......##.......", -"................", -"................" -}; Index: trunk/extragear/utils/kdiff3/src/xpm/filesave.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/filesave.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/filesave.xpm (nonexistent) @@ -1,21 +0,0 @@ -/* XPM */ -static const char *filesave[] = { -" 14 14 3 1", -". c #040404", -"# c #808304", -"a c #bfc2bf", -"..............", -".#.aaaaaaaa.a.", -".#.aaaaaaaa...", -".#.aaaaaaaa.#.", -".#.aaaaaaaa.#.", -".#.aaaaaaaa.#.", -".#.aaaaaaaa.#.", -".##........##.", -".############.", -".##.........#.", -".##......aa.#.", -".##......aa.#.", -".##......aa.#.", -"a............." -}; Index: trunk/extragear/utils/kdiff3/src/xpm/prevunsolved.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/prevunsolved.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/prevunsolved.xpm (nonexistent) @@ -1,23 +0,0 @@ -/* XPM */ -static const char *prevunsolved[]={ -"16 16 4 1", -" c #0080ff", -"# c #000000", -"a c #ff0000", -". c None", -".......##.......", -"......#aa#......", -".....#aaaa#.....", -"....#aaaaaa#....", -"...#aaaaaaaa#...", -"..############..", -"......# #......", -".....# #.....", -"....# #....", -"...# #...", -"..############..", -"......# #......", -".....# #.....", -"....# #....", -"...# #...", -"..############.."}; Index: trunk/extragear/utils/kdiff3/src/xpm/upend.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/upend.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/upend.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *upend[]={ -"16 16 3 1", -" c #0080ff", -"# c #000000", -". c None", -"................", -"................", -"................", -"................", -"..############..", -".......##.......", -"......# #......", -".....# #.....", -"....# #....", -"...# #...", -"..############..", -"................", -"................", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/folder.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/folder.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/folder.xpm (nonexistent) @@ -1,24 +0,0 @@ -/* XPM */ -static const char *folder_pm[]={ -"16 16 5 1", -". c None", -"# c #040404", -"c c #808304", -"a c #f3f704", -"b c #f3f7f3", -"................", -"................", -"................", -".###............", -"#aba#######.....", -"#babababab#.....", -"#ababababa#.....", -"#baba###########", -"#aba#ccccccccc#.", -"#ba#ccccccccc#..", -"#a#ccccccccc#...", -"##ccccccccc#....", -"###########.....", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/showwhitespacechars.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/showwhitespacechars.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/showwhitespacechars.xpm (nonexistent) @@ -1,21 +0,0 @@ -/* XPM */ -static const char *showwhitespacechars[]={ -"16 16 2 1", -". c None", -"# c #000040", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".####.####.####.", -".####.####.####.", -"................", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/filenew.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/filenew.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/filenew.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char * filenew[] = { -"10 14 5 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #DCDCDC", -"# c #C0C0C0", -"....... ", -".++++@@. ", -".++++#+@. ", -".++++#++@.", -".++++#....", -".+++++###.", -".++++++++.", -".++++++++.", -".++++++++.", -".++++++++.", -".++++++++.", -".++++++++.", -".++++++++.", -".........."}; Index: trunk/extragear/utils/kdiff3/src/xpm/nextunsolved.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/nextunsolved.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/nextunsolved.xpm (nonexistent) @@ -1,23 +0,0 @@ -/* XPM */ -static const char *nextunsolved[]={ -"16 16 4 1", -". c None", -" c #0080ff", -"# c #000000", -"a c #ff0000", -"..############..", -"...# #...", -"....# #....", -".....# #.....", -"......# #......", -"..############..", -"...# #...", -"....# #....", -".....# #.....", -"......# #......", -"..############..", -"...#aaaaaaaa#...", -"....#aaaaaa#....", -".....#aaaa#.....", -"......#aa#......", -".......##......."}; Index: trunk/extragear/utils/kdiff3/src/xpm/up1arrow.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/up1arrow.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/up1arrow.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *up1arrow[]={ -"16 16 3 1", -". c None", -"# c #000000", -"a c #0080ff", -"................", -"................", -"................", -"................", -"................", -".......##.......", -"......#aa#......", -".....#aaaa#.....", -"....#aaaaaa#....", -"...#aaaaaaaa#...", -"..############..", -"................", -"................", -"................", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/fileprint.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/fileprint.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/fileprint.xpm (nonexistent) @@ -1,24 +0,0 @@ -/* XPM */ -static const char *fileprint[] = { -" 16 14 6 1", -". c #000000", -"# c #848284", -"a c #c6c3c6", -"b c #ffff00", -"c c #ffffff", -"d c None", -"ddddd.........dd", -"dddd.cccccccc.dd", -"dddd.c.....c.ddd", -"ddd.cccccccc.ddd", -"ddd.c.....c....d", -"dd.cccccccc.a.a.", -"d..........a.a..", -".aaaaaaaaaa.a.a.", -".............aa.", -".aaaaaa###aa.a.d", -".aaaaaabbbaa...d", -".............a.d", -"d.aaaaaaaaa.a.dd", -"dd...........ddd" -}; Index: trunk/extragear/utils/kdiff3/src/xpm/reload.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/reload.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/reload.xpm (nonexistent) @@ -1,74 +0,0 @@ -/* XPM */ -static const char *reloadIcon[]={ -"16 16 55 1", -". c None", -"e c #25502a", -"# c #25512b", -"d c #25522b", -"g c #26552c", -"c c #27562e", -"n c #27582f", -"b c #28592e", -"M c #285930", -"a c #295a2f", -"q c #295a30", -"G c #295c31", -"t c #2a5e31", -"y c #2b6635", -"U c #2b6636", -"Q c #2f703a", -"H c #327b3d", -"0 c #36843f", -"W c #388943", -"u c #3f7046", -"r c #42764a", -"f c #44754b", -"A c #488653", -"N c #50995b", -"K c #529d5f", -"J c #529f60", -"m c #53885c", -"l c #55a161", -"B c #57a863", -"R c #5aaa66", -"I c #5aad69", -"v c #5baa67", -"X c #5cb16b", -"o c #5db469", -"k c #5eb56c", -"z c #5eb66b", -"s c #5fb26d", -"V c #64b171", -"Y c #64c274", -"j c #69c779", -"Z c #6dc97d", -"p c #729a77", -"O c #73c782", -"i c #7ace89", -"w c #7bce89", -"C c #7ecb8b", -"L c #80d191", -"h c #80d193", -"S c #8dd49b", -"P c #95d8a1", -"D c #a7ddb1", -"x c #bde3c2", -"T c #c0e5c5", -"E c #daf0de", -"F c #f9fdf9", -"................", -"..#abcde#df.....", -"..ghhhijklm.....", -"..nhoooooop.....", -"..qho....rso....", -"..tho...uvwxo...", -"..yhz..ABCDEFo..", -"gGHhIJJAAKLooo..", -"MNOPEFo..Qho....", -".eRSTo...Uho....", -"..eV.....Uho....", -"...W.....Qho....", -"....nXYZihho....", -"....0ooooooo....", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/xpm/up2arrow.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/up2arrow.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/up2arrow.xpm (nonexistent) @@ -1,25 +0,0 @@ -/* XPM */ -static const char *up2arrow[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -" c #0080ff", -"# c #000000", -". c None", -/* pixels */ -"................", -"................", -".......##.......", -"......# #......", -".....# #.....", -"....# #....", -"...# #...", -"..############..", -".......##.......", -"......# #......", -".....# #.....", -"....# #....", -"...# #...", -"..############..", -"................", -"................" -}; Index: trunk/extragear/utils/kdiff3/src/xpm/link_arrow.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/link_arrow.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/link_arrow.xpm (nonexistent) @@ -1,24 +0,0 @@ -/* XPM */ -static const char *link_arrow[]={ -"16 16 5 1", -". c None", -"b c #000000", -"# c #585858", -"c c #dcdcdc", -"a c #ffffff", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"########........", -"#aaaaaab........", -"#aabbbab........", -"#aac#bab........", -"#acbcbab........", -"#abcaaab........", -"#aaaaaab........", -"#bbbbbbb........"}; Index: trunk/extragear/utils/kdiff3/src/xpm/currentpos.xpm =================================================================== --- trunk/extragear/utils/kdiff3/src/xpm/currentpos.xpm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/xpm/currentpos.xpm (nonexistent) @@ -1,22 +0,0 @@ -/* XPM */ -static const char *currentpos[]={ -"16 16 3 1", -" c #0080FF", -"# c #000000", -". c None", -"................", -"................", -"................", -".#............#.", -".##..........##.", -".# #........# #.", -".# #..##..# #.", -".# ## ## #.", -".# # # #.", -".# ## ## #.", -".# #..##..# #.", -".# #........# #.", -".##..........##.", -".#............#.", -"................", -"................"}; Index: trunk/extragear/utils/kdiff3/src/version.h =================================================================== --- trunk/extragear/utils/kdiff3/src/version.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/version.h (nonexistent) @@ -1,2 +0,0 @@ -#undef VERSION -#define VERSION "0.9.95" Index: trunk/extragear/utils/kdiff3/src/kdiff3_part.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3_part.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3_part.h (nonexistent) @@ -1,99 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2007 Joachim Eibl * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef _KDIFF3PART_H_ -#define _KDIFF3PART_H_ - -#include -#include - -class QWidget; -class KDiff3App; - -/** - * This is a "Part". It that does all the real work in a KPart - * application. - * - * @short Main Part - * @author Joachim Eibl - */ -class KDiff3Part : public KParts::ReadWritePart -{ - Q_OBJECT -public: - /** - * Default constructor - */ - KDiff3Part(QWidget *parentWidget, const char *widgetName, - QObject *parent ); - - /** - * Destructor - */ - virtual ~KDiff3Part(); - - /** - * This is a virtual function inherited from KParts::ReadWritePart. - * A shell will use this to inform this Part if it should act - * read-only - */ - virtual void setReadWrite(bool rw); - - /** - * Reimplemented to disable and enable Save action - */ - virtual void setModified(bool modified); - -protected: - /** - * This must be implemented by each part - */ - virtual bool openFile(); - - /** - * This must be implemented by each read-write part - */ - virtual bool saveFile(); - -private: - KDiff3App* m_widget; - bool m_bIsShell; -}; - -class KComponentData; -class KAboutData; - -class KDiff3PartFactory : public KParts::Factory -{ - Q_OBJECT -public: - KDiff3PartFactory(); - virtual ~KDiff3PartFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, - QObject *parent, - const char *classname, - const QStringList &args ); - static KComponentData* instance(); - -private: - static KComponentData* s_instance; - static KAboutData* s_about; -}; - -#endif // _KDIFF3PART_H_ Index: trunk/extragear/utils/kdiff3/src/fileaccess.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/fileaccess.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/fileaccess.cpp (nonexistent) @@ -1,1820 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2011 by Joachim Eibl * - * joachim.eibl at gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - ***************************************************************************/ - -#include "fileaccess.h" -#include "optiondialog.h" -#include "common.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifdef _WIN32 -#include -#include -#include -#include -#else -#include // Needed for creating symbolic links via symlink(). -#include -#endif - - -ProgressDialog* g_pProgressDialog=0; - - -FileAccess::FileAccess( const QString& name, bool bWantToWrite ) -{ - setFile( name, bWantToWrite ); -} - -FileAccess::FileAccess() -{ - m_bValidData = false; - m_size = 0; - m_creationTime = QDateTime(); - m_accessTime = QDateTime(); - m_modificationTime = QDateTime(); - m_bReadable = false; - m_bWritable = false; - m_bExecutable = false; - m_bLocal = false; - m_bHidden = false; - m_bExists = false; - m_bFile = false; - m_bDir = false; - m_bSymLink = false; -} - -FileAccess::~FileAccess() -{ - if( !m_localCopy.isEmpty() ) - { - removeTempFile( m_localCopy ); - } -} - -void FileAccess::setFile( const QString& name, bool bWantToWrite ) -{ - m_url = KUrl( name ); - m_bValidData = false; - - m_size = 0; - m_creationTime = QDateTime(); - m_accessTime = QDateTime(); - m_modificationTime = QDateTime(); - m_bReadable = false; - m_bWritable = false; - m_bExecutable = false; - m_bHidden = false; - m_bExists = false; - m_bFile = false; - m_bDir = false; - m_bSymLink = false; - m_linkTarget = ""; - m_fileType = -1; - m_bLocal = true; - - // Note: Checking if the filename-string is empty is necessary for Win95/98/ME. - // The isFile() / isDir() queries would cause the program to crash. - // (This is a Win95-bug which has been corrected only in WinNT/2000/XP.) - if ( !name.isEmpty() ) - { - // FileAccess tries to detect if the given name is an URL or a local file. - // This is a problem if the filename looks like an URL (i.e. contains a colon ':'). - // e.g. "file:f.txt" is a valid filename. - // Most of the time it is sufficient to check if the file exists locally. - // 2 Problems remain: - // 1. When the local file exists and the remote location is wanted nevertheless. (unlikely) - // 2. When the local file doesn't exist and should be written to. - - bool bExistsLocal = QDir().exists(name); - if ( m_url.isLocalFile() || m_url.isRelative() || !m_url.isValid() || bExistsLocal ) // assuming that invalid means relative - { - QString localName = name; - if ( !bExistsLocal && m_url.isLocalFile() && name.left(5).toLower()=="file:" ) - { - localName = m_url.path(); // I want the path without preceding "file:" - } - QFileInfo fi( localName ); -#if defined(Q_WS_WIN) - // On some windows machines in a network this takes very long. - // and it's not so important anyway. - m_bReadable = true; - m_bWritable = true; // in certain situations this might become a problem though - m_bExecutable = false; -#else - m_bReadable = fi.isReadable(); - m_bWritable = fi.isWritable(); - m_bExecutable = fi.isExecutable(); -#endif - //m_creationTime = fi.created(); - m_bHidden = fi.isHidden(); - //m_modificationTime = fi.lastModified(); - m_accessTime = fi.lastRead(); - m_size = fi.size(); - m_bSymLink = fi.isSymLink(); - m_bFile = fi.isFile(); - m_bDir = fi.isDir(); - m_bExists = fi.exists(); - m_name = fi.fileName(); - m_path = fi.filePath(); - m_absoluteFilePath= fi.absoluteFilePath(); - if ( m_bSymLink ) m_linkTarget = fi.readLink(); - m_bLocal = true; - m_bValidData = true; - if ( ! m_url.isValid() ) - { - m_url.setPath( m_absoluteFilePath ); - } - - if ( !m_bExists && m_absoluteFilePath.contains("@@") ) - { - // Try reading a clearcase file - m_localCopy = FileAccess::tempFileName(); - QString cmd = "cleartool get -to \"" + m_localCopy + "\" \"" + m_absoluteFilePath + "\""; - QProcess process; - process.start( cmd ); - process.waitForFinished(-1); - //::system( cmd.local8Bit() ); - QFile::setPermissions( m_localCopy, QFile::ReadUser | QFile::WriteUser ); // Clearcase creates a write protected file, allow delete. - - QFileInfo fi( m_localCopy ); -#if defined(Q_WS_WIN) - m_bReadable = true;//fi.isReadable(); - m_bWritable = true;//fi.isWritable(); - m_bExecutable = false;//fi.isExecutable(); -#else - m_bReadable = fi.isReadable(); - m_bWritable = fi.isWritable(); - m_bExecutable = fi.isExecutable(); -#endif - m_creationTime = fi.created(); - m_bHidden = fi.isHidden(); - m_modificationTime = fi.lastModified(); - m_accessTime = fi.lastRead(); - m_size = fi.size(); - m_bSymLink = fi.isSymLink(); - m_bFile = fi.isFile(); - m_bDir = fi.isDir(); - m_bExists = fi.exists(); - } - } - else - { - m_absoluteFilePath = name; - m_name = m_url.fileName(); - m_bLocal = false; - - FileAccessJobHandler jh( this ); // A friend, which writes to the parameters of this class! - jh.stat(2/*all details*/, bWantToWrite); // returns bSuccess, ignored - - m_path = name; - m_bValidData = true; // After running stat() the variables are initialised - // and valid even if the file doesn't exist and the stat - // query failed. - } - } -} - -void FileAccess::addPath( const QString& txt ) -{ - if ( m_url.isValid() ) - { - m_url.addPath( txt ); - setFile( m_url.url() ); // reinitialise - } - else - { - QString slash = (txt.isEmpty() || txt[0]=='/') ? "" : "/"; - setFile( absoluteFilePath() + slash + txt ); - } -} - -/* Filetype: - S_IFMT 0170000 bitmask for the file type bitfields - S_IFSOCK 0140000 socket - S_IFLNK 0120000 symbolic link - S_IFREG 0100000 regular file - S_IFBLK 0060000 block device - S_IFDIR 0040000 directory - S_IFCHR 0020000 character device - S_IFIFO 0010000 fifo - S_ISUID 0004000 set UID bit - S_ISGID 0002000 set GID bit (see below) - S_ISVTX 0001000 sticky bit (see below) - - Access: - S_IRWXU 00700 mask for file owner permissions - S_IRUSR 00400 owner has read permission - S_IWUSR 00200 owner has write permission - S_IXUSR 00100 owner has execute permission - S_IRWXG 00070 mask for group permissions - S_IRGRP 00040 group has read permission - S_IWGRP 00020 group has write permission - S_IXGRP 00010 group has execute permission - S_IRWXO 00007 mask for permissions for others (not in group) - S_IROTH 00004 others have read permission - S_IWOTH 00002 others have write permisson - S_IXOTH 00001 others have execute permission -*/ - -#ifdef KREPLACEMENTS_H -void FileAccess::setUdsEntry( const KIO::UDSEntry& ){} // not needed if KDE is not available -#else -void FileAccess::setUdsEntry( const KIO::UDSEntry& e ) -{ - long acc = 0; - long fileType = 0; - QList< uint > fields = e.listFields(); - for( QList< uint >::ConstIterator ei=fields.constBegin(); ei!=fields.constEnd(); ++ei ) - { - uint f = *ei; - switch( f ) - { - case KIO::UDSEntry::UDS_SIZE : m_size = e.numberValue(f); break; - case KIO::UDSEntry::UDS_USER : m_user = e.stringValue(f); break; - case KIO::UDSEntry::UDS_GROUP : m_group = e.stringValue(f); break; - case KIO::UDSEntry::UDS_NAME : m_path = e.stringValue(f); break; // During listDir the relative path is given here. - case KIO::UDSEntry::UDS_MODIFICATION_TIME : m_modificationTime.setTime_t( e.numberValue(f) ); break; - case KIO::UDSEntry::UDS_ACCESS_TIME : m_accessTime.setTime_t( e.numberValue(f) ); break; - case KIO::UDSEntry::UDS_CREATION_TIME : m_creationTime.setTime_t( e.numberValue(f) ); break; - case KIO::UDSEntry::UDS_LINK_DEST : m_linkTarget = e.stringValue(f); break; - case KIO::UDSEntry::UDS_ACCESS : - { - acc = e.numberValue(f); - m_bReadable = (acc & S_IRUSR)!=0; - m_bWritable = (acc & S_IWUSR)!=0; - m_bExecutable = (acc & S_IXUSR)!=0; - break; - } - case KIO::UDSEntry::UDS_FILE_TYPE : - { - fileType = e.numberValue(f); - m_bDir = ( fileType & S_IFMT ) == S_IFDIR; - m_bFile = ( fileType & S_IFMT ) == S_IFREG; - m_bSymLink = ( fileType & S_IFMT ) == S_IFLNK; - m_bExists = fileType != 0; - m_fileType = fileType; - break; - } - - case KIO::UDSEntry::UDS_URL : // m_url = KUrl( e.stringValue(f) ); - break; - case KIO::UDSEntry::UDS_MIME_TYPE : break; - case KIO::UDSEntry::UDS_GUESSED_MIME_TYPE : break; - case KIO::UDSEntry::UDS_XML_PROPERTIES : break; - default: break; - } - } - - m_bExists = acc!=0 || fileType!=0; - - m_bLocal = false; - m_bValidData = true; - m_bSymLink = !m_linkTarget.isEmpty(); - if ( m_name.isEmpty() ) - { - int pos = m_path.lastIndexOf('/') + 1; - m_name = m_path.mid( pos ); - } - m_bHidden = m_name[0]=='.'; -} -#endif - - -bool FileAccess::isValid() const { return m_bValidData; } -bool FileAccess::isFile() const { return m_bFile; } -bool FileAccess::isDir() const { return m_bDir; } -bool FileAccess::isSymLink() const { return m_bSymLink; } -bool FileAccess::exists() const { return m_bExists; } -qint64 FileAccess::size() const { return m_size; } -KUrl FileAccess::url() const { return m_url; } -bool FileAccess::isLocal() const { return m_bLocal; } -bool FileAccess::isReadable() const { return m_bReadable; } -bool FileAccess::isWritable() const { return m_bWritable; } -bool FileAccess::isExecutable() const { return m_bExecutable; } -bool FileAccess::isHidden() const { return m_bHidden; } -QString FileAccess::readLink() const { return m_linkTarget; } -QString FileAccess::absoluteFilePath() const{ return m_absoluteFilePath; } // Full abs path -QString FileAccess::fileName() const { return m_name; } // Just the name-part of the path, without parent directories -QString FileAccess::filePath() const { return m_path; } // The path-string that was used during construction -QString FileAccess::prettyAbsPath() const { return isLocal() ? m_absoluteFilePath : m_url.prettyUrl(); } - -QDateTime FileAccess::created() const -{ - if ( m_bLocal && m_creationTime.isNull() ) - const_cast(this)->m_creationTime = QFileInfo( m_absoluteFilePath ).created(); - return ( m_creationTime.isValid() ? m_creationTime : lastModified() ); -} - -QDateTime FileAccess::lastModified() const -{ - if ( m_bLocal && m_modificationTime.isNull() ) - const_cast(this)->m_modificationTime = QFileInfo( m_absoluteFilePath ).lastModified(); - return m_modificationTime; -} - -QDateTime FileAccess::lastRead() const -{ - return ( m_accessTime.isValid() ? m_accessTime : m_modificationTime ); -} - -static bool interruptableReadFile( QFile& f, void* pDestBuffer, unsigned long maxLength ) -{ - ProgressProxy pp; - const unsigned long maxChunkSize = 100000; - unsigned long i=0; - while( i " + bakName; - return false; - } - } - return true; -} - -FileAccessJobHandler::FileAccessJobHandler( FileAccess* pFileAccess ) -{ - m_pFileAccess = pFileAccess; - m_bSuccess = false; -} - -bool FileAccessJobHandler::stat( int detail, bool bWantToWrite ) -{ - m_bSuccess = false; - m_pFileAccess->m_statusText = QString(); - KIO::StatJob* pStatJob = KIO::stat( m_pFileAccess->m_url, - bWantToWrite ? KIO::StatJob::DestinationSide : KIO::StatJob::SourceSide, - detail, KIO::HideProgressInfo ); - - connect( pStatJob, SIGNAL(result(KJob*)), this, SLOT(slotStatResult(KJob*))); - - g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1",m_pFileAccess->prettyAbsPath()) ); - - return m_bSuccess; -} - -void FileAccessJobHandler::slotStatResult(KJob* pJob) -{ - if ( pJob->error() ) - { - //pJob->uiDelegate()->showErrorMessage(); - m_pFileAccess->m_bExists = false; - m_bSuccess = true; - } - else - { - m_bSuccess = true; - - m_pFileAccess->m_bValidData = true; - const KIO::UDSEntry e = static_cast(pJob)->statResult(); - - m_pFileAccess->setUdsEntry( e ); - } - - g_pProgressDialog->exitEventLoop(); -} - - -bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength ) -{ - ProgressProxy pp; // Implicitly used in slotPercent() - if ( maxLength>0 && !pp.wasCancelled() ) - { - KIO::TransferJob* pJob = KIO::get( m_pFileAccess->m_url, KIO::NoReload ); - m_transferredBytes = 0; - m_pTransferBuffer = (char*)pDestBuffer; - m_maxLength = maxLength; - m_bSuccess = false; - m_pFileAccess->m_statusText = QString(); - - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - connect( pJob, SIGNAL(data(KJob*,const QByteArray &)), this, SLOT(slotGetData(KJob*, const QByteArray&))); - connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); - - g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1",m_pFileAccess->prettyAbsPath()) ); - return m_bSuccess; - } - else - return true; -} - -void FileAccessJobHandler::slotGetData( KJob* pJob, const QByteArray& newData ) -{ - if ( pJob->error() ) - { - pJob->uiDelegate()->showErrorMessage(); - } - else - { - qint64 length = min2( qint64(newData.size()), m_maxLength - m_transferredBytes ); - ::memcpy( m_pTransferBuffer + m_transferredBytes, newData.data(), newData.size() ); - m_transferredBytes += length; - } -} - -bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOverwrite, bool bResume, int permissions ) -{ - if ( maxLength>0 ) - { - KIO::TransferJob* pJob = KIO::put( m_pFileAccess->m_url, permissions, - KIO::HideProgressInfo | (bOverwrite ? KIO::Overwrite : KIO::DefaultFlags) | (bResume ? KIO::Resume : KIO::DefaultFlags) ); - m_transferredBytes = 0; - m_pTransferBuffer = (char*)pSrcBuffer; - m_maxLength = maxLength; - m_bSuccess = false; - m_pFileAccess->m_statusText = QString(); - - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotPutJobResult(KJob*))); - connect( pJob, SIGNAL(dataReq(KIO::Job*, QByteArray&)), this, SLOT(slotPutData(KIO::Job*, QByteArray&))); - connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); - - g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1",m_pFileAccess->prettyAbsPath()) ); - return m_bSuccess; - } - else - return true; -} - -void FileAccessJobHandler::slotPutData( KIO::Job* pJob, QByteArray& data ) -{ - if ( pJob->error() ) - { - pJob->uiDelegate()->showErrorMessage(); - } - else - { - qint64 maxChunkSize = 100000; - qint64 length = min2( maxChunkSize, m_maxLength - m_transferredBytes ); - data.resize( length ); - if ( data.size()==length ) - { - if ( length>0 ) - { - ::memcpy( data.data(), m_pTransferBuffer + m_transferredBytes, data.size() ); - m_transferredBytes += length; - } - } - else - { - KMessageBox::error( g_pProgressDialog, i18n("Out of memory") ); - data.resize(0); - m_bSuccess = false; - } - } -} - -void FileAccessJobHandler::slotPutJobResult(KJob* pJob) -{ - if ( pJob->error() ) - { - pJob->uiDelegate()->showErrorMessage(); - } - else - { - m_bSuccess = (m_transferredBytes == m_maxLength); // Special success condition - } - g_pProgressDialog->exitEventLoop(); // Close the dialog, return from exec() -} - -bool FileAccessJobHandler::mkDir( const QString& dirName ) -{ - KUrl dirURL = KUrl( dirName ); - if ( dirName.isEmpty() ) - return false; - else if ( dirURL.isLocalFile() || dirURL.isRelative() ) - { - return QDir().mkdir( dirURL.path() ); - } - else - { - m_bSuccess = false; - KIO::SimpleJob* pJob = KIO::mkdir( dirURL ); - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - - g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1", dirName) ); - return m_bSuccess; - } -} - -bool FileAccessJobHandler::rmDir( const QString& dirName ) -{ - KUrl dirURL = KUrl( dirName ); - if ( dirName.isEmpty() ) - return false; - else if ( dirURL.isLocalFile() ) - { - return QDir().rmdir( dirURL.path() ); - } - else - { - m_bSuccess = false; - KIO::SimpleJob* pJob = KIO::rmdir( dirURL ); - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - - g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1",dirName)); - return m_bSuccess; - } -} - -bool FileAccessJobHandler::removeFile( const QString& fileName ) -{ - if ( fileName.isEmpty() ) - return false; - else - { - m_bSuccess = false; - KIO::SimpleJob* pJob = KIO::file_delete( fileName, KIO::HideProgressInfo ); - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - - g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1",fileName) ); - return m_bSuccess; - } -} - -bool FileAccessJobHandler::symLink( const QString& linkTarget, const QString& linkLocation ) -{ - if ( linkTarget.isEmpty() || linkLocation.isEmpty() ) - return false; - else - { - m_bSuccess = false; - KIO::CopyJob* pJob = KIO::link( linkTarget, linkLocation, KIO::HideProgressInfo ); - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - - g_pProgressDialog->enterEventLoop( pJob, - i18n("Creating symbolic link: %1 -> %2",linkLocation,linkTarget) ); - return m_bSuccess; - } -} - -bool FileAccessJobHandler::rename( const QString& dest ) -{ - if ( dest.isEmpty() ) - return false; - - KUrl kurl( dest ); - if ( !kurl.isValid() ) - kurl = KUrl( QDir().absoluteFilePath(dest) ); // assuming that invalid means relative - - if ( m_pFileAccess->isLocal() && kurl.isLocalFile() ) - { - return QDir().rename( m_pFileAccess->absoluteFilePath(), kurl.path() ); - } - else - { - int permissions=-1; - m_bSuccess = false; - KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->m_url, kurl, permissions, KIO::HideProgressInfo ); - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); - - g_pProgressDialog->enterEventLoop( pJob, - i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); - return m_bSuccess; - } -} - -void FileAccessJobHandler::slotSimpleJobResult(KJob* pJob) -{ - if ( pJob->error() ) - { - pJob->uiDelegate()->showErrorMessage(); - } - else - { - m_bSuccess = true; - } - g_pProgressDialog->exitEventLoop(); // Close the dialog, return from exec() -} - - -// Copy local or remote files. -bool FileAccessJobHandler::copyFile( const QString& dest ) -{ - ProgressProxy pp; - KUrl destUrl( dest ); - m_pFileAccess->m_statusText = QString(); - if ( ! m_pFileAccess->isLocal() || ! destUrl.isLocalFile() ) // if either url is nonlocal - { - int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0); - m_bSuccess = false; - KIO::FileCopyJob* pJob = KIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, KIO::HideProgressInfo ); - connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); - g_pProgressDialog->enterEventLoop( pJob, - i18n("Copying file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); - - return m_bSuccess; - // Note that the KIO-slave preserves the original date, if this is supported. - } - - // Both files are local: - QString srcName = m_pFileAccess->absoluteFilePath(); - QString destName = dest; - QFile srcFile( srcName ); - QFile destFile( destName ); - bool bReadSuccess = srcFile.open( QIODevice::ReadOnly ); - if ( bReadSuccess == false ) - { - m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1",srcName); - return false; - } - bool bWriteSuccess = destFile.open( QIODevice::WriteOnly ); - if ( bWriteSuccess == false ) - { - m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1",destName); - return false; - } - -#if QT_VERSION==230 - typedef long Q_LONG; -#endif - std::vector buffer(100000); - qint64 bufSize = buffer.size(); - qint64 srcSize = srcFile.size(); - while ( srcSize > 0 && !pp.wasCancelled() ) - { - qint64 readSize = srcFile.read( &buffer[0], min2( srcSize, bufSize ) ); - if ( readSize==-1 || readSize==0 ) - { - m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1",srcName); - return false; - } - srcSize -= readSize; - while ( readSize > 0 ) - { - qint64 writeSize = destFile.write( &buffer[0], readSize ); - if ( writeSize==-1 || writeSize==0 ) - { - m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1",destName); - return false; - } - readSize -= writeSize; - } - destFile.flush(); - pp.setCurrent( (double)(srcFile.size()-srcSize)/srcFile.size(), false ); - } - srcFile.close(); - destFile.close(); - - // Update the times of the destFile -#ifdef _WIN32 - struct _stat srcFileStatus; - int statResult = ::_stat( srcName.toLocal8Bit().constData(), &srcFileStatus ); - if (statResult==0) - { - _utimbuf destTimes; - destTimes.actime = srcFileStatus.st_atime;/* time of last access */ - destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */ - - _utime ( destName.toLocal8Bit().constData(), &destTimes ); - _chmod ( destName.toLocal8Bit().constData(), srcFileStatus.st_mode ); - } -#else - struct stat srcFileStatus; - int statResult = ::stat( srcName.toLocal8Bit().constData(), &srcFileStatus ); - if (statResult==0) - { - utimbuf destTimes; - destTimes.actime = srcFileStatus.st_atime;/* time of last access */ - destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */ - - utime ( destName.toLocal8Bit().constData(), &destTimes ); - chmod ( destName.toLocal8Bit().constData(), srcFileStatus.st_mode ); - } -#endif - return true; -} - -bool wildcardMultiMatch( const QString& wildcard, const QString& testString, bool bCaseSensitive ) -{ - QStringList sl = wildcard.split( ";" ); - - for ( QStringList::Iterator it = sl.begin(); it != sl.end(); ++it ) - { - QRegExp pattern( *it, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive, QRegExp::Wildcard ); - if ( pattern.exactMatch( testString ) ) - return true; - } - - return false; -} - - -// class CvsIgnoreList from Cervisia cvsdir.cpp -// Copyright (C) 1999-2002 Bernd Gehrmann -// with elements from class StringMatcher -// Copyright (c) 2003 Andre Woebbeking -// Modifications for KDiff3 by Joachim Eibl -class CvsIgnoreList -{ -public: - CvsIgnoreList(){} - void init(FileAccess& dir, bool bUseLocalCvsIgnore ); - bool matches(const QString& fileName, bool bCaseSensitive ) const; - -private: - void addEntriesFromString(const QString& str); - void addEntriesFromFile(const QString& name); - void addEntry(const QString& entry); - - QStringList m_exactPatterns; - QStringList m_startPatterns; - QStringList m_endPatterns; - QStringList m_generalPatterns; -}; - - -void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore ) -{ - static const char *ignorestr = ". .. core RCSLOG tags TAGS RCS SCCS .make.state " - ".nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj " - "*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$"; - - addEntriesFromString(QString::fromLatin1(ignorestr)); - addEntriesFromFile(QDir::homePath() + "/.cvsignore"); - addEntriesFromString(QString::fromLocal8Bit(::getenv("CVSIGNORE"))); - - if (bUseLocalCvsIgnore) - { - FileAccess file(dir); - file.addPath( ".cvsignore" ); - int size = file.exists() ? file.sizeForReading() : 0; - if ( size>0 ) - { - char* buf=new char[size]; - if (buf!=0) - { - file.readFile( buf, size ); - int pos1 = 0; - for ( int pos = 0; pos<=size; ++pos ) - { - if( pos==size || buf[pos]==' ' || buf[pos]=='\t' || buf[pos]=='\n' || buf[pos]=='\r' ) - { - if (pos>pos1) - { - addEntry( QString::fromLatin1( &buf[pos1], pos-pos1 ) ); - } - ++pos1; - } - } - delete buf; - } - } - } -} - - -void CvsIgnoreList::addEntriesFromString(const QString& str) -{ - int posLast(0); - int pos; - while ((pos = str.indexOf(' ', posLast)) >= 0) - { - if (pos > posLast) - addEntry(str.mid(posLast, pos - posLast)); - posLast = pos + 1; - } - - if (posLast < static_cast(str.length())) - addEntry(str.mid(posLast)); -} - - -void CvsIgnoreList::addEntriesFromFile(const QString &name) -{ - QFile file(name); - - if( file.open(QIODevice::ReadOnly) ) - { - QTextStream stream(&file); - while( !stream.atEnd() ) - { - addEntriesFromString(stream.readLine()); - } - } -} - -void CvsIgnoreList::addEntry(const QString& pattern) -{ - if (pattern != QString("!")) - { - if (pattern.isEmpty()) return; - - // The general match is general but slow. - // Special tests for '*' and '?' at the beginning or end of a pattern - // allow fast checks. - - // Count number of '*' and '?' - unsigned int nofMetaCharacters = 0; - - const QChar* pos; - pos = pattern.unicode(); - const QChar* posEnd; - posEnd=pos + pattern.length(); - while (pos < posEnd) - { - if( *pos==QChar('*') || *pos==QChar('?') ) ++nofMetaCharacters; - ++pos; - } - - if ( nofMetaCharacters==0 ) - { - m_exactPatterns.append(pattern); - } - else if ( nofMetaCharacters==1 ) - { - if ( pattern.at(0) == QChar('*') ) - { - m_endPatterns.append( pattern.right( pattern.length() - 1) ); - } - else if (pattern.at(pattern.length() - 1) == QChar('*')) - { - m_startPatterns.append( pattern.left( pattern.length() - 1) ); - } - else - { - m_generalPatterns.append(pattern.toLocal8Bit()); - } - } - else - { - m_generalPatterns.append(pattern.toLocal8Bit()); - } - } - else - { - m_exactPatterns.clear(); - m_startPatterns.clear(); - m_endPatterns.clear(); - m_generalPatterns.clear(); - } -} - -bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive ) const -{ - if ( m_exactPatterns.indexOf(text) >=0 ) - { - return true; - } - - QStringList::ConstIterator it; - QStringList::ConstIterator itEnd; - for ( it=m_startPatterns.begin(), itEnd=m_startPatterns.end(); it != itEnd; ++it) - { - if (text.startsWith(*it)) - { - return true; - } - } - - for ( it = m_endPatterns.begin(), itEnd=m_endPatterns.end(); it != itEnd; ++it) - { - if (text.mid( text.length() - (*it).length() )==*it) //(text.endsWith(*it)) - { - return true; - } - } - - /* - for (QValueList::const_iterator it(m_generalPatterns.begin()), - itEnd(m_generalPatterns.end()); - it != itEnd; ++it) - { - if (::fnmatch(*it, text.local8Bit(), FNM_PATHNAME) == 0) - { - return true; - } - } - */ - - - for ( it = m_generalPatterns.begin(); it != m_generalPatterns.end(); ++it ) - { - QRegExp pattern( *it, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive, QRegExp::Wildcard ); - if ( pattern.exactMatch( text ) ) - return true; - } - - return false; -} - -static QString nicePath( const QFileInfo& fi ) -{ - QString fp = fi.filePath(); - if ( fp.length()>2 && fp[0] == '.' && fp[1] == '/' ) - { - return fp.mid(2); - } - return fp; -} - -static bool cvsIgnoreExists( t_DirectoryList* pDirList ) -{ - t_DirectoryList::iterator i; - for( i = pDirList->begin(); i!=pDirList->end(); ++i ) - { - if ( i->fileName()==".cvsignore" ) - return true; - } - return false; -} - -bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive, bool bFindHidden, const QString& filePattern, - const QString& fileAntiPattern, const QString& dirAntiPattern, bool bFollowDirLinks, bool bUseCvsIgnore ) -{ - ProgressProxy pp; - m_pDirList = pDirList; - m_pDirList->clear(); - m_bFindHidden = bFindHidden; - m_bRecursive = bRecursive; - m_bFollowDirLinks = bFollowDirLinks; // Only relevant if bRecursive==true. - m_fileAntiPattern = fileAntiPattern; - m_filePattern = filePattern; - m_dirAntiPattern = dirAntiPattern; - - if ( pp.wasCancelled() ) - return true; // Cancelled is not an error. - - pp.setInformation( i18n("Reading directory: ") + m_pFileAccess->absoluteFilePath(), 0, false ); - - if( m_pFileAccess->isLocal() ) - { - QString currentPath = QDir::currentPath(); - m_bSuccess = QDir::setCurrent( m_pFileAccess->absoluteFilePath() ); - if ( m_bSuccess ) - { -#ifndef _WIN32 - m_bSuccess = true; - QDir dir( "." ); - - dir.setSorting( QDir::Name | QDir::DirsFirst ); - dir.setFilter( QDir::Files | QDir::Dirs | /* from KDE3 QDir::TypeMaskDirs | */ QDir::Hidden ); - - QFileInfoList fiList = dir.entryInfoList(); - if ( fiList.isEmpty() ) - { - // No Permission to read directory or other error. - m_bSuccess = false; - } - else - { - foreach ( QFileInfo fi, fiList ) // for each file... - { - if ( fi.fileName() == "." || fi.fileName()==".." ) - continue; - - pDirList->push_back( FileAccess( nicePath(fi) ) ); - } - } -#else - QString pattern ="*.*"; - WIN32_FIND_DATA findData; - WIN32_FIND_DATAA& findDataA=*(WIN32_FIND_DATAA*)&findData; // Needed for Win95 - - Qt::HANDLE searchHandle = QT_WA_INLINE( - FindFirstFile( (TCHAR*)pattern.utf16(), &findData ), - FindFirstFileA( pattern.toLocal8Bit(), &findDataA ) - ); - - if ( searchHandle != INVALID_HANDLE_VALUE ) - { - QString absPath = m_pFileAccess->absoluteFilePath(); - QString relPath = m_pFileAccess->filePath(); - bool bFirst=true; - while( ! pp.wasCancelled() ) - { - if (!bFirst) - { - if ( ! QT_WA_INLINE( - FindNextFile(searchHandle,&findData), - FindNextFileA(searchHandle,&findDataA)) ) - break; - } - bFirst = false; - FileAccess fa; - fa.m_size = ( qint64( findData.nFileSizeHigh ) << 32 ) + findData.nFileSizeLow; - - FILETIME ft; - SYSTEMTIME t; - FileTimeToLocalFileTime( &findData.ftLastWriteTime, &ft ); FileTimeToSystemTime(&ft,&t); - fa.m_modificationTime = QDateTime( QDate(t.wYear, t.wMonth, t.wDay), QTime(t.wHour, t.wMinute, t.wSecond) ); - FileTimeToLocalFileTime( &findData.ftLastAccessTime, &ft ); FileTimeToSystemTime(&ft,&t); - fa.m_accessTime = QDateTime( QDate(t.wYear, t.wMonth, t.wDay), QTime(t.wHour, t.wMinute, t.wSecond) ); - FileTimeToLocalFileTime( &findData.ftCreationTime, &ft ); FileTimeToSystemTime(&ft,&t); - fa.m_creationTime = QDateTime( QDate(t.wYear, t.wMonth, t.wDay), QTime(t.wHour, t.wMinute, t.wSecond) ); - - int a = findData.dwFileAttributes; - fa.m_bWritable = ( a & FILE_ATTRIBUTE_READONLY) == 0; - fa.m_bDir = ( a & FILE_ATTRIBUTE_DIRECTORY ) != 0; - fa.m_bFile = !fa.m_bDir; - fa.m_bHidden = ( a & FILE_ATTRIBUTE_HIDDEN) != 0; - - fa.m_bExecutable = false; // Useless on windows - fa.m_bExists = true; - fa.m_bReadable = true; - fa.m_bLocal = true; - fa.m_bValidData = true; - fa.m_bSymLink = false; - fa.m_fileType = 0; - - fa.m_name = QT_WA_INLINE( - QString::fromUtf16((const ushort*)findData.cFileName), - QString::fromLocal8Bit(findDataA.cFileName) - ); - - fa.m_path = fa.m_name; - fa.m_absoluteFilePath = absPath + "/" + fa.m_name; - fa.m_url.setPath( fa.m_absoluteFilePath ); - if ( fa.m_name!="." && fa.m_name!=".." ) - pDirList->push_back( fa ); - } - FindClose( searchHandle ); - } - else - { - QDir::setCurrent( currentPath ); // restore current path - return false; - } -#endif - } - QDir::setCurrent( currentPath ); // restore current path - } - else - { - KIO::ListJob* pListJob=0; - pListJob = KIO::listDir( m_pFileAccess->m_url, KIO::HideProgressInfo, true /*bFindHidden*/ ); - - m_bSuccess = false; - if ( pListJob!=0 ) - { - connect( pListJob, SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ), - this, SLOT( slotListDirProcessNewEntries( KIO::Job*, const KIO::UDSEntryList& )) ); - connect( pListJob, SIGNAL( result( KJob* )), - this, SLOT( slotSimpleJobResult(KJob*) ) ); - - connect( pListJob, SIGNAL( infoMessage(KJob*, const QString&)), - this, SLOT( slotListDirInfoMessage(KJob*, const QString&) )); - - // This line makes the transfer via fish unreliable.:-( - //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); - - g_pProgressDialog->enterEventLoop( pListJob, - i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) ); - } - } - - CvsIgnoreList cvsIgnoreList; - if ( bUseCvsIgnore ) - { - cvsIgnoreList.init( *m_pFileAccess, cvsIgnoreExists(pDirList) ); - } -#if defined(_WIN32) || defined(Q_OS_OS2) - bool bCaseSensitive = false; -#else - bool bCaseSensitive = true; -#endif - - // Now remove all entries that don't match: - t_DirectoryList::iterator i; - for( i = pDirList->begin(); i!=pDirList->end(); ) - { - t_DirectoryList::iterator i2=i; - ++i2; - QString fn = i->fileName(); - if ( (!bFindHidden && i->isHidden() ) - || - (i->isFile() && - ( !wildcardMultiMatch( filePattern, i->fileName(), bCaseSensitive ) || - wildcardMultiMatch( fileAntiPattern, i->fileName(), bCaseSensitive ) ) ) - || - (i->isDir() && wildcardMultiMatch( dirAntiPattern, i->fileName(), bCaseSensitive ) ) - || - cvsIgnoreList.matches( i->fileName(), bCaseSensitive ) - ) - { - // Remove it - pDirList->erase( i ); - i = i2; - } - else - { - ++i; - } - } - - if ( bRecursive ) - { - t_DirectoryList subDirsList; - - t_DirectoryList::iterator i; - for( i = m_pDirList->begin(); i!=m_pDirList->end(); ++i ) - { - if ( i->isDir() && (!i->isSymLink() || m_bFollowDirLinks)) - { - t_DirectoryList dirList; - i->listDir( &dirList, bRecursive, bFindHidden, - filePattern, fileAntiPattern, dirAntiPattern, bFollowDirLinks, bUseCvsIgnore ); - - t_DirectoryList::iterator j; - for( j = dirList.begin(); j!=dirList.end(); ++j ) - { - j->m_path = i->fileName() + "/" + j->m_path; - } - - // append data onto the main list - subDirsList.splice( subDirsList.end(), dirList ); - } - } - - m_pDirList->splice( m_pDirList->end(), subDirsList ); - } - - return m_bSuccess; -} - - -void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job*, const KIO::UDSEntryList& l ) -{ - KUrl parentUrl( m_pFileAccess->m_absoluteFilePath ); - - KIO::UDSEntryList::ConstIterator i; - for ( i=l.begin(); i!=l.end(); ++i ) - { - const KIO::UDSEntry& e = *i; - FileAccess fa; - fa.setUdsEntry( e ); - - if ( fa.filePath() != "." && fa.filePath() != ".." ) - { - fa.m_url = parentUrl; - fa.m_url.addPath( fa.filePath() ); - fa.m_absoluteFilePath = fa.m_url.url(); - m_pDirList->push_back( fa ); - } - } -} - -void FileAccessJobHandler::slotListDirInfoMessage( KJob*, const QString& msg ) -{ - g_pProgressDialog->setInformation( msg, 0.0 ); -} - -void FileAccessJobHandler::slotPercent( KJob*, unsigned long percent ) -{ - g_pProgressDialog->setCurrent( percent/100.0 ); -} - - -ProgressDialog::ProgressDialog( QWidget* pParent ) -: QDialog( pParent ) -{ - setObjectName("ProgressDialog"); - m_bStayHidden = false; - setModal(true); - QVBoxLayout* layout = new QVBoxLayout(this); - - m_pInformation = new QLabel( " ", this ); - layout->addWidget( m_pInformation ); - - m_pProgressBar = new QProgressBar(); - m_pProgressBar->setRange(0,1000); - layout->addWidget( m_pProgressBar ); - - m_pSubInformation = new QLabel( " ", this); - layout->addWidget( m_pSubInformation ); - - m_pSubProgressBar = new QProgressBar(); - m_pSubProgressBar->setRange(0,1000); - layout->addWidget( m_pSubProgressBar ); - - m_pSlowJobInfo = new QLabel( " ", this); - layout->addWidget( m_pSlowJobInfo ); - - QHBoxLayout* hlayout = new QHBoxLayout(); - layout->addLayout(hlayout); - hlayout->addStretch(1); - m_pAbortButton = new QPushButton( i18n("&Cancel"), this); - hlayout->addWidget( m_pAbortButton ); - connect( m_pAbortButton, SIGNAL(clicked()), this, SLOT(slotAbort()) ); - - m_progressDelayTimer = 0; - resize( 400, 100 ); - m_t1.start(); - m_t2.start(); - m_bWasCancelled = false; - m_pJob = 0; -} - -void ProgressDialog::setStayHidden( bool bStayHidden ) -{ - m_bStayHidden = bStayHidden; -} - -void ProgressDialog::push() -{ - ProgressLevelData pld; - if ( !m_progressStack.empty() ) - { - pld.m_dRangeMax = m_progressStack.back().m_dSubRangeMax; - pld.m_dRangeMin = m_progressStack.back().m_dSubRangeMin; - } - else - { - m_bWasCancelled = false; - m_t1.restart(); - m_t2.restart(); - if ( !m_bStayHidden ) - show(); - } - - m_progressStack.push_back( pld ); -} - -void ProgressDialog::pop( bool bRedrawUpdate ) -{ - if ( !m_progressStack.empty() ) - { - m_progressStack.pop_back(); - if ( m_progressStack.empty() ) - hide(); - else - recalc(bRedrawUpdate); - } -} - -void ProgressDialog::setInformation(const QString& info, double dCurrent, bool bRedrawUpdate ) -{ - if ( m_progressStack.empty() ) - return; - ProgressLevelData& pld = m_progressStack.back(); - pld.m_dCurrent = dCurrent; - int level = m_progressStack.size(); - if ( level==1 ) - { - m_pInformation->setText( info ); - m_pSubInformation->setText(""); - } - else if ( level==2 ) - { - m_pSubInformation->setText( info ); - } - recalc(bRedrawUpdate); -} - -void ProgressDialog::setInformation(const QString& info, bool bRedrawUpdate ) -{ - if ( m_progressStack.empty() ) - return; - //ProgressLevelData& pld = m_progressStack.back(); - int level = m_progressStack.size(); - if ( level==1 ) - { - m_pInformation->setText( info ); - m_pSubInformation->setText( "" ); - } - else if ( level==2 ) - { - m_pSubInformation->setText( info ); - } - recalc(bRedrawUpdate); -} - -void ProgressDialog::setMaxNofSteps( int maxNofSteps ) -{ - if ( m_progressStack.empty() ) - return; - ProgressLevelData& pld = m_progressStack.back(); - pld.m_maxNofSteps = maxNofSteps; - pld.m_dCurrent = 0; -} - -void ProgressDialog::step( bool bRedrawUpdate ) -{ - if ( m_progressStack.empty() ) - return; - ProgressLevelData& pld = m_progressStack.back(); - pld.m_dCurrent += 1.0/pld.m_maxNofSteps; - recalc(bRedrawUpdate); -} - -void ProgressDialog::setCurrent( double dSubCurrent, bool bRedrawUpdate ) -{ - if ( m_progressStack.empty() ) - return; - ProgressLevelData& pld = m_progressStack.back(); - pld.m_dCurrent = dSubCurrent; - recalc( bRedrawUpdate ); -} - -// The progressbar goes from 0 to 1 usually. -// By supplying a subrange transformation the subCurrent-values -// 0 to 1 will be transformed to dMin to dMax instead. -// Requirement: 0 < dMin < dMax < 1 -void ProgressDialog::setRangeTransformation( double dMin, double dMax ) -{ - if ( m_progressStack.empty() ) - return; - ProgressLevelData& pld = m_progressStack.back(); - pld.m_dRangeMin = dMin; - pld.m_dRangeMax = dMax; - pld.m_dCurrent = 0; -} - -void ProgressDialog::setSubRangeTransformation( double dMin, double dMax ) -{ - if ( m_progressStack.empty() ) - return; - ProgressLevelData& pld = m_progressStack.back(); - pld.m_dSubRangeMin = dMin; - pld.m_dSubRangeMax = dMax; -} - -void qt_enter_modal(QWidget*); -void qt_leave_modal(QWidget*); - -void ProgressDialog::enterEventLoop( KJob* pJob, const QString& jobInfo ) -{ - m_pJob = pJob; - m_pSlowJobInfo->setText(""); - m_currentJobInfo = jobInfo; - if ( m_progressDelayTimer ) - killTimer( m_progressDelayTimer ); - m_progressDelayTimer = startTimer( 3000 ); /* 3 s delay */ - - // instead of using exec() the eventloop is entered and exited often without hiding/showing the window. - //qt_enter_modal(this); - QEventLoop* pEventLoop = new QEventLoop(this); - m_eventLoopStack.push_back( pEventLoop ); - pEventLoop->exec(); // this function only returns after ProgressDialog::exitEventLoop() is called. - delete pEventLoop; - m_eventLoopStack.pop_back(); - //qt_leave_modal(this); -} - -void ProgressDialog::exitEventLoop() -{ - if ( m_progressDelayTimer ) - killTimer( m_progressDelayTimer ); - m_progressDelayTimer = 0; - m_pJob = 0; - if (!m_eventLoopStack.empty()) - m_eventLoopStack.back()->exit(); -} - -void ProgressDialog::recalc( bool bUpdate ) -{ - if ( m_progressDelayTimer ) - killTimer( m_progressDelayTimer ); - m_progressDelayTimer = startTimer( 3000 ); /* 3 s delay */ - - int level = m_progressStack.size(); - if( ( bUpdate && level==1) || m_t1.elapsed()>200 ) - { - if (m_progressStack.empty() ) - { - m_pProgressBar->setValue( 0 ); - m_pSubProgressBar->setValue( 0 ); - } - else - { - std::list::iterator i = m_progressStack.begin(); - m_pProgressBar->setValue( int( 1000.0 * ( i->m_dCurrent * (i->m_dRangeMax - i->m_dRangeMin) + i->m_dRangeMin ) ) ); - ++i; - if ( i!=m_progressStack.end() ) - m_pSubProgressBar->setValue( int( 1000.0 * ( i->m_dCurrent * (i->m_dRangeMax - i->m_dRangeMin) + i->m_dRangeMin ) ) ); - else - m_pSubProgressBar->setValue( int( 1000.0 * m_progressStack.front().m_dSubRangeMin ) ); - } - - if ( !m_bStayHidden && !isVisible() ) - show(); - qApp->processEvents(); - m_t1.restart(); - } -} - - -#include -void ProgressDialog::show() -{ - if ( m_progressDelayTimer ) - killTimer( m_progressDelayTimer ); - m_progressDelayTimer = 0; - if ( !isVisible() && (parentWidget()==0 || parentWidget()->isVisible()) ) - { - QDialog::show(); - } -} - -void ProgressDialog::hide() -{ - if ( m_progressDelayTimer ) - killTimer( m_progressDelayTimer ); - m_progressDelayTimer = 0; - // Calling QDialog::hide() directly doesn't always work. (?) - QTimer::singleShot( 100, this, SLOT(delayedHide()) ); -} - -void ProgressDialog::delayedHide() -{ - if (m_pJob!=0) - { - m_pJob->kill( KJob::Quietly ); - m_pJob = 0; - } - QDialog::hide(); - m_pInformation->setText( "" ); - - //m_progressStack.clear(); - - m_pProgressBar->setValue( 0 ); - m_pSubProgressBar->setValue( 0 ); - m_pSubInformation->setText(""); - m_pSlowJobInfo->setText(""); -} - -void ProgressDialog::reject() -{ - m_bWasCancelled = true; - QDialog::reject(); -} - -void ProgressDialog::slotAbort() -{ - reject(); -} - -bool ProgressDialog::wasCancelled() -{ - if( m_t2.elapsed()>100 ) - { - qApp->processEvents(); - m_t2.restart(); - } - return m_bWasCancelled; -} - - -void ProgressDialog::timerEvent(QTimerEvent*) -{ - if( !isVisible() ) - { - show(); - } - m_pSlowJobInfo->setText( m_currentJobInfo ); -} - - -ProgressProxy::ProgressProxy() -{ - g_pProgressDialog->push(); -} - -ProgressProxy::~ProgressProxy() -{ - g_pProgressDialog->pop(false); -} - -void ProgressProxy::setInformation( const QString& info, bool bRedrawUpdate ) -{ - g_pProgressDialog->setInformation( info, bRedrawUpdate ); -} - -void ProgressProxy::setInformation( const QString& info, double dCurrent, bool bRedrawUpdate ) -{ - g_pProgressDialog->setInformation( info, dCurrent, bRedrawUpdate ); -} - -void ProgressProxy::setCurrent( double dCurrent, bool bRedrawUpdate ) -{ - g_pProgressDialog->setCurrent( dCurrent, bRedrawUpdate ); -} - -void ProgressProxy::step( bool bRedrawUpdate ) -{ - g_pProgressDialog->step( bRedrawUpdate ); -} - -void ProgressProxy::setMaxNofSteps( int maxNofSteps ) -{ - g_pProgressDialog->setMaxNofSteps( maxNofSteps ); -} - -bool ProgressProxy::wasCancelled() -{ - return g_pProgressDialog->wasCancelled(); -} - -void ProgressProxy::setRangeTransformation( double dMin, double dMax ) -{ - g_pProgressDialog->setRangeTransformation( dMin, dMax ); -} - -void ProgressProxy::setSubRangeTransformation( double dMin, double dMax ) -{ - g_pProgressDialog->setSubRangeTransformation( dMin, dMax ); -} - - - - - -//#include "fileaccess.moc" Index: trunk/extragear/utils/kdiff3/src/difftextwindow.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/difftextwindow.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/difftextwindow.cpp (nonexistent) @@ -1,1846 +0,0 @@ -/*************************************************************************** - difftextwindow.cpp - description - ------------------- - begin : Mon Apr 8 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "difftextwindow.h" -#include "merger.h" -#include "optiondialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - -class DiffTextWindowData -{ -public: - DiffTextWindowData( DiffTextWindow* p ) - { - m_pDiffTextWindow = p; - m_bPaintingAllowed = false; - m_pLineData = 0; - m_size = 0; - m_bWordWrap = false; - m_delayedDrawTimer = 0; - m_pDiff3LineVector = 0; - m_pManualDiffHelpList = 0; - m_pOptionDialog = 0; - m_fastSelectorLine1 = 0; - m_fastSelectorNofLines = 0; - m_bTriple = 0; - m_winIdx = 0; - m_firstLine = 0; - m_oldFirstLine = 0; - m_oldFirstColumn = 0; - m_firstColumn = 0; - m_lineNumberWidth = 0; - m_pStatusBar = 0; - m_scrollDeltaX = 0; - m_scrollDeltaY = 0; - m_bMyUpdate = false; - m_bSelectionInProgress = false; - m_pTextCodec = 0; - #if defined(_WIN32) || defined(Q_OS_OS2) - m_eLineEndStyle = eLineEndStyleDos; - #else - m_eLineEndStyle = eLineEndStyleUnix; - #endif - } - DiffTextWindow* m_pDiffTextWindow; - DiffTextWindowFrame* m_pDiffTextWindowFrame; - QTextCodec* m_pTextCodec; - e_LineEndStyle m_eLineEndStyle; - - bool m_bPaintingAllowed; - const LineData* m_pLineData; - int m_size; - QString m_filename; - bool m_bWordWrap; - int m_delayedDrawTimer; - - const Diff3LineVector* m_pDiff3LineVector; - Diff3WrapLineVector m_diff3WrapLineVector; - const ManualDiffHelpList* m_pManualDiffHelpList; - - OptionDialog* m_pOptionDialog; - QColor m_cThis; - QColor m_cDiff1; - QColor m_cDiff2; - QColor m_cDiffBoth; - - int m_fastSelectorLine1; - int m_fastSelectorNofLines; - - bool m_bTriple; - int m_winIdx; - int m_firstLine; - int m_oldFirstLine; - int m_oldFirstColumn; - int m_firstColumn; - int m_lineNumberWidth; - - void getLineInfo( - const Diff3Line& d, - int& lineIdx, - DiffList*& pFineDiff1, DiffList*& pFineDiff2, // return values - int& changed, int& changed2 ); - - QString getString( int d3lIdx ); - QString getLineString( int line ); - - void writeLine( - MyPainter& p, const LineData* pld, - const DiffList* pLineDiff1, const DiffList* pLineDiff2, int line, - int whatChanged, int whatChanged2, int srcLineIdx, - int wrapLineOffset, int wrapLineLength, bool bWrapLine, const QRect& invalidRect, int deviceWidth - ); - - void draw( MyPainter& p, const QRect& invalidRect, int deviceWidth, int beginLine, int endLine ); - - QStatusBar* m_pStatusBar; - - Selection m_selection; - - int m_scrollDeltaX; - int m_scrollDeltaY; - - bool m_bMyUpdate; - void myUpdate(int afterMilliSecs ); - - int leftInfoWidth() { return 4+m_lineNumberWidth; } // Nr of information columns on left side - int convertLineOnScreenToLineInSource( int lineOnScreen, e_CoordType coordType, bool bFirstLine ); - - bool m_bSelectionInProgress; - QPoint m_lastKnownMousePos; -}; - -DiffTextWindow::DiffTextWindow( - DiffTextWindowFrame* pParent, - QStatusBar* pStatusBar, - OptionDialog* pOptionDialog, - int winIdx - ) - : QWidget(pParent) -{ - setObjectName(QString("DiffTextWindow%1").arg(winIdx)); - setAttribute( Qt::WA_OpaquePaintEvent ); - //setAttribute( Qt::WA_PaintOnScreen ); - - d = new DiffTextWindowData(this); - d->m_pDiffTextWindowFrame = pParent; - setFocusPolicy( Qt::ClickFocus ); - setAcceptDrops( true ); - - d->m_pOptionDialog = pOptionDialog; - init( 0, 0, d->m_eLineEndStyle, 0, 0, 0, 0, false ); - - setMinimumSize(QSize(20,20)); - - d->m_pStatusBar = pStatusBar; - d->m_bPaintingAllowed = true; - d->m_bWordWrap = false; - d->m_winIdx = winIdx; - - setFont(d->m_pOptionDialog->m_font); -} - -DiffTextWindow::~DiffTextWindow() -{ - delete d; -} - -void DiffTextWindow::init( - const QString& filename, - QTextCodec* pTextCodec, - e_LineEndStyle eLineEndStyle, - const LineData* pLineData, - int size, - const Diff3LineVector* pDiff3LineVector, - const ManualDiffHelpList* pManualDiffHelpList, - bool bTriple - ) -{ - d->m_filename = filename; - d->m_pLineData = pLineData; - d->m_size = size; - d->m_pDiff3LineVector = pDiff3LineVector; - d->m_diff3WrapLineVector.clear(); - d->m_pManualDiffHelpList = pManualDiffHelpList; - - d->m_firstLine = 0; - d->m_oldFirstLine = -1; - d->m_firstColumn = 0; - d->m_oldFirstColumn = -1; - d->m_bTriple = bTriple; - d->m_scrollDeltaX=0; - d->m_scrollDeltaY=0; - d->m_bMyUpdate = false; - d->m_fastSelectorLine1 = 0; - d->m_fastSelectorNofLines = 0; - d->m_lineNumberWidth = 0; - d->m_selection.reset(); - d->m_selection.oldFirstLine = -1; // reset is not enough here. - d->m_selection.oldLastLine = -1; - d->m_selection.lastLine = -1; - - d->m_pTextCodec = pTextCodec; - d->m_eLineEndStyle = eLineEndStyle; - - update(); - d->m_pDiffTextWindowFrame->init(); -} - -void DiffTextWindow::reset() -{ - d->m_pLineData=0; - d->m_size=0; - d->m_pDiff3LineVector=0; - d->m_filename=""; - d->m_diff3WrapLineVector.clear(); -} - -void DiffTextWindow::setPaintingAllowed( bool bAllowPainting ) -{ - if (d->m_bPaintingAllowed != bAllowPainting) - { - d->m_bPaintingAllowed = bAllowPainting; - if ( d->m_bPaintingAllowed ) update(); - else reset(); - } -} - -void DiffTextWindow::dragEnterEvent( QDragEnterEvent* e ) -{ - e->setAccepted( e->mimeData()->hasUrls() || e->mimeData()->hasText() ); - // Note that the corresponding drop is handled in KDiff3App::eventFilter(). -} - - -void DiffTextWindow::setFirstLine(int firstLine) -{ - int fontHeight = fontMetrics().height(); - - int newFirstLine = max2(0,firstLine); - - int deltaY = fontHeight * ( d->m_firstLine - newFirstLine ); - - d->m_firstLine = newFirstLine; - - if ( d->m_bSelectionInProgress && d->m_selection.firstLine != -1 ) - { - int line, pos; - convertToLinePos( d->m_lastKnownMousePos.x(), d->m_lastKnownMousePos.y(), line, pos ); - d->m_selection.end( line, pos ); - update(); - } - else - { - QWidget::scroll( 0, deltaY ); - } - d->m_pDiffTextWindowFrame->setFirstLine( d->m_firstLine ); -} - -int DiffTextWindow::getFirstLine() -{ - return d->m_firstLine; -} - -void DiffTextWindow::setFirstColumn(int firstCol) -{ - int fontWidth = fontMetrics().width('W'); - int xOffset = d->leftInfoWidth() * fontWidth; - - int newFirstColumn = max2(0,firstCol); - - int deltaX = fontWidth * ( d->m_firstColumn - newFirstColumn ); - - d->m_firstColumn = newFirstColumn; - - QRect r( xOffset, 0, width()-xOffset, height() ); - - if ( d->m_pOptionDialog->m_bRightToLeftLanguage ) - { - deltaX = -deltaX; - r = QRect( width()-1-xOffset, 0, -(width()-xOffset), height() ).normalized(); - } - - if ( d->m_bSelectionInProgress && d->m_selection.firstLine != -1 ) - { - int line, pos; - convertToLinePos( d->m_lastKnownMousePos.x(), d->m_lastKnownMousePos.y(), line, pos ); - d->m_selection.end( line, pos ); - update(); - } - else - { - QWidget::scroll( deltaX, 0, r ); - } -} - -int DiffTextWindow::getNofColumns() -{ - if (d->m_bWordWrap) - { - return getNofVisibleColumns(); - } - else - { - int nofColumns = 0; - for( int i = 0; i< d->m_size; ++i ) - { - if ( d->m_pLineData[i].width( d->m_pOptionDialog->m_tabSize ) > nofColumns ) - nofColumns = d->m_pLineData[i].width( d->m_pOptionDialog->m_tabSize ); - } - return nofColumns; - } -} - -int DiffTextWindow::getNofLines() -{ - return d->m_bWordWrap ? d->m_diff3WrapLineVector.size() : - d->m_pDiff3LineVector->size(); -} - - -int DiffTextWindow::convertLineToDiff3LineIdx( int line ) -{ - if ( d->m_bWordWrap && d->m_diff3WrapLineVector.size()>0 ) - return d->m_diff3WrapLineVector[ min2( line, (int)d->m_diff3WrapLineVector.size()-1 ) ].diff3LineIndex; - else - return line; -} - -int DiffTextWindow::convertDiff3LineIdxToLine( int d3lIdx ) -{ - if ( d->m_bWordWrap && d->m_pDiff3LineVector!=0 && d->m_pDiff3LineVector->size()>0 ) - return (*d->m_pDiff3LineVector)[ min2( d3lIdx, (int)d->m_pDiff3LineVector->size()-1 ) ]->sumLinesNeededForDisplay; - else - return d3lIdx; -} - -/** Returns a line number where the linerange [line, line+nofLines] can - be displayed best. If it fits into the currently visible range then - the returned value is the current firstLine. -*/ -int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines ) -{ - int newFirstLine = firstLine; - if ( line < firstLine || line + nofLines + 2 > firstLine + visibleLines ) - { - if ( nofLines > visibleLines || nofLines <= ( 2*visibleLines / 3 - 1) ) - newFirstLine = line - visibleLines/3; - else - newFirstLine = line - (visibleLines - nofLines); - } - - return newFirstLine; -} - - -void DiffTextWindow::setFastSelectorRange( int line1, int nofLines ) -{ - d->m_fastSelectorLine1 = line1; - d->m_fastSelectorNofLines = nofLines; - if ( isVisible() ) - { - int newFirstLine = getBestFirstLine( - convertDiff3LineIdxToLine(d->m_fastSelectorLine1), - convertDiff3LineIdxToLine(d->m_fastSelectorLine1+d->m_fastSelectorNofLines)-convertDiff3LineIdxToLine(d->m_fastSelectorLine1), - d->m_firstLine, - getNofVisibleLines() - ); - if ( newFirstLine != d->m_firstLine ) - { - scroll( 0, newFirstLine - d->m_firstLine ); - } - - update(); - } -} - - -void DiffTextWindow::showStatusLine(int line ) -{ - int d3lIdx = convertLineToDiff3LineIdx( line ); - if( d->m_pDiff3LineVector!=0 && d3lIdx >= 0 && d3lIdx<(int)d->m_pDiff3LineVector->size() ) - { - const Diff3Line* pD3l = (*d->m_pDiff3LineVector)[d3lIdx]; - if ( pD3l != 0 ) - { - int l = pD3l->getLineInFile( d->m_winIdx ); - - QString s = i18n("File") + " " + d->m_filename; - if ( l!=-1 ) - s += ": " + i18n("Line") + " " + QString::number( l+1 ); - else - s += ": " + i18n("Line not available"); - if (d->m_pStatusBar!=0) d->m_pStatusBar->showMessage(s); - - emit lineClicked( d->m_winIdx, l ); - } - } -} - -void DiffTextWindow::focusInEvent(QFocusEvent* e) -{ - emit gotFocus(); - QWidget::focusInEvent(e); -} - -void DiffTextWindow::mousePressEvent ( QMouseEvent* e ) -{ - if ( e->button() == Qt::LeftButton ) - { - int line; - int pos; - convertToLinePos( e->x(), e->y(), line, pos ); - if ( pos < d->m_firstColumn ) - { - emit setFastSelectorLine( convertLineToDiff3LineIdx(line) ); - d->m_selection.firstLine = -1; // Disable current d->m_selection - } - else - { // Selection - resetSelection(); - d->m_selection.start( line, pos ); - d->m_selection.end( line, pos ); - d->m_bSelectionInProgress = true; - d->m_lastKnownMousePos = e->pos(); - - showStatusLine( line ); - } - } -} - -bool isCTokenChar( QChar c ) -{ - return (c=='_') || - ( c>='A' && c<='Z' ) || ( c>='a' && c<='z' ) || - (c>='0' && c<='9'); -} - -/// Calculate where a token starts and ends, given the x-position on screen. -void calcTokenPos( const QString& s, int posOnScreen, int& pos1, int& pos2, int tabSize ) -{ - // Cursor conversions that consider g_tabSize - int pos = convertToPosInText( s, max2( 0, posOnScreen ), tabSize ); - if ( pos>=(int)s.length() ) - { - pos1=s.length(); - pos2=s.length(); - return; - } - - pos1 = pos; - pos2 = pos+1; - - if( isCTokenChar( s[pos1] ) ) - { - while( pos1>=0 && isCTokenChar( s[pos1] ) ) - --pos1; - ++pos1; - - while( pos2<(int)s.length() && isCTokenChar( s[pos2] ) ) - ++pos2; - } -} - -void DiffTextWindow::mouseDoubleClickEvent( QMouseEvent* e ) -{ - d->m_bSelectionInProgress = false; - d->m_lastKnownMousePos = e->pos(); - if ( e->button() == Qt::LeftButton ) - { - int line; - int pos; - convertToLinePos( e->x(), e->y(), line, pos ); - - // Get the string data of the current line - QString s; - if ( d->m_bWordWrap ) - { - if ( line<0 || line >= (int)d->m_diff3WrapLineVector.size() ) - return; - const Diff3WrapLine& d3wl = d->m_diff3WrapLineVector[line]; - s = d->getString( d3wl.diff3LineIndex ).mid( d3wl.wrapLineOffset, d3wl.wrapLineLength ); - } - else - { - if ( line<0 || line >= (int)d->m_pDiff3LineVector->size() ) - return; - s = d->getString( line ); - } - - if ( ! s.isEmpty() ) - { - int pos1, pos2; - calcTokenPos( s, pos, pos1, pos2, d->m_pOptionDialog->m_tabSize ); - - resetSelection(); - d->m_selection.start( line, convertToPosOnScreen( s, pos1, d->m_pOptionDialog->m_tabSize ) ); - d->m_selection.end( line, convertToPosOnScreen( s, pos2, d->m_pOptionDialog->m_tabSize ) ); - update(); - // emit d->m_selectionEnd() happens in the mouseReleaseEvent. - showStatusLine( line ); - } - } -} - -void DiffTextWindow::mouseReleaseEvent ( QMouseEvent* e ) -{ - d->m_bSelectionInProgress = false; - d->m_lastKnownMousePos = e->pos(); - //if ( e->button() == LeftButton ) - { - if (d->m_delayedDrawTimer) - killTimer(d->m_delayedDrawTimer); - d->m_delayedDrawTimer = 0; - if (d->m_selection.firstLine != -1 ) - { - emit selectionEnd(); - } - } - d->m_scrollDeltaX=0; - d->m_scrollDeltaY=0; -} - -inline int sqr(int x){return x*x;} - -void DiffTextWindow::mouseMoveEvent ( QMouseEvent * e ) -{ - int line; - int pos; - convertToLinePos( e->x(), e->y(), line, pos ); - d->m_lastKnownMousePos = e->pos(); - - if (d->m_selection.firstLine != -1 ) - { - d->m_selection.end( line, pos ); - - showStatusLine( line ); - - // Scroll because mouse moved out of the window - const QFontMetrics& fm = fontMetrics(); - int fontWidth = fm.width('W'); - int deltaX=0; - int deltaY=0; - if ( ! d->m_pOptionDialog->m_bRightToLeftLanguage ) - { - if ( e->x() < d->leftInfoWidth()*fontWidth ) deltaX = -1 - abs(e->x()-d->leftInfoWidth()*fontWidth)/fontWidth; - if ( e->x() > width() ) deltaX = +1 + abs(e->x()-width())/fontWidth; - } - else - { - if ( e->x() > width()-1-d->leftInfoWidth()*fontWidth ) deltaX=+1+ abs(e->x() - (width()-1-d->leftInfoWidth()*fontWidth)) / fontWidth; - if ( e->x() < fontWidth ) deltaX=-1- abs(e->x()-fontWidth)/fontWidth; - } - if ( e->y() < 0 ) deltaY = -1 - sqr( e->y() ) / sqr(fm.height()); - if ( e->y() > height() ) deltaY = +1 + sqr( e->y() - height() ) / sqr(fm.height()); - if ( (deltaX != 0 && d->m_scrollDeltaX!=deltaX) || (deltaY!= 0 && d->m_scrollDeltaY!=deltaY) ) - { - d->m_scrollDeltaX = deltaX; - d->m_scrollDeltaY = deltaY; - emit scroll( deltaX, deltaY ); - if (d->m_delayedDrawTimer) - killTimer( d->m_delayedDrawTimer ); - d->m_delayedDrawTimer = startTimer(50); - } - else - { - d->m_scrollDeltaX = deltaX; - d->m_scrollDeltaY = deltaY; - d->myUpdate(0); - } - } -} - - -void DiffTextWindowData::myUpdate(int afterMilliSecs) -{ - if (m_delayedDrawTimer) - m_pDiffTextWindow->killTimer( m_delayedDrawTimer ); - m_bMyUpdate = true; - m_delayedDrawTimer = m_pDiffTextWindow->startTimer( afterMilliSecs ); -} - -void DiffTextWindow::timerEvent(QTimerEvent*) -{ - killTimer(d->m_delayedDrawTimer); - d->m_delayedDrawTimer = 0; - - if ( d->m_bMyUpdate ) - { - int fontHeight = fontMetrics().height(); - - if ( d->m_selection.oldLastLine != -1 ) - { - int lastLine; - int firstLine; - if ( d->m_selection.oldFirstLine != -1 ) - { - firstLine = min3( d->m_selection.oldFirstLine, d->m_selection.lastLine, d->m_selection.oldLastLine ); - lastLine = max3( d->m_selection.oldFirstLine, d->m_selection.lastLine, d->m_selection.oldLastLine ); - } - else - { - firstLine = min2( d->m_selection.lastLine, d->m_selection.oldLastLine ); - lastLine = max2( d->m_selection.lastLine, d->m_selection.oldLastLine ); - } - int y1 = ( firstLine - d->m_firstLine ) * fontHeight; - int y2 = min2( height(), ( lastLine - d->m_firstLine + 1 ) * fontHeight ); - - if ( y10 ) - { - QRect invalidRect = QRect( 0, y1, width(), y2-y1 ); - update( invalidRect ); - } - } - - d->m_bMyUpdate = false; - } - - if ( d->m_scrollDeltaX != 0 || d->m_scrollDeltaY != 0 ) - { - d->m_selection.end( d->m_selection.lastLine + d->m_scrollDeltaY, d->m_selection.lastPos + d->m_scrollDeltaX ); - emit scroll( d->m_scrollDeltaX, d->m_scrollDeltaY ); - killTimer(d->m_delayedDrawTimer); - d->m_delayedDrawTimer = startTimer(50); - } -} - -void DiffTextWindow::resetSelection() -{ - d->m_selection.reset(); - update(); -} - -void DiffTextWindow::convertToLinePos( int x, int y, int& line, int& pos ) -{ - const QFontMetrics& fm = fontMetrics(); - int fontHeight = fm.height(); - int fontWidth = fm.width('W'); - int xOffset = ( d->leftInfoWidth() - d->m_firstColumn ) * fontWidth; - - int yOffset = - d->m_firstLine * fontHeight; - - line = ( y - yOffset ) / fontHeight; - if ( ! d->m_pOptionDialog->m_bRightToLeftLanguage ) - pos = ( x - xOffset ) / fontWidth; - else - pos = ( (width() - 1 - x) - xOffset ) / fontWidth; -} - -int Selection::firstPosInLine(int l) -{ - assert( firstLine != -1 ); - - int l1 = firstLine; - int l2 = lastLine; - int p1 = firstPos; - int p2 = lastPos; - if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); } - if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); } - - if ( l==l1 ) - return p1; - return 0; -} - -int Selection::lastPosInLine(int l) -{ - assert( firstLine != -1 ); - - int l1 = firstLine; - int l2 = lastLine; - int p1 = firstPos; - int p2 = lastPos; - - if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); } - if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); } - - if ( l==l2 ) - return p2; - return INT_MAX; -} - -bool Selection::within( int l, int p ) -{ - if ( firstLine == -1 ) return false; - int l1 = firstLine; - int l2 = lastLine; - int p1 = firstPos; - int p2 = lastPos; - if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); } - if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); } - if( l1 <= l && l <= l2 ) - { - if ( l1==l2 ) - return p>=p1 && p=p1; - if ( l==l2 ) - return pl2 ){ std::swap(l1,l2); } - - return ( l1 <= l && l <= l2 ); -} - -class DrawTextOptimizer -// Drawing continuous text is much faster than drawing one char after another. -{ -private: - QFont m_font; - QPen m_pen; - QString m_text; - QPoint m_pos; - MyPainter* m_pPainter; - QFontMetrics m_fm; - void draw() - { - if ( m_pPainter && !m_text.isEmpty() ) - { - m_pPainter->setFont( m_font ); - m_pPainter->setPen( m_pen ); - m_pPainter->drawText( m_pos.x(), m_pos.y(), m_text, true ); - m_text = QString(); - } - } -public: - DrawTextOptimizer( MyPainter* pPainter ) - : m_fm(pPainter->fontMetrics()) - { - m_pPainter = pPainter; - m_font = m_pPainter->font(); - m_pen = m_pPainter->pen(); - } - ~DrawTextOptimizer() { end(); } - void setFont( const QFont& f ) - { - if ( f!=m_font ) - { - draw(); - m_font = f; - m_fm = m_pPainter->fontMetrics(); - } - } - void setPen( const QPen& pen ) - { - if ( pen!=m_pen ) - { - draw(); - m_pen = pen; - } - } - void drawText( int x, int y, const QString& s ) - { - if ( y!=m_pos.y() || x != m_pos.x()+m_text.length()*m_fm.width("W") ) - { - draw(); - m_pos = QPoint(x,y); - } - m_text += s; - } - void end() - { - draw(); - } -}; - -void DiffTextWindowData::writeLine( - MyPainter& p, - const LineData* pld, - const DiffList* pLineDiff1, - const DiffList* pLineDiff2, - int line, - int whatChanged, - int whatChanged2, - int srcLineIdx, - int wrapLineOffset, - int wrapLineLength, - bool bWrapLine, - const QRect& invalidRect, - int deviceWidth - ) -{ - QFont normalFont = p.font(); - QFont diffFont = normalFont; - diffFont.setItalic( m_pOptionDialog->m_bItalicForDeltas ); - const QFontMetrics& fm = p.fontMetrics(); - int fontHeight = fm.height(); - int fontAscent = fm.ascent(); - int fontDescent = fm.descent(); - int fontWidth = fm.width('W'); - - int xOffset = (leftInfoWidth() - m_firstColumn)*fontWidth; - int yOffset = (line-m_firstLine) * fontHeight; - - QRect lineRect( 0, yOffset, deviceWidth, fontHeight ); - if ( ! invalidRect.intersects( lineRect ) ) - { - return; - } - - int fastSelectorLine1 = m_pDiffTextWindow->convertDiff3LineIdxToLine(m_fastSelectorLine1); - int fastSelectorLine2 = m_pDiffTextWindow->convertDiff3LineIdxToLine(m_fastSelectorLine1+m_fastSelectorNofLines)-1; - - bool bFastSelectionRange = (line>=fastSelectorLine1 && line<= fastSelectorLine2 ); - QColor bgColor = m_pOptionDialog->m_bgColor; - QColor diffBgColor = m_pOptionDialog->m_diffBgColor; - - if ( bFastSelectionRange ) - { - bgColor = m_pOptionDialog->m_currentRangeBgColor; - diffBgColor = m_pOptionDialog->m_currentRangeDiffBgColor; - } - - if ( yOffset+fontHeightm_fgColor; - p.setPen(c); - if ( changed == 2 ) { - c = m_cDiff2; - } else if ( changed == 1 ) { - c = m_cDiff1; - } else if ( changed == 3 ) { - c = m_cDiffBoth; - } - - p.fillRect( leftInfoWidth()*fontWidth, yOffset, deviceWidth, fontHeight, bgColor ); - - if (pld!=0) - { - // First calculate the "changed" information for each character. - int i=0; - QString lineString( pld->pLine, pld->size ); - std::vector charChanged( pld->size ); - Merger merger( pLineDiff1, pLineDiff2 ); - while( ! merger.isEndReached() && isize ) - { - if ( i < pld->size ) - { - charChanged[i] = merger.whatChanged(); - ++i; - } - merger.next(); - } - - QString s=" "; - // Convert tabs - int outPos = 0; - - int lineLength = m_bWordWrap ? wrapLineOffset+wrapLineLength : lineString.length(); - - DrawTextOptimizer dto( &p ); - - for( i=wrapLineOffset; im_tabSize ); - s[0] = ' '; - } - else - { - s[0] = lineString[i]; - } - - QColor c = m_pOptionDialog->m_fgColor; - int cchanged = charChanged[i] | whatChanged; - - if ( cchanged == 2 ) { - c = m_cDiff2; - } else if ( cchanged == 1 ) { - c = m_cDiff1; - } else if ( cchanged == 3 ) { - c = m_cDiffBoth; - } - - if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 && !m_pOptionDialog->m_bShowWhiteSpace ) - { - // The user doesn't want to see highlighted white space. - c = m_pOptionDialog->m_fgColor; - } - - QRect outRect( xOffset + fontWidth*outPos, yOffset, fontWidth*spaces, fontHeight ); - if ( m_pOptionDialog->m_bRightToLeftLanguage ) - outRect = QRect( deviceWidth-1-(xOffset + fontWidth*outPos), yOffset, -fontWidth*spaces, fontHeight ).normalized(); - if ( invalidRect.intersects( outRect ) ) - { - if( !m_selection.within( line, outPos ) ) - { - - if( c!=m_pOptionDialog->m_fgColor ) - { - QColor lightc = diffBgColor; - p.fillRect( xOffset + fontWidth*outPos, yOffset, - fontWidth*spaces, fontHeight, lightc ); - dto.setFont(diffFont); - } - - dto.setPen( c ); - if ( s[0]==' ' && c!=m_pOptionDialog->m_fgColor && charChanged[i]!=0 ) - { - if ( m_pOptionDialog->m_bShowWhiteSpaceCharacters && m_pOptionDialog->m_bShowWhiteSpace) - { - p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent, - fontWidth*spaces-1, fontDescent, c ); - } - } - else - { - dto.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s ); - } - dto.setFont(normalFont); - } - else - { - p.fillRect( xOffset + fontWidth*outPos, yOffset, - fontWidth*(spaces), fontHeight, m_pDiffTextWindow->palette().highlight() ); - - dto.setPen( m_pDiffTextWindow->palette().highlightedText().color() ); - dto.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s ); - - m_selection.bSelectionContainsData = true; - } - } - - outPos += spaces; - } // end for - dto.end(); - if( m_selection.lineWithin( line ) && m_selection.lineWithin( line+1 ) ) - { - p.fillRect( xOffset + fontWidth*outPos, yOffset, - deviceWidth, fontHeight, m_pDiffTextWindow->palette().highlight() ); - } - } - - p.fillRect( 0, yOffset, leftInfoWidth()*fontWidth, fontHeight, m_pOptionDialog->m_bgColor ); - - xOffset = (m_lineNumberWidth+2)*fontWidth; - int xLeft = m_lineNumberWidth*fontWidth; - p.setPen( m_pOptionDialog->m_fgColor ); - if ( pld!=0 ) - { - if ( m_pOptionDialog->m_bShowLineNumbers && !bWrapLine ) - { - QString num; - num.sprintf( "%0*d", m_lineNumberWidth, srcLineIdx+1); - p.drawText( 0, yOffset + fontAscent, num ); - //p.drawLine( xLeft -1, yOffset, xLeft -1, yOffset+fontHeight-1 ); - } - if ( !bWrapLine || wrapLineLength>0 ) - { - p.setPen( QPen( m_pOptionDialog->m_fgColor, 0, bWrapLine ? Qt::DotLine : Qt::SolidLine) ); - p.drawLine( xOffset +1, yOffset, xOffset +1, yOffset+fontHeight-1 ); - p.setPen( QPen( m_pOptionDialog->m_fgColor, 0, Qt::SolidLine) ); - } - } - if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 )//&& whatChanged==0 ) - { - if ( m_pOptionDialog->m_bShowWhiteSpace ) - { - p.setBrushOrigin(0,0); - p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, QBrush(c,Qt::Dense5Pattern) ); - } - } - else - { - p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, c==m_pOptionDialog->m_fgColor ? bgColor : c ); - } - - if ( bFastSelectionRange ) - { - p.fillRect( xOffset + fontWidth-1, yOffset, 3, fontHeight, m_pOptionDialog->m_fgColor ); - } - - // Check if line needs a manual diff help mark - ManualDiffHelpList::const_iterator ci; - for( ci = m_pManualDiffHelpList->begin(); ci!=m_pManualDiffHelpList->end(); ++ci) - { - const ManualDiffHelpEntry& mdhe=*ci; - int rangeLine1 = -1; - int rangeLine2 = -1; - if (m_winIdx==1 ) { rangeLine1 = mdhe.lineA1; rangeLine2= mdhe.lineA2; } - if (m_winIdx==2 ) { rangeLine1 = mdhe.lineB1; rangeLine2= mdhe.lineB2; } - if (m_winIdx==3 ) { rangeLine1 = mdhe.lineC1; rangeLine2= mdhe.lineC2; } - if ( rangeLine1>=0 && rangeLine2>=0 && srcLineIdx >= rangeLine1 && srcLineIdx <= rangeLine2 ) - { - p.fillRect( xOffset - fontWidth, yOffset, fontWidth-1, fontHeight, m_pOptionDialog->m_manualHelpRangeColor ); - break; - } - } -} - -void DiffTextWindow::paintEvent( QPaintEvent* e ) -{ - QRect invalidRect = e->rect(); - if ( invalidRect.isEmpty() || ! d->m_bPaintingAllowed ) - return; - - if ( d->m_pDiff3LineVector==0 || ( d->m_diff3WrapLineVector.empty() && d->m_bWordWrap ) ) - { - QPainter p(this); - p.fillRect( invalidRect, d->m_pOptionDialog->m_bgColor ); - return; - } - - bool bOldSelectionContainsData = d->m_selection.bSelectionContainsData; - d->m_selection.bSelectionContainsData = false; - - int endLine = min2( d->m_firstLine + getNofVisibleLines()+2, getNofLines() ); - - //if ( invalidRect.size()==size() ) - { // double buffering, obsolete with Qt4 - //QPainter painter(this); // Remove for Qt4 - //QPixmap pixmap( invalidRect.size() );// Remove for Qt4 - - MyPainter p( this, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); // For Qt4 change pixmap to this - - //p.translate( -invalidRect.x(), -invalidRect.y() );// Remove for Qt4 - - p.setFont( font() ); - p.QPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor ); - - d->draw( p, invalidRect, width(), d->m_firstLine, endLine ); - // p.drawLine( m_invalidRect.x(), m_invalidRect.y(), m_invalidRect.right(), m_invalidRect.bottom() ); // For test only - p.end(); - - //painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap );// Remove for Qt4 - } -// else -// { // no double buffering -// MyPainter p( this, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); -// p.setFont( font() ); -// p.QPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor ); -// d->draw( p, invalidRect, width(), d->m_firstLine, endLine ); -// } - - - d->m_oldFirstLine = d->m_firstLine; - d->m_oldFirstColumn = d->m_firstColumn; - d->m_selection.oldLastLine = -1; - if ( d->m_selection.oldFirstLine !=-1 ) - d->m_selection.oldFirstLine = -1; - - if( !bOldSelectionContainsData && d->m_selection.bSelectionContainsData ) - emit newSelection(); -} - -void DiffTextWindow::print( MyPainter& p, const QRect&, int firstLine, int nofLinesPerPage ) -{ - if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed || - ( d->m_diff3WrapLineVector.empty() && d->m_bWordWrap ) ) - return; - resetSelection(); -// MyPainter p( this, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); - int oldFirstLine = d->m_firstLine; - d->m_firstLine = firstLine; - QRect invalidRect = QRect(0,0,1000000000,1000000000); - QColor bgColor = d->m_pOptionDialog->m_bgColor; - d->m_pOptionDialog->m_bgColor = Qt::white; - d->draw( p, invalidRect, p.window().width(), firstLine, min2(firstLine+nofLinesPerPage,getNofLines()) ); - d->m_pOptionDialog->m_bgColor = bgColor; - d->m_firstLine = oldFirstLine; -} - -void DiffTextWindowData::draw( MyPainter& p, const QRect& invalidRect, int deviceWidth, int beginLine, int endLine ) -{ - m_lineNumberWidth = m_pOptionDialog->m_bShowLineNumbers ? (int)log10((double)qMax(m_size,1))+1 : 0; - - if ( m_winIdx==1 ) - { - m_cThis = m_pOptionDialog->m_colorA; - m_cDiff1 = m_pOptionDialog->m_colorB; - m_cDiff2 = m_pOptionDialog->m_colorC; - } - if ( m_winIdx==2 ) - { - m_cThis = m_pOptionDialog->m_colorB; - m_cDiff1 = m_pOptionDialog->m_colorC; - m_cDiff2 = m_pOptionDialog->m_colorA; - } - if ( m_winIdx==3 ) - { - m_cThis = m_pOptionDialog->m_colorC; - m_cDiff1 = m_pOptionDialog->m_colorA; - m_cDiff2 = m_pOptionDialog->m_colorB; - } - m_cDiffBoth = m_pOptionDialog->m_colorForConflict; // Conflict color - - p.setPen( m_cThis ); - - for ( int line = beginLine; line 0 && m_diff3WrapLineVector[line-1].pD3L == d3l; - } - else - { - d3l = (*m_pDiff3LineVector)[line]; - } - DiffList* pFineDiff1; - DiffList* pFineDiff2; - int changed=0; - int changed2=0; - - int srcLineIdx=-1; - getLineInfo( *d3l, srcLineIdx, pFineDiff1, pFineDiff2, changed, changed2 ); - - writeLine( - p, // QPainter - srcLineIdx == -1 ? 0 : &m_pLineData[srcLineIdx], // Text in this line - pFineDiff1, - pFineDiff2, - line, // Line on the screen - changed, - changed2, - srcLineIdx, - wrapLineOffset, - wrapLineLength, - bWrapLine, - invalidRect, - deviceWidth - ); - } -} - -QString DiffTextWindowData::getString( int d3lIdx ) -{ - if ( d3lIdx<0 || d3lIdx>=(int)m_pDiff3LineVector->size() ) - return QString(); - const Diff3Line* d3l = (*m_pDiff3LineVector)[d3lIdx]; - DiffList* pFineDiff1; - DiffList* pFineDiff2; - int changed=0; - int changed2=0; - int lineIdx; - getLineInfo( *d3l, lineIdx, pFineDiff1, pFineDiff2, changed, changed2 ); - - if (lineIdx==-1) return QString(); - else - { - const LineData* ld = &m_pLineData[lineIdx]; - return QString( ld->pLine, ld->size ); - } - return QString(); -} - -QString DiffTextWindowData::getLineString( int line ) -{ - if ( m_bWordWrap ) - { - int d3LIdx = m_pDiffTextWindow->convertLineToDiff3LineIdx(line); - return getString( d3LIdx ).mid( m_diff3WrapLineVector[line].wrapLineOffset, m_diff3WrapLineVector[line].wrapLineLength ); - } - else - { - return getString( line ); - } -} - -void DiffTextWindowData::getLineInfo( - const Diff3Line& d3l, - int& lineIdx, - DiffList*& pFineDiff1, DiffList*& pFineDiff2, // return values - int& changed, int& changed2 - ) -{ - changed=0; - changed2=0; - bool bAEqB = d3l.bAEqB || ( d3l.bWhiteLineA && d3l.bWhiteLineB ); - bool bAEqC = d3l.bAEqC || ( d3l.bWhiteLineA && d3l.bWhiteLineC ); - bool bBEqC = d3l.bBEqC || ( d3l.bWhiteLineB && d3l.bWhiteLineC ); - if ( m_winIdx == 1 ) { - lineIdx=d3l.lineA; - pFineDiff1=d3l.pFineAB; - pFineDiff2=d3l.pFineCA; - changed |= ((d3l.lineB==-1)!=(lineIdx==-1) ? 1 : 0) + - ((d3l.lineC==-1)!=(lineIdx==-1) && m_bTriple ? 2 : 0); - changed2 |= ( bAEqB ? 0 : 1 ) + (bAEqC || !m_bTriple ? 0 : 2); - } - else if ( m_winIdx == 2 ) { - lineIdx=d3l.lineB; - pFineDiff1=d3l.pFineBC; - pFineDiff2=d3l.pFineAB; - changed |= ((d3l.lineC==-1)!=(lineIdx==-1) && m_bTriple ? 1 : 0) + - ((d3l.lineA==-1)!=(lineIdx==-1) ? 2 : 0); - changed2 |= ( bBEqC || !m_bTriple ? 0 : 1 ) + (bAEqB ? 0 : 2); - } - else if ( m_winIdx == 3 ) { - lineIdx=d3l.lineC; - pFineDiff1=d3l.pFineCA; - pFineDiff2=d3l.pFineBC; - changed |= ((d3l.lineA==-1)!=(lineIdx==-1) ? 1 : 0) + - ((d3l.lineB==-1)!=(lineIdx==-1) ? 2 : 0); - changed2 |= ( bAEqC ? 0 : 1 ) + (bBEqC ? 0 : 2); - } - else assert(false); -} - - - -void DiffTextWindow::resizeEvent( QResizeEvent* e ) -{ - QSize s = e->size(); - QFontMetrics fm = fontMetrics(); - int visibleLines = s.height()/fm.height()-2; - int visibleColumns = s.width()/fm.width('W') - d->leftInfoWidth(); - emit resizeSignal( visibleColumns, visibleLines ); - QWidget::resizeEvent(e); -} - -int DiffTextWindow::getNofVisibleLines() -{ - QFontMetrics fm = fontMetrics(); - int fmh = fm.height(); - int h = height(); - return h/fmh -1;//height()/fm.height()-2; -} - -int DiffTextWindow::getNofVisibleColumns() -{ - QFontMetrics fm = fontMetrics(); - return width()/fm.width('W') - d->leftInfoWidth(); -} - -QString DiffTextWindow::getSelection() -{ - if ( d->m_pLineData==0 ) - return QString(); - - QString selectionString; - - int line=0; - int lineIdx=0; - - int it; - int vectorSize = d->m_bWordWrap ? d->m_diff3WrapLineVector.size() : d->m_pDiff3LineVector->size(); - for( it=0; itm_bWordWrap ? d->m_diff3WrapLineVector[it].pD3L : (*d->m_pDiff3LineVector)[it]; - if ( d->m_winIdx == 1 ) { lineIdx=d3l->lineA; } - else if ( d->m_winIdx == 2 ) { lineIdx=d3l->lineB; } - else if ( d->m_winIdx == 3 ) { lineIdx=d3l->lineC; } - else assert(false); - - if( lineIdx != -1 ) - { - const QChar* pLine = d->m_pLineData[lineIdx].pLine; - int size = d->m_pLineData[lineIdx].size; - QString lineString = QString( pLine, size ); - - if ( d->m_bWordWrap ) - { - size = d->m_diff3WrapLineVector[it].wrapLineLength; - lineString = lineString.mid( d->m_diff3WrapLineVector[it].wrapLineOffset, size ); - } - - // Consider tabs - int outPos = 0; - for( int i=0; im_pOptionDialog->m_tabSize ); - } - - if( d->m_selection.within( line, outPos ) ) - { - selectionString += lineString[i]; - } - - outPos += spaces; - } - - if( d->m_selection.within( line, outPos ) && - !( d->m_bWordWrap && it+1m_diff3WrapLineVector[it+1].pD3L ) - ) - { - #if defined(_WIN32) || defined(Q_OS_OS2) - selectionString += '\r'; - #endif - selectionString += '\n'; - } - } - - ++line; - } - - return selectionString; -} - -bool DiffTextWindow::findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive ) -{ - int it = d3vLine; - int endIt = bDirDown ? (int)d->m_pDiff3LineVector->size() : -1; - int step = bDirDown ? 1 : -1; - int startPos = posInLine; - - for( ; it!=endIt; it+=step ) - { - QString line = d->getString( it ); - if ( !line.isEmpty() ) - { - int pos = line.indexOf( s, startPos, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive ); - if ( pos != -1 ) - { - d3vLine = it; - posInLine = pos; - return true; - } - - startPos = 0; - } - } - return false; -} - -void DiffTextWindow::convertD3LCoordsToLineCoords( int d3LIdx, int d3LPos, int& line, int& pos ) -{ - if( d->m_bWordWrap ) - { - int wrapPos = d3LPos; - int wrapLine = convertDiff3LineIdxToLine(d3LIdx); - while ( wrapPos > d->m_diff3WrapLineVector[wrapLine].wrapLineLength ) - { - wrapPos -= d->m_diff3WrapLineVector[wrapLine].wrapLineLength; - ++wrapLine; - } - pos = wrapPos; - line = wrapLine; - } - else - { - pos = d3LPos; - line = d3LIdx; - } -} - -void DiffTextWindow::convertLineCoordsToD3LCoords( int line, int pos, int& d3LIdx, int& d3LPos ) -{ - if( d->m_bWordWrap ) - { - d3LPos = pos; - d3LIdx = convertLineToDiff3LineIdx( line ); - int wrapLine = convertDiff3LineIdxToLine(d3LIdx); // First wrap line belonging to this d3LIdx - while ( wrapLine < line ) - { - d3LPos += d->m_diff3WrapLineVector[wrapLine].wrapLineLength; - ++wrapLine; - } - } - else - { - d3LPos = pos; - d3LIdx = line; - } -} - - -void DiffTextWindow::setSelection( int firstLine, int startPos, int lastLine, int endPos, int& l, int& p ) -{ - d->m_selection.reset(); - if ( lastLine >= getNofLines() ) - { - lastLine = getNofLines()-1; - - const Diff3Line* d3l = (*d->m_pDiff3LineVector)[convertLineToDiff3LineIdx(lastLine)]; - int line = -1; - if ( d->m_winIdx==1 ) line = d3l->lineA; - if ( d->m_winIdx==2 ) line = d3l->lineB; - if ( d->m_winIdx==3 ) line = d3l->lineC; - if (line>=0) - endPos = d->m_pLineData[line].width( d->m_pOptionDialog->m_tabSize); - } - - if ( d->m_bWordWrap && d->m_pDiff3LineVector!=0 ) - { - QString s1 = d->getString(firstLine); - int firstWrapLine = convertDiff3LineIdxToLine(firstLine); - int wrapStartPos = startPos; - while ( wrapStartPos > d->m_diff3WrapLineVector[firstWrapLine].wrapLineLength ) - { - wrapStartPos -= d->m_diff3WrapLineVector[firstWrapLine].wrapLineLength; - s1 = s1.mid(d->m_diff3WrapLineVector[firstWrapLine].wrapLineLength); - ++firstWrapLine; - } - - QString s2 = d->getString(lastLine); - int lastWrapLine = convertDiff3LineIdxToLine(lastLine); - int wrapEndPos = endPos; - while ( wrapEndPos > d->m_diff3WrapLineVector[lastWrapLine].wrapLineLength ) - { - wrapEndPos -= d->m_diff3WrapLineVector[lastWrapLine].wrapLineLength; - s2 = s2.mid(d->m_diff3WrapLineVector[lastWrapLine].wrapLineLength); - ++lastWrapLine; - } - - d->m_selection.start( firstWrapLine, convertToPosOnScreen( s1, wrapStartPos, d->m_pOptionDialog->m_tabSize ) ); - d->m_selection.end( lastWrapLine, convertToPosOnScreen( s2, wrapEndPos, d->m_pOptionDialog->m_tabSize ) ); - l=firstWrapLine; - p=wrapStartPos; - } - else - { - d->m_selection.start( firstLine, convertToPosOnScreen( d->getString(firstLine), startPos, d->m_pOptionDialog->m_tabSize ) ); - d->m_selection.end( lastLine, convertToPosOnScreen( d->getString(lastLine), endPos, d->m_pOptionDialog->m_tabSize ) ); - l=firstLine; - p=startPos; - } - update(); -} - -int DiffTextWindowData::convertLineOnScreenToLineInSource( int lineOnScreen, e_CoordType coordType, bool bFirstLine ) -{ - int line=-1; - if (lineOnScreen>=0) - { - if (coordType==eWrapCoords) return lineOnScreen; - int d3lIdx = m_pDiffTextWindow->convertLineToDiff3LineIdx( lineOnScreen ); - if ( !bFirstLine && d3lIdx >= (int)m_pDiff3LineVector->size() ) - d3lIdx = m_pDiff3LineVector->size()-1; - if (coordType==eD3LLineCoords) return d3lIdx; - while ( line<0 && d3lIdx<(int)m_pDiff3LineVector->size() && d3lIdx>=0 ) - { - const Diff3Line* d3l = (*m_pDiff3LineVector)[d3lIdx]; - if ( m_winIdx==1 ) line = d3l->lineA; - if ( m_winIdx==2 ) line = d3l->lineB; - if ( m_winIdx==3 ) line = d3l->lineC; - if ( bFirstLine ) - ++d3lIdx; - else - --d3lIdx; - } - if (coordType==eFileCoords) return line; - } - return line; -} - - -void DiffTextWindow::getSelectionRange( int* pFirstLine, int* pLastLine, e_CoordType coordType ) -{ - if (pFirstLine) - *pFirstLine = d->convertLineOnScreenToLineInSource( d->m_selection.beginLine(), coordType, true ); - if (pLastLine) - *pLastLine = d->convertLineOnScreenToLineInSource( d->m_selection.endLine(), coordType, false ); -} - -// Returns the number of wrapped lines -// if pWrappedLines != 0 then the stringlist will contain the wrapped lines. -int wordWrap( const QString& origLine, int nofColumns, Diff3WrapLine* pDiff3WrapLine ) -{ - if (nofColumns<=0) - nofColumns = 1; - - int nofNeededLines = 0; - int length = origLine.length(); - - if (length==0) - { - nofNeededLines = 1; - if( pDiff3WrapLine ) - { - pDiff3WrapLine->wrapLineOffset=0; - pDiff3WrapLine->wrapLineLength=0; - } - } - else - { - int pos = 0; - - while ( pos < length ) - { - int wrapPos = pos + nofColumns; - - if ( length-pos <= nofColumns ) - { - wrapPos = length; - } - else - { - int wsPos = max2( origLine.lastIndexOf( ' ', wrapPos ), origLine.lastIndexOf( '\t', wrapPos ) ); - - if ( wsPos > pos ) - { - // Wrap line at wsPos - wrapPos = wsPos; - } - } - - if ( pDiff3WrapLine ) - { - pDiff3WrapLine->wrapLineOffset = pos; - pDiff3WrapLine->wrapLineLength = wrapPos-pos; - ++pDiff3WrapLine; - } - - pos = wrapPos; - - ++nofNeededLines; - } - } - return nofNeededLines; -} - -void DiffTextWindow::convertSelectionToD3LCoords() -{ - if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed || !isVisible() || d->m_selection.isEmpty() ) - { - return; - } - - // convert the d->m_selection to unwrapped coordinates: Later restore to new coords - int firstD3LIdx, firstD3LPos; - QString s = d->getLineString( d->m_selection.beginLine() ); - int firstPosInText = convertToPosInText( s, d->m_selection.beginPos(), d->m_pOptionDialog->m_tabSize ); - convertLineCoordsToD3LCoords( d->m_selection.beginLine(), firstPosInText, firstD3LIdx, firstD3LPos ); - - int lastD3LIdx, lastD3LPos; - s = d->getLineString( d->m_selection.endLine() ); - int lastPosInText = convertToPosInText( s, d->m_selection.endPos(), d->m_pOptionDialog->m_tabSize ); - convertLineCoordsToD3LCoords( d->m_selection.endLine(), lastPosInText, lastD3LIdx, lastD3LPos ); - - //d->m_selection.reset(); - d->m_selection.start( firstD3LIdx, firstD3LPos ); - d->m_selection.end( lastD3LIdx, lastD3LPos ); -} - -void DiffTextWindow::recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int nofVisibleColumns ) -{ - if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed || !isVisible() ) - { - d->m_bWordWrap = bWordWrap; - if (!bWordWrap) d->m_diff3WrapLineVector.resize( 0 ); - return; - } - - d->m_bWordWrap = bWordWrap; - - if ( bWordWrap ) - { - d->m_diff3WrapLineVector.resize( wrapLineVectorSize ); - - if (nofVisibleColumns<0) - nofVisibleColumns = getNofVisibleColumns(); - else - nofVisibleColumns-= d->leftInfoWidth(); - int i; - int wrapLineIdx = 0; - int size = d->m_pDiff3LineVector->size(); - for( i=0; igetString( i ); - int linesNeeded = wordWrap( s, nofVisibleColumns, wrapLineVectorSize==0 ? 0 : &d->m_diff3WrapLineVector[wrapLineIdx] ); - Diff3Line& d3l = *(*d->m_pDiff3LineVector)[i]; - if ( d3l.linesNeededForDisplay0 ) - { - int j; - for( j=0; jm_diff3WrapLineVector[wrapLineIdx]; - d3wl.diff3LineIndex = i; - d3wl.pD3L = (*d->m_pDiff3LineVector)[i]; - if ( j>=linesNeeded ) - { - d3wl.wrapLineOffset=0; - d3wl.wrapLineLength=0; - } - } - } - } - - if ( wrapLineVectorSize>0 ) - { - d->m_firstLine = min2( d->m_firstLine, wrapLineVectorSize-1 ); - d->m_firstColumn = 0; - d->m_pDiffTextWindowFrame->setFirstLine( d->m_firstLine ); - } - } - else - { - d->m_diff3WrapLineVector.resize( 0 ); - } - - if ( !d->m_selection.isEmpty() && ( !d->m_bWordWrap || wrapLineVectorSize>0 ) ) - { - // Assume unwrapped coordinates - //( Why? ->Conversion to unwrapped coords happened a few lines above in this method. - // Also see KDiff3App::recalcWordWrap() on the role of wrapLineVectorSize) - - // Wrap them now. - - // convert the d->m_selection to unwrapped coordinates. - int firstLine, firstPos; - convertD3LCoordsToLineCoords( d->m_selection.beginLine(), d->m_selection.beginPos(), firstLine, firstPos ); - - int lastLine, lastPos; - convertD3LCoordsToLineCoords( d->m_selection.endLine(), d->m_selection.endPos(), lastLine, lastPos ); - - //d->m_selection.reset(); - d->m_selection.start( firstLine, convertToPosOnScreen( d->getLineString( firstLine ), firstPos, d->m_pOptionDialog->m_tabSize ) ); - d->m_selection.end( lastLine, convertToPosOnScreen( d->getLineString( lastLine ),lastPos, d->m_pOptionDialog->m_tabSize ) ); - } -} - - -class DiffTextWindowFrameData -{ -public: - DiffTextWindow* m_pDiffTextWindow; - QLineEdit* m_pFileSelection; - QPushButton* m_pBrowseButton; - OptionDialog* m_pOptionDialog; - QLabel* m_pLabel; - QLabel* m_pTopLine; - QLabel* m_pEncoding; - QLabel* m_pLineEndStyle; - QWidget* m_pTopLineWidget; - int m_winIdx; -}; - -DiffTextWindowFrame::DiffTextWindowFrame( QWidget* pParent, QStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx ) - : QWidget( pParent ) -{ - d = new DiffTextWindowFrameData; - d->m_winIdx = winIdx; - setAutoFillBackground(true); - d->m_pOptionDialog = pOptionDialog; - d->m_pTopLineWidget = new QWidget(this); - d->m_pFileSelection = new QLineEdit(d->m_pTopLineWidget); - d->m_pBrowseButton = new QPushButton( "...",d->m_pTopLineWidget ); - d->m_pBrowseButton->setFixedWidth( 30 ); - connect(d->m_pBrowseButton,SIGNAL(clicked()), this, SLOT(slotBrowseButtonClicked())); - connect(d->m_pFileSelection,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed())); - - d->m_pLabel = new QLabel("A:",d->m_pTopLineWidget); - d->m_pTopLine = new QLabel(d->m_pTopLineWidget); - d->m_pDiffTextWindow = 0; - d->m_pDiffTextWindow = new DiffTextWindow( this, pStatusBar, pOptionDialog, winIdx ); - - QVBoxLayout* pVTopLayout = new QVBoxLayout(d->m_pTopLineWidget); - pVTopLayout->setMargin(2); - pVTopLayout->setSpacing(0); - QHBoxLayout* pHL = new QHBoxLayout(); - QHBoxLayout* pHL2 = new QHBoxLayout(); - pVTopLayout->addLayout(pHL); - pVTopLayout->addLayout(pHL2); - - // Upper line: - pHL->setMargin(0); - pHL->setSpacing(2); - - pHL->addWidget( d->m_pLabel, 0 ); - pHL->addWidget( d->m_pFileSelection, 1 ); - pHL->addWidget( d->m_pBrowseButton, 0 ); - pHL->addWidget( d->m_pTopLine, 0 ); - - // Lower line - pHL2->setMargin(0); - pHL2->setSpacing(2); - pHL2->addWidget( d->m_pTopLine, 0 ); - d->m_pEncoding = new QLabel(i18n("Encoding:")); - d->m_pLineEndStyle = new QLabel(i18n("Line end style:")); - pHL2->addWidget(d->m_pEncoding); - pHL2->addWidget(d->m_pLineEndStyle); - - QVBoxLayout* pVL = new QVBoxLayout( this ); - pVL->setMargin(0); - pVL->setSpacing(0); - pVL->addWidget( d->m_pTopLineWidget, 0 ); - pVL->addWidget( d->m_pDiffTextWindow, 1 ); - - d->m_pDiffTextWindow->installEventFilter( this ); - d->m_pFileSelection->installEventFilter( this ); - d->m_pBrowseButton->installEventFilter( this ); - init(); -} - -DiffTextWindowFrame::~DiffTextWindowFrame() -{ - delete d; -} - -void DiffTextWindowFrame::init() -{ - DiffTextWindow* pDTW = d->m_pDiffTextWindow; - if ( pDTW ) - { - QString s = QDir::toNativeSeparators( pDTW->d->m_filename ); - d->m_pFileSelection->setText( s ); - QString winId = pDTW->d->m_winIdx==1 ? - ( pDTW->d->m_bTriple?"A (Base)":"A") : - ( pDTW->d->m_winIdx==2 ? "B" : "C" ); - d->m_pLabel->setText( winId + ":" ); - d->m_pEncoding->setText( i18n("Encoding:") + " " + (pDTW->d->m_pTextCodec!=0 ? pDTW->d->m_pTextCodec->name() : QString()) ); - d->m_pLineEndStyle->setText( i18n("Line end style:") + " " + (pDTW->d->m_eLineEndStyle==eLineEndStyleDos ? i18n("DOS") : i18n("Unix")) ); - } -} - -// Search for the first visible line (search loop needed when no line exist for this file.) -int DiffTextWindow::calcTopLineInFile( int firstLine ) -{ - int l=-1; - for ( int i = convertLineToDiff3LineIdx(firstLine); i<(int)d->m_pDiff3LineVector->size(); ++i ) - { - const Diff3Line* d3l = (*d->m_pDiff3LineVector)[i]; - l = d3l->getLineInFile(d->m_winIdx); - if (l!=-1) break; - } - return l; -} - -void DiffTextWindowFrame::setFirstLine( int firstLine ) -{ - DiffTextWindow* pDTW = d->m_pDiffTextWindow; - if ( pDTW && pDTW->d->m_pDiff3LineVector ) - { - QString s= i18n("Top line"); - int lineNumberWidth = (int)log10((double)qMax(pDTW->d->m_size,1))+1; - - int l=pDTW->calcTopLineInFile(firstLine); - - int w = d->m_pTopLine->fontMetrics().width( - s+" "+QString().fill('0',lineNumberWidth)); - d->m_pTopLine->setMinimumWidth( w ); - - if (l==-1) - s = i18n("End"); - else - s += " " + QString::number( l+1 ); - - d->m_pTopLine->setText( s ); - d->m_pTopLine->repaint(); - } -} - -DiffTextWindow* DiffTextWindowFrame::getDiffTextWindow() -{ - return d->m_pDiffTextWindow; -} - -bool DiffTextWindowFrame::eventFilter( QObject* o, QEvent* e ) -{ - DiffTextWindow* pDTW = d->m_pDiffTextWindow; - if ( e->type()==QEvent::FocusIn || e->type()==QEvent::FocusOut ) - { - QColor c1 = d->m_pOptionDialog->m_bgColor; - QColor c2; - if ( d->m_winIdx==1 ) c2 = d->m_pOptionDialog->m_colorA; - else if ( d->m_winIdx==2 ) c2 = d->m_pOptionDialog->m_colorB; - else if ( d->m_winIdx==3 ) c2 = d->m_pOptionDialog->m_colorC; - - QPalette p = d->m_pTopLineWidget->palette(); - if ( e->type()==QEvent::FocusOut ) - std::swap(c1,c2); - - p.setColor(QPalette::Window, c2); - setPalette( p ); - - p.setColor(QPalette::WindowText, c1); - d->m_pLabel->setPalette( p ); - d->m_pTopLine->setPalette( p ); - d->m_pEncoding->setPalette( p ); - d->m_pLineEndStyle->setPalette( p ); - } - if (o == d->m_pFileSelection && e->type()==QEvent::Drop) - { - QDropEvent* d = static_cast(e); - - if ( d->mimeData()->hasUrls() ) - { - QList lst = d->mimeData()->urls(); - - if ( lst.count() > 0 ) - { - static_cast(o)->setText( lst[0].toString() ); - static_cast(o)->setFocus(); - emit fileNameChanged( lst[0].toString(), pDTW->d->m_winIdx ); - return true; - } - } - } - return false; -} - -void DiffTextWindowFrame::slotReturnPressed() -{ - DiffTextWindow* pDTW = d->m_pDiffTextWindow; - if ( pDTW->d->m_filename != d->m_pFileSelection->text() ) - { - emit fileNameChanged( d->m_pFileSelection->text(), pDTW->d->m_winIdx ); - } -} - -void DiffTextWindowFrame::slotBrowseButtonClicked() -{ - QString current = d->m_pFileSelection->text(); - - KUrl newURL = KFileDialog::getOpenUrl( current, 0, this); - if ( !newURL.isEmpty() ) - { - DiffTextWindow* pDTW = d->m_pDiffTextWindow; - emit fileNameChanged( newURL.url(), pDTW->d->m_winIdx ); - } -} Index: trunk/extragear/utils/kdiff3/src/guiutils.h =================================================================== --- trunk/extragear/utils/kdiff3/src/guiutils.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/guiutils.h (nonexistent) @@ -1,130 +0,0 @@ -/*************************************************************************** - kdiff3.h - description - ------------------- - begin : March 26 17:44 CEST 2002 - copyright : (c) 2008 by Valentin Rusu - email : kde at rusu.info - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include -#include - -namespace KDiff3 { - - template - T* createAction( - const QString& text, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName); - - template <> - inline KAction* createAction( - const QString& text, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) { - assert( ac != 0 ); - KAction* theAction = ac->addAction( actionName ); - theAction->setText( text ); - QObject::connect( theAction, SIGNAL( triggered() ), receiver, slot ); - return theAction; - } - template <> - inline KToggleAction* createAction( - const QString& text, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) { - assert( ac != 0 ); - KToggleAction* theAction = new KToggleAction(ac); - ac->addAction( actionName, theAction ); - theAction->setText( text ); - QObject::connect( theAction, SIGNAL( triggered(bool) ), receiver, slot ); - return theAction; - } - - template - T* createAction( - const QString& text, - const KShortcut& shortcut, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) - { - T* theAction = createAction( text, receiver, slot, ac, actionName ); - theAction->setShortcut( shortcut ); - return theAction; - } - template - T* createAction( - const QString& text, - const QIcon& icon, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) - { - T* theAction = createAction( text, receiver, slot, ac, actionName ); - theAction->setIcon( icon ); - return theAction; - } - template - T* createAction( - const QString& text, - const QIcon& icon, - const QString& iconText, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) - { - T* theAction = createAction( text, receiver, slot, ac, actionName ); - theAction->setIcon( icon ); - theAction->setIconText( iconText ); - return theAction; - } - template - T* createAction( - const QString& text, - const QIcon& icon, - const KShortcut& shortcut, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) - { - T* theAction = createAction( text, shortcut, receiver, slot, ac, actionName ); - theAction->setIcon( icon ); - return theAction; - } - template - T* createAction( - const QString& text, - const QIcon& icon, - const QString& iconText, - const KShortcut& shortcut, - const QObject* receiver, - const char* slot, - KActionCollection* ac, - const char* actionName) - { - T* theAction = createAction( text, shortcut, receiver, slot, ac, actionName ); - theAction->setIcon( icon ); - theAction->setIconText( iconText ); - return theAction; - } -} Index: trunk/extragear/utils/kdiff3/src/gnudiff_analyze.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/gnudiff_analyze.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/gnudiff_analyze.cpp (nonexistent) @@ -1,873 +0,0 @@ -/* Analyze file differences for GNU DIFF. - - Modified for KDiff3 by Joachim Eibl 2003. - The original file was part of GNU DIFF. - - Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002 - Free Software Foundation, Inc. - - GNU DIFF is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GNU DIFF is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. - If not, write to the Free Software Foundation, - 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* The basic algorithm is described in: - "An O(ND) Difference Algorithm and its Variations", Eugene Myers, - Algorithmica Vol. 1 No. 2, 1986, pp. 251-266; - see especially section 4.2, which describes the variation used below. - Unless the --minimal option is specified, this code uses the TOO_EXPENSIVE - heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N) - at the price of producing suboptimal output for large inputs with - many differences. - - The basic algorithm was independently discovered as described in: - "Algorithms for Approximate String Matching", E. Ukkonen, - Information and Control Vol. 64, 1985, pp. 100-118. */ - -#define GDIFF_MAIN - -#include "gnudiff_diff.h" -//#include -#include - -static lin *xvec, *yvec; /* Vectors being compared. */ -static lin *fdiag; /* Vector, indexed by diagonal, containing - 1 + the X coordinate of the point furthest - along the given diagonal in the forward - search of the edit matrix. */ -static lin *bdiag; /* Vector, indexed by diagonal, containing - the X coordinate of the point furthest - along the given diagonal in the backward - search of the edit matrix. */ -static lin too_expensive; /* Edit scripts longer than this are too - expensive to compute. */ - -#define SNAKE_LIMIT 20 /* Snakes bigger than this are considered `big'. */ - - -struct partition -{ - lin xmid, ymid; /* Midpoints of this partition. */ - bool lo_minimal; /* Nonzero if low half will be analyzed minimally. */ - bool hi_minimal; /* Likewise for high half. */ -}; - -/* Find the midpoint of the shortest edit script for a specified - portion of the two files. - - Scan from the beginnings of the files, and simultaneously from the ends, - doing a breadth-first search through the space of edit-sequence. - When the two searches meet, we have found the midpoint of the shortest - edit sequence. - - If FIND_MINIMAL is nonzero, find the minimal edit script regardless - of expense. Otherwise, if the search is too expensive, use - heuristics to stop the search and report a suboptimal answer. - - Set PART->(xmid,ymid) to the midpoint (XMID,YMID). The diagonal number - XMID - YMID equals the number of inserted lines minus the number - of deleted lines (counting only lines before the midpoint). - Return the approximate edit cost; this is the total number of - lines inserted or deleted (counting only lines before the midpoint), - unless a heuristic is used to terminate the search prematurely. - - Set PART->lo_minimal to true iff the minimal edit script for the - left half of the partition is known; similarly for PART->hi_minimal. - - This function assumes that the first lines of the specified portions - of the two files do not match, and likewise that the last lines do not - match. The caller must trim matching lines from the beginning and end - of the portions it is going to specify. - - If we return the "wrong" partitions, - the worst this can do is cause suboptimal diff output. - It cannot cause incorrect diff output. */ - -lin -GnuDiff::diag (lin xoff, lin xlim, lin yoff, lin ylim, bool find_minimal, - struct partition *part) -{ - lin *const fd = fdiag; /* Give the compiler a chance. */ - lin *const bd = bdiag; /* Additional help for the compiler. */ - lin const *const xv = xvec; /* Still more help for the compiler. */ - lin const *const yv = yvec; /* And more and more . . . */ - lin const dmin = xoff - ylim; /* Minimum valid diagonal. */ - lin const dmax = xlim - yoff; /* Maximum valid diagonal. */ - lin const fmid = xoff - yoff; /* Center diagonal of top-down search. */ - lin const bmid = xlim - ylim; /* Center diagonal of bottom-up search. */ - lin fmin = fmid, fmax = fmid; /* Limits of top-down search. */ - lin bmin = bmid, bmax = bmid; /* Limits of bottom-up search. */ - lin c; /* Cost. */ - bool odd = (fmid - bmid) & 1; /* True if southeast corner is on an odd - diagonal with respect to the northwest. */ - - fd[fmid] = xoff; - bd[bmid] = xlim; - - for (c = 1;; ++c) - { - lin d; /* Active diagonal. */ - bool big_snake = 0; - - /* Extend the top-down search by an edit step in each diagonal. */ - fmin > dmin ? fd[--fmin - 1] = -1 : ++fmin; - fmax < dmax ? fd[++fmax + 1] = -1 : --fmax; - for (d = fmax; d >= fmin; d -= 2) - { - lin x, y, oldx, tlo = fd[d - 1], thi = fd[d + 1]; - - if (tlo >= thi) - x = tlo + 1; - else - x = thi; - oldx = x; - y = x - d; - while (x < xlim && y < ylim && xv[x] == yv[y]) - ++x, ++y; - if (x - oldx > SNAKE_LIMIT) - big_snake = 1; - fd[d] = x; - if (odd && bmin <= d && d <= bmax && bd[d] <= x) - { - part->xmid = x; - part->ymid = y; - part->lo_minimal = part->hi_minimal = 1; - return 2 * c - 1; - } - } - - /* Similarly extend the bottom-up search. */ - bmin > dmin ? bd[--bmin - 1] = LIN_MAX : ++bmin; - bmax < dmax ? bd[++bmax + 1] = LIN_MAX : --bmax; - for (d = bmax; d >= bmin; d -= 2) - { - lin x, y, oldx, tlo = bd[d - 1], thi = bd[d + 1]; - - if (tlo < thi) - x = tlo; - else - x = thi - 1; - oldx = x; - y = x - d; - while (x > xoff && y > yoff && xv[x - 1] == yv[y - 1]) - --x, --y; - if (oldx - x > SNAKE_LIMIT) - big_snake = 1; - bd[d] = x; - if (!odd && fmin <= d && d <= fmax && x <= fd[d]) - { - part->xmid = x; - part->ymid = y; - part->lo_minimal = part->hi_minimal = 1; - return 2 * c; - } - } - - if (find_minimal) - continue; - - /* Heuristic: check occasionally for a diagonal that has made - lots of progress compared with the edit distance. - If we have any such, find the one that has made the most - progress and return it as if it had succeeded. - - With this heuristic, for files with a constant small density - of changes, the algorithm is linear in the file size. */ - - if (200 < c && big_snake && speed_large_files) - { - lin best; - - best = 0; - for (d = fmax; d >= fmin; d -= 2) - { - lin dd = d - fmid; - lin x = fd[d]; - lin y = x - d; - lin v = (x - xoff) * 2 - dd; - if (v > 12 * (c + (dd < 0 ? -dd : dd))) - { - if (v > best - && xoff + SNAKE_LIMIT <= x && x < xlim - && yoff + SNAKE_LIMIT <= y && y < ylim) - { - /* We have a good enough best diagonal; - now insist that it end with a significant snake. */ - int k; - - for (k = 1; xv[x - k] == yv[y - k]; k++) - if (k == SNAKE_LIMIT) - { - best = v; - part->xmid = x; - part->ymid = y; - break; - } - } - } - } - if (best > 0) - { - part->lo_minimal = 1; - part->hi_minimal = 0; - return 2 * c - 1; - } - - best = 0; - for (d = bmax; d >= bmin; d -= 2) - { - lin dd = d - bmid; - lin x = bd[d]; - lin y = x - d; - lin v = (xlim - x) * 2 + dd; - if (v > 12 * (c + (dd < 0 ? -dd : dd))) - { - if (v > best - && xoff < x && x <= xlim - SNAKE_LIMIT - && yoff < y && y <= ylim - SNAKE_LIMIT) - { - /* We have a good enough best diagonal; - now insist that it end with a significant snake. */ - int k; - - for (k = 0; xv[x + k] == yv[y + k]; k++) - if (k == SNAKE_LIMIT - 1) - { - best = v; - part->xmid = x; - part->ymid = y; - break; - } - } - } - } - if (best > 0) - { - part->lo_minimal = 0; - part->hi_minimal = 1; - return 2 * c - 1; - } - } - - /* Heuristic: if we've gone well beyond the call of duty, - give up and report halfway between our best results so far. */ - if (c >= too_expensive) - { - lin fxybest, fxbest; - lin bxybest, bxbest; - - fxbest = bxbest = 0; /* Pacify `gcc -Wall'. */ - - /* Find forward diagonal that maximizes X + Y. */ - fxybest = -1; - for (d = fmax; d >= fmin; d -= 2) - { - lin x = MIN (fd[d], xlim); - lin y = x - d; - if (ylim < y) - x = ylim + d, y = ylim; - if (fxybest < x + y) - { - fxybest = x + y; - fxbest = x; - } - } - - /* Find backward diagonal that minimizes X + Y. */ - bxybest = LIN_MAX; - for (d = bmax; d >= bmin; d -= 2) - { - lin x = MAX (xoff, bd[d]); - lin y = x - d; - if (y < yoff) - x = yoff + d, y = yoff; - if (x + y < bxybest) - { - bxybest = x + y; - bxbest = x; - } - } - - /* Use the better of the two diagonals. */ - if ((xlim + ylim) - bxybest < fxybest - (xoff + yoff)) - { - part->xmid = fxbest; - part->ymid = fxybest - fxbest; - part->lo_minimal = 1; - part->hi_minimal = 0; - } - else - { - part->xmid = bxbest; - part->ymid = bxybest - bxbest; - part->lo_minimal = 0; - part->hi_minimal = 1; - } - return 2 * c - 1; - } - } -} - -/* Compare in detail contiguous subsequences of the two files - which are known, as a whole, to match each other. - - The results are recorded in the vectors files[N].changed, by - storing 1 in the element for each line that is an insertion or deletion. - - The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1. - - Note that XLIM, YLIM are exclusive bounds. - All line numbers are origin-0 and discarded lines are not counted. - - If FIND_MINIMAL, find a minimal difference no matter how - expensive it is. */ - -void GnuDiff::compareseq (lin xoff, lin xlim, lin yoff, lin ylim, bool find_minimal) -{ - lin * const xv = xvec; /* Help the compiler. */ - lin * const yv = yvec; - - /* Slide down the bottom initial diagonal. */ - while (xoff < xlim && yoff < ylim && xv[xoff] == yv[yoff]) - ++xoff, ++yoff; - /* Slide up the top initial diagonal. */ - while (xlim > xoff && ylim > yoff && xv[xlim - 1] == yv[ylim - 1]) - --xlim, --ylim; - - /* Handle simple cases. */ - if (xoff == xlim) - while (yoff < ylim) - files[1].changed[files[1].realindexes[yoff++]] = 1; - else if (yoff == ylim) - while (xoff < xlim) - files[0].changed[files[0].realindexes[xoff++]] = 1; - else - { - lin c; - struct partition part; - - /* Find a point of correspondence in the middle of the files. */ - - c = diag (xoff, xlim, yoff, ylim, find_minimal, &part); - - if (c == 1) - { - /* This should be impossible, because it implies that - one of the two subsequences is empty, - and that case was handled above without calling `diag'. - Let's verify that this is true. */ - abort (); -#if 0 - /* The two subsequences differ by a single insert or delete; - record it and we are done. */ - if (part.xmid - part.ymid < xoff - yoff) - files[1].changed[files[1].realindexes[part.ymid - 1]] = 1; - else - files[0].changed[files[0].realindexes[part.xmid]] = 1; -#endif - } - else - { - /* Use the partitions to split this problem into subproblems. */ - compareseq (xoff, part.xmid, yoff, part.ymid, part.lo_minimal); - compareseq (part.xmid, xlim, part.ymid, ylim, part.hi_minimal); - } - } -} - -/* Discard lines from one file that have no matches in the other file. - - A line which is discarded will not be considered by the actual - comparison algorithm; it will be as if that line were not in the file. - The file's `realindexes' table maps virtual line numbers - (which don't count the discarded lines) into real line numbers; - this is how the actual comparison algorithm produces results - that are comprehensible when the discarded lines are counted. - - When we discard a line, we also mark it as a deletion or insertion - so that it will be printed in the output. */ - -void GnuDiff::discard_confusing_lines (struct file_data filevec[]) -{ - int f; - lin i; - char *discarded[2]; - lin *equiv_count[2]; - lin *p; - - /* Allocate our results. */ - p = (lin*)xmalloc ((filevec[0].buffered_lines + filevec[1].buffered_lines) - * (2 * sizeof *p)); - for (f = 0; f < 2; f++) - { - filevec[f].undiscarded = p; p += filevec[f].buffered_lines; - filevec[f].realindexes = p; p += filevec[f].buffered_lines; - } - - /* Set up equiv_count[F][I] as the number of lines in file F - that fall in equivalence class I. */ - - p = (lin*)zalloc (filevec[0].equiv_max * (2 * sizeof *p)); - equiv_count[0] = p; - equiv_count[1] = p + filevec[0].equiv_max; - - for (i = 0; i < filevec[0].buffered_lines; ++i) - ++equiv_count[0][filevec[0].equivs[i]]; - for (i = 0; i < filevec[1].buffered_lines; ++i) - ++equiv_count[1][filevec[1].equivs[i]]; - - /* Set up tables of which lines are going to be discarded. */ - - discarded[0] = (char*)zalloc (filevec[0].buffered_lines - + filevec[1].buffered_lines); - discarded[1] = discarded[0] + filevec[0].buffered_lines; - - /* Mark to be discarded each line that matches no line of the other file. - If a line matches many lines, mark it as provisionally discardable. */ - - for (f = 0; f < 2; f++) - { - size_t end = filevec[f].buffered_lines; - char *discards = discarded[f]; - lin *counts = equiv_count[1 - f]; - lin *equivs = filevec[f].equivs; - size_t many = 5; - size_t tem = end / 64; - - /* Multiply MANY by approximate square root of number of lines. - That is the threshold for provisionally discardable lines. */ - while ((tem = tem >> 2) > 0) - many *= 2; - - for (i = 0; i < (lin)end; i++) - { - lin nmatch; - if (equivs[i] == 0) - continue; - nmatch = counts[equivs[i]]; - if (nmatch == 0) - discards[i] = 1; - else if (nmatch > (lin)many) - discards[i] = 2; - } - } - - /* Don't really discard the provisional lines except when they occur - in a run of discardables, with nonprovisionals at the beginning - and end. */ - - for (f = 0; f < 2; f++) - { - lin end = filevec[f].buffered_lines; - register char *discards = discarded[f]; - - for (i = 0; i < end; i++) - { - /* Cancel provisional discards not in middle of run of discards. */ - if (discards[i] == 2) - discards[i] = 0; - else if (discards[i] != 0) - { - /* We have found a nonprovisional discard. */ - register lin j; - lin length; - lin provisional = 0; - - /* Find end of this run of discardable lines. - Count how many are provisionally discardable. */ - for (j = i; j < end; j++) - { - if (discards[j] == 0) - break; - if (discards[j] == 2) - ++provisional; - } - - /* Cancel provisional discards at end, and shrink the run. */ - while (j > i && discards[j - 1] == 2) - discards[--j] = 0, --provisional; - - /* Now we have the length of a run of discardable lines - whose first and last are not provisional. */ - length = j - i; - - /* If 1/4 of the lines in the run are provisional, - cancel discarding of all provisional lines in the run. */ - if (provisional * 4 > length) - { - while (j > i) - if (discards[--j] == 2) - discards[j] = 0; - } - else - { - register lin consec; - lin minimum = 1; - lin tem = length >> 2; - - /* MINIMUM is approximate square root of LENGTH/4. - A subrun of two or more provisionals can stand - when LENGTH is at least 16. - A subrun of 4 or more can stand when LENGTH >= 64. */ - while (0 < (tem >>= 2)) - minimum <<= 1; - minimum++; - - /* Cancel any subrun of MINIMUM or more provisionals - within the larger run. */ - for (j = 0, consec = 0; j < length; j++) - if (discards[i + j] != 2) - consec = 0; - else if (minimum == ++consec) - /* Back up to start of subrun, to cancel it all. */ - j -= consec; - else if (minimum < consec) - discards[i + j] = 0; - - /* Scan from beginning of run - until we find 3 or more nonprovisionals in a row - or until the first nonprovisional at least 8 lines in. - Until that point, cancel any provisionals. */ - for (j = 0, consec = 0; j < length; j++) - { - if (j >= 8 && discards[i + j] == 1) - break; - if (discards[i + j] == 2) - consec = 0, discards[i + j] = 0; - else if (discards[i + j] == 0) - consec = 0; - else - consec++; - if (consec == 3) - break; - } - - /* I advances to the last line of the run. */ - i += length - 1; - - /* Same thing, from end. */ - for (j = 0, consec = 0; j < length; j++) - { - if (j >= 8 && discards[i - j] == 1) - break; - if (discards[i - j] == 2) - consec = 0, discards[i - j] = 0; - else if (discards[i - j] == 0) - consec = 0; - else - consec++; - if (consec == 3) - break; - } - } - } - } - } - - /* Actually discard the lines. */ - for (f = 0; f < 2; f++) - { - char *discards = discarded[f]; - lin end = filevec[f].buffered_lines; - lin j = 0; - for (i = 0; i < end; ++i) - if (minimal || discards[i] == 0) - { - filevec[f].undiscarded[j] = filevec[f].equivs[i]; - filevec[f].realindexes[j++] = i; - } - else - filevec[f].changed[i] = 1; - filevec[f].nondiscarded_lines = j; - } - - free (discarded[0]); - free (equiv_count[0]); -} - -/* Adjust inserts/deletes of identical lines to join changes - as much as possible. - - We do something when a run of changed lines include a - line at one end and have an excluded, identical line at the other. - We are free to choose which identical line is included. - `compareseq' usually chooses the one at the beginning, - but usually it is cleaner to consider the following identical line - to be the "change". */ - -void GnuDiff::shift_boundaries (struct file_data filevec[]) -{ - int f; - - for (f = 0; f < 2; f++) - { - bool *changed = filevec[f].changed; - bool const *other_changed = filevec[1 - f].changed; - lin const *equivs = filevec[f].equivs; - lin i = 0; - lin j = 0; - lin i_end = filevec[f].buffered_lines; - - while (1) - { - lin runlength, start, corresponding; - - /* Scan forwards to find beginning of another run of changes. - Also keep track of the corresponding point in the other file. */ - - while (i < i_end && !changed[i]) - { - while (other_changed[j++]) - continue; - i++; - } - - if (i == i_end) - break; - - start = i; - - /* Find the end of this run of changes. */ - - while (changed[++i]) - continue; - while (other_changed[j]) - j++; - - do - { - /* Record the length of this run of changes, so that - we can later determine whether the run has grown. */ - runlength = i - start; - - /* Move the changed region back, so long as the - previous unchanged line matches the last changed one. - This merges with previous changed regions. */ - - while (start && equivs[start - 1] == equivs[i - 1]) - { - changed[--start] = 1; - changed[--i] = 0; - while (changed[start - 1]) - start--; - while (other_changed[--j]) - continue; - } - - /* Set CORRESPONDING to the end of the changed run, at the last - point where it corresponds to a changed run in the other file. - CORRESPONDING == I_END means no such point has been found. */ - corresponding = other_changed[j - 1] ? i : i_end; - - /* Move the changed region forward, so long as the - first changed line matches the following unchanged one. - This merges with following changed regions. - Do this second, so that if there are no merges, - the changed region is moved forward as far as possible. */ - - while (i != i_end && equivs[start] == equivs[i]) - { - changed[start++] = 0; - changed[i++] = 1; - while (changed[i]) - i++; - while (other_changed[++j]) - corresponding = i; - } - } - while (runlength != i - start); - - /* If possible, move the fully-merged run of changes - back to a corresponding run in the other file. */ - - while (corresponding < i) - { - changed[--start] = 1; - changed[--i] = 0; - while (other_changed[--j]) - continue; - } - } - } -} - -/* Cons an additional entry onto the front of an edit script OLD. - LINE0 and LINE1 are the first affected lines in the two files (origin 0). - DELETED is the number of lines deleted here from file 0. - INSERTED is the number of lines inserted here in file 1. - - If DELETED is 0 then LINE0 is the number of the line before - which the insertion was done; vice versa for INSERTED and LINE1. */ - -GnuDiff::change* GnuDiff::add_change (lin line0, lin line1, lin deleted, lin inserted, struct change *old) -{ - struct change *newChange = (change*) xmalloc (sizeof *newChange); - - newChange->line0 = line0; - newChange->line1 = line1; - newChange->inserted = inserted; - newChange->deleted = deleted; - newChange->link = old; - return newChange; -} - -/* Scan the tables of which lines are inserted and deleted, - producing an edit script in reverse order. */ - -GnuDiff::change* GnuDiff::build_reverse_script (struct file_data const filevec[]) -{ - struct change *script = 0; - bool *changed0 = filevec[0].changed; - bool *changed1 = filevec[1].changed; - lin len0 = filevec[0].buffered_lines; - lin len1 = filevec[1].buffered_lines; - - /* Note that changedN[len0] does exist, and is 0. */ - - lin i0 = 0, i1 = 0; - - while (i0 < len0 || i1 < len1) - { - if (changed0[i0] | changed1[i1]) - { - lin line0 = i0, line1 = i1; - - /* Find # lines changed here in each file. */ - while (changed0[i0]) ++i0; - while (changed1[i1]) ++i1; - - /* Record this change. */ - script = add_change (line0, line1, i0 - line0, i1 - line1, script); - } - - /* We have reached lines in the two files that match each other. */ - i0++, i1++; - } - - return script; -} - -/* Scan the tables of which lines are inserted and deleted, - producing an edit script in forward order. */ - -GnuDiff::change* GnuDiff::build_script (struct file_data const filevec[]) -{ - struct change *script = 0; - bool *changed0 = filevec[0].changed; - bool *changed1 = filevec[1].changed; - lin i0 = filevec[0].buffered_lines, i1 = filevec[1].buffered_lines; - - /* Note that changedN[-1] does exist, and is 0. */ - - while (i0 >= 0 || i1 >= 0) - { - if (changed0[i0 - 1] | changed1[i1 - 1]) - { - lin line0 = i0, line1 = i1; - - /* Find # lines changed here in each file. */ - while (changed0[i0 - 1]) --i0; - while (changed1[i1 - 1]) --i1; - - /* Record this change. */ - script = add_change (i0, i1, line0 - i0, line1 - i1, script); - } - - /* We have reached lines in the two files that match each other. */ - i0--, i1--; - } - - return script; -} - - -/* Report the differences of two files. */ -GnuDiff::change* GnuDiff::diff_2_files (struct comparison *cmp) -{ - lin diags; - int f; - //struct change *e, *p; - struct change *script; - int changes; - - read_files (cmp->file, files_can_be_treated_as_binary); - - { - /* Allocate vectors for the results of comparison: - a flag for each line of each file, saying whether that line - is an insertion or deletion. - Allocate an extra element, always 0, at each end of each vector. */ - - size_t s = cmp->file[0].buffered_lines + cmp->file[1].buffered_lines + 4; - bool *flag_space = (bool*)zalloc (s * sizeof(*flag_space)); - cmp->file[0].changed = flag_space + 1; - cmp->file[1].changed = flag_space + cmp->file[0].buffered_lines + 3; - - /* Some lines are obviously insertions or deletions - because they don't match anything. Detect them now, and - avoid even thinking about them in the main comparison algorithm. */ - - discard_confusing_lines (cmp->file); - - /* Now do the main comparison algorithm, considering just the - undiscarded lines. */ - - xvec = cmp->file[0].undiscarded; - yvec = cmp->file[1].undiscarded; - diags = (cmp->file[0].nondiscarded_lines - + cmp->file[1].nondiscarded_lines + 3); - fdiag = (lin*)xmalloc (diags * (2 * sizeof *fdiag)); - bdiag = fdiag + diags; - fdiag += cmp->file[1].nondiscarded_lines + 1; - bdiag += cmp->file[1].nondiscarded_lines + 1; - - /* Set TOO_EXPENSIVE to be approximate square root of input size, - bounded below by 256. */ - too_expensive = 1; - for (; diags != 0; diags >>= 2) - too_expensive <<= 1; - too_expensive = MAX (256, too_expensive); - - files[0] = cmp->file[0]; - files[1] = cmp->file[1]; - - compareseq (0, cmp->file[0].nondiscarded_lines, - 0, cmp->file[1].nondiscarded_lines, minimal); - - free (fdiag - (cmp->file[1].nondiscarded_lines + 1)); - - /* Modify the results slightly to make them prettier - in cases where that can validly be done. */ - - shift_boundaries (cmp->file); - - /* Get the results of comparison in the form of a chain - of `struct change's -- an edit script. */ - - script = build_script (cmp->file); - - changes = (script != 0); - - free (cmp->file[0].undiscarded); - - free (flag_space); - - for (f = 0; f < 2; f++) - { - free (cmp->file[f].equivs); - free (cmp->file[f].linbuf + cmp->file[f].linbuf_base); - } - } - - return script; -} Index: trunk/extragear/utils/kdiff3/src/kdiff3.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3.h (nonexistent) @@ -1,406 +0,0 @@ -/*************************************************************************** - kdiff3.h - description - ------------------- - begin : Don Jul 11 12:31:29 CEST 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef KDIFF3_H -#define KDIFF3_H - -#include "diff.h" - -#include - -// include files for Qt -#include -#include - -// include files for KDE -#include -#include -#include -#include -#include -#include - - -// forward declaration of the KDiff3 classes -class OptionDialog; -class FindDialog; -class ManualDiffHelpDialog; -class DiffTextWindow; -class DiffTextWindowFrame; -class MergeResultWindow; -class WindowTitleWidget; -class Overview; - -class QScrollBar; -class QSplitter; - - -class KDiff3Part; -class DirectoryMergeWindow; -class DirectoryMergeInfo; - - -class ReversibleScrollBar : public QScrollBar -{ - Q_OBJECT - bool* m_pbRightToLeftLanguage; - int m_realVal; -public: - ReversibleScrollBar( Qt::Orientation o, bool* pbRightToLeftLanguage ) - : QScrollBar( o ) - { - m_pbRightToLeftLanguage=pbRightToLeftLanguage; - m_realVal=0; - connect( this, SIGNAL(valueChanged(int)), this, SLOT(slotValueChanged(int))); - } - void setAgain(){ setValue(m_realVal); } -public slots: - void slotValueChanged(int i) - { - m_realVal = i; - if(m_pbRightToLeftLanguage && *m_pbRightToLeftLanguage) - m_realVal = maximum()-(i-minimum()); - emit valueChanged2(m_realVal); - } - void setValue(int i) - { - if(m_pbRightToLeftLanguage && *m_pbRightToLeftLanguage) - QScrollBar::setValue( maximum()-(i-minimum()) ); - else - QScrollBar::setValue( i ); - } -signals: - void valueChanged2(int); -}; - -class KDiff3App : public QSplitter -{ - Q_OBJECT - - public: - /** constructor of KDiff3App, calls all init functions to create the application. - */ - KDiff3App( QWidget* parent, const char* name, KDiff3Part* pKDiff3Part ); - ~KDiff3App(); - - bool isPart(); - - /** initializes the KActions of the application */ - void initActions( KActionCollection* ); - - /** save general Options like all bar positions and status as well as the geometry - and the recent file list to the configuration file */ - void saveOptions( KSharedConfigPtr ); - - /** read general Options again and initialize all variables like the recent file list */ - void readOptions( KSharedConfigPtr ); - - // Finish initialisation (virtual, so that it can be called from the shell too.) - virtual void completeInit(const QString& fn1="", const QString& fn2="", const QString& fn3=""); - - /** queryClose is called by KMainWindow on each closeEvent of a window. Against the - * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall - * be saved if Modified; on cancel the closeEvent is rejected. - * @see KMainWindow#queryClose - * @see KMainWindow#closeEvent - */ - virtual bool queryClose(); - virtual bool isFileSaved(); - virtual bool isDirComparison(); - - signals: - void createNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 ); - protected: - void initDirectoryMergeActions(); - /** sets up the statusbar for the main window by initialzing a statuslabel. */ - void initStatusBar(); - - /** creates the centerwidget of the KMainWindow instance and sets it as the view */ - void initView(); - - public slots: - - /** open a file and load it into the document*/ - void slotFileOpen(); - void slotFileOpen2( QString fn1, QString fn2, QString fn3, QString ofn, - QString an1, QString an2, QString an3, TotalDiffStatus* pTotalDiffStatus ); - - void slotFileNameChanged(const QString& fileName, int winIdx); - - /** save a document */ - void slotFileSave(); - /** save a document by a new filename*/ - void slotFileSaveAs(); - - void slotFilePrint(); - - /** closes all open windows by calling close() on each memberList item until the list is empty, then quits the application. - * If queryClose() returns false because the user canceled the saveModified() dialog, the closing breaks. - */ - void slotFileQuit(); - /** put the marked text/object into the clipboard and remove - * it from the document - */ - void slotEditCut(); - /** put the marked text/object into the clipboard - */ - void slotEditCopy(); - /** paste the clipboard into the document - */ - void slotEditPaste(); - /** toggles the toolbar - */ - void slotViewToolBar(); - /** toggles the statusbar - */ - void slotViewStatusBar(); - /** changes the statusbar contents for the standard label permanently, used to indicate current actions. - * @param text the text that is displayed in the statusbar - */ - void slotStatusMsg(const QString &text); - - private: - /** the configuration object of the application */ - //KConfig *config; - - // KAction pointers to enable/disable actions - KAction* fileOpen; - KAction* fileSave; - KAction* fileSaveAs; - KAction* filePrint; - KAction* fileQuit; - KAction* fileReload; - KAction* editCut; - KAction* editCopy; - KAction* editPaste; - KAction* editSelectAll; - KToggleAction* viewToolBar; - KToggleAction* viewStatusBar; - -//////////////////////////////////////////////////////////////////////// -// Special KDiff3 specific stuff starts here - KAction *editFind; - KAction *editFindNext; - - KAction *goCurrent; - KAction *goTop; - KAction *goBottom; - KAction *goPrevUnsolvedConflict; - KAction *goNextUnsolvedConflict; - KAction *goPrevConflict; - KAction *goNextConflict; - KAction *goPrevDelta; - KAction *goNextDelta; - KToggleAction *chooseA; - KToggleAction *chooseB; - KToggleAction *chooseC; - KToggleAction *autoAdvance; - KToggleAction *wordWrap; - KAction* splitDiff; - KAction* joinDiffs; - KAction* addManualDiffHelp; - KAction* clearManualDiffHelpList; - KToggleAction *showWhiteSpaceCharacters; - KToggleAction *showWhiteSpace; - KToggleAction *showLineNumbers; - KAction* chooseAEverywhere; - KAction* chooseBEverywhere; - KAction* chooseCEverywhere; - KAction* chooseAForUnsolvedConflicts; - KAction* chooseBForUnsolvedConflicts; - KAction* chooseCForUnsolvedConflicts; - KAction* chooseAForUnsolvedWhiteSpaceConflicts; - KAction* chooseBForUnsolvedWhiteSpaceConflicts; - KAction* chooseCForUnsolvedWhiteSpaceConflicts; - KAction* autoSolve; - KAction* unsolve; - KAction* mergeHistory; - KAction* mergeRegExp; - KToggleAction *showWindowA; - KToggleAction *showWindowB; - KToggleAction *showWindowC; - KAction *winFocusNext; - KAction *winFocusPrev; - KAction* winToggleSplitOrientation; - KToggleAction *dirShowBoth; - KAction *dirViewToggle; - KToggleAction *overviewModeNormal; - KToggleAction *overviewModeAB; - KToggleAction *overviewModeAC; - KToggleAction *overviewModeBC; - - - QMenu* m_pMergeEditorPopupMenu; - - QSplitter* m_pMainSplitter; - QWidget* m_pMainWidget; - QWidget* m_pMergeWindowFrame; - ReversibleScrollBar* m_pHScrollBar; - QScrollBar* m_pDiffVScrollBar; - QScrollBar* m_pMergeVScrollBar; - - DiffTextWindow* m_pDiffTextWindow1; - DiffTextWindow* m_pDiffTextWindow2; - DiffTextWindow* m_pDiffTextWindow3; - DiffTextWindowFrame* m_pDiffTextWindowFrame1; - DiffTextWindowFrame* m_pDiffTextWindowFrame2; - DiffTextWindowFrame* m_pDiffTextWindowFrame3; - QSplitter* m_pDiffWindowSplitter; - - MergeResultWindow* m_pMergeResultWindow; - WindowTitleWidget* m_pMergeResultWindowTitle; - bool m_bTripleDiff; - - QSplitter* m_pDirectoryMergeSplitter; - DirectoryMergeWindow* m_pDirectoryMergeWindow; - DirectoryMergeInfo* m_pDirectoryMergeInfo; - bool m_bDirCompare; - - Overview* m_pOverview; - - QWidget* m_pCornerWidget; - - TotalDiffStatus m_totalDiffStatus; - - SourceData m_sd1; - SourceData m_sd2; - SourceData m_sd3; - - QString m_outputFilename; - bool m_bDefaultFilename; - - DiffList m_diffList12; - DiffList m_diffList23; - DiffList m_diffList13; - - DiffBufferInfo m_diffBufferInfo; - Diff3LineList m_diff3LineList; - Diff3LineVector m_diff3LineVector; - //ManualDiffHelpDialog* m_pManualDiffHelpDialog; - ManualDiffHelpList m_manualDiffHelpList; - - int m_neededLines; - int m_DTWHeight; - bool m_bOutputModified; - bool m_bFileSaved; - bool m_bTimerBlock; // Synchronisation - - OptionDialog* m_pOptionDialog; - FindDialog* m_pFindDialog; - - void init( bool bAuto=false, TotalDiffStatus* pTotalDiffStatus=0, bool bLoadFiles=true ); - - - virtual bool eventFilter( QObject* o, QEvent* e ); - virtual void resizeEvent(QResizeEvent*); - - bool improveFilenames(bool bCreateNewInstance); - - bool runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList, int winIdx1, int winIdx2 ); - bool runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList ); - bool canContinue(); - - void choose(int choice); - - KActionCollection* actionCollection(); - KStatusBar* statusBar(); - KToolBar* toolBar(const char*); - KDiff3Part* m_pKDiff3Part; - KParts::MainWindow* m_pKDiff3Shell; - bool m_bAutoFlag; - bool m_bAutoMode; - void recalcWordWrap(int nofVisibleColumns=-1); - void setHScrollBarRange(); - -public slots: - void resizeDiffTextWindow(int newWidth, int newHeight); - void resizeMergeResultWindow(); - void slotRecalcWordWrap(); - - void showPopupMenu( const QPoint& point ); - - void scrollDiffTextWindow( int deltaX, int deltaY ); - void scrollMergeResultWindow( int deltaX, int deltaY ); - void setDiff3Line( int line ); - void sourceMask( int srcMask, int enabledMask ); - - void slotDirShowBoth(); - void slotDirViewToggle(); - - void slotUpdateAvailabilities(); - void slotEditSelectAll(); - void slotEditFind(); - void slotEditFindNext(); - void slotGoCurrent(); - void slotGoTop(); - void slotGoBottom(); - void slotGoPrevUnsolvedConflict(); - void slotGoNextUnsolvedConflict(); - void slotGoPrevConflict(); - void slotGoNextConflict(); - void slotGoPrevDelta(); - void slotGoNextDelta(); - void slotChooseA(); - void slotChooseB(); - void slotChooseC(); - void slotAutoSolve(); - void slotUnsolve(); - void slotMergeHistory(); - void slotRegExpAutoMerge(); - void slotChooseAEverywhere(); - void slotChooseBEverywhere(); - void slotChooseCEverywhere(); - void slotChooseAForUnsolvedConflicts(); - void slotChooseBForUnsolvedConflicts(); - void slotChooseCForUnsolvedConflicts(); - void slotChooseAForUnsolvedWhiteSpaceConflicts(); - void slotChooseBForUnsolvedWhiteSpaceConflicts(); - void slotChooseCForUnsolvedWhiteSpaceConflicts(); - void slotConfigure(); - void slotConfigureKeys(); - void slotRefresh(); - void slotSelectionEnd(); - void slotSelectionStart(); - void slotClipboardChanged(); - void slotOutputModified(bool); - void slotAfterFirstPaint(); - void slotMergeCurrentFile(); - void slotReload(); - void slotCheckIfCanContinue( bool* pbContinue ); - void slotShowWhiteSpaceToggled(); - void slotShowLineNumbersToggled(); - void slotAutoAdvanceToggled(); - void slotWordWrapToggled(); - void slotShowWindowAToggled(); - void slotShowWindowBToggled(); - void slotShowWindowCToggled(); - void slotWinFocusNext(); - void slotWinFocusPrev(); - void slotWinToggleSplitterOrientation(); - void slotOverviewNormal(); - void slotOverviewAB(); - void slotOverviewAC(); - void slotOverviewBC(); - void slotSplitDiff(); - void slotJoinDiffs(); - void slotAddManualDiffHelp(); - void slotClearManualDiffHelpList(); - - void slotNoRelevantChangesDetected(); -}; - -#endif // KDIFF3_H Index: trunk/extragear/utils/kdiff3/src/kdiff3.lsm =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3.lsm (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3.lsm (nonexistent) @@ -1,16 +0,0 @@ -Begin3 -Title: kdiff3 -- Comparison and Merge of Files and Directories -Version: 0.9.89 -Entered-date: -Description: Tool for comparison and merge of two or three files or directories -Keywords: KDE Qt -Author: Joachim Eibl -Maintained-by: Joachim Eibl -Home-page: http://kdiff3.sourceforge.net -Alternate-site: http://extragear.kde.org/apps/kdiff3 -Primary-site: http://sourceforge.net/project/showfiles.php?group_id=58666 - xxxxxx kdiff3-0.9.89.tar.gz - xxx kdiff3-0.9.89.lsm -Platform: Linux. Needs Qt, runs even better on KDE -Copying-policy: GPL -End Index: trunk/extragear/utils/kdiff3/src/gnudiff_io.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/gnudiff_io.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/gnudiff_io.cpp (nonexistent) @@ -1,559 +0,0 @@ -/* File I/O for GNU DIFF. - - Modified for KDiff3 by Joachim Eibl 2003, 2004, 2005. - The original file was part of GNU DIFF. - - Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002 - Free Software Foundation, Inc. - - GNU DIFF is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GNU DIFF is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. - If not, write to the Free Software Foundation, - 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#include "gnudiff_diff.h" -#include - -/* Rotate an unsigned value to the left. */ -#define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n))) - -/* Given a hash value and a new character, return a new hash value. */ -#define HASH(h, c) ((c) + ROL (h, 7)) - -/* The type of a hash value. */ -typedef size_t hash_value; -verify (hash_value_is_unsigned, ! TYPE_SIGNED (hash_value)); - -/* Lines are put into equivalence classes of lines that match in lines_differ. - Each equivalence class is represented by one of these structures, - but only while the classes are being computed. - Afterward, each class is represented by a number. */ -struct equivclass -{ - lin next; /* Next item in this bucket. */ - hash_value hash; /* Hash of lines in this class. */ - const QChar *line; /* A line that fits this class. */ - size_t length; /* That line's length, not counting its newline. */ -}; - -/* Hash-table: array of buckets, each being a chain of equivalence classes. - buckets[-1] is reserved for incomplete lines. */ -static lin *buckets; - -/* Number of buckets in the hash table array, not counting buckets[-1]. */ -static size_t nbuckets; - -/* Array in which the equivalence classes are allocated. - The bucket-chains go through the elements in this array. - The number of an equivalence class is its index in this array. */ -static struct equivclass *equivs; - -/* Index of first free element in the array `equivs'. */ -static lin equivs_index; - -/* Number of elements allocated in the array `equivs'. */ -static lin equivs_alloc; - - -/* Check for binary files and compare them for exact identity. */ - -/* Return 1 if BUF contains a non text character. - SIZE is the number of characters in BUF. */ - -#define binary_file_p(buf, size) (memchr (buf, 0, size) != 0) - -/* Compare two lines (typically one from each input file) - according to the command line options. - For efficiency, this is invoked only when the lines do not match exactly - but an option like -i might cause us to ignore the difference. - Return nonzero if the lines differ. */ - -bool GnuDiff::lines_differ (const QChar *s1, size_t len1, const QChar *s2, size_t len2 ) -{ - const QChar *t1 = s1; - const QChar *t2 = s2; - const QChar *s1end = s1+len1; - const QChar *s2end = s2+len2; - - for ( ; ; ++t1, ++t2 ) - { - /* Test for exact char equality first, since it's a common case. */ - if ( t1!=s1end && t2!=s2end && *t1==*t2 ) - continue; - else - { - while ( t1!=s1end && - ( bIgnoreWhiteSpace && isWhite( *t1 ) || - bIgnoreNumbers && (t1->isDigit() || *t1=='-' || *t1=='.' ))) - { - ++t1; - } - - while ( t2 != s2end && - ( bIgnoreWhiteSpace && isWhite( *t2 ) || - bIgnoreNumbers && (t2->isDigit() || *t2=='-' || *t2=='.' ))) - { - ++t2; - } - - if ( t1!=s1end && t2!=s2end ) - { - if (ignore_case) - { /* Lowercase comparison. */ - if ( t1->toLower() == t2->toLower() ) - continue; - } - else if ( *t1 == *t2 ) - continue; - else - return true; - } - else if ( t1==s1end && t2==s2end ) - return false; - else - return true; - } - } - return false; -} - - -/* Split the file into lines, simultaneously computing the equivalence - class for each line. */ - -void GnuDiff::find_and_hash_each_line (struct file_data *current) -{ - hash_value h; - const QChar *p = current->prefix_end; - QChar c; - lin i, *bucket; - size_t length; - - /* Cache often-used quantities in local variables to help the compiler. */ - const QChar **linbuf = current->linbuf; - lin alloc_lines = current->alloc_lines; - lin line = 0; - lin linbuf_base = current->linbuf_base; - lin *cureqs = (lin*)xmalloc (alloc_lines * sizeof *cureqs); - struct equivclass *eqs = equivs; - lin eqs_index = equivs_index; - lin eqs_alloc = equivs_alloc; - const QChar *suffix_begin = current->suffix_begin; - const QChar *bufend = current->buffer + current->buffered; - bool diff_length_compare_anyway = - ignore_white_space != IGNORE_NO_WHITE_SPACE || bIgnoreNumbers; - bool same_length_diff_contents_compare_anyway = - diff_length_compare_anyway | ignore_case; - - while ( p < suffix_begin) - { - const QChar *ip = p; - - h = 0; - - /* Hash this line until we find a newline or bufend is reached. */ - if (ignore_case) - switch (ignore_white_space) - { - case IGNORE_ALL_SPACE: - while ( pbuffered_lines = line; - - for (i = 0; ; i++) - { - /* Record the line start for lines in the suffix that we care about. - Record one more line start than lines, - so that we can compute the length of any buffered line. */ - if (line == alloc_lines) - { - /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. */ - if ((lin)(PTRDIFF_MAX / 3) <= alloc_lines - || (lin)(PTRDIFF_MAX / sizeof *cureqs) <= 2 * alloc_lines - linbuf_base - || (lin)(PTRDIFF_MAX / sizeof *linbuf) <= alloc_lines - linbuf_base) - xalloc_die (); - alloc_lines = 2 * alloc_lines - linbuf_base; - linbuf += linbuf_base; - linbuf = (const QChar**)xrealloc (linbuf, - (alloc_lines - linbuf_base) * sizeof *linbuf); - linbuf -= linbuf_base; - } - linbuf[line] = p; - - if ( p >= bufend) - break; - - if (context <= i && no_diff_means_no_output) - break; - - line++; - - while (plinbuf = linbuf; - current->valid_lines = line; - current->alloc_lines = alloc_lines; - current->equivs = cureqs; - equivs = eqs; - equivs_alloc = eqs_alloc; - equivs_index = eqs_index; -} - -/* We have found N lines in a buffer of size S; guess the - proportionate number of lines that will be found in a buffer of - size T. However, do not guess a number of lines so large that the - resulting line table might cause overflow in size calculations. */ -static lin -guess_lines (lin n, size_t s, size_t t) -{ - size_t guessed_bytes_per_line = n < 10 ? 32 : s / (n - 1); - lin guessed_lines = MAX (1, t / guessed_bytes_per_line); - return MIN (guessed_lines, (lin)(PTRDIFF_MAX / (2 * sizeof (QChar *) + 1) - 5)) + 5; -} - -/* Given a vector of two file_data objects, find the identical - prefixes and suffixes of each object. */ - -void GnuDiff::find_identical_ends (struct file_data filevec[]) -{ - /* Find identical prefix. */ - const QChar *p0, *p1, *buffer0, *buffer1; - p0 = buffer0 = filevec[0].buffer; - p1 = buffer1 = filevec[1].buffer; - size_t n0, n1; - n0 = filevec[0].buffered; - n1 = filevec[1].buffered; - const QChar* const pEnd0 = p0 + n0; - const QChar* const pEnd1 = p1 + n1; - - if (p0 == p1) - /* The buffers are the same; sentinels won't work. */ - p0 = p1 += n1; - else - { - /* Loop until first mismatch, or end. */ - while ( p0!=pEnd0 && p1!=pEnd1 && *p0 == *p1 ) - { - p0++; - p1++; - } - } - - /* Now P0 and P1 point at the first nonmatching characters. */ - - /* Skip back to last line-beginning in the prefix. */ - while (p0 != buffer0 && (p0[-1] != '\n' )) - p0--, p1--; - - /* Record the prefix. */ - filevec[0].prefix_end = p0; - filevec[1].prefix_end = p1; - - /* Find identical suffix. */ - - /* P0 and P1 point beyond the last chars not yet compared. */ - p0 = buffer0 + n0; - p1 = buffer1 + n1; - - const QChar *end0, *beg0; - end0 = p0; /* Addr of last char in file 0. */ - - /* Get value of P0 at which we should stop scanning backward: - this is when either P0 or P1 points just past the last char - of the identical prefix. */ - beg0 = filevec[0].prefix_end + (n0 < n1 ? 0 : n0 - n1); - - /* Scan back until chars don't match or we reach that point. */ - for (; p0 != beg0; p0--, p1--) - { - if (*p0 != *p1) - { - /* Point at the first char of the matching suffix. */ - beg0 = p0; - break; - } - } - - // Go to the next line (skip last line with a difference) - if ( p0 != end0 ) - { - if (*p0 != *p1) - ++p0; - while ( p0. */ - -static unsigned char const prime_offset[] = -{ - 0, 0, 1, 1, 3, 1, 3, 1, 5, 3, 3, 9, 3, 1, 3, 19, 15, 1, 5, 1, 3, 9, 3, - 15, 3, 39, 5, 39, 57, 3, 35, 1, 5, 9, 41, 31, 5, 25, 45, 7, 87, 21, - 11, 57, 17, 55, 21, 115, 59, 81, 27, 129, 47, 111, 33, 55, 5, 13, 27, - 55, 93, 1, 57, 25 -}; - -/* Verify that this host's size_t is not too wide for the above table. */ - -verify (enough_prime_offsets, - sizeof (size_t) * CHAR_BIT <= sizeof prime_offset); - -/* Given a vector of two file_data objects, read the file associated - with each one, and build the table of equivalence classes. - Return nonzero if either file appears to be a binary file. - If PRETEND_BINARY is nonzero, pretend they are binary regardless. */ - -bool -GnuDiff::read_files (struct file_data filevec[], bool /*pretend_binary*/) -{ - int i; - - find_identical_ends (filevec); - - equivs_alloc = filevec[0].alloc_lines + filevec[1].alloc_lines + 1; - if ((lin)(PTRDIFF_MAX / sizeof *equivs) <= equivs_alloc) - xalloc_die (); - equivs = (equivclass*)xmalloc (equivs_alloc * sizeof *equivs); - /* Equivalence class 0 is permanently safe for lines that were not - hashed. Real equivalence classes start at 1. */ - equivs_index = 1; - - /* Allocate (one plus) a prime number of hash buckets. Use a prime - number between 1/3 and 2/3 of the value of equiv_allocs, - approximately. */ - for (i = 9; 1 << i < equivs_alloc / 3; i++) - continue; - nbuckets = ((size_t) 1 << i) - prime_offset[i]; - if (PTRDIFF_MAX / sizeof *buckets <= nbuckets) - xalloc_die (); - buckets = (lin*)zalloc ((nbuckets + 1) * sizeof *buckets); - buckets++; - - for (i = 0; i < 2; i++) - find_and_hash_each_line (&filevec[i]); - - filevec[0].equiv_max = filevec[1].equiv_max = equivs_index; - - free (equivs); - free (buckets - 1); - - return 0; -} Index: trunk/extragear/utils/kdiff3/src/kdiff3part.desktop =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3part.desktop (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3part.desktop (nonexistent) @@ -1,53 +0,0 @@ -[Desktop Entry] -Name=KDiff3Part -Name[bg]=KDiff3Part -Name[bs]=KDiff3Part -Name[ca]=KDiff3Part -Name[ca@valencia]=KDiff3Part -Name[cs]=KDiff3Part -Name[da]=KDiff3Part -Name[de]=KDiff3Part -Name[el]=KDiff3Part -Name[en_GB]=KDiff3Part -Name[es]=KDiff3Part -Name[et]=KDiff3 komponent -Name[fi]=KDiff3Part -Name[fr]=Module KDiff3 -Name[ga]=KDiff3Part -Name[gl]=KDiff3Part -Name[hi]=के-डिफ3पार्ट -Name[hne]=के-डिफ3पार्ट -Name[hu]=KDiff3Part -Name[it]=KDiff3Part -Name[ja]=KDiff3Part -Name[km]=KDiff3Part -Name[ko]=KDiff3Part -Name[lt]=KDiff3Part -Name[ml]=കെഡിഫ്3ഭാഗം -Name[mr]=के-डिफ3-पार्ट -Name[nb]=KDiff3Part -Name[nds]=KDiff3Part -Name[nl]=KDiff3Part -Name[nn]=KDiff3Part -Name[pl]=Moduł KDiff3 -Name[pt]=KDiff3Part -Name[pt_BR]=KDiff3Part -Name[ro]=KDiff3Part -Name[ru]=KDiff3Part -Name[sk]=KDiff3Part -Name[sl]=KDiff3Part -Name[sr]=К‑диф3 део -Name[sr@ijekavian]=К‑диф3 део -Name[sr@ijekavianlatin]=KDiff3 deo -Name[sr@latin]=KDiff3 deo -Name[sv]=Kdiff3-del -Name[tr]=KDiff3Part -Name[ug]=KDiff3Part -Name[uk]=KDiff3Part -Name[x-test]=xxKDiff3Partxx -Name[zh_CN]=KDiff3Part -Name[zh_TW]=KDiff3Part -MimeType=text/x-diff; -ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart -X-KDE-Library=libkdiff3part -Type=Service Index: trunk/extragear/utils/kdiff3/src/common.h =================================================================== --- trunk/extragear/utils/kdiff3/src/common.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/common.h (nonexistent) @@ -1,124 +0,0 @@ -/*************************************************************************** - common.h - Things that are needed often - ------------------- - begin : Mon Mar 18 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef _COMMON_H -#define _COMMON_H - -#include - - -template< class T > -T min2( T x, T y ) -{ - return x -T max2( T x, T y ) -{ - return x>y ? x : y; -} - -typedef unsigned char UINT8; -typedef unsigned short UINT16; -typedef unsigned int UINT32; - - -template -T min3( T d1, T d2, T d3 ) -{ - if ( d1 < d2 && d1 < d3 ) return d1; - if ( d2 < d3 ) return d2; - return d3; -} - -template -T max3( T d1, T d2, T d3 ) -{ - - if ( d1 > d2 && d1 > d3 ) return d1; - - - if ( d2 > d3 ) return d2; - return d3; - -} - -template -T minMaxLimiter( T d, T minimum, T maximum ) -{ - assert(minimum<=maximum); - if ( d < minimum ) return minimum; - if ( d > maximum ) return maximum; - return d; -} - -#include -#include -class QFont; -class QColor; -class QSize; -class QPoint; -class QStringList; -class QTextStream; - -class ValueMap -{ -private: - std::map m_map; -public: - ValueMap(); - virtual ~ValueMap(); - - void save( QTextStream& ts ); - void load( QTextStream& ts ); - QString getAsString(); - // void load( const QString& s ); - - virtual void writeEntry(const QString&, const QFont& ); - virtual void writeEntry(const QString&, const QColor& ); - virtual void writeEntry(const QString&, const QSize& ); - virtual void writeEntry(const QString&, const QPoint& ); - virtual void writeEntry(const QString&, int ); - virtual void writeEntry(const QString&, bool ); - virtual void writeEntry(const QString&, const QStringList&, char separator='|' ); - virtual void writeEntry(const QString&, const QString& ); - virtual void writeEntry(const QString&, const char* ); - - virtual QFont readFontEntry (const QString&, const QFont* defaultVal ); - virtual QColor readColorEntry(const QString&, const QColor* defaultVal ); - virtual QSize readSizeEntry (const QString&, const QSize* defaultVal ); - virtual QPoint readPointEntry(const QString&, const QPoint* defaultVal ); - virtual bool readBoolEntry (const QString&, bool bDefault ); - virtual int readNumEntry (const QString&, int iDefault ); - virtual QStringList readListEntry (const QString&, const QStringList& defaultVal, char separator='|' ); - virtual QString readStringEntry(const QString&, const QString& ); - - QString readEntry (const QString& s, const QString& defaultVal ); - QString readEntry (const QString& s, const char* defaultVal ); - QFont readEntry (const QString& s, const QFont& defaultVal ); - QColor readEntry(const QString& s, const QColor defaultVal ); - QSize readEntry (const QString& s, const QSize defaultVal ); - QPoint readEntry(const QString& s, const QPoint defaultVal ); - bool readEntry (const QString& s, bool bDefault ); - int readEntry (const QString& s, int iDefault ); - QStringList readEntry (const QString& s, const QStringList& defaultVal, char separator='|' ); -}; - -QStringList safeStringSplit(const QString& s, char sepChar=',', char metaChar='\\' ); -QString safeStringJoin(const QStringList& sl, char sepChar=',', char metaChar='\\' ); - -#endif Index: trunk/extragear/utils/kdiff3/src/merger.h =================================================================== --- trunk/extragear/utils/kdiff3/src/merger.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/merger.h (nonexistent) @@ -1,61 +0,0 @@ -/*************************************************************************** - merger.h - description - ------------------- - begin : Sun Mar 24 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef MERGER_H -#define MERGER_H - -#include "diff.h" - - -class Merger -{ -public: - - Merger( const DiffList* pDiffList1, const DiffList* pDiffList2 ); - - /** Go one step. */ - void next(); - - /** Information about what changed. Can be used for coloring. - The return value is 0 if nothing changed here, - bit 1 is set if a difference from pDiffList1 was detected, - bit 2 is set if a difference from pDiffList2 was detected. - */ - int whatChanged(); - - /** End of both diff lists reached. */ - bool isEndReached(); -private: - - struct MergeData - { - DiffList::const_iterator it; - const DiffList* pDiffList; - Diff d; - int idx; - - MergeData( const DiffList* p, int i ); - bool eq(); - void update(); - bool isEnd(); - }; - - MergeData md1; - MergeData md2; -}; - -#endif Index: trunk/extragear/utils/kdiff3/src/Messages.sh =================================================================== --- trunk/extragear/utils/kdiff3/src/Messages.sh (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/Messages.sh (nonexistent) @@ -1,3 +0,0 @@ -#! /usr/bin/env bash -$EXTRACTRC *.rc >> rc.cpp -$XGETTEXT -kaliasLocal `find -name \*.cpp -o -name \*.h` -o $podir/kdiff3.pot Index: trunk/extragear/utils/kdiff3/src/kdiff3_part.rc =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3_part.rc (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3_part.rc (nonexistent) @@ -1,24 +0,0 @@ - - - - &KDiff3 - - - - - - - - - Configure KDiff3 - - -KDiff3 - - - - - - - - Index: trunk/extragear/utils/kdiff3/src/gnudiff_system.h =================================================================== --- trunk/extragear/utils/kdiff3/src/gnudiff_system.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/gnudiff_system.h (nonexistent) @@ -1,121 +0,0 @@ -/* System dependent declarations. - - Modified for KDiff3 by Joachim Eibl 2003. - The original file was part of GNU DIFF. - - Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002 - Free Software Foundation, Inc. - - GNU DIFF is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GNU DIFF is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. - If not, write to the Free Software Foundation, - 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef GNUDIFF_SYSTEM_H -#define GNUDIFF_SYSTEM_H - - - -/* Don't bother to support K&R C compilers any more; it's not worth - the trouble. These macros prevent some library modules from being - compiled in K&R C mode. */ -#define PARAMS(Args) Args -#define PROTOTYPES 1 - -/* Verify a requirement at compile-time (unlike assert, which is runtime). */ -#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } - - -/* Determine whether an integer type is signed, and its bounds. - This code assumes two's (or one's!) complement with no holes. */ - -/* The extra casts work around common compiler bugs, - e.g. Cray C 5.0.3.0 when t == time_t. */ -#ifndef TYPE_SIGNED -# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -#endif -#ifndef TYPE_MINIMUM -# define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) \ - : (t) 0)) -#endif -#ifndef TYPE_MAXIMUM -# define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) -#endif - -#include -#include - - -# include -#ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -#endif -#if !EXIT_FAILURE -# undef EXIT_FAILURE /* Sony NEWS-OS 4.0C defines EXIT_FAILURE to 0. */ -# define EXIT_FAILURE 1 -#endif -#define EXIT_TROUBLE 2 - -#include -#ifndef SSIZE_MAX -# define SSIZE_MAX TYPE_MAXIMUM (ssize_t) -#endif - -#ifndef PTRDIFF_MAX -# define PTRDIFF_MAX TYPE_MAXIMUM (ptrdiff_t) -#endif -#ifndef SIZE_MAX -# define SIZE_MAX TYPE_MAXIMUM (size_t) -#endif -#ifndef UINTMAX_MAX -# define UINTMAX_MAX TYPE_MAXIMUM (uintmax_t) -#endif - -#include -#include -#include - -/* CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given - as an argument to macros like `isspace'. */ -# define CTYPE_DOMAIN(c) 1 -#define ISPRINT(c) (CTYPE_DOMAIN (c) && isprint (c)) -#define ISSPACE(c) (CTYPE_DOMAIN (c) && isspace (c)) - -# define TOLOWER(c) tolower (c) - -/* ISDIGIT differs from isdigit, as follows: - - Its arg may be any int or unsigned int; it need not be an unsigned char. - - It's guaranteed to evaluate its argument exactly once. - - It's typically faster. - POSIX 1003.1-2001 says that only '0' through '9' are digits. - Prefer ISDIGIT to isdigit unless it's important to use the locale's - definition of `digit' even when the host does not conform to POSIX. */ -#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) - -#undef MIN -#undef MAX -#define MIN(a, b) ((a) <= (b) ? (a) : (b)) -#define MAX(a, b) ((a) >= (b) ? (a) : (b)) - - -/* The integer type of a line number. Since files are read into main - memory, ptrdiff_t should be wide enough. */ - -typedef ptrdiff_t lin; -#define LIN_MAX PTRDIFF_MAX -verify (lin_is_signed, TYPE_SIGNED (lin)); -verify (lin_is_wide_enough, sizeof (ptrdiff_t) <= sizeof (lin)); -//verify (lin_is_printable_as_long, sizeof (lin) <= sizeof (long)); - -#endif Index: trunk/extragear/utils/kdiff3/src/stable.h =================================================================== --- trunk/extragear/utils/kdiff3/src/stable.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/stable.h (nonexistent) @@ -1,8 +0,0 @@ -#ifndef STABLE_H -#define STABLE_H -#include -#include -#ifdef _WIN32 -#include -#endif -#endif Index: trunk/extragear/utils/kdiff3/src/kdiff3_shell.h =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3_shell.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3_shell.h (nonexistent) @@ -1,72 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2007 Joachim Eibl * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef _KDIFF3SHELL_H_ -#define _KDIFF3SHELL_H_ - -#include - -#include -#include - -class KToggleAction; - -/** - * This is the application "Shell". It has a menubar, toolbar, and - * statusbar but relies on the "Part" to do all the real work. - * - * @short Application Shell - * @author Joachim Eibl - */ -class KDiff3Shell : public KParts::MainWindow -{ - Q_OBJECT -public: - /** - * Default Constructor - */ - KDiff3Shell(bool bCompleteInit=true); - - /** - * Default Destructor - */ - virtual ~KDiff3Shell(); - - bool queryClose(); - bool queryExit(); - virtual void closeEvent(QCloseEvent*e); - -private slots: - void optionsShowToolbar(); - void optionsShowStatusbar(); - void optionsConfigureKeys(); - void optionsConfigureToolbars(); - - void applyNewToolbarConfig(); - void slotNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 ); - -private: - KParts::ReadWritePart *m_part; - - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; - bool m_bUnderConstruction; -}; - -#endif // _KDIFF3_H_ Index: trunk/extragear/utils/kdiff3/src/hi16-app-kdiff3.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/kdiff3/src/hi16-app-kdiff3.png =================================================================== --- trunk/extragear/utils/kdiff3/src/hi16-app-kdiff3.png (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/hi16-app-kdiff3.png (nonexistent) Property changes on: trunk/extragear/utils/kdiff3/src/hi16-app-kdiff3.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/kdiff3/src/gnudiff_diff.h =================================================================== --- trunk/extragear/utils/kdiff3/src/gnudiff_diff.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/gnudiff_diff.h (nonexistent) @@ -1,355 +0,0 @@ -/* Shared definitions for GNU DIFF - - Modified for KDiff3 by Joachim Eibl 2003, 2004, 2005. - The original file was part of GNU DIFF. - - Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 2001, - 2002 Free Software Foundation, Inc. - - GNU DIFF is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GNU DIFF is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. - If not, write to the Free Software Foundation, - 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef GNUDIFF_DIFF_H -#define GNUDIFF_DIFF_H - -#include "gnudiff_system.h" - -#include -#include - -#define TAB_WIDTH 8 - -class GnuDiff -{ -public: -/* What kind of changes a hunk contains. */ -enum changes -{ - /* No changes: lines common to both files. */ - UNCHANGED, - - /* Deletes only: lines taken from just the first file. */ - OLD, - - /* Inserts only: lines taken from just the second file. */ - NEW, - - /* Both deletes and inserts: a hunk containing both old and new lines. */ - CHANGED -}; - -/* Variables for command line options */ - -/* Nonzero if output cannot be generated for identical files. */ -bool no_diff_means_no_output; - -/* Number of lines of context to show in each set of diffs. - This is zero when context is not to be shown. */ -lin context; - -/* Consider all files as text files (-a). - Don't interpret codes over 0177 as implying a "binary file". */ -bool text; - -/* The significance of white space during comparisons. */ -enum -{ - /* All white space is significant (the default). */ - IGNORE_NO_WHITE_SPACE, - - /* Ignore changes due to tab expansion (-E). */ - IGNORE_TAB_EXPANSION, - - /* Ignore changes in horizontal white space (-b). */ - IGNORE_SPACE_CHANGE, - - /* Ignore all horizontal white space (-w). */ - IGNORE_ALL_SPACE -} ignore_white_space; - -/* Ignore changes that affect only blank lines (-B). */ -bool ignore_blank_lines; - -/* Ignore changes that affect only numbers. (J. Eibl) */ -bool bIgnoreNumbers; -bool bIgnoreWhiteSpace; - -/* Files can be compared byte-by-byte, as if they were binary. - This depends on various options. */ -bool files_can_be_treated_as_binary; - -/* Ignore differences in case of letters (-i). */ -bool ignore_case; - -/* Ignore differences in case of letters in file names. */ -bool ignore_file_name_case; - -/* Regexp to identify function-header lines (-F). */ -//struct re_pattern_buffer function_regexp; - -/* Ignore changes that affect only lines matching this regexp (-I). */ -//struct re_pattern_buffer ignore_regexp; - -/* Say only whether files differ, not how (-q). */ -bool brief; - -/* Expand tabs in the output so the text lines up properly - despite the characters added to the front of each line (-t). */ -bool expand_tabs; - -/* Use a tab in the output, rather than a space, before the text of an - input line, so as to keep the proper alignment in the input line - without changing the characters in it (-T). */ -bool initial_tab; - -/* In directory comparison, specify file to start with (-S). - This is used for resuming an aborted comparison. - All file names less than this name are ignored. */ -const QChar *starting_file; - -/* Pipe each file's output through pr (-l). */ -bool paginate; - -/* Line group formats for unchanged, old, new, and changed groups. */ -const QChar *group_format[CHANGED + 1]; - -/* Line formats for unchanged, old, and new lines. */ -const QChar *line_format[NEW + 1]; - -/* If using OUTPUT_SDIFF print extra information to help the sdiff filter. */ -bool sdiff_merge_assist; - -/* Tell OUTPUT_SDIFF to show only the left version of common lines. */ -bool left_column; - -/* Tell OUTPUT_SDIFF to not show common lines. */ -bool suppress_common_lines; - -/* The half line width and column 2 offset for OUTPUT_SDIFF. */ -unsigned int sdiff_half_width; -unsigned int sdiff_column2_offset; - -/* Use heuristics for better speed with large files with a small - density of changes. */ -bool speed_large_files; - -/* Patterns that match file names to be excluded. */ -struct exclude *excluded; - -/* Don't discard lines. This makes things slower (sometimes much - slower) but will find a guaranteed minimal set of changes. */ -bool minimal; - - -/* The result of comparison is an "edit script": a chain of `struct change'. - Each `struct change' represents one place where some lines are deleted - and some are inserted. - - LINE0 and LINE1 are the first affected lines in the two files (origin 0). - DELETED is the number of lines deleted here from file 0. - INSERTED is the number of lines inserted here in file 1. - - If DELETED is 0 then LINE0 is the number of the line before - which the insertion was done; vice versa for INSERTED and LINE1. */ - -struct change -{ - struct change *link; /* Previous or next edit command */ - lin inserted; /* # lines of file 1 changed here. */ - lin deleted; /* # lines of file 0 changed here. */ - lin line0; /* Line number of 1st deleted line. */ - lin line1; /* Line number of 1st inserted line. */ - bool ignore; /* Flag used in context.c. */ -}; - -/* Structures that describe the input files. */ - -/* Data on one input file being compared. */ - -struct file_data { - /* Buffer in which text of file is read. */ - const QChar* buffer; - - /* Allocated size of buffer, in QChars. Always a multiple of - sizeof *buffer. */ - size_t bufsize; - - /* Number of valid bytes now in the buffer. */ - size_t buffered; - - /* Array of pointers to lines in the file. */ - const QChar **linbuf; - - /* linbuf_base <= buffered_lines <= valid_lines <= alloc_lines. - linebuf[linbuf_base ... buffered_lines - 1] are possibly differing. - linebuf[linbuf_base ... valid_lines - 1] contain valid data. - linebuf[linbuf_base ... alloc_lines - 1] are allocated. */ - lin linbuf_base, buffered_lines, valid_lines, alloc_lines; - - /* Pointer to end of prefix of this file to ignore when hashing. */ - const QChar *prefix_end; - - /* Count of lines in the prefix. - There are this many lines in the file before linbuf[0]. */ - lin prefix_lines; - - /* Pointer to start of suffix of this file to ignore when hashing. */ - const QChar *suffix_begin; - - /* Vector, indexed by line number, containing an equivalence code for - each line. It is this vector that is actually compared with that - of another file to generate differences. */ - lin *equivs; - - /* Vector, like the previous one except that - the elements for discarded lines have been squeezed out. */ - lin *undiscarded; - - /* Vector mapping virtual line numbers (not counting discarded lines) - to real ones (counting those lines). Both are origin-0. */ - lin *realindexes; - - /* Total number of nondiscarded lines. */ - lin nondiscarded_lines; - - /* Vector, indexed by real origin-0 line number, - containing TRUE for a line that is an insertion or a deletion. - The results of comparison are stored here. */ - bool *changed; - - /* 1 if at end of file. */ - bool eof; - - /* 1 more than the maximum equivalence value used for this or its - sibling file. */ - lin equiv_max; -}; - -/* Data on two input files being compared. */ - -struct comparison - { - struct file_data file[2]; - struct comparison const *parent; /* parent, if a recursive comparison */ - }; - -/* Describe the two files currently being compared. */ - -struct file_data files[2]; - -/* Stdio stream to output diffs to. */ - -FILE *outfile; - -/* Declare various functions. */ - -/* analyze.c */ -struct change* diff_2_files (struct comparison *); - -/* context.c */ -void print_context_header (struct file_data[], bool); -void print_context_script (struct change *, bool); - -/* dir.c */ -int diff_dirs (struct comparison const *, int (*) (struct comparison const *, const QChar *, const QChar *)); - -/* ed.c */ -void print_ed_script (struct change *); -void pr_forward_ed_script (struct change *); - -/* ifdef.c */ -void print_ifdef_script (struct change *); - -/* io.c */ -void file_block_read (struct file_data *, size_t); -bool read_files (struct file_data[], bool); - -/* normal.c */ -void print_normal_script (struct change *); - -/* rcs.c */ -void print_rcs_script (struct change *); - -/* side.c */ -void print_sdiff_script (struct change *); - -/* util.c */ -QChar *concat (const QChar *, const QChar *, const QChar *); -bool lines_differ ( const QChar *, size_t, const QChar *, size_t ); -lin translate_line_number (struct file_data const *, lin); -struct change *find_change (struct change *); -struct change *find_reverse_change (struct change *); -void *zalloc (size_t); -enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *); -void begin_output (void); -void debug_script (struct change *); -void finish_output (void); -void message (const QChar *, const QChar *, const QChar *); -void message5 (const QChar *, const QChar *, const QChar *, const QChar *, const QChar *); -void output_1_line (const QChar *, const QChar *, const QChar *, const QChar *); -void perror_with_name (const QChar *); -void setup_output (const QChar *, const QChar *, bool); -void translate_range (struct file_data const *, lin, lin, long *, long *); - -/* version.c */ -//extern const QChar version_string[]; - -private: - // gnudiff_analyze.cpp - lin diag (lin xoff, lin xlim, lin yoff, lin ylim, bool find_minimal, struct partition *part); - void compareseq (lin xoff, lin xlim, lin yoff, lin ylim, bool find_minimal); - void discard_confusing_lines (struct file_data filevec[]); - void shift_boundaries (struct file_data filevec[]); - struct change * add_change (lin line0, lin line1, lin deleted, lin inserted, struct change *old); - struct change * build_reverse_script (struct file_data const filevec[]); - struct change* build_script (struct file_data const filevec[]); - - // gnudiff_io.cpp - void find_and_hash_each_line (struct file_data *current); - void find_identical_ends (struct file_data filevec[]); - - // gnudiff_xmalloc.cpp - void *xmalloc (size_t n); - void *xrealloc(void *p, size_t n); - void xalloc_die (void); - - inline bool isWhite( QChar c ) - { - return c==' ' || c=='\t' || c=='\r'; - } -}; // class GnuDiff - -# define XMALLOC(Type, N_items) ((Type *) xmalloc (sizeof (Type) * (N_items))) -# define XREALLOC(Ptr, Type, N_items) \ - ((Type *) xrealloc ((void *) (Ptr), sizeof (Type) * (N_items))) - -/* Declare and alloc memory for VAR of type TYPE. */ -# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1) - -/* Free VAR only if non NULL. */ -# define XFREE(Var) \ - do { \ - if (Var) \ - free (Var); \ - } while (0) - -/* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */ -# define CCLONE(Src, Num) \ - (memcpy (xmalloc (sizeof (*Src) * (Num)), (Src), sizeof (*Src) * (Num))) - -/* Return a malloc'ed copy of SRC. */ -# define CLONE(Src) CCLONE (Src, 1) - -#endif Index: trunk/extragear/utils/kdiff3/src/lo16-app-kdiff3.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/kdiff3/src/lo16-app-kdiff3.png =================================================================== --- trunk/extragear/utils/kdiff3/src/lo16-app-kdiff3.png (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/lo16-app-kdiff3.png (nonexistent) Property changes on: trunk/extragear/utils/kdiff3/src/lo16-app-kdiff3.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/kdiff3/src/diff.h =================================================================== --- trunk/extragear/utils/kdiff3/src/diff.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/diff.h (nonexistent) @@ -1,471 +0,0 @@ -/*************************************************************************** - diff.h - description - ------------------- - begin : Mon Mar 18 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef DIFF_H -#define DIFF_H - -#include -#include -#include -#include -#include "common.h" -#include "fileaccess.h" -#include "optiondialog.h" - - -class OptionDialog; - -// Each range with matching elements is followed by a range with differences on either side. -// Then again range of matching elements should follow. -struct Diff -{ - int nofEquals; - - int diff1; - int diff2; - - Diff(int eq, int d1, int d2){nofEquals=eq; diff1=d1; diff2=d2; } -}; - -typedef std::list DiffList; - -struct LineData -{ - const QChar* pLine; - const QChar* pFirstNonWhiteChar; - int size; - - LineData(){ pLine=0; pFirstNonWhiteChar=0; size=0; /*occurances=0;*/ bContainsPureComment=false; } - int width(int tabSize) const; // Calcs width considering tabs. - //int occurances; - bool whiteLine() const { return pFirstNonWhiteChar-pLine == size; } - bool bContainsPureComment; -}; - -class Diff3LineList; -class Diff3LineVector; - -struct DiffBufferInfo -{ - const LineData* m_pLineDataA; - const LineData* m_pLineDataB; - const LineData* m_pLineDataC; - int m_sizeA; - int m_sizeB; - int m_sizeC; - const Diff3LineList* m_pDiff3LineList; - const Diff3LineVector* m_pDiff3LineVector; - void init( Diff3LineList* d3ll, const Diff3LineVector* d3lv, - const LineData* pldA, int sizeA, const LineData* pldB, int sizeB, const LineData* pldC, int sizeC ); -}; - -struct Diff3Line -{ - int lineA; - int lineB; - int lineC; - - bool bAEqC : 1; // These are true if equal or only white-space changes exist. - bool bBEqC : 1; - bool bAEqB : 1; - - bool bWhiteLineA : 1; - bool bWhiteLineB : 1; - bool bWhiteLineC : 1; - - DiffList* pFineAB; // These are 0 only if completely equal or if either source doesn't exist. - DiffList* pFineBC; - DiffList* pFineCA; - - int linesNeededForDisplay; // Due to wordwrap - int sumLinesNeededForDisplay; // For fast conversion to m_diff3WrapLineVector - - DiffBufferInfo* m_pDiffBufferInfo; // For convenience - - Diff3Line() - { - lineA=-1; lineB=-1; lineC=-1; - bAEqC=false; bAEqB=false; bBEqC=false; - pFineAB=0; pFineBC=0; pFineCA=0; - linesNeededForDisplay=1; - sumLinesNeededForDisplay=0; - bWhiteLineA=false; bWhiteLineB=false; bWhiteLineC=false; - m_pDiffBufferInfo=0; - } - - ~Diff3Line() - { - if (pFineAB!=0) delete pFineAB; - if (pFineBC!=0) delete pFineBC; - if (pFineCA!=0) delete pFineCA; - pFineAB=0; pFineBC=0; pFineCA=0; - } - - bool operator==( const Diff3Line& d3l ) - { - return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC - && bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC; - } - - const LineData* getLineData( int src ) const - { - assert( m_pDiffBufferInfo!=0 ); - if ( src == 1 && lineA >= 0 ) return &m_pDiffBufferInfo->m_pLineDataA[lineA]; - if ( src == 2 && lineB >= 0 ) return &m_pDiffBufferInfo->m_pLineDataB[lineB]; - if ( src == 3 && lineC >= 0 ) return &m_pDiffBufferInfo->m_pLineDataC[lineC]; - return 0; - } - QString getString( int src ) const - { - const LineData* pld = getLineData(src); - if ( pld ) - return QString( pld->pLine, pld->size); - else - return QString(); - } - int getLineInFile( int src ) const - { - if ( src == 1 ) return lineA; - if ( src == 2 ) return lineB; - if ( src == 3 ) return lineC; - return -1; - } -}; - - -class Diff3LineList : public std::list -{ -}; -class Diff3LineVector : public std::vector -{ -}; - -class Diff3WrapLine -{ -public: - Diff3Line* pD3L; - int diff3LineIndex; - int wrapLineOffset; - int wrapLineLength; -}; - -typedef std::vector Diff3WrapLineVector; - - -class TotalDiffStatus -{ -public: - TotalDiffStatus(){ reset(); } - void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false; - bTextAEqC=false; bTextBEqC=false; bTextAEqB=false; - nofUnsolvedConflicts=0; nofSolvedConflicts=0; - nofWhitespaceConflicts=0; - } - bool bBinaryAEqC; - bool bBinaryBEqC; - bool bBinaryAEqB; - - bool bTextAEqC; - bool bTextBEqC; - bool bTextAEqB; - - int nofUnsolvedConflicts; - int nofSolvedConflicts; - int nofWhitespaceConflicts; -}; - -// Three corresponding ranges. (Minimum size of a valid range is one line.) -class ManualDiffHelpEntry -{ -public: - ManualDiffHelpEntry() { lineA1=-1; lineA2=-1; - lineB1=-1; lineB2=-1; - lineC1=-1; lineC2=-1; } - int lineA1; - int lineA2; - int lineB1; - int lineB2; - int lineC1; - int lineC2; - int& firstLine( int winIdx ) - { - return winIdx==1 ? lineA1 : (winIdx==2 ? lineB1 : lineC1 ); - } - int& lastLine( int winIdx ) - { - return winIdx==1 ? lineA2 : (winIdx==2 ? lineB2 : lineC2 ); - } - bool isLineInRange( int line, int winIdx ) - { - return line>=0 && line>=firstLine(winIdx) && line<=lastLine(winIdx); - } - bool operator==(const ManualDiffHelpEntry& r) const - { - return lineA1 == r.lineA1 && lineB1 == r.lineB1 && lineC1 == r.lineC1 && - lineA2 == r.lineA2 && lineB2 == r.lineB2 && lineC2 == r.lineC2; - } -}; - -// A list of corresponding ranges -typedef std::list ManualDiffHelpList; - -void calcDiff3LineListUsingAB( - const DiffList* pDiffListAB, - Diff3LineList& d3ll - ); - -void calcDiff3LineListUsingAC( - const DiffList* pDiffListBC, - Diff3LineList& d3ll - ); - -void calcDiff3LineListUsingBC( - const DiffList* pDiffListBC, - Diff3LineList& d3ll - ); - -void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList ); - -class SourceData -{ -public: - SourceData(); - ~SourceData(); - - void setOptionDialog( OptionDialog* pOptionDialog ); - - int getSizeLines() const; - int getSizeBytes() const; - const char* getBuf() const; - const LineData* getLineDataForDisplay() const; - const LineData* getLineDataForDiff() const; - - void setFilename(const QString& filename); - void setFileAccess( const FileAccess& fa ); - //FileAccess& getFileAccess(); - QString getFilename(); - void setAliasName(const QString& a); - QString getAliasName(); - bool isEmpty(); // File was set - bool hasData(); // Data was readable - bool isText(); // is it pure text (vs. binary data) - bool isIncompleteConversion(); // true if some replacement characters were found - bool isFromBuffer(); // was it set via setData() (vs. setFileAccess() or setFilename()) - void setData( const QString& data ); - bool isValid(); // Either no file is specified or reading was successful - - void readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode ); - bool saveNormalDataAs( const QString& fileName ); - - bool isBinaryEqualWith( const SourceData& other ) const; - - void reset(); - - QTextCodec* getEncoding() const { return m_pEncoding; } - e_LineEndStyle getLineEndStyle() const { return m_normalData.m_eLineEndStyle; } - -private: - QTextCodec* detectEncoding( const QString& fileName, QTextCodec* pFallbackCodec ); - QString m_aliasName; - FileAccess m_fileAccess; - OptionDialog* m_pOptionDialog; - QString m_tempInputFileName; - - struct FileData - { - FileData(){ m_pBuf=0; m_size=0; m_vSize=0; m_bIsText=false; m_eLineEndStyle=eLineEndStyleUndefined; m_bIncompleteConversion=false;} - ~FileData(){ reset(); } - const char* m_pBuf; - int m_size; - int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13 - QString m_unicodeBuf; - std::vector m_v; - bool m_bIsText; - bool m_bIncompleteConversion; - e_LineEndStyle m_eLineEndStyle; - bool readFile( const QString& filename ); - bool writeFile( const QString& filename ); - void preprocess(bool bPreserveCR, QTextCodec* pEncoding ); - void reset(); - void removeComments(); - void copyBufFrom( const FileData& src ); - }; - FileData m_normalData; - FileData m_lmppData; - QTextCodec* m_pEncoding; -}; - -void calcDiff3LineListTrim( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList ); -void calcWhiteDiff3Lines( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC ); - -void calcDiff3LineVector( Diff3LineList& d3ll, Diff3LineVector& d3lv ); - -void debugLineCheck( Diff3LineList& d3ll, int size, int idx ); - - - -class Selection -{ -public: - Selection(){ reset(); oldLastLine=-1; lastLine=-1; oldFirstLine=-1; } - int firstLine; - int firstPos; - int lastLine; - int lastPos; - int oldLastLine; - int oldFirstLine; - bool bSelectionContainsData; - bool isEmpty() { return firstLine==-1 || (firstLine==lastLine && firstPos==lastPos) || bSelectionContainsData==false;} - void reset(){ - oldFirstLine=firstLine; - oldLastLine =lastLine; - firstLine=-1; - lastLine=-1; - bSelectionContainsData = false; - } - void start( int l, int p ) { firstLine = l; firstPos = p; } - void end( int l, int p ) { - if ( oldLastLine == -1 ) - oldLastLine = lastLine; - lastLine = l; - lastPos = p; - } - bool within( int l, int p ); - - bool lineWithin( int l ); - int firstPosInLine(int l); - int lastPosInLine(int l); - int beginLine(){ - if (firstLine<0 && lastLine<0) return -1; - return max2(0,min2(firstLine,lastLine)); - } - int endLine(){ - if (firstLine<0 && lastLine<0) return -1; - return max2(firstLine,lastLine); - } - int beginPos() { return firstLine==lastLine ? min2(firstPos,lastPos) : - firstLine=0; --i ) - { - s2 += s[i]; - } - QPainter::drawText( m_xOffset-m_fontWidth*s.length() + m_factor*x, y, s2 ); - return; - } - QPainter::drawText( m_xOffset-m_fontWidth*s.length() + m_factor*x, y, s ); - } - - void drawLine( int x1, int y1, int x2, int y2 ) - { - QPainter::drawLine( m_xOffset + m_factor*x1, y1, m_xOffset + m_factor*x2, y2 ); - } -}; - -void fineDiff( - Diff3LineList& diff3LineList, - int selector, - const LineData* v1, - const LineData* v2, - bool& bTextsTotalEqual - ); - - -bool equal( const LineData& l1, const LineData& l2, bool bStrict ); - - - - -inline bool isWhite( QChar c ) -{ - return c==' ' || c=='\t' || c=='\r'; -} - -/** Returns the number of equivalent spaces at position outPos. -*/ -inline int tabber( int outPos, int tabSize ) -{ - return tabSize - ( outPos % tabSize ); -} - -/** Returns a line number where the linerange [line, line+nofLines] can - be displayed best. If it fits into the currently visible range then - the returned value is the current firstLine. -*/ -int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines ); - -extern bool g_bIgnoreWhiteSpace; -extern bool g_bIgnoreTrivialMatches; -extern int g_bAutoSolve; - -// Cursor conversions that consider g_tabSize. -int convertToPosInText( const QString& s, int posOnScreen, int tabSize ); -int convertToPosOnScreen( const QString& s, int posInText, int tabSize ); - -enum e_CoordType { eFileCoords, eD3LLineCoords, eWrapCoords }; - -void calcTokenPos( const QString&, int posOnScreen, int& pos1, int& pos2, int tabSize ); - -QString calcHistorySortKey( const QString& keyOrder, QRegExp& matchedRegExpr, const QStringList& parenthesesGroupList ); -bool findParenthesesGroups( const QString& s, QStringList& sl ); -#endif - Index: trunk/extragear/utils/kdiff3/src/kdiff3_part.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3_part.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3_part.cpp (nonexistent) @@ -1,320 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2007 Joachim Eibl * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "kdiff3_part.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include "kdiff3.h" -#include "fileaccess.h" - -#include -#include -#include - -#include "version.h" - -KDiff3Part::KDiff3Part( QWidget *parentWidget, const char *widgetName, - QObject *parent ) - : KParts::ReadWritePart(parent) -{ - // we need an instance - setComponentData( *KDiff3PartFactory::instance() ); - - // this should be your custom internal widget - m_widget = new KDiff3App( parentWidget, widgetName, this ); - - // This hack is necessary to avoid a crash when the program terminates. - m_bIsShell = dynamic_cast(parentWidget)!=0; - - // notify the part that this is our internal widget - setWidget(m_widget); - - // create our actions - //KStandardAction::open(this, SLOT(fileOpen()), actionCollection()); - //KStandardAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - //KStandardAction::save(this, SLOT(save()), actionCollection()); - - setXMLFile("kdiff3_part.rc"); - - // we are read-write by default - setReadWrite(true); - - // we are not modified since we haven't done anything yet - setModified(false); -} - -KDiff3Part::~KDiff3Part() -{ - if ( m_widget!=0 && ! m_bIsShell ) - { - m_widget->saveOptions( m_widget->isPart() ? componentData().config() : KGlobal::config() ); - } -} - -void KDiff3Part::setReadWrite(bool /*rw*/) -{ -// ReadWritePart::setReadWrite(rw); -} - -void KDiff3Part::setModified(bool /*modified*/) -{ -/* - // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStandardAction::stdName(KStandardAction::Save)); - if (!save) - return; - - // if so, we either enable or disable it based on the current - // state - if (modified) - save->setEnabled(true); - else - save->setEnabled(false); - - // in any event, we want our parent to do it's thing - ReadWritePart::setModified(modified); -*/ -} - -static void getNameAndVersion( const QString& str, const QString& lineStart, QString& fileName, QString& version ) -{ - if ( str.left( lineStart.length() )==lineStart && fileName.isEmpty() ) - { - int pos = lineStart.length(); - while ( pospos ) - { - while (pos2>pos && str[pos2]!=' ' && str[pos2]!='\t') --pos2; - fileName = str.mid( pos, pos2-pos ); - std::cerr << "KDiff3: " << fileName.toLatin1().constData() << std::endl; - if ( FileAccess(fileName).exists() ) break; - --pos2; - } - - int vpos = str.lastIndexOf("\t", -1); - if ( vpos>0 && vpos>(int)pos2 ) - { - version = str.mid( vpos+1 ); - while( !version.right(1)[0].isLetterOrNumber() ) - version.truncate( version.length()-1 ); - } - } -} - - -bool KDiff3Part::openFile() -{ - // m_file is always local so we can use QFile on it - std::cerr << "KDiff3: " << localFilePath().toLatin1().constData() << std::endl; - QFile file(localFilePath()); - if (file.open(QIODevice::ReadOnly) == false) - return false; - - // our example widget is text-based, so we use QTextStream instead - // of a raw QDataStream - QTextStream stream(&file); - QString str; - QString fileName1; - QString fileName2; - QString version1; - QString version2; - while (!stream.atEnd() && (fileName1.isEmpty() || fileName2.isEmpty()) ) - { - str = stream.readLine() + "\n"; - getNameAndVersion( str, "---", fileName1, version1 ); - getNameAndVersion( str, "+++", fileName2, version2 ); - } - - file.close(); - - if ( fileName1.isEmpty() && fileName2.isEmpty() ) - { - KMessageBox::sorry(m_widget, i18n("Couldn't find files for comparison.")); - return false; - } - - FileAccess f1(fileName1); - FileAccess f2(fileName2); - - if ( f1.exists() && f2.exists() && fileName1!=fileName2 ) - { - m_widget->slotFileOpen2( fileName1, fileName2, "", "", "", "", "", 0 ); - return true; - } - else if ( version1.isEmpty() && f1.exists() ) - { - // Normal patch - // patch -f -u --ignore-whitespace -i [inputfile] -o [outfile] [patchfile] - QString tempFileName = FileAccess::tempFileName(); - QString cmd = "patch -f -u --ignore-whitespace -i \"" + localFilePath() + - "\" -o \""+tempFileName + "\" \"" + fileName1+ "\""; - - QProcess process; - process.start( cmd ); - process.waitForFinished(-1); - - m_widget->slotFileOpen2( fileName1, tempFileName, "", "", - "", version2.isEmpty() ? fileName2 : "REV:"+version2+":"+fileName2, "", 0 ); // alias names -// std::cerr << "KDiff3: f1:" << fileName1.toLatin1() <<"<->"<slotFileOpen2( tempFileName, fileName2, "", "", - version1.isEmpty() ? fileName1 : "REV:"+version1+":"+fileName1, "", "", 0 ); // alias name -// std::cerr << "KDiff3: f2:" << fileName2.toLatin1() <<"<->"<"< [OUTPUTFILE] - - QString tempFileName1 = FileAccess::tempFileName(); - QString cmd1 = "cvs update -p -r " + version1 + " \"" + fileName1 + "\" >\""+tempFileName1+"\""; - QProcess process1; - process1.start( cmd1 ); - process1.waitForFinished(-1); - - QString tempFileName2 = FileAccess::tempFileName(); - QString cmd2 = "cvs update -p -r " + version2 + " \"" + fileName2 + "\" >\""+tempFileName2+"\""; - QProcess process2; - process2.start( cmd2 ); - process2.waitForFinished(-1); - - m_widget->slotFileOpen2( tempFileName1, tempFileName2, "", "", - "REV:"+version1+":"+fileName1, - "REV:"+version2+":"+fileName2, - "", 0 - ); - -// std::cerr << "KDiff3: f1/2:" << tempFileName1.toLatin1() <<"<->"<text(); - - file.close(); - return true; -*/ - return false; // Not implemented -} - - -// It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data -#include -#include -#include - -KComponentData* KDiff3PartFactory::s_instance = 0L; -KAboutData* KDiff3PartFactory::s_about = 0L; - -KDiff3PartFactory::KDiff3PartFactory() - : KParts::Factory() -{ -} - -KDiff3PartFactory::~KDiff3PartFactory() -{ - delete s_instance; - delete s_about; - - s_instance = 0L; -} - -KParts::Part* KDiff3PartFactory::createPartObject( QWidget *parentWidget, - QObject *parent, - const char *classname, const QStringList&/*args*/ ) -{ - // Create an instance of our Part - KDiff3Part* obj = new KDiff3Part( parentWidget, 0, parent ); - - // See if we are to be read-write or not - if (QString(classname) == "KParts::ReadOnlyPart") - obj->setReadWrite(false); - - return obj; -} - -KComponentData* KDiff3PartFactory::instance() -{ - if( !s_instance ) - { - s_about = new KAboutData(QByteArray("kdiff3part"), QByteArray("kdiff3part"), ki18n("KDiff3Part"), QByteArray(VERSION)); - s_about->addAuthor(ki18n("Joachim Eibl"), KLocalizedString(), QByteArray("joachim.eibl at gmx.de")); - s_instance = new KComponentData(s_about); - } - return s_instance; -} - -extern "C" -{ - void* init_libkdiff3part() - { - return new KDiff3PartFactory; - } -} - -// Suppress warning with --enable-final -#undef VERSION - -//#include "kdiff3_part.moc" Index: trunk/extragear/utils/kdiff3/src/mergeresultwindow.h =================================================================== --- trunk/extragear/utils/kdiff3/src/mergeresultwindow.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/mergeresultwindow.h (nonexistent) @@ -1,458 +0,0 @@ -/*************************************************************************** - mergeresultwindow.h - description - ------------------- - begin : Mon Mar 18 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef MERGERESULTWINDOW_H -#define MERGERESULTWINDOW_H - -#include "diff.h" - -#include -#include -#include -#include - -class QPainter; - -class Overview : public QWidget -{ - Q_OBJECT -public: - Overview( OptionDialog* pOptions ); - - void init( Diff3LineList* pDiff3LineList, bool bTripleDiff ); - void reset(); - void setRange( int firstLine, int pageHeight ); - void setPaintingAllowed( bool bAllowPainting ); - - enum e_OverviewMode { eOMNormal, eOMAvsB, eOMAvsC, eOMBvsC }; - void setOverviewMode( e_OverviewMode eOverviewMode ); - e_OverviewMode getOverviewMode(); - -public slots: - void setFirstLine(int firstLine); - void slotRedraw(); -signals: - void setLine(int); -private: - const Diff3LineList* m_pDiff3LineList; - OptionDialog* m_pOptions; - bool m_bTripleDiff; - int m_firstLine; - int m_pageHeight; - QPixmap m_pixmap; - bool m_bPaintingAllowed; - e_OverviewMode m_eOverviewMode; - int m_nofLines; - - virtual void paintEvent( QPaintEvent* e ); - virtual void mousePressEvent( QMouseEvent* e ); - virtual void mouseMoveEvent( QMouseEvent* e ); - void drawColumn( QPainter& p, e_OverviewMode eOverviewMode, int x, int w, int h, int nofLines ); -}; - - -enum e_MergeDetails -{ - eDefault, - eNoChange, - eBChanged, - eCChanged, - eBCChanged, // conflict - eBCChangedAndEqual, // possible conflict - eBDeleted, - eCDeleted, - eBCDeleted, // possible conflict - - eBChanged_CDeleted, // conflict - eCChanged_BDeleted, // conflict - eBAdded, - eCAdded, - eBCAdded, // conflict - eBCAddedAndEqual // possible conflict -}; - -void mergeOneLine( const Diff3Line& d, e_MergeDetails& mergeDetails, bool& bConflict, bool& bLineRemoved, int& src, bool bTwoInputs ); - -enum e_MergeSrcSelector -{ - A=1, - B=2, - C=3 -}; - -class MergeResultWindow : public QWidget -{ - Q_OBJECT -public: - MergeResultWindow( - QWidget* pParent, - OptionDialog* pOptionDialog, - QStatusBar* pStatusBar - ); - - void init( - const LineData* pLineDataA, int sizeA, - const LineData* pLineDataB, int sizeB, - const LineData* pLineDataC, int sizeC, - const Diff3LineList* pDiff3LineList, - TotalDiffStatus* pTotalDiffStatus - ); - - void reset(); - - bool saveDocument( const QString& fileName, QTextCodec* pEncoding, e_LineEndStyle eLineEndStyle ); - int getNrOfUnsolvedConflicts(int* pNrOfWhiteSpaceConflicts=0); - void choose(int selector); - void chooseGlobal(int selector, bool bConflictsOnly, bool bWhiteSpaceOnly ); - - int getNofColumns(); - int getNofLines(); - int getNofVisibleColumns(); - int getNofVisibleLines(); - QString getSelection(); - void resetSelection(); - void showNrOfConflicts(); - bool isDeltaAboveCurrent(); - bool isDeltaBelowCurrent(); - bool isConflictAboveCurrent(); - bool isConflictBelowCurrent(); - bool isUnsolvedConflictAtCurrent(); - bool isUnsolvedConflictAboveCurrent(); - bool isUnsolvedConflictBelowCurrent(); - bool findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive ); - void setSelection( int firstLine, int startPos, int lastLine, int endPos ); - void setOverviewMode( Overview::e_OverviewMode eOverviewMode ); - Overview::e_OverviewMode getOverviewMode(); -public slots: - void setFirstLine(int firstLine); - void setFirstColumn(int firstCol); - - void slotGoCurrent(); - void slotGoTop(); - void slotGoBottom(); - void slotGoPrevDelta(); - void slotGoNextDelta(); - void slotGoPrevUnsolvedConflict(); - void slotGoNextUnsolvedConflict(); - void slotGoPrevConflict(); - void slotGoNextConflict(); - void slotAutoSolve(); - void slotUnsolve(); - void slotMergeHistory(); - void slotRegExpAutoMerge(); - void slotSplitDiff( int firstD3lLineIdx, int lastD3lLineIdx ); - void slotJoinDiffs( int firstD3lLineIdx, int lastD3lLineIdx ); - void slotSetFastSelectorLine(int); - void setPaintingAllowed(bool); - void updateSourceMask(); - -signals: - void scroll( int deltaX, int deltaY ); - void modifiedChanged(bool bModified); - void setFastSelectorRange( int line1, int nofLines ); - void sourceMask( int srcMask, int enabledMask ); - void resizeSignal(); - void selectionEnd(); - void newSelection(); - void updateAvailabilities(); - void showPopupMenu( const QPoint& point ); - void noRelevantChangesDetected(); - -private: - void merge(bool bAutoSolve, int defaultSelector, bool bConflictsOnly=false, bool bWhiteSpaceOnly=false ); - QString getString( int lineIdx ); - - OptionDialog* m_pOptionDialog; - - const LineData* m_pldA; - const LineData* m_pldB; - const LineData* m_pldC; - int m_sizeA; - int m_sizeB; - int m_sizeC; - - const Diff3LineList* m_pDiff3LineList; - TotalDiffStatus* m_pTotalDiffStatus; - - bool m_bPaintingAllowed; - int m_delayedDrawTimer; - Overview::e_OverviewMode m_eOverviewMode; - -private: - class MergeEditLine - { - public: - MergeEditLine(Diff3LineList::const_iterator i, int src=0){m_id3l=i; m_src=src; m_bLineRemoved=false; } - void setConflict() { m_src=0; m_bLineRemoved=false; m_str=QString(); } - bool isConflict() { return m_src==0 && !m_bLineRemoved && m_str.isNull(); } - void setRemoved(int src=0) { m_src=src; m_bLineRemoved=true; m_str=QString(); } - bool isRemoved() { return m_bLineRemoved; } - bool isEditableText() { return !isConflict() && !isRemoved(); } - void setString( const QString& s ){ m_str=s; m_bLineRemoved=false; m_src=0; } - QString getString( const MergeResultWindow* ); - bool isModified() { return ! m_str.isNull() || (m_bLineRemoved && m_src==0); } - - void setSource( int src, bool bLineRemoved ) { m_src=src; m_bLineRemoved =bLineRemoved; } - int src() { return m_src; } - Diff3LineList::const_iterator id3l(){return m_id3l;} - // getString() is implemented as MergeResultWindow::getString() - private: - Diff3LineList::const_iterator m_id3l; - int m_src; // 1, 2 or 3 for A, B or C respectively, or 0 when line is from neither source. - QString m_str; // String when modified by user or null-string when orig data is used. - bool m_bLineRemoved; - }; - - class MergeEditLineList : private std::list - { // I want to know the size immediately! - private: - typedef std::list BASE; - int m_size; - int* m_pTotalSize; - public: - typedef std::list::iterator iterator; - typedef std::list::reverse_iterator reverse_iterator; - typedef std::list::const_iterator const_iterator; - MergeEditLineList(){m_size=0; m_pTotalSize=0; } - void clear() { ds(-m_size); BASE::clear(); } - void push_back( const MergeEditLine& m) { ds(+1); BASE::push_back(m); } - void push_front( const MergeEditLine& m) { ds(+1); BASE::push_front(m); } - void pop_back() { ds(-1); BASE::pop_back(); } - iterator erase( iterator i ) { ds(-1); return BASE::erase(i); } - iterator insert( iterator i, const MergeEditLine& m ) { ds(+1); return BASE::insert(i,m); } - int size(){ if (!m_pTotalSize) m_size = BASE::size(); return m_size; } - iterator begin(){return BASE::begin();} - iterator end(){return BASE::end();} - reverse_iterator rbegin(){return BASE::rbegin();} - reverse_iterator rend(){return BASE::rend();} - MergeEditLine& front(){return BASE::front();} - MergeEditLine& back(){return BASE::back();} - bool empty() { return m_size==0; } - void splice(iterator destPos, MergeEditLineList& srcList, iterator srcFirst, iterator srcLast) - { - int* pTotalSize = getTotalSizePtr() ? getTotalSizePtr() : srcList.getTotalSizePtr(); - srcList.setTotalSizePtr(0); // Force size-recalc after splice, because splice doesn't handle size-tracking - setTotalSizePtr(0); - BASE::splice( destPos, srcList, srcFirst, srcLast ); - srcList.setTotalSizePtr( pTotalSize ); - setTotalSizePtr( pTotalSize ); - } - - void setTotalSizePtr(int* pTotalSize) - { - if ( pTotalSize==0 && m_pTotalSize!=0 ) { *m_pTotalSize -= size(); } - else if ( pTotalSize!=0 && m_pTotalSize==0 ) { *pTotalSize += size(); } - m_pTotalSize = pTotalSize; - } - int* getTotalSizePtr() - { - return m_pTotalSize; - } - - private: - void ds(int deltaSize) - { - m_size+=deltaSize; - if (m_pTotalSize!=0) *m_pTotalSize+=deltaSize; - } - }; - - friend class MergeEditLine; - - struct MergeLine - { - MergeLine() - { - srcSelect=0; mergeDetails=eDefault; d3lLineIdx = -1; srcRangeLength=0; - bConflict=false; bDelta=false; bWhiteSpaceConflict=false; - } - Diff3LineList::const_iterator id3l; - int d3lLineIdx; // Needed to show the correct window pos. - int srcRangeLength; // how many src-lines have this properties - e_MergeDetails mergeDetails; - bool bConflict; - bool bWhiteSpaceConflict; - bool bDelta; - int srcSelect; - MergeEditLineList mergeEditLineList; - void split( MergeLine& ml2, int d3lLineIdx2 ) // The caller must insert the ml2 after this ml in the m_mergeLineList - { - if ( d3lLineIdx2= d3lLineIdx + srcRangeLength ) - return; //Error - ml2.mergeDetails = mergeDetails; - ml2.bConflict = bConflict; - ml2.bWhiteSpaceConflict = bWhiteSpaceConflict; - ml2.bDelta = bDelta; - ml2.srcSelect = srcSelect; - - ml2.d3lLineIdx = d3lLineIdx2; - ml2.srcRangeLength = srcRangeLength - (d3lLineIdx2-d3lLineIdx); - srcRangeLength = d3lLineIdx2-d3lLineIdx; // current MergeLine controls fewer lines - ml2.id3l = id3l; - for(int i=0; iid3l()==ml2.id3l) - { - ml2.mergeEditLineList.splice( ml2.mergeEditLineList.begin(), mergeEditLineList, i, mergeEditLineList.end() ); - return; - } - } - ml2.mergeEditLineList.setTotalSizePtr( mergeEditLineList.getTotalSizePtr() ); - ml2.mergeEditLineList.push_back(MergeEditLine(ml2.id3l)); - } - void join( MergeLine& ml2 ) // The caller must remove the ml2 from the m_mergeLineList after this call - { - srcRangeLength += ml2.srcRangeLength; - ml2.mergeEditLineList.clear(); - mergeEditLineList.clear(); - mergeEditLineList.push_back(MergeEditLine(id3l)); // Create a simple conflict - if ( ml2.bConflict ) bConflict = true; - if ( !ml2.bWhiteSpaceConflict ) bWhiteSpaceConflict = false; - if ( ml2.bDelta ) bDelta = true; - } - }; - -private: - static bool sameKindCheck( const MergeLine& ml1, const MergeLine& ml2 ); - struct HistoryMapEntry - { - MergeEditLineList mellA; - MergeEditLineList mellB; - MergeEditLineList mellC; - MergeEditLineList& choice( bool bThreeInputs ); - bool staysInPlace( bool bThreeInputs, Diff3LineList::const_iterator& iHistoryEnd ); - }; - typedef std::map HistoryMap; - void collectHistoryInformation( int src, Diff3LineList::const_iterator iHistoryBegin, Diff3LineList::const_iterator iHistoryEnd, HistoryMap& historyMap, std::list< HistoryMap::iterator >& hitList ); - - typedef std::list MergeLineList; - MergeLineList m_mergeLineList; - MergeLineList::iterator m_currentMergeLineIt; - bool isItAtEnd( bool bIncrement, MergeLineList::iterator i ) - { - if ( bIncrement ) return i!=m_mergeLineList.end(); - else return i!=m_mergeLineList.begin(); - } - - int m_currentPos; - bool checkOverviewIgnore(MergeLineList::iterator &i); - - enum e_Direction { eUp, eDown }; - enum e_EndPoint { eDelta, eConflict, eUnsolvedConflict, eLine, eEnd }; - void go( e_Direction eDir, e_EndPoint eEndPoint ); - void calcIteratorFromLineNr( - int line, - MergeLineList::iterator& mlIt, - MergeEditLineList::iterator& melIt - ); - MergeLineList::iterator splitAtDiff3LineIdx( int d3lLineIdx ); - - virtual void paintEvent( QPaintEvent* e ); - - - void myUpdate(int afterMilliSecs); - virtual void timerEvent(QTimerEvent*); - void writeLine( - MyPainter& p, int line, const QString& str, - int srcSelect, e_MergeDetails mergeDetails, int rangeMark, bool bUserModified, bool bLineRemoved, bool bWhiteSpaceConflict - ); - void setFastSelector(MergeLineList::iterator i); - void convertToLinePos( int x, int y, int& line, int& pos ); - virtual void mousePressEvent ( QMouseEvent* e ); - virtual void mouseDoubleClickEvent ( QMouseEvent* e ); - virtual void mouseReleaseEvent ( QMouseEvent * ); - virtual void mouseMoveEvent ( QMouseEvent * ); - virtual void resizeEvent( QResizeEvent* e ); - virtual void keyPressEvent( QKeyEvent* e ); - virtual void wheelEvent( QWheelEvent* e ); - virtual void focusInEvent( QFocusEvent* e ); - - QPixmap m_pixmap; - int m_firstLine; - int m_firstColumn; - int m_nofColumns; - int m_nofLines; - int m_totalSize; //Same as m_nofLines, but calculated differently - bool m_bMyUpdate; - bool m_bInsertMode; - bool m_bModified; - void setModified(bool bModified=true); - - int m_scrollDeltaX; - int m_scrollDeltaY; - int m_cursorXPos; - int m_cursorYPos; - int m_cursorOldXPos; - bool m_bCursorOn; // blinking on and off each second - QTimer m_cursorTimer; - bool m_bCursorUpdate; - QStatusBar* m_pStatusBar; - - Selection m_selection; - - bool deleteSelection2( QString& str, int& x, int& y, - MergeLineList::iterator& mlIt, MergeEditLineList::iterator& melIt ); - bool doRelevantChangesExist(); -public slots: - void deleteSelection(); - void pasteClipboard(bool bFromSelection); -private slots: - void slotCursorUpdate(); -}; - -class QLineEdit; -class QTextCodec; -class QComboBox; -class QLabel; -class WindowTitleWidget : public QWidget -{ - Q_OBJECT -private: - QLabel* m_pLabel; - QLineEdit* m_pFileNameLineEdit; - //QPushButton* m_pBrowseButton; - QLabel* m_pModifiedLabel; - QLabel* m_pLineEndStyleLabel; - QComboBox* m_pLineEndStyleSelector; - QLabel* m_pEncodingLabel; - QComboBox* m_pEncodingSelector; - OptionDialog* m_pOptionDialog; -public: - WindowTitleWidget(OptionDialog* pOptionDialog); - QTextCodec* getEncoding(); - void setFileName(const QString& fileName ); - QString getFileName(); - void setEncodings( QTextCodec* pCodecForA, QTextCodec* pCodecForB, QTextCodec* pCodecForC ); - void setEncoding( QTextCodec* pCodec ); - void setLineEndStyles( e_LineEndStyle eLineEndStyleA, e_LineEndStyle eLineEndStyleB, e_LineEndStyle eLineEndStyleC); - e_LineEndStyle getLineEndStyle(); - - bool eventFilter( QObject* o, QEvent* e ); -public slots: - void slotSetModified( bool bModified ); -//private slots: -// void slotBrowseButtonClicked(); - -}; - -#endif - Index: trunk/extragear/utils/kdiff3/src/kdiff3.desktop =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3.desktop (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3.desktop (nonexistent) @@ -1,153 +0,0 @@ -[Desktop Entry] -Name=KDiff3 -Name[be]=KDiff3 -Name[bg]=KDiff3 -Name[bs]=KDiff3 -Name[ca]=KDiff3 -Name[ca@valencia]=KDiff3 -Name[cs]=KDiff3 -Name[da]=KDiff3 -Name[de]=KDiff3 -Name[el]=KDiff3 -Name[en_GB]=KDiff3 -Name[es]=KDiff3 -Name[et]=KDiff3 -Name[fi]=KDiff3 -Name[fr]=KDiff3 -Name[ga]=KDiff3 -Name[gl]=KDiff3 -Name[hi]=के-डिफ3 -Name[hne]=के-डिफ3 -Name[hr]=KDiff3 -Name[hu]=KDiff3 -Name[it]=KDiff3 -Name[ja]=KDiff3 -Name[km]=KDiff3 -Name[ko]=KDiff3 -Name[lt]=KDiff3 -Name[ml]=കെഡിഫ്3 -Name[mr]=के-डिफ3 -Name[nb]=KDiff3 -Name[nds]=KDiff3 -Name[nl]=KDiff3 -Name[nn]=KDiff3 -Name[pl]=KDiff3 -Name[pt]=KDiff3 -Name[pt_BR]=KDiff3 -Name[ro]=KDiff3 -Name[ru]=KDiff3 -Name[sk]=KDiff3 -Name[sl]=KDiff3 -Name[sr]=К‑диф3 -Name[sr@ijekavian]=К‑диф3 -Name[sr@ijekavianlatin]=KDiff3 -Name[sr@latin]=KDiff3 -Name[sv]=Kdiff3 -Name[tr]=KDiff3 -Name[ug]=KDiff3 -Name[uk]=KDiff3 -Name[x-test]=xxKDiff3xx -Name[zh_CN]=KDiff3 -Name[zh_TW]=KDiff3 -GenericName=Diff/Patch Frontend -GenericName[bg]=Интерфейс на Diff/Patch -GenericName[bs]=Prikaz za Diff/Patch -GenericName[ca]=Frontal del Diff/Patch -GenericName[ca@valencia]=Frontal del Diff/Patch -GenericName[cs]=Rozhraní pro Diff/Patch -GenericName[da]=Brugerflade til diff/patch -GenericName[de]=Grafische Oberfläche zu Diff/Patch -GenericName[el]=Σύστημα υποστήριξης χρήστη για τα Diff/Patch -GenericName[en_GB]=Diff/Patch Frontend -GenericName[eo]=Fasado por la programoj "diff" kaj "patch" -GenericName[es]=Interfaz para diff/patch -GenericName[et]=Võrdlemise ja liitmise rakendus -GenericName[fi]=Diff/Patch-käyttöliittymä -GenericName[fr]=Interface graphique pour « Diff » / « Patch » -GenericName[ga]=Comhéadan Diff/Patch -GenericName[gl]=Interface para Diff e Patch -GenericName[hi]=डिफ/पैच फ्रन्टएण्ड -GenericName[hne]=डिफ/पैच फ्रन्टएन्ड -GenericName[hu]=Diff/Patch Frontend -GenericName[it]=Interfaccia per i comandi diff e patch -GenericName[ja]=Diff/Patch フロントエンド -GenericName[km]=Diff/Patch ខាង​មុខ -GenericName[ko]=Diff/Patch 프론트엔드 -GenericName[lt]=Diff/Patch naudotojo sąsaja -GenericName[ml]=ഡിഫ്/പാച്ച് പുരോഭാഗം -GenericName[mr]=डिफ/पेच फ्रंटएन्ड -GenericName[nb]=Diff-/Patch-grensesnitt -GenericName[nds]=Böversiet för "diff" un "patch" -GenericName[nl]=Diff/Patch-hulpprogramma -GenericName[nn]=Motor for diff- og patch-filer -GenericName[pl]=Interfejs do Diff/Patch -GenericName[pt]=Interface do Diff/Patch -GenericName[pt_BR]=Interface do diff/patch -GenericName[ro]=Interfață Diferențiere/Peticire -GenericName[ru]=Графический интерфейс Diff/Patch -GenericName[sk]=Rozhranie Diff/Patch -GenericName[sl]=Začelje za diff/patch -GenericName[sr]=Прочеље за diff и patch -GenericName[sr@ijekavian]=Прочеље за diff и patch -GenericName[sr@ijekavianlatin]=Pročelje za diff i patch -GenericName[sr@latin]=Pročelje za diff i patch -GenericName[sv]=Jämförelse- och programfixgränssnitt -GenericName[tr]=Diff/Patch Arayüzü -GenericName[ug]=سېلىشتۇرۇش/ياماش(Diff/Patch) نىڭ ئالدى ئۇچى -GenericName[uk]=Графічна оболонка Diff/Patch -GenericName[x-test]=xxDiff/Patch Frontendxx -GenericName[zh_CN]=Diff/Patch 前端 -GenericName[zh_TW]=比較/修補程式前端介面 -Exec=kdiff3 %i -caption %c -Icon=kdiff3 -Type=Application -X-DocPath=kdiff3/index.html -Comment=A File And Directory Comparison And Merge Tool -Comment[bg]=Инструмент за сравняване и сливане на файлове и директории -Comment[bs]=Alat za poređenje i spajanje direktorija i datoteka -Comment[ca]=Una eina per a la comparació i fusió de fitxers i directoris -Comment[ca@valencia]=Una eina per a la comparació i fusió de fitxers i directoris -Comment[cs]=Nástroj pro porovnávání a slučování souborů a adresářů -Comment[da]=Et værktøj til sammenfletning og sammenligning af filer og mapper -Comment[de]=Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern -Comment[el]=Ένα εργαλείο σύγκρισης και συγχώνευσης αρχείων και καταλόγων -Comment[en_GB]=A File And Directory Comparison And Merge Tool -Comment[es]=Una herramienta para comparar y fusionar archivos y directorios -Comment[et]=Failide ja kataloogide võrdlemise ja liitmise tööriist -Comment[fi]=Tiedostojen ja hakemistojen vertailu- ja yhdistämistyökalu -Comment[fr]=Un outil de comparaison et de fusion de fichiers et de dossiers -Comment[ga]=Uirlis a chuireann comhaid agus comhadlanna i gcomparáid agus a chumascann iad más gá -Comment[gl]=Unha ferramenta de comparación e fusión de ficheiros e directorios -Comment[hi]=फ़ाइल तथा डिरेक्ट्री तुलना करने व मिलाने का औजार -Comment[hne]=फाइल अउ डिरेक्टरी तुलना करे अउ मिलाय के औजार -Comment[hu]=Egy fájl és könyvtár összehasonlítási és egyesítési eszköz -Comment[it]=Uno strumento di confronto e fusione di file e cartelle -Comment[ja]=ファイルやディレクトリの比較/マージを行うツール -Comment[km]=ការ​ប្រៀបធៀប​ថត និង​ឯកសារ និង​ឧបករណ៌​បញ្ចូល​គ្នា -Comment[ko]=파일과 디렉터리 비교 및 병합 도구 -Comment[lt]=Failų ir Direktorijų palyginimo ir suliejimo įrankis -Comment[ml]=ഫയലും അറകളും താരതമ്യം ചെയ്യാനും ലയിപ്പിക്കാനുമുള്ള ഒരു ആയുധം -Comment[nb]=Et verktøy for å sammelnlikne og flette filer og mapper -Comment[nds]=En Warktüüch för't Verglieken un Tosamenföhren vun Dateien un Ornern -Comment[nl]=Hulpmiddel voor het vergelijken en samenvoegen van bestanden en mappen -Comment[nn]=Eit program for samanlikning og fletting av filer og mapper -Comment[pl]=Narzędzie do porównywania i łączenia plików i katalogów -Comment[pt]=Uma Ferramenta de Comparação e Junção de Ficheiros e Pastas -Comment[pt_BR]=Uma ferramenta de comparação e junção de arquivos e pastas -Comment[ro]=Un instrument de comparare și îmbinare a fișierelor și directoarelor -Comment[ru]=Инструмент для сравнения и объединения файлов и каталогов -Comment[sk]=Nástroj na porovnanie a zlúčenie súborov a adresárov -Comment[sl]=Orodje za primerjavo in združevanje datotek in map -Comment[sr]=Алатка за поређење и стапање фајлова и фасцикли -Comment[sr@ijekavian]=Алатка за поређење и стапање фајлова и фасцикли -Comment[sr@ijekavianlatin]=Alatka za poređenje i stapanje fajlova i fascikli -Comment[sr@latin]=Alatka za poređenje i stapanje fajlova i fascikli -Comment[sv]=Ett jämförelseverktyg för fil- och katalogjämförelser -Comment[tr]=Bir Dosya Ve Dizin Karşılaştırma Ve Birleştirme Aracı -Comment[ug]=ھۆججەت ۋە مۇندەرىجە سېلىشتۇرۇش ۋە بىرىكتۈرۈش قورالى -Comment[uk]=Інструмент для порівняння та з’єднання файлів та тек -Comment[x-test]=xxA File And Directory Comparison And Merge Toolxx -Comment[zh_CN]=一个文件和目录的比较和合并工具 -Comment[zh_TW]=一個檔案與目錄比較與合併的工具 -Terminal=false -Categories=Qt;KDE;Development; Index: trunk/extragear/utils/kdiff3/src/kdiff3_shell.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3_shell.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3_shell.cpp (nonexistent) @@ -1,176 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2007 Joachim Eibl * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "kdiff3_shell.h" -#include "kdiff3.h" -#include "kdiff3_part.h" - -#include -#include -#include -#include - -#include - -#include -#include - -#include -#include -#include -#include - -#include - -#include -#include -#include - - -KDiff3Shell::KDiff3Shell( bool bCompleteInit ) - : KParts::MainWindow( ) -{ - m_bUnderConstruction = true; - // set the shell's ui resource file - setXMLFile("kdiff3_shell.rc"); - - // and a status bar - statusBar()->show(); - -// m_part = static_cast(factory->create(this, "KDiff3Part", QStringList("KParts::ReadWritePart"))); - m_part = new KDiff3Part( this, "KDiff3Part", this ); - - if (m_part) - { - // and integrate the part's GUI with the shell's - createGUI(m_part); - //toolBar()->setToolButtonStyle( Qt::ToolButtonIconOnly ); - - // tell the KParts::MainWindow that this is indeed the main widget - setCentralWidget(m_part->widget()); - - if (bCompleteInit) - ((KDiff3App*)m_part->widget())->completeInit(); - connect(((KDiff3App*)m_part->widget()), SIGNAL(createNewInstance(const QString&, const QString&, const QString&)), this, SLOT(slotNewInstance(const QString&, const QString&, const QString&))); - } - else - { - // if we couldn't find our Part, we exit since the Shell by - // itself can't do anything useful - KMessageBox::error(this, i18n("Could not initialize the KDiff3 part.\n" - "This usually happens due to an installation problem. " - "Please read the README-file in the source package for details.") - ); - //kapp->quit(); - - ::exit(-1); //kapp->quit() doesn't work here yet. - - // we return here, cause kapp->quit() only means "exit the - // next time we enter the event loop... - - return; - } - - // apply the saved mainwindow settings, if any, and ask the mainwindow - // to automatically save settings if changed: window size, toolbar - // position, icon size, etc. - setAutoSaveSettings(); - m_bUnderConstruction = false; -} - -KDiff3Shell::~KDiff3Shell() -{ -} - -bool KDiff3Shell::queryClose() -{ - if (m_part) - return ((KDiff3App*)m_part->widget())->queryClose(); - else - return true; -} - -bool KDiff3Shell::queryExit() -{ - return true; -} - -void KDiff3Shell::closeEvent(QCloseEvent*e) -{ - if ( queryClose() ) - { - e->accept(); - bool bFileSaved = ((KDiff3App*)m_part->widget())->isFileSaved(); - bool bDirCompare = ((KDiff3App*)m_part->widget())->isDirComparison(); - KApplication::exit( bFileSaved || bDirCompare ? 0 : 1 ); - } - else - e->ignore(); -} - -void KDiff3Shell::optionsShowToolbar() -{ - // this is all very cut and paste code for showing/hiding the - // toolbar - if (m_toolbarAction->isChecked()) - toolBar()->show(); - else - toolBar()->hide(); -} - -void KDiff3Shell::optionsShowStatusbar() -{ - // this is all very cut and paste code for showing/hiding the - // statusbar - if (m_statusbarAction->isChecked()) - statusBar()->show(); - else - statusBar()->hide(); -} - -void KDiff3Shell::optionsConfigureKeys() -{ - KShortcutsDialog::configure(actionCollection() /*, "kdiff3_shell.rc" */ ); -} - -void KDiff3Shell::optionsConfigureToolbars() -{ - KConfigGroup mainWindowGroup( KGlobal::config(), "MainWindow" ); - saveMainWindowSettings( mainWindowGroup ); - - // use the standard toolbar editor - KEditToolBar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); - dlg.exec(); -} - -void KDiff3Shell::applyNewToolbarConfig() -{ - KConfigGroup mainWindowGroup( KGlobal::config(), "MainWindow" ); - applyMainWindowSettings( mainWindowGroup ); -} - -void KDiff3Shell::slotNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 ) -{ - KDiff3Shell* pKDiff3Shell = new KDiff3Shell(false); - ((KDiff3App*)pKDiff3Shell->m_part->widget())->completeInit(fn1,fn2,fn3); -} - -//#include "kdiff3_shell.moc" Index: trunk/extragear/utils/kdiff3/src/fileaccess.h =================================================================== --- trunk/extragear/utils/kdiff3/src/fileaccess.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/fileaccess.h (nonexistent) @@ -1,268 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2007 by Joachim Eibl * - * joachim.eibl at gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - ***************************************************************************/ - -#ifndef FILEACCESS_H -#define FILEACCESS_H - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -bool wildcardMultiMatch( const QString& wildcard, const QString& testString, bool bCaseSensitive ); - -class t_DirectoryList; - -class FileAccess -{ -public: - FileAccess(); - ~FileAccess(); - FileAccess( const QString& name, bool bWantToWrite=false ); // name: local file or dirname or url (when supported) - void setFile( const QString& name, bool bWantToWrite=false ); - - bool isValid() const; - bool isFile() const; - bool isDir() const; - bool isSymLink() const; - bool exists() const; - qint64 size() const; // Size as returned by stat(). - qint64 sizeForReading(); // If the size can't be determined by stat() then the file is copied to a local temp file. - bool isReadable() const; - bool isWritable() const; - bool isExecutable() const; - bool isHidden() const; - QString readLink() const; - - QDateTime created() const; - QDateTime lastModified() const; - QDateTime lastRead() const; - - QString fileName() const; // Just the name-part of the path, without parent directories - QString filePath() const; // The path-string that was used during construction - QString prettyAbsPath() const; - KUrl url() const; - QString absoluteFilePath() const; - - bool isLocal() const; - - bool readFile(void* pDestBuffer, unsigned long maxLength ); - bool writeFile(const void* pSrcBuffer, unsigned long length ); - bool listDir( t_DirectoryList* pDirList, bool bRecursive, bool bFindHidden, - const QString& filePattern, const QString& fileAntiPattern, - const QString& dirAntiPattern, bool bFollowDirLinks, bool bUseCvsIgnore ); - bool copyFile( const QString& destUrl ); - bool createBackup( const QString& bakExtension ); - - static QString tempFileName(); - static bool removeTempFile( const QString& ); - bool removeFile(); - static bool removeFile( const QString& ); - static bool makeDir( const QString& ); - static bool removeDir( const QString& ); - static bool exists( const QString& ); - static QString cleanPath( const QString& ); - - //bool chmod( const QString& ); - bool rename( const QString& ); - static bool symLink( const QString& linkTarget, const QString& linkLocation ); - - void addPath( const QString& txt ); - QString getStatusText(); -private: - void setUdsEntry( const KIO::UDSEntry& e ); - KUrl m_url; - bool m_bLocal; - bool m_bValidData; - - qint64 m_size; - QDateTime m_modificationTime; - QDateTime m_accessTime; - QDateTime m_creationTime; - bool m_bReadable; - bool m_bWritable; - bool m_bExecutable; - bool m_bExists; - bool m_bFile; - bool m_bDir; - bool m_bSymLink; - bool m_bHidden; - long m_fileType; // for testing only - - QString m_linkTarget; - QString m_user; - QString m_group; - QString m_name; - QString m_path; - QString m_absoluteFilePath; - QString m_localCopy; - QString m_statusText; // Might contain an error string, when the last operation didn't succeed. - - friend class FileAccessJobHandler; -}; - -class t_DirectoryList : public std::list -{}; - - -class FileAccessJobHandler : public QObject -{ - Q_OBJECT -public: - FileAccessJobHandler( FileAccess* pFileAccess ); - - bool get( void* pDestBuffer, long maxLength ); - bool put( const void* pSrcBuffer, long maxLength, bool bOverwrite, bool bResume=false, int permissions=-1 ); - bool stat(int detailLevel=2, bool bWantToWrite=false ); - bool copyFile( const QString& dest ); - bool rename( const QString& dest ); - bool listDir( t_DirectoryList* pDirList, bool bRecursive, bool bFindHidden, - const QString& filePattern, const QString& fileAntiPattern, - const QString& dirAntiPattern, bool bFollowDirLinks, bool bUseCvsIgnore ); - bool mkDir( const QString& dirName ); - bool rmDir( const QString& dirName ); - bool removeFile( const QString& dirName ); - bool symLink( const QString& linkTarget, const QString& linkLocation ); - -private: - FileAccess* m_pFileAccess; - bool m_bSuccess; - - // Data needed during Job - qint64 m_transferredBytes; - char* m_pTransferBuffer; // Needed during get or put - qint64 m_maxLength; - - QString m_filePattern; - QString m_fileAntiPattern; - QString m_dirAntiPattern; - t_DirectoryList* m_pDirList; - bool m_bFindHidden; - bool m_bRecursive; - bool m_bFollowDirLinks; - - bool scanLocalDirectory( const QString& dirName, t_DirectoryList* dirList ); - -private slots: - void slotStatResult( KJob* ); - void slotSimpleJobResult( KJob* pJob ); - void slotPutJobResult( KJob* pJob ); - - void slotGetData(KJob*,const QByteArray&); - void slotPutData(KIO::Job*, QByteArray&); - - void slotListDirInfoMessage( KJob*, const QString& msg ); - void slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l ); - - void slotPercent( KJob* pJob, unsigned long percent ); -}; - -class ProgressDialog : public QDialog -{ - Q_OBJECT -public: - ProgressDialog( QWidget* pParent ); - - void setStayHidden( bool bStayHidden ); - void setInformation( const QString& info, bool bRedrawUpdate=true ); - void setInformation( const QString& info, double dCurrent, bool bRedrawUpdate=true ); - void setCurrent( double dCurrent, bool bRedrawUpdate=true ); - void step( bool bRedrawUpdate=true ); - void setMaxNofSteps( int dMaxNofSteps ); - void push(); - void pop(bool bRedrawUpdate=true); - - // The progressbar goes from 0 to 1 usually. - // By supplying a subrange transformation the subCurrent-values - // 0 to 1 will be transformed to dMin to dMax instead. - // Requirement: 0 < dMin < dMax < 1 - void setRangeTransformation( double dMin, double dMax ); - void setSubRangeTransformation( double dMin, double dMax ); - - void exitEventLoop(); - void enterEventLoop( KJob* pJob, const QString& jobInfo ); - - bool wasCancelled(); - void show(); - void hide(); - - virtual void timerEvent(QTimerEvent*); -private: - - struct ProgressLevelData - { - ProgressLevelData() - { - m_dCurrent=0; m_maxNofSteps=1; m_dRangeMin=0; m_dRangeMax=1; - m_dSubRangeMin = 0; m_dSubRangeMax = 1; - } - double m_dCurrent; - int m_maxNofSteps; // when step() is used. - double m_dRangeMax; - double m_dRangeMin; - double m_dSubRangeMax; - double m_dSubRangeMin; - }; - std::list m_progressStack; - - int m_progressDelayTimer; - std::list m_eventLoopStack; - - QProgressBar* m_pProgressBar; - QProgressBar* m_pSubProgressBar; - QLabel* m_pInformation; - QLabel* m_pSubInformation; - QLabel* m_pSlowJobInfo; - QPushButton* m_pAbortButton; - void recalc(bool bRedrawUpdate); - QTime m_t1; - QTime m_t2; - bool m_bWasCancelled; - KJob* m_pJob; - QString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time. - bool m_bStayHidden; -protected: - virtual void reject(); -private slots: - void delayedHide(); - void slotAbort(); -}; - -// When using the ProgressProxy you need not take care of the push and pop, except when explicit. -class ProgressProxy -{ -public: - ProgressProxy(); - ~ProgressProxy(); - - void setInformation( const QString& info, bool bRedrawUpdate=true ); - void setInformation( const QString& info, double dCurrent, bool bRedrawUpdate=true ); - void setCurrent( double dCurrent, bool bRedrawUpdate=true ); - void step( bool bRedrawUpdate=true ); - void setMaxNofSteps( int dMaxNofSteps ); - bool wasCancelled(); - void setRangeTransformation( double dMin, double dMax ); - void setSubRangeTransformation( double dMin, double dMax ); -private: -}; - -extern ProgressDialog* g_pProgressDialog; - - - -#endif - Index: trunk/extragear/utils/kdiff3/src/optiondialog.h =================================================================== --- trunk/extragear/utils/kdiff3/src/optiondialog.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/optiondialog.h (nonexistent) @@ -1,229 +0,0 @@ -/* - * kdiff3 - Text Diff And Merge Tool - * Copyright (C) 2002-2007 Joachim Eibl, joachim.eibl at gmx.de - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef OPTION_DIALOG_H -#define OPTION_DIALOG_H - - -#include -#include -#include -#include - -class OptionItem; -class OptionCheckBox; -class OptionEncodingComboBox; -class OptionLineEdit; -class KKeyDialog; - -enum e_LineEndStyle -{ - eLineEndStyleUnix=0, - eLineEndStyleDos, - eLineEndStyleAutoDetect, - eLineEndStyleUndefined, // only one line exists - eLineEndStyleConflict // User must resolve manually -}; - -class OptionDialog : public KPageDialog -{ - Q_OBJECT - -public: - - OptionDialog( bool bShowDirMergeSettings, QWidget *parent = 0, char *name = 0 ); - ~OptionDialog( void ); - QString parseOptions( const QStringList& optionList ); - QString calcOptionHelp(); - - // Some settings are not available in the option dialog: - QSize m_geometry; - QPoint m_position; - bool m_bMaximised; - bool m_bShowToolBar; - bool m_bShowStatusBar; - int m_toolBarPos; - - // These are the results of the option dialog. - QFont m_font; - bool m_bItalicForDeltas; - - QColor m_fgColor; - QColor m_bgColor; - QColor m_diffBgColor; - QColor m_colorA; - QColor m_colorB; - QColor m_colorC; - QColor m_colorForConflict; - QColor m_currentRangeBgColor; - QColor m_currentRangeDiffBgColor; - QColor m_oldestFileColor; - QColor m_midAgeFileColor; - QColor m_newestFileColor; - QColor m_missingFileColor; - QColor m_manualHelpRangeColor; - - bool m_bWordWrap; - - bool m_bReplaceTabs; - bool m_bAutoIndentation; - int m_tabSize; - bool m_bAutoCopySelection; - bool m_bSameEncoding; - QTextCodec* m_pEncodingA; - bool m_bAutoDetectUnicodeA; - QTextCodec* m_pEncodingB; - bool m_bAutoDetectUnicodeB; - QTextCodec* m_pEncodingC; - bool m_bAutoDetectUnicodeC; - QTextCodec* m_pEncodingOut; - bool m_bAutoSelectOutEncoding; - QTextCodec* m_pEncodingPP; - int m_lineEndStyle; - - bool m_bPreserveCarriageReturn; - bool m_bTryHard; - bool m_bShowWhiteSpaceCharacters; - bool m_bShowWhiteSpace; - bool m_bShowLineNumbers; - bool m_bHorizDiffWindowSplitting; - bool m_bShowInfoDialogs; - bool m_bDiff3AlignBC; - - int m_whiteSpace2FileMergeDefault; - int m_whiteSpace3FileMergeDefault; - bool m_bIgnoreCase; - bool m_bIgnoreNumbers; - bool m_bIgnoreComments; - QString m_PreProcessorCmd; - QString m_LineMatchingPreProcessorCmd; - bool m_bRunRegExpAutoMergeOnMergeStart; - QString m_autoMergeRegExp; - bool m_bRunHistoryAutoMergeOnMergeStart; - QString m_historyStartRegExp; - QString m_historyEntryStartRegExp; - bool m_bHistoryMergeSorting; - QString m_historyEntryStartSortKeyOrder; - int m_maxNofHistoryEntries; - QString m_IrrelevantMergeCmd; - bool m_bAutoSaveAndQuitOnMergeWithoutConflicts; - - bool m_bAutoAdvance; - int m_autoAdvanceDelay; - - QStringList m_recentAFiles; - QStringList m_recentBFiles; - QStringList m_recentCFiles; - - QStringList m_recentOutputFiles; - - // Directory Merge options - bool m_bDmSyncMode; - bool m_bDmRecursiveDirs; - bool m_bDmFollowFileLinks; - bool m_bDmFollowDirLinks; - bool m_bDmFindHidden; - bool m_bDmCreateBakFiles; - bool m_bDmBinaryComparison; - bool m_bDmFullAnalysis; - bool m_bDmTrustDate; - bool m_bDmTrustDateFallbackToBinary; - bool m_bDmTrustSize; - bool m_bDmCopyNewer; - //bool m_bDmShowOnlyDeltas; - bool m_bDmShowIdenticalFiles; - bool m_bDmUseCvsIgnore; - bool m_bDmWhiteSpaceEqual; - bool m_bDmCaseSensitiveFilenameComparison; - QString m_DmFilePattern; - QString m_DmFileAntiPattern; - QString m_DmDirAntiPattern; - - QString m_language; - bool m_bRightToLeftLanguage; - - QString m_ignorableCmdLineOptions; - bool m_bIntegrateWithClearCase; - bool m_bEscapeKeyQuits; - - void saveOptions(KSharedConfigPtr config); - void readOptions(KSharedConfigPtr config); - - void setState(); // Must be called before calling exec(); - - void addOptionItem(OptionItem*); - KKeyDialog* m_pKeyDialog; -protected slots: - virtual void slotDefault( void ); - virtual void slotOk( void ); - virtual void slotApply( void ); - - void slotEncodingChanged(); - void slotHistoryMergeRegExpTester(); - void slotIntegrateWithClearCase(); - void slotRemoveClearCaseIntegration(); -signals: - void applyDone(); -private: - void resetToDefaults(); - - std::list m_optionItemList; - - OptionCheckBox* m_pSameEncoding; - OptionEncodingComboBox* m_pEncodingAComboBox; - OptionCheckBox* m_pAutoDetectUnicodeA; - OptionEncodingComboBox* m_pEncodingBComboBox; - OptionCheckBox* m_pAutoDetectUnicodeB; - OptionEncodingComboBox* m_pEncodingCComboBox; - OptionCheckBox* m_pAutoDetectUnicodeC; - OptionEncodingComboBox* m_pEncodingOutComboBox; - OptionCheckBox* m_pAutoSelectOutEncoding; - OptionEncodingComboBox* m_pEncodingPPComboBox; - OptionCheckBox* m_pHistoryAutoMerge; - OptionLineEdit* m_pAutoMergeRegExpLineEdit; - OptionLineEdit* m_pHistoryStartRegExpLineEdit; - OptionLineEdit* m_pHistoryEntryStartRegExpLineEdit; - OptionCheckBox* m_pHistoryMergeSorting; - OptionLineEdit* m_pHistorySortKeyOrderLineEdit; - -private: - void setupFontPage(); - void setupColorPage(); - void setupEditPage(); - void setupDiffPage(); - void setupMergePage(); - void setupDirectoryMergePage(); - void setupKeysPage(); - void setupRegionalPage(); - void setupIntegrationPage(); - void setupOtherOptions(); -}; - - - - -#endif - - - - - - - Index: trunk/extragear/utils/kdiff3/src/smalldialogs.h =================================================================== --- trunk/extragear/utils/kdiff3/src/smalldialogs.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/smalldialogs.h (nonexistent) @@ -1,118 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Joachim Eibl * - * joachim.eibl at gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef SMALLDIALOGS_H -#define SMALLDIALOGS_H - -#include - -class OptionDialog; -class QComboBox; -class QCheckBox; -class QLineEdit; - -class OpenDialog : public QDialog -{ - Q_OBJECT -public: - OpenDialog( - QWidget* pParent, const QString& n1, const QString& n2, const QString& n3, - bool bMerge, const QString& outputName, const char* slotConfigure, OptionDialog* pOptions ); - - QComboBox* m_pLineA; - QComboBox* m_pLineB; - QComboBox* m_pLineC; - QComboBox* m_pLineOut; - - QCheckBox* m_pMerge; - virtual void accept(); - virtual bool eventFilter(QObject* o, QEvent* e); -private: - OptionDialog* m_pOptions; - void selectURL( QComboBox* pLine, bool bDir, int i, bool bSave ); - bool m_bInputFileNameChanged; -private slots: - void selectFileA(); - void selectFileB(); - void selectFileC(); - void selectDirA(); - void selectDirB(); - void selectDirC(); - void selectOutputName(); - void selectOutputDir(); - void internalSlot(int); - void inputFilenameChanged(); - void slotSwapCopyNames(QAction*); -signals: - void internalSignal(bool); -}; - -class FindDialog : public QDialog -{ - Q_OBJECT -public: - FindDialog(QWidget* pParent); - -signals: - void findNext(); - -public: - QLineEdit* m_pSearchString; - QCheckBox* m_pSearchInA; - QCheckBox* m_pSearchInB; - QCheckBox* m_pSearchInC; - QCheckBox* m_pSearchInOutput; - QCheckBox* m_pCaseSensitive; - - int currentLine; - int currentPos; - int currentWindow; -}; - - -class RegExpTester : public QDialog -{ - Q_OBJECT -private: - QLineEdit* m_pAutoMergeRegExpEdit; - QLineEdit* m_pAutoMergeMatchResult; - QLineEdit* m_pAutoMergeExampleEdit; - QLineEdit* m_pHistoryStartRegExpEdit; - QLineEdit* m_pHistoryStartMatchResult; - QLineEdit* m_pHistoryStartExampleEdit; - QLineEdit* m_pHistoryEntryStartRegExpEdit; - QLineEdit* m_pHistorySortKeyOrderEdit; - QLineEdit* m_pHistoryEntryStartExampleEdit; - QLineEdit* m_pHistoryEntryStartMatchResult; - QLineEdit* m_pHistorySortKeyResult; - OptionDialog* m_pOptionDialog; -public: - RegExpTester( QWidget* pParent, const QString& autoMergeRegExpToolTip, const QString& historyStartRegExpToolTip, - const QString& historyEntryStartRegExpToolTip, const QString& historySortKeyOrderToolTip ); - void init( const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString sortKeyOrder ); - QString autoMergeRegExp(); - QString historyStartRegExp(); - QString historyEntryStartRegExp(); - QString historySortKeyOrder(); -public slots: - void slotRecalc(); -}; - -#endif Index: trunk/extragear/utils/kdiff3/src/difftextwindow.h =================================================================== --- trunk/extragear/utils/kdiff3/src/difftextwindow.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/difftextwindow.h (nonexistent) @@ -1,138 +0,0 @@ -/*************************************************************************** - difftextwindow.h - description - ------------------- - begin : Mon Mar 18 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef DIFFTEXTWINDOW_H -#define DIFFTEXTWINDOW_H - -#include "diff.h" - -#include - -class QStatusBar; -class OptionDialog; -class DiffTextWindowData; -class DiffTextWindowFrame; - -class DiffTextWindow : public QWidget -{ - Q_OBJECT -public: - DiffTextWindow( - DiffTextWindowFrame* pParent, - QStatusBar* pStatusBar, - OptionDialog* pOptionDialog, - int winIdx - ); - ~DiffTextWindow(); - void init( - const QString& fileName, - QTextCodec* pCodec, - e_LineEndStyle eLineEndStyle, - const LineData* pLineData, - int size, - const Diff3LineVector* pDiff3LineVector, - const ManualDiffHelpList* pManualDiffHelpList, - bool bTriple - ); - void reset(); - void convertToLinePos( int x, int y, int& line, int& pos ); - - QString getSelection(); - int getFirstLine(); - int calcTopLineInFile( int firstLine ); - - int getNofColumns(); - int getNofLines(); - int getNofVisibleLines(); - int getNofVisibleColumns(); - - int convertLineToDiff3LineIdx( int line ); - int convertDiff3LineIdxToLine( int d3lIdx ); - - void convertD3LCoordsToLineCoords( int d3LIdx, int d3LPos, int& line, int& pos ); - void convertLineCoordsToD3LCoords( int line, int pos, int& d3LIdx, int& d3LPos ); - - void convertSelectionToD3LCoords(); - - bool findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive ); - void setSelection( int firstLine, int startPos, int lastLine, int endPos, int& l, int& p ); - void getSelectionRange( int* firstLine, int* lastLine, e_CoordType coordType ); - - void setPaintingAllowed( bool bAllowPainting ); - void recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int nofVisibleColumns ); - void print( MyPainter& painter, const QRect& r, int firstLine, int nofLinesPerPage ); -signals: - void resizeSignal( int nofVisibleColumns, int nofVisibleLines ); - void scroll( int deltaX, int deltaY ); - void newSelection(); - void selectionEnd(); - void setFastSelectorLine( int line ); - void gotFocus(); - void lineClicked( int winIdx, int line ); - -public slots: - void setFirstLine( int line ); - void setFirstColumn( int col ); - void resetSelection(); - void setFastSelectorRange( int line1, int nofLines ); - -protected: - virtual void mousePressEvent ( QMouseEvent * ); - virtual void mouseReleaseEvent ( QMouseEvent * ); - virtual void mouseMoveEvent ( QMouseEvent * ); - virtual void mouseDoubleClickEvent ( QMouseEvent * e ); - - virtual void paintEvent( QPaintEvent* ); - virtual void dragEnterEvent( QDragEnterEvent* e ); - virtual void focusInEvent( QFocusEvent* e ); - - virtual void resizeEvent( QResizeEvent* ); - virtual void timerEvent(QTimerEvent*); - -private: - DiffTextWindowData* d; - void showStatusLine( int line ); - friend class DiffTextWindowFrame; -}; - - -class DiffTextWindowFrameData; - -class DiffTextWindowFrame : public QWidget -{ - Q_OBJECT -public: - DiffTextWindowFrame( QWidget* pParent, QStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx ); - ~DiffTextWindowFrame(); - DiffTextWindow* getDiffTextWindow(); - void init(); - void setFirstLine(int firstLine); -signals: - void fileNameChanged(const QString&, int); -protected: - bool eventFilter( QObject*, QEvent* ); - //void paintEvent(QPaintEvent*); -private slots: - void slotReturnPressed(); - void slotBrowseButtonClicked(); -private: - DiffTextWindowFrameData* d; -}; - - -#endif - Index: trunk/extragear/utils/kdiff3/src/kdiff3.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3.cpp (nonexistent) @@ -1,1061 +0,0 @@ -/*************************************************************************** - kdiff3.cpp - description - ------------------- - begin : Don Jul 11 12:31:29 CEST 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "difftextwindow.h" -#include "mergeresultwindow.h" - -#include -#include - -// include files for QT -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// include files for KDE -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include - -// application specific includes -#include "kdiff3.h" -#include "optiondialog.h" -#include "fileaccess.h" -#include "kdiff3_part.h" -#include "directorymergewindow.h" -#include "smalldialogs.h" -#include "guiutils.h" // namespace KDiff3 - -#define ID_STATUS_MSG 1 -#define MAIN_TOOLBAR_NAME "mainToolBar" - -KActionCollection* KDiff3App::actionCollection() -{ - if ( m_pKDiff3Shell==0 ) - return m_pKDiff3Part->actionCollection(); - else - return m_pKDiff3Shell->actionCollection(); -} - -KStatusBar* KDiff3App::statusBar() -{ - if ( m_pKDiff3Shell==0 ) - return 0; - else - return m_pKDiff3Shell->statusBar(); -} - -KToolBar* KDiff3App::toolBar(const char* toolBarId ) -{ - if ( m_pKDiff3Shell==0 ) - return 0; - else - return m_pKDiff3Shell->toolBar( toolBarId ); -//return m_pKDiff3Shell->toolBar(); -} - -bool KDiff3App::isPart() -{ - return m_pKDiff3Shell==0; -} - -bool KDiff3App::isFileSaved() -{ - return m_bFileSaved; -} - -bool KDiff3App::isDirComparison() -{ - return m_bDirCompare; -} - -KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3Part ) - : QSplitter(pParent) //previously KMainWindow -{ - setObjectName( "KDiff3App" ); - m_pKDiff3Part = pKDiff3Part; - m_pKDiff3Shell = dynamic_cast(pParent); - - setWindowTitle( "KDiff3" ); - setOpaqueResize(false); // faster resizing - setUpdatesEnabled(false); - - m_pMainSplitter = 0; - m_pDirectoryMergeSplitter = 0; - m_pDirectoryMergeWindow = 0; - m_pCornerWidget = 0; - m_pMainWidget = 0; - m_pDiffTextWindow1 = 0; - m_pDiffTextWindow2 = 0; - m_pDiffTextWindow3 = 0; - m_pDiffTextWindowFrame1 = 0; - m_pDiffTextWindowFrame2 = 0; - m_pDiffTextWindowFrame3 = 0; - m_pDiffWindowSplitter = 0; - m_pOverview = 0; - m_bTripleDiff = false; - m_pMergeResultWindow = 0; - m_pMergeWindowFrame = 0; - m_bOutputModified = false; - m_bFileSaved = false; - m_bTimerBlock = false; - m_pHScrollBar = 0; - m_pDiffVScrollBar = 0; - m_pMergeVScrollBar = 0; - viewToolBar = 0; - - // Needed before any file operations via FileAccess happen. - if (!g_pProgressDialog) - { - g_pProgressDialog = new ProgressDialog(0); - g_pProgressDialog->setStayHidden( true ); - } - - // All default values must be set before calling readOptions(). - m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=0, this ); - connect( m_pOptionDialog, SIGNAL(applyDone()), this, SLOT(slotRefresh()) ); - - m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->componentData().config() : KGlobal::config() ); - - // Option handling: Only when pParent==0 (no parent) - KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs(); - - if (args) - { - QString s; - QString title; - if ( args->isSet("confighelp") ) - { - s = m_pOptionDialog->calcOptionHelp(); - title = i18n("Current Configuration:"); - } - else - { - s = m_pOptionDialog->parseOptions( args->getOptionList("cs") ); - title = i18n("Config Option Error:"); - } - if (!s.isEmpty()) - { -#if defined(_WIN32) || defined(Q_OS_OS2) - // A windows program has no console - //KMessageBox::information(0, s,i18n("KDiff3-Usage")); - QDialog* pDialog = new QDialog(this); - pDialog->setAttribute( Qt::WA_DeleteOnClose ); - pDialog->setModal( true ); - pDialog->setWindowTitle(title); - QVBoxLayout* pVBoxLayout = new QVBoxLayout( pDialog ); - QTextEdit* pTextEdit = new QTextEdit(pDialog); - pTextEdit->setText(s); - pTextEdit->setReadOnly(true); - pTextEdit->setWordWrapMode(QTextOption::NoWrap); - pVBoxLayout->addWidget(pTextEdit); - pDialog->resize(600,400); - pDialog->exec(); -#else - std::cerr << title.toLatin1().constData() << std::endl; - std::cerr << s.toLatin1().constData() << std::endl; -#endif - exit(1); - } - } - - m_sd1.setOptionDialog(m_pOptionDialog); - m_sd2.setOptionDialog(m_pOptionDialog); - m_sd3.setOptionDialog(m_pOptionDialog); - - if (args!=0) - { - m_outputFilename = args->getOption("output"); - if ( m_outputFilename.isEmpty() ) - m_outputFilename = args->getOption("out"); - } - - m_bAutoFlag = args!=0 && args->isSet("auto"); - m_bAutoMode = m_bAutoFlag || m_pOptionDialog->m_bAutoSaveAndQuitOnMergeWithoutConflicts; - if ( m_bAutoMode && m_outputFilename.isEmpty() ) - { - if ( m_bAutoFlag ) - { - //KMessageBox::information(this, i18n("Option --auto used, but no output file specified.")); - std::cerr << (const char*)i18n("Option --auto used, but no output file specified.").toLatin1() << std::endl; - } - m_bAutoMode = false; - } - g_pProgressDialog->setStayHidden( m_bAutoMode ); - - if ( m_outputFilename.isEmpty() && args!=0 && args->isSet("merge") ) - { - m_outputFilename = "unnamed.txt"; - m_bDefaultFilename = true; - } - else - m_bDefaultFilename = false; - - g_bAutoSolve = args!=0 && !args->isSet("qall"); // Note that this is effective only once. - - if ( args!=0 ) - { - m_sd1.setFilename( args->getOption("base") ); - if ( m_sd1.isEmpty() ) - { - if ( args->count() > 0 ) m_sd1.setFilename( args->url(0).url() ); // args->arg(0) - if ( args->count() > 1 ) m_sd2.setFilename( args->url(1).url() ); - if ( args->count() > 2 ) m_sd3.setFilename( args->url(2).url() ); - } - else - { - if ( args->count() > 0 ) m_sd2.setFilename( args->url(0).url() ); - if ( args->count() > 1 ) m_sd3.setFilename( args->url(1).url() ); - } - - - QStringList aliasList = args->getOptionList("fname"); - QStringList::Iterator ali = aliasList.begin(); - - QString an1 = args->getOption("L1"); - if ( !an1.isEmpty() ) { m_sd1.setAliasName(an1); } - else if ( ali != aliasList.end() ) { m_sd1.setAliasName(*ali); ++ali; } - - QString an2 = args->getOption("L2"); - if ( !an2.isEmpty() ) { m_sd2.setAliasName(an2); } - else if ( ali != aliasList.end() ) { m_sd2.setAliasName(*ali); ++ali; } - - QString an3 = args->getOption("L3"); - if ( !an3.isEmpty() ) { m_sd3.setAliasName(an3); } - else if ( ali != aliasList.end() ) { m_sd3.setAliasName(*ali); ++ali; } - } - - /////////////////////////////////////////////////////////////////// - // call inits to invoke all other construction parts - initActions(actionCollection()); - initStatusBar(); - - m_pFindDialog = new FindDialog( this ); - connect( m_pFindDialog, SIGNAL(findNext()), this, SLOT(slotEditFindNext())); - - autoAdvance->setChecked( m_pOptionDialog->m_bAutoAdvance ); - showWhiteSpaceCharacters->setChecked( m_pOptionDialog->m_bShowWhiteSpaceCharacters ); - showWhiteSpace->setChecked( m_pOptionDialog->m_bShowWhiteSpace ); - showWhiteSpaceCharacters->setEnabled( m_pOptionDialog->m_bShowWhiteSpace ); - showLineNumbers->setChecked( m_pOptionDialog->m_bShowLineNumbers ); - wordWrap->setChecked( m_pOptionDialog->m_bWordWrap ); - if ( ! isPart() ) - { -// TODO -// viewToolBar->setChecked( m_pOptionDialog->m_bShowToolBar ); -// slotViewToolBar(); - - viewStatusBar->setChecked( m_pOptionDialog->m_bShowStatusBar ); - slotViewStatusBar(); -/* - vrusu - commented out as new KToolBar does not hase setParPos - TODO figure out how to restore bar position - if( toolBar(MAIN_TOOLBAR_NAME)!=0 ) - toolBar(MAIN_TOOLBAR_NAME)->setBarPos( (KToolBar::BarPosition) m_pOptionDialog->m_toolBarPos );*/ -/* QSize size = m_pOptionDialog->m_geometry; - QPoint pos = m_pOptionDialog->m_position; - if(!size.isEmpty()) - { - m_pKDiff3Shell->resize( size ); - QRect visibleRect = QRect( pos, size ) & QApplication::desktop()->rect(); - if ( visibleRect.width()>100 && visibleRect.height()>100 ) - m_pKDiff3Shell->move( pos ); - }*/ - } - slotRefresh(); - - m_pMainSplitter = this; //new QSplitter(this); - m_pMainSplitter->setOrientation( Qt::Vertical ); -// setCentralWidget( m_pMainSplitter ); - m_pDirectoryMergeSplitter = new QSplitter( m_pMainSplitter ); - m_pDirectoryMergeSplitter->setObjectName("DirectoryMergeSplitter"); - m_pMainSplitter->addWidget( m_pDirectoryMergeSplitter ); - m_pDirectoryMergeSplitter->setOrientation( Qt::Horizontal ); - m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog, - KIconLoader::global() ); - m_pDirectoryMergeSplitter->addWidget(m_pDirectoryMergeWindow); - m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); - m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo ); - m_pDirectoryMergeSplitter->addWidget(m_pDirectoryMergeInfo); - - connect( m_pDirectoryMergeWindow, SIGNAL(startDiffMerge(QString,QString,QString,QString,QString,QString,QString,TotalDiffStatus*)), - this, SLOT( slotFileOpen2(QString,QString,QString,QString,QString,QString,QString,TotalDiffStatus*))); - connect( m_pDirectoryMergeWindow, SIGNAL(itemSelectionChanged()), this, SLOT(slotUpdateAvailabilities())); - connect( m_pDirectoryMergeWindow, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(slotUpdateAvailabilities())); - connect( m_pDirectoryMergeWindow, SIGNAL(checkIfCanContinue(bool*)), this, SLOT(slotCheckIfCanContinue(bool*))); - connect( m_pDirectoryMergeWindow, SIGNAL(updateAvailabilities()), this, SLOT(slotUpdateAvailabilities())); - connect( m_pDirectoryMergeWindow, SIGNAL(statusBarMessage(const QString&)), this, SLOT(slotStatusMsg(const QString&))); - - m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() ); - - if ( args!=0 ) args->clear(); // Free up some memory. - - if (m_pKDiff3Shell==0) - { - completeInit(); - } -} - - -void KDiff3App::completeInit( const QString& fn1, const QString& fn2, const QString& fn3 ) -{ - if (m_pKDiff3Shell!=0) - { - QSize size=m_pOptionDialog->m_geometry; - QPoint pos=m_pOptionDialog->m_position; - if(!size.isEmpty()) - { - m_pKDiff3Shell->resize( size ); - - QRect visibleRect = QRect( pos, size ) & QApplication::desktop()->rect(); - if ( visibleRect.width()>100 && visibleRect.height()>100 ) - m_pKDiff3Shell->move( pos ); - if (!m_bAutoMode) - { - if ( m_pOptionDialog->m_bMaximised ) - m_pKDiff3Shell->showMaximized(); - else - m_pKDiff3Shell->show(); - } - } - } - if ( ! fn1.isEmpty() ) { m_sd1.setFilename(fn1); } - if ( ! fn2.isEmpty() ) { m_sd2.setFilename(fn2); } - if ( ! fn3.isEmpty() ) { m_sd3.setFilename(fn3); } - - bool bSuccess = improveFilenames(false); - - if ( m_bAutoFlag && m_bAutoMode && m_bDirCompare ) - { - std::cerr << (const char*)i18n("Option --auto ignored for directory comparison.").toLatin1()<hide(); - - init( m_bAutoMode ); - if ( m_bAutoMode ) - { - SourceData* pSD=0; - if ( m_sd3.isEmpty() ) - { - if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd1; } - } - else - { - if ( m_totalDiffStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old) - else if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed - else if ( m_totalDiffStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed - } - - if ( pSD!=0 ) - { - // Save this file directly, not via the merge result window. - bool bSuccess = false; - FileAccess fa( m_outputFilename ); - if ( m_pOptionDialog->m_bDmCreateBakFiles && fa.exists() ) - { - QString newName = m_outputFilename + ".orig"; - if ( FileAccess::exists( newName ) ) FileAccess::removeFile( newName ); - if ( !FileAccess::exists( newName ) ) fa.rename( newName ); - } - - bSuccess = pSD->saveNormalDataAs( m_outputFilename ); - if ( bSuccess ) ::exit(0); - else KMessageBox::error( this, i18n("Saving failed.") ); - } - else if ( m_pMergeResultWindow->getNrOfUnsolvedConflicts() == 0 ) - { - bool bSuccess = m_pMergeResultWindow->saveDocument( m_pMergeResultWindowTitle->getFileName(), m_pMergeResultWindowTitle->getEncoding(), m_pMergeResultWindowTitle->getLineEndStyle() ); - if ( bSuccess ) ::exit(0); - } - } - } - m_bAutoMode = false; - - if (m_pKDiff3Shell) - { - if ( m_pOptionDialog->m_bMaximised ) - m_pKDiff3Shell->showMaximized(); - else - m_pKDiff3Shell->show(); - } - - g_pProgressDialog->setStayHidden( false ); - - if (statusBar() !=0 ) - statusBar()->setSizeGripEnabled(true); - - slotClipboardChanged(); // For initialisation. - - slotUpdateAvailabilities(); - - if ( ! m_bDirCompare && m_pKDiff3Shell!=0 ) - { - bool bFileOpenError = false; - if ( (! m_sd1.isEmpty() && !m_sd1.hasData()) || - (! m_sd2.isEmpty() && !m_sd2.hasData()) || - (! m_sd3.isEmpty() && !m_sd3.hasData()) ) - { - QString text( i18n("Opening of these files failed:") ); - text += "\n\n"; - if ( ! m_sd1.isEmpty() && !m_sd1.hasData() ) - text += " - " + m_sd1.getAliasName() + "\n"; - if ( ! m_sd2.isEmpty() && !m_sd2.hasData() ) - text += " - " + m_sd2.getAliasName() + "\n"; - if ( ! m_sd3.isEmpty() && !m_sd3.hasData() ) - text += " - " + m_sd3.getAliasName() + "\n"; - - KMessageBox::sorry( this, text, i18n("File Open Error") ); - bFileOpenError = true; - } - - if ( m_sd1.isEmpty() || m_sd2.isEmpty() || bFileOpenError ) - slotFileOpen(); - } - else if ( !bSuccess ) // Directory open failed - { - slotFileOpen(); - } -} - -KDiff3App::~KDiff3App() -{ - -} - -/** - * Helper function used to create actions into the ac collection - */ - -void KDiff3App::initActions( KActionCollection* ac ) -{ - if (ac==0) - KMessageBox::error(0, "actionCollection==0"); - - fileOpen = KStandardAction::open(this, SLOT(slotFileOpen()), ac); - fileOpen->setStatusTip(i18n("Opens documents for comparison...")); - - fileReload = KDiff3::createAction< KAction >( i18n("Reload"), KShortcut( Qt::Key_F5 ), this, SLOT(slotReload()), ac, "file_reload" ); - - fileSave = KStandardAction::save(this, SLOT(slotFileSave()), ac); - fileSave->setStatusTip(i18n("Saves the merge result. All conflicts must be solved!")); - fileSaveAs = KStandardAction::saveAs(this, SLOT(slotFileSaveAs()), ac); - fileSaveAs->setStatusTip(i18n("Saves the current document as...")); -#ifndef QT_NO_PRINTER - filePrint = KStandardAction::print(this, SLOT(slotFilePrint()), ac); - filePrint->setStatusTip(i18n("Print the differences")); -#endif - fileQuit = KStandardAction::quit(this, SLOT(slotFileQuit()), ac); - fileQuit->setStatusTip(i18n("Quits the application")); - editCut = KStandardAction::cut(this, SLOT(slotEditCut()), ac); - editCut->setStatusTip(i18n("Cuts the selected section and puts it to the clipboard")); - editCopy = KStandardAction::copy(this, SLOT(slotEditCopy()), ac); - editCopy->setStatusTip(i18n("Copies the selected section to the clipboard")); - editPaste = KStandardAction::paste(this, SLOT(slotEditPaste()), ac); - editPaste->setStatusTip(i18n("Pastes the clipboard contents to current position")); - editSelectAll = KStandardAction::selectAll(this, SLOT(slotEditSelectAll()), ac); - editSelectAll->setStatusTip(i18n("Select everything in current window")); - editFind = KStandardAction::find(this, SLOT(slotEditFind()), ac); - editFind->setStatusTip(i18n("Search for a string")); - editFindNext = KStandardAction::findNext(this, SLOT(slotEditFindNext()), ac); - editFindNext->setStatusTip(i18n("Search again for the string")); -/* FIXME figure out how to implement this action - viewToolBar = KStandardAction::showToolbar(this, SLOT(slotViewToolBar()), ac); - viewToolBar->setStatusTip(i18n("Enables/disables the toolbar")); */ - viewStatusBar = KStandardAction::showStatusbar(this, SLOT(slotViewStatusBar()), ac); - viewStatusBar->setStatusTip(i18n("Enables/disables the statusbar")); - KStandardAction::keyBindings(this, SLOT(slotConfigureKeys()), ac); - KAction* pAction = KStandardAction::preferences(this, SLOT(slotConfigure()), ac ); - if ( isPart() ) - pAction->setText(i18n("Configure KDiff3...")); - - -#include "xpm/downend.xpm" -#include "xpm/currentpos.xpm" -#include "xpm/down1arrow.xpm" -#include "xpm/down2arrow.xpm" -#include "xpm/upend.xpm" -#include "xpm/up1arrow.xpm" -#include "xpm/up2arrow.xpm" -#include "xpm/prevunsolved.xpm" -#include "xpm/nextunsolved.xpm" -#include "xpm/iconA.xpm" -#include "xpm/iconB.xpm" -#include "xpm/iconC.xpm" -#include "xpm/autoadvance.xpm" -#include "xpm/showwhitespace.xpm" -#include "xpm/showwhitespacechars.xpm" -#include "xpm/showlinenumbers.xpm" -//#include "reload.xpm" - - goCurrent = KDiff3::createAction< KAction >( i18n("Go to Current Delta"), QIcon(QPixmap(currentpos)), i18n("Current\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Space ), this, SLOT(slotGoCurrent()), ac, "go_current"); - - goTop = KDiff3::createAction< KAction >(i18n("Go to First Delta"), QIcon(QPixmap(upend)), i18n("First\nDelta"), this, SLOT(slotGoTop()), ac, "go_top"); - - goBottom = KDiff3::createAction< KAction >(i18n("Go to Last Delta"), QIcon(QPixmap(downend)), i18n("Last\nDelta"), this, SLOT(slotGoBottom()), ac, "go_bottom"); - - QString omitsWhitespace = ".\n" + i18n("(Skips white space differences when \"Show White Space\" is disabled.)"); - QString includeWhitespace = ".\n" + i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)"); - goPrevDelta = KDiff3::createAction< KAction >(i18n("Go to Previous Delta"), QIcon(QPixmap(up1arrow)), i18n("Prev\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Up), this, SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); - goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace ); - goNextDelta = KDiff3::createAction< KAction >(i18n("Go to Next Delta"), QIcon(QPixmap(down1arrow)), i18n("Next\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Down ), this, SLOT(slotGoNextDelta()), ac, "go_next_delta"); - goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace ); - goPrevConflict = KDiff3::createAction< KAction >(i18n("Go to Previous Conflict"), QIcon(QPixmap(up2arrow)), i18n("Prev\nConflict"), KShortcut( Qt::CTRL+Qt::Key_PageUp ), this, SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); - goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace ); - goNextConflict = KDiff3::createAction< KAction >(i18n("Go to Next Conflict"), QIcon(QPixmap(down2arrow)), i18n("Next\nConflict"), KShortcut( Qt::CTRL+Qt::Key_PageDown ), this, SLOT(slotGoNextConflict()), ac, "go_next_conflict"); - goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace ); - goPrevUnsolvedConflict = KDiff3::createAction< KAction >(i18n("Go to Previous Unsolved Conflict"), QIcon(QPixmap(prevunsolved)), i18n("Prev\nUnsolved"), this, SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); - goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace ); - goNextUnsolvedConflict = KDiff3::createAction< KAction >(i18n("Go to Next Unsolved Conflict"), QIcon(QPixmap(nextunsolved)), i18n("Next\nUnsolved"), this, SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); - goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace ); - chooseA = KDiff3::createAction< KToggleAction >(i18n("Select Line(s) From A"), QIcon(QPixmap(iconA)), i18n("Choose\nA"), KShortcut( Qt::CTRL+Qt::Key_1 ), this, SLOT(slotChooseA()), ac, "merge_choose_a"); - chooseB = KDiff3::createAction< KToggleAction >(i18n("Select Line(s) From B"), QIcon(QPixmap(iconB)), i18n("Choose\nB"), KShortcut( Qt::CTRL+Qt::Key_2 ), this, SLOT(slotChooseB()), ac, "merge_choose_b"); - chooseC = KDiff3::createAction< KToggleAction >(i18n("Select Line(s) From C"), QIcon(QPixmap(iconC)), i18n("Choose\nC"), KShortcut( Qt::CTRL+Qt::Key_3 ), this, SLOT(slotChooseC()), ac, "merge_choose_c"); - autoAdvance = KDiff3::createAction< KToggleAction >(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), QIcon(QPixmap(autoadvance)), i18n("Auto\nNext"), this, SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance"); - - showWhiteSpaceCharacters = KDiff3::createAction< KToggleAction >(i18n("Show Space && Tabulator Characters for Differences"), QIcon(QPixmap(showwhitespacechars)), i18n("White\nCharacters"), this, SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); - showWhiteSpace = KDiff3::createAction< KToggleAction >(i18n("Show White Space"), QIcon(QPixmap(showwhitespace)), i18n("White\nDeltas"), this, SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); - - showLineNumbers = KDiff3::createAction< KToggleAction >(i18n("Show Line Numbers"), QIcon(QPixmap(showlinenumbers)), i18n("Line\nNumbers"), this, SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); - chooseAEverywhere = KDiff3::createAction< KAction >(i18n("Choose A Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_1 ), this, SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); - chooseBEverywhere = KDiff3::createAction< KAction >(i18n("Choose B Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_2 ), this, SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); - chooseCEverywhere = KDiff3::createAction< KAction >(i18n("Choose C Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_3 ), this, SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); - chooseAForUnsolvedConflicts = KDiff3::createAction< KAction >(i18n("Choose A for All Unsolved Conflicts"), this, SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); - chooseBForUnsolvedConflicts = KDiff3::createAction< KAction >(i18n("Choose B for All Unsolved Conflicts"), this, SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts"); - chooseCForUnsolvedConflicts = KDiff3::createAction< KAction >(i18n("Choose C for All Unsolved Conflicts"), this, SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts"); - chooseAForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< KAction >(i18n("Choose A for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); - chooseBForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< KAction >(i18n("Choose B for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); - chooseCForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< KAction >(i18n("Choose C for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); - autoSolve = KDiff3::createAction< KAction >(i18n("Automatically Solve Simple Conflicts"), this, SLOT(slotAutoSolve()), ac, "merge_autosolve"); - unsolve = KDiff3::createAction< KAction >(i18n("Set Deltas to Conflicts"), this, SLOT(slotUnsolve()), ac, "merge_autounsolve"); - mergeRegExp = KDiff3::createAction< KAction >(i18n("Run Regular Expression Auto Merge"), this, SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); - mergeHistory = KDiff3::createAction< KAction >(i18n("Automatically Solve History Conflicts"), this, SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); - splitDiff = KDiff3::createAction< KAction >(i18n("Split Diff At Selection"), this, SLOT(slotSplitDiff()), ac, "merge_splitdiff"); - joinDiffs = KDiff3::createAction< KAction >(i18n("Join Selected Diffs"), this, SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); - - showWindowA = KDiff3::createAction< KToggleAction >(i18n("Show Window A"), this, SLOT(slotShowWindowAToggled()), ac, "win_show_a"); - showWindowB = KDiff3::createAction< KToggleAction >(i18n("Show Window B"), this, SLOT(slotShowWindowBToggled()), ac, "win_show_b"); - showWindowC = KDiff3::createAction< KToggleAction >(i18n("Show Window C"), this, SLOT(slotShowWindowCToggled()), ac, "win_show_c"); - winFocusNext = KDiff3::createAction< KAction >(i18n("Focus Next Window"), KShortcut( Qt::ALT+Qt::Key_Right ), this, SLOT(slotWinFocusNext()), ac, "win_focus_next"); - - overviewModeNormal = KDiff3::createAction< KToggleAction >(i18n("Normal Overview"), this, SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); - overviewModeAB = KDiff3::createAction< KToggleAction >(i18n("A vs. B Overview"), this, SLOT(slotOverviewAB()), ac, "diff_overview_ab"); - overviewModeAC = KDiff3::createAction< KToggleAction >(i18n("A vs. C Overview"), this, SLOT(slotOverviewAC()), ac, "diff_overview_ac"); - overviewModeBC = KDiff3::createAction< KToggleAction >(i18n("B vs. C Overview"), this, SLOT(slotOverviewBC()), ac, "diff_overview_bc"); - wordWrap = KDiff3::createAction< KToggleAction >(i18n("Word Wrap Diff Windows"), this, SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); - addManualDiffHelp = KDiff3::createAction< KAction >(i18n("Add Manual Diff Alignment"), KShortcut( Qt::CTRL+Qt::Key_Y ), this, SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); - clearManualDiffHelpList = KDiff3::createAction< KAction >(i18n("Clear All Manual Diff Alignments"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_Y ), this, SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list"); - -#if defined(_WIN32) || defined(Q_OS_OS2) - KDiff3::createAction< KAction >(i18n("Focus Next Window"), KShortcut(Qt::CTRL+Qt::Key_Tab), this, SLOT(slotWinFocusNext()), ac, "win_focus_next"); -#endif - winFocusPrev = KDiff3::createAction< KAction >(i18n("Focus Prev Window"), KShortcut( Qt::ALT+Qt::Key_Left ), this, SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); - winToggleSplitOrientation = KDiff3::createAction< KAction >(i18n("Toggle Split Orientation"), this, SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); - - dirShowBoth = KDiff3::createAction< KToggleAction >(i18n("Dir && Text Split Screen View"), this, SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); - dirShowBoth->setChecked( true ); - dirViewToggle = KDiff3::createAction< KAction >(i18n("Toggle Between Dir && Text View"), this, SLOT(slotDirViewToggle()), ac, "win_dir_view_toggle"); - - m_pMergeEditorPopupMenu = new QMenu( this ); -/* chooseA->plug( m_pMergeEditorPopupMenu ); - chooseB->plug( m_pMergeEditorPopupMenu ); - chooseC->plug( m_pMergeEditorPopupMenu );*/ - m_pMergeEditorPopupMenu->addAction( chooseA ); - m_pMergeEditorPopupMenu->addAction( chooseB ); - m_pMergeEditorPopupMenu->addAction( chooseC ); -} - - -void KDiff3App::showPopupMenu( const QPoint& point ) -{ - m_pMergeEditorPopupMenu->popup( point ); -} - -void KDiff3App::initStatusBar() -{ - /////////////////////////////////////////////////////////////////// - // STATUSBAR - if (statusBar() !=0 ) - statusBar()->showMessage( i18n("Ready.") ); -} - -void KDiff3App::saveOptions( KSharedConfigPtr config ) -{ - if ( !m_bAutoMode ) - { - if (!isPart()) - { - m_pOptionDialog->m_bMaximised = m_pKDiff3Shell->isMaximized(); - if( ! m_pKDiff3Shell->isMaximized() && m_pKDiff3Shell->isVisible() ) - { - m_pOptionDialog->m_geometry = m_pKDiff3Shell->size(); - m_pOptionDialog->m_position = m_pKDiff3Shell->pos(); - } -/* TODO change this option as now KToolbar uses QToolbar positioning style - if ( toolBar(MAIN_TOOLBAR_NAME)!=0 ) - m_pOptionDialog->m_toolBarPos = (int) toolBar(MAIN_TOOLBAR_NAME)->allowedAreas();*/ - } - - m_pOptionDialog->saveOptions( config ); - } -} - - - - -bool KDiff3App::queryClose() -{ - saveOptions( isPart() ? m_pKDiff3Part->componentData().config() : KGlobal::config() ); - - if(m_bOutputModified) - { - int result = KMessageBox::warningYesNoCancel(this, - i18n("The merge result hasn't been saved."), - i18n("Warning"), - KGuiItem( i18n("Save && Quit") ), - KGuiItem( i18n("Quit Without Saving") ) ); - if ( result==KMessageBox::Cancel ) - return false; - else if ( result==KMessageBox::Yes ) - { - slotFileSave(); - if ( m_bOutputModified ) - { - KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") ); - return false; - } - } - } - - m_bOutputModified = false; - - if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() ) - { - int result = KMessageBox::warningYesNo(this, - i18n("You are currently doing a directory merge. Are you sure, you want to abort?"), - i18n("Warning"), - KStandardGuiItem::quit(), - KStandardGuiItem::cont() /* i18n("Continue Merging") */ ); - if ( result!=KMessageBox::Yes ) - return false; - } - - return true; -} - - -///////////////////////////////////////////////////////////////////// -// SLOT IMPLEMENTATION -///////////////////////////////////////////////////////////////////// - - -void KDiff3App::slotFileSave() -{ - if ( m_bDefaultFilename ) - { - slotFileSaveAs(); - } - else - { - slotStatusMsg(i18n("Saving file...")); - - bool bSuccess = m_pMergeResultWindow->saveDocument( m_outputFilename, m_pMergeResultWindowTitle->getEncoding(), m_pMergeResultWindowTitle->getLineEndStyle() ); - if ( bSuccess ) - { - m_bFileSaved = true; - m_bOutputModified = false; - if ( m_bDirCompare ) - m_pDirectoryMergeWindow->mergeResultSaved( m_outputFilename ); - } - - slotStatusMsg(i18n("Ready.")); - } -} - -void KDiff3App::slotFileSaveAs() -{ - slotStatusMsg(i18n("Saving file with a new filename...")); - - QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); - if(!s.isEmpty()) - { - m_outputFilename = s; - m_pMergeResultWindowTitle->setFileName( m_outputFilename ); - bool bSuccess = m_pMergeResultWindow->saveDocument( m_outputFilename, m_pMergeResultWindowTitle->getEncoding(), m_pMergeResultWindowTitle->getLineEndStyle() ); - if ( bSuccess ) - { - m_bOutputModified = false; - if ( m_bDirCompare ) - m_pDirectoryMergeWindow->mergeResultSaved( m_outputFilename ); - } - //setCaption(url.fileName(),doc->isModified()); - - m_bDefaultFilename = false; - } - - slotStatusMsg(i18n("Ready.")); -} - - -void printDiffTextWindow( MyPainter& painter, const QRect& view, const QString& headerText, DiffTextWindow* pDiffTextWindow, int line, int linesPerPage, QColor fgColor ) -{ - QRect clipRect = view; - clipRect.setTop(0); - painter.setClipRect( clipRect ); - painter.translate( view.left() , 0 ); - QFontMetrics fm = painter.fontMetrics(); - //if ( fm.width(headerText) > view.width() ) - { - // A simple wrapline algorithm - int l=0; - for (int p=0; pview.width()) - { - --i; - break; - } - //QString s2 = s.left(i); - painter.drawText( 0, l*fm.height() + fm.ascent(), s.left(i) ); - p+=i; - ++l; - } - painter.setPen( fgColor ); - painter.drawLine( 0, view.top()-2, view.width(), view.top()-2 ); - } - - painter.translate( 0, view.top() ); - pDiffTextWindow->print( painter, view, line, linesPerPage ); - painter.resetMatrix(); -} - -void KDiff3App::slotFilePrint() -{ - if ( !m_pDiffTextWindow1 ) - return; -#ifdef QT_NO_PRINTER - slotStatusMsg( i18n( "Printing not implemented." ) ); -#endif -#ifndef QT_NO_PRINTER - QPrinter printer; - QPrintDialog printDialog(&printer, this); - - int firstSelectionD3LIdx = -1; - int lastSelectionD3LIdx = -1; - if ( m_pDiffTextWindow1 ) { m_pDiffTextWindow1->getSelectionRange(&firstSelectionD3LIdx, &lastSelectionD3LIdx, eD3LLineCoords); } - if ( firstSelectionD3LIdx<0 && m_pDiffTextWindow2 ) { m_pDiffTextWindow2->getSelectionRange(&firstSelectionD3LIdx, &lastSelectionD3LIdx, eD3LLineCoords); } - if ( firstSelectionD3LIdx<0 && m_pDiffTextWindow3 ) { m_pDiffTextWindow3->getSelectionRange(&firstSelectionD3LIdx, &lastSelectionD3LIdx, eD3LLineCoords); } -#ifdef KREPLACEMENTS_H // Currently PrintSelection is not supported in KDEs print dialog. - if ( firstSelectionD3LIdx>=0 ) - { - printDialog.addEnabledOption(QPrintDialog::PrintSelection); - //printer.setOptionEnabled(QPrinter::PrintSelection,true); - printDialog.setPrintRange(QAbstractPrintDialog::Selection); - } -#endif - - if ( firstSelectionD3LIdx == -1 ) - printDialog.setPrintRange(QAbstractPrintDialog::AllPages); - //printDialog.setMinMax(0,0); - printDialog.setFromTo(0,0); - - int currentFirstLine = m_pDiffTextWindow1->getFirstLine(); - int currentFirstD3LIdx = m_pDiffTextWindow1->convertLineToDiff3LineIdx( currentFirstLine ); - - // do some printer initialization - printer.setFullPage( false ); - - // initialize the printer using the print dialog - if (printDialog.exec()== QDialog::Accepted) - { - slotStatusMsg( i18n( "Printing..." ) ); - // create a painter to paint on the printer object - MyPainter painter( &printer, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); - - QPaintDevice* pPaintDevice = painter.device(); - int dpiy = pPaintDevice->logicalDpiY(); - int columnDistance = (int) ( (0.5/2.54)*dpiy ); // 0.5 cm between the columns - - int columns = m_bTripleDiff ? 3 : 2; - int columnWidth = ( pPaintDevice->width() - (columns-1)*columnDistance ) / columns; - - QFont f = m_pOptionDialog->m_font; - f.setPointSizeF(f.pointSizeF()-1); // Print with slightly smaller font. - painter.setFont( f ); - QFontMetrics fm = painter.fontMetrics(); - - QString topLineText = i18n("Top line"); - - //int headerWidth = fm.width( m_sd1.getAliasName() + ", "+topLineText+": 01234567" ); - int headerLines = fm.width( m_sd1.getAliasName() + ", "+topLineText+": 01234567" )/columnWidth+1; - - int headerMargin = headerLines * fm.height() + 3; // Text + one horizontal line - int footerMargin = fm.height() + 3; - - QRect view ( 0, headerMargin, pPaintDevice->width(), pPaintDevice->height() - (headerMargin + footerMargin) ); - QRect view1( 0*(columnWidth + columnDistance), view.top(), columnWidth, view.height() ); - QRect view2( 1*(columnWidth + columnDistance), view.top(), columnWidth, view.height() ); - QRect view3( 2*(columnWidth + columnDistance), view.top(), columnWidth, view.height() ); - - int linesPerPage = view.height() / fm.height(); - int charactersPerLine = columnWidth / fm.width("W"); - if ( m_pOptionDialog->m_bWordWrap ) - { - // For printing the lines are wrapped differently (this invalidates the first line) - recalcWordWrap( charactersPerLine ); - } - - int totalNofLines = max2(m_pDiffTextWindow1->getNofLines(), m_pDiffTextWindow2->getNofLines()); - if ( m_bTripleDiff && m_pDiffTextWindow3) - totalNofLines = max2(totalNofLines, m_pDiffTextWindow3->getNofLines()); - - QList pageList;// = printer.pageList(); - - bool bPrintCurrentPage=false; - bool bFirstPrintedPage = false; - - bool bPrintSelection = false; - int totalNofPages = (totalNofLines+linesPerPage-1) / linesPerPage; - int line=-1; - int selectionEndLine = -1; - -#ifdef KREPLACEMENTS_H - if ( printer.printRange()==QPrinter::AllPages ) - { - pageList.clear(); - for(int i=0; i=0 ) - { - line = m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstSelectionD3LIdx ); - selectionEndLine = m_pDiffTextWindow1->convertDiff3LineIdxToLine( lastSelectionD3LIdx+1 ); - totalNofPages = (selectionEndLine-line+linesPerPage-1) / linesPerPage; - } - } - - int page = 1; - - QList::iterator pageListIt = pageList.begin(); - for(;;) - { - if (!bPrintSelection) - { - if (pageListIt==pageList.end()) - break; - page = *pageListIt; - line = (page - 1) * linesPerPage; - if (page==10000) // This means "Print the current page" - { - bPrintCurrentPage=true; - // Detect the first visible line in the window. - line = m_pDiffTextWindow1->convertDiff3LineIdxToLine( currentFirstD3LIdx ); - } - } - else - { - if ( line>=selectionEndLine ) - { - break; - } - else - { - if ( selectionEndLine-line < linesPerPage ) - linesPerPage=selectionEndLine-line; - } - } - if (line>=0 && linem_colorA ); - QString headerText1 = m_sd1.getAliasName() + ", "+topLineText+": " + QString::number(m_pDiffTextWindow1->calcTopLineInFile(line)+1); - printDiffTextWindow( painter, view1, headerText1, m_pDiffTextWindow1, line, linesPerPage, m_pOptionDialog->m_fgColor ); - - painter.setPen( m_pOptionDialog->m_colorB ); - QString headerText2 = m_sd2.getAliasName() + ", "+topLineText+": " + QString::number(m_pDiffTextWindow2->calcTopLineInFile(line)+1); - printDiffTextWindow( painter, view2, headerText2, m_pDiffTextWindow2, line, linesPerPage, m_pOptionDialog->m_fgColor ); - - if ( m_bTripleDiff && m_pDiffTextWindow3 ) - { - painter.setPen( m_pOptionDialog->m_colorC ); - QString headerText3 = m_sd3.getAliasName() + ", "+topLineText+": " + QString::number(m_pDiffTextWindow3->calcTopLineInFile(line)+1); - printDiffTextWindow( painter, view3, headerText3, m_pDiffTextWindow3, line, linesPerPage, m_pOptionDialog->m_fgColor ); - } - painter.setClipping(false); - - painter.setPen( m_pOptionDialog->m_fgColor ); - painter.drawLine( 0, view.bottom()+3, view.width(), view.bottom()+3 ); - QString s = bPrintCurrentPage ? QString("") - : QString::number( page ) + "/" + QString::number(totalNofPages); - if ( bPrintSelection ) s+=" (" + i18n("Selection") + ")"; - painter.drawText( (view.right() - painter.fontMetrics().width( s ))/2, - view.bottom() + painter.fontMetrics().ascent() + 5, s ); - - bFirstPrintedPage = true; - } - - if ( bPrintSelection ) - { - line+=linesPerPage; - ++page; - } - else - { - ++pageListIt; - } - } - - painter.end(); - - if ( m_pOptionDialog->m_bWordWrap ) - { - recalcWordWrap(); - m_pDiffVScrollBar->setValue( m_pDiffTextWindow1->convertDiff3LineIdxToLine( currentFirstD3LIdx ) ); - } - - slotStatusMsg( i18n( "Printing completed." ) ); - } - else - { - slotStatusMsg( i18n( "Printing aborted." ) ); - } -#endif -} - -void KDiff3App::slotFileQuit() -{ - slotStatusMsg(i18n("Exiting...")); - - if( !queryClose() ) - return; // Don't quit - - KApplication::exit( isFileSaved() || isDirComparison() ? 0 : 1 ); -} - - - -void KDiff3App::slotViewToolBar() -{ - assert( viewToolBar != 0 ); - slotStatusMsg(i18n("Toggling toolbar...")); - m_pOptionDialog->m_bShowToolBar = viewToolBar->isChecked(); - /////////////////////////////////////////////////////////////////// - // turn Toolbar on or off - if ( toolBar(MAIN_TOOLBAR_NAME) !=0 ) - { - if(!m_pOptionDialog->m_bShowToolBar) - { - toolBar(MAIN_TOOLBAR_NAME)->hide(); - } - else - { - toolBar(MAIN_TOOLBAR_NAME)->show(); - } - } - - slotStatusMsg(i18n("Ready.")); -} - -void KDiff3App::slotViewStatusBar() -{ - slotStatusMsg(i18n("Toggle the statusbar...")); - m_pOptionDialog->m_bShowStatusBar = viewStatusBar->isChecked(); - /////////////////////////////////////////////////////////////////// - //turn Statusbar on or off - if (statusBar() !=0 ) - { - if(!viewStatusBar->isChecked()) - { - statusBar()->hide(); - } - else - { - statusBar()->show(); - } - } - - slotStatusMsg(i18n("Ready.")); -} - - -void KDiff3App::slotStatusMsg(const QString &text) -{ - /////////////////////////////////////////////////////////////////// - // change status message permanently - if (statusBar() !=0 ) - { - statusBar()->clearMessage(); - statusBar()->showMessage( text ); - } -} - - - - -//#include "kdiff3.moc" Index: trunk/extragear/utils/kdiff3/src/kdiff3.pro =================================================================== --- trunk/extragear/utils/kdiff3/src/kdiff3.pro (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/kdiff3.pro (nonexistent) @@ -1,71 +0,0 @@ -TEMPLATE = app -# When unresolved items remain during linking: Try adding "shared" in the CONFIG. -CONFIG += qt warn_on thread precompile_header -!os2:PRECOMPILED_HEADER = stable.h -HEADERS = version.h \ - diff.h \ - difftextwindow.h \ - mergeresultwindow.h \ - kdiff3.h \ - merger.h \ - optiondialog.h \ - kreplacements/kreplacements.h \ - directorymergewindow.h \ - fileaccess.h \ - kdiff3_shell.h \ - kdiff3_part.h \ - smalldialogs.h -SOURCES = main.cpp \ - diff.cpp \ - difftextwindow.cpp \ - kdiff3.cpp \ - merger.cpp \ - mergeresultwindow.cpp \ - optiondialog.cpp \ - pdiff.cpp \ - directorymergewindow.cpp \ - fileaccess.cpp \ - smalldialogs.cpp \ - kdiff3_shell.cpp \ - kdiff3_part.cpp \ - gnudiff_analyze.cpp \ - gnudiff_io.cpp \ - gnudiff_xmalloc.cpp \ - common.cpp \ - stable.cpp \ - kreplacements/kreplacements.cpp \ - kreplacements/ShellContextMenu.cpp -TARGET = kdiff3 -INCLUDEPATH += . ./kreplacements - -win32 { -# QMAKE_CXXFLAGS_DEBUG -= -Zi -# QMAKE_CXXFLAGS_DEBUG += -GX -GR -Z7 /FR -DQT_NO_ASCII_CAST -# QMAKE_LFLAGS_DEBUG += /PDB:NONE -# QMAKE_CXXFLAGS_RELEASE += -GX -GR -DNDEBUG -DQT_NO_ASCII_CAST - - QMAKE_CXXFLAGS_DEBUG += -DQT_NO_ASCII_CAST - QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DQT_NO_ASCII_CAST - RC_FILE = kdiff3win.rc - win32-g++ { - QMAKE_LFLAGS += -luser32 -lshell32 - QMAKE_LFLAGS_RELEASE += -static-libgcc # Remove dependency to libgcc_s_dw2-1.dll - QMAKE_LFLAGS_EXCEPTIONS_ON -= -mthreads # Remove dependency to mingwm10.dll (hack, yet no problem if not multithreaded) - # Better: configure -static -release -no-exceptions -fast - } else { - QMAKE_LFLAGS += user32.lib shell32.lib - } -} -os2 { - RC_FILE = kdiff3os2.rc -} - -unix { - documentation.path = /usr/local/share/doc/kdiff3 - documentation.files = ../doc/* - - INSTALLS += documentation - - target.path = /usr/local/bin - INSTALLS += target -} Index: trunk/extragear/utils/kdiff3/src/diff.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/diff.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/diff.cpp (nonexistent) @@ -1,2137 +0,0 @@ -/*************************************************************************** - diff.cpp - description - ------------------- - begin : Mon Mar 18 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include -#include -#include - -#include "diff.h" -#include "fileaccess.h" -#include "optiondialog.h" - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -//using namespace std; - - -int LineData::width(int tabSize) const -{ - int w=0; - int j=0; - for( int i=0; i=5 || l2.occurances>=5) ) - return false; - - // Ignore white space diff - const QChar* p1 = l1.pLine; - const QChar* p1End = p1 + l1.size; - - const QChar* p2 = l2.pLine; - const QChar* p2End = p2 + l2.size; - - if ( g_bIgnoreWhiteSpace ) - { - int nonWhite = 0; - for(;;) - { - while( isWhite( *p1 ) && p1!=p1End ) ++p1; - while( isWhite( *p2 ) && p2!=p2End ) ++p2; - - if ( p1 == p1End && p2 == p2End ) - { - if ( bStrict && g_bIgnoreTrivialMatches ) - { // Then equality is not enough - return nonWhite>2; - } - else // equality is enough - return true; - } - else if ( p1 == p1End || p2 == p2End ) - return false; - - if( *p1 != *p2 ) - return false; - ++p1; - ++p2; - ++nonWhite; - } - } - - else - { - if ( l1.size==l2.size && memcmp(p1, p2, l1.size)==0) - return true; - else - return false; - } -} - - -static bool isLineOrBufEnd( const QChar* p, int i, int size ) -{ - return - i>=size // End of file - || p[i]=='\n' // Normal end of line - - // No support for Mac-end of line yet, because incompatible with GNU-diff-routines. - // || ( p[i]=='\r' && (i>=size-1 || p[i+1]!='\n') - // && (i==0 || p[i-1]!='\n') ) // Special case: '\r' without '\n' - ; -} - - -/* Features of class SourceData: -- Read a file (from the given URL) or accept data via a string. -- Allocate and free buffers as necessary. -- Run a preprocessor, when specified. -- Run the line-matching preprocessor, when specified. -- Run other preprocessing steps: Uppercase, ignore comments, - remove carriage return, ignore numbers. - -Order of operation: - 1. If data was given via a string then save it to a temp file. (see setData()) - 2. If the specified file is nonlocal (URL) copy it to a temp file. - 3. If a preprocessor was specified, run the input file through it. - 4. Read the output of the preprocessor. - 5. If Uppercase was specified: Turn the read data to uppercase. - 6. Write the result to a temp file. - 7. If a line-matching preprocessor was specified, run the temp file through it. - 8. Read the output of the line-matching preprocessor. - 9. If ignore numbers was specified, strip the LMPP-output of all numbers. -10. If ignore comments was specified, strip the LMPP-output of comments. - -Optimizations: Skip unneeded steps. -*/ - -SourceData::SourceData() -{ - m_pOptionDialog = 0; - reset(); -} - -SourceData::~SourceData() -{ - reset(); -} - -void SourceData::reset() -{ - m_pEncoding = 0; - m_fileAccess = FileAccess(); - m_normalData.reset(); - m_lmppData.reset(); - if ( !m_tempInputFileName.isEmpty() ) - { - FileAccess::removeFile( m_tempInputFileName ); - m_tempInputFileName = ""; - } -} - -void SourceData::setFilename( const QString& filename ) -{ - if (filename.isEmpty()) - { - reset(); - } - else - { - FileAccess fa( filename ); - setFileAccess( fa ); - } -} - -bool SourceData::isEmpty() -{ - return getFilename().isEmpty(); -} - -bool SourceData::hasData() -{ - return m_normalData.m_pBuf != 0; -} - -bool SourceData::isValid() -{ - return isEmpty() || hasData(); -} - -void SourceData::setOptionDialog( OptionDialog* pOptionDialog ) -{ - m_pOptionDialog = pOptionDialog; -} - -QString SourceData::getFilename() -{ - return m_fileAccess.absoluteFilePath(); -} - -QString SourceData::getAliasName() -{ - return m_aliasName.isEmpty() ? m_fileAccess.prettyAbsPath() : m_aliasName; -} - -void SourceData::setAliasName( const QString& name ) -{ - m_aliasName = name; -} - -void SourceData::setFileAccess( const FileAccess& fileAccess ) -{ - m_fileAccess = fileAccess; - m_aliasName = QString(); - if ( !m_tempInputFileName.isEmpty() ) - { - FileAccess::removeFile( m_tempInputFileName ); - m_tempInputFileName = ""; - } -} - -void SourceData::setData( const QString& data ) -{ - // Create a temp file for preprocessing: - if ( m_tempInputFileName.isEmpty() ) - { - m_tempInputFileName = FileAccess::tempFileName(); - } - - FileAccess f( m_tempInputFileName ); - QByteArray ba = QTextCodec::codecForName("UTF-8")->fromUnicode(data); - bool bSuccess = f.writeFile( ba.constData(), ba.length() ); - if ( !bSuccess ) - { - KMessageBox::error( m_pOptionDialog, i18n("Writing clipboard data to temp file failed.") ); - return; - } - - m_aliasName = i18n("From Clipboard"); - m_fileAccess = FileAccess(""); // Effect: m_fileAccess.isValid() is false -} - -const LineData* SourceData::getLineDataForDiff() const -{ - if ( m_lmppData.m_pBuf==0 ) - return m_normalData.m_v.size()>0 ? &m_normalData.m_v[0] : 0; - else - return m_lmppData.m_v.size()>0 ? &m_lmppData.m_v[0] : 0; -} - -const LineData* SourceData::getLineDataForDisplay() const -{ - return m_normalData.m_v.size()>0 ? &m_normalData.m_v[0] : 0; -} - -int SourceData::getSizeLines() const -{ - return m_normalData.m_vSize; -} - -int SourceData::getSizeBytes() const -{ - return m_normalData.m_size; -} - -const char* SourceData::getBuf() const -{ - return m_normalData.m_pBuf; -} - -bool SourceData::isText() -{ - return m_normalData.m_bIsText; -} - -bool SourceData::isIncompleteConversion() -{ - return m_normalData.m_bIncompleteConversion; -} - -bool SourceData::isFromBuffer() -{ - return !m_fileAccess.isValid(); -} - - -bool SourceData::isBinaryEqualWith( const SourceData& other ) const -{ - return m_fileAccess.exists() && other.m_fileAccess.exists() && - getSizeBytes() == other.getSizeBytes() && - ( getSizeBytes()==0 || memcmp( getBuf(), other.getBuf(), getSizeBytes() )==0 ); -} - -void SourceData::FileData::reset() -{ - delete[] (char*)m_pBuf; - m_pBuf = 0; - m_v.clear(); - m_size = 0; - m_vSize = 0; - m_bIsText = true; - m_bIncompleteConversion = false; - m_eLineEndStyle = eLineEndStyleUndefined; -} - -bool SourceData::FileData::readFile( const QString& filename ) -{ - reset(); - if ( filename.isEmpty() ) { return true; } - - FileAccess fa( filename ); - m_size = fa.sizeForReading(); - char* pBuf; - m_pBuf = pBuf = new char[m_size+100]; // Alloc 100 byte extra: Savety hack, not nice but does no harm. - // Some extra bytes at the end of the buffer are needed by - // the diff algorithm. See also GnuDiff::diff_2_files(). - bool bSuccess = fa.readFile( pBuf, m_size ); - if ( !bSuccess ) - { - delete pBuf; - m_pBuf = 0; - m_size = 0; - } - return bSuccess; -} - -bool SourceData::saveNormalDataAs( const QString& fileName ) -{ - return m_normalData.writeFile( fileName ); -} - -bool SourceData::FileData::writeFile( const QString& filename ) -{ - if ( filename.isEmpty() ) { return true; } - - FileAccess fa( filename ); - bool bSuccess = fa.writeFile(m_pBuf, m_size); - return bSuccess; -} - -void SourceData::FileData::copyBufFrom( const FileData& src ) -{ - reset(); - char* pBuf; - m_size = src.m_size; - m_pBuf = pBuf = new char[m_size+100]; - memcpy( pBuf, src.m_pBuf, m_size ); -} - -// Convert the input file from input encoding to output encoding and write it to the output file. -static bool convertFileEncoding( const QString& fileNameIn, QTextCodec* pCodecIn, - const QString& fileNameOut, QTextCodec* pCodecOut ) -{ - QFile in( fileNameIn ); - if ( ! in.open(QIODevice::ReadOnly ) ) - return false; - QTextStream inStream( &in ); - inStream.setCodec( pCodecIn ); - inStream.setAutoDetectUnicode( false ); - - QFile out( fileNameOut ); - if ( ! out.open( QIODevice::WriteOnly ) ) - return false; - QTextStream outStream( &out ); - outStream.setCodec( pCodecOut ); - - QString data = inStream.readAll(); - outStream << data; - - return true; -} - -static QTextCodec* getEncodingFromTag( const QByteArray& s, const QByteArray& encodingTag ) -{ - int encodingPos = s.indexOf( encodingTag ); - if ( encodingPos>=0 ) - { - int apostrophPos = s.indexOf( '"', encodingPos + encodingTag.length() ); - int apostroph2Pos = s.indexOf( '\'', encodingPos + encodingTag.length() ); - char apostroph = '"'; - if ( apostroph2Pos>=0 && ( apostrophPos<0 || apostrophPos>=0 && apostroph2Pos < apostrophPos ) ) - { - apostroph = '\''; - apostrophPos = apostroph2Pos; - } - - int encodingEnd = s.indexOf( apostroph, apostrophPos+1 ); - if ( encodingEnd>=0 ) // e.g.: or - { - QByteArray encoding = s.mid( apostrophPos+1, encodingEnd - (apostrophPos + 1) ); - return QTextCodec::codecForName( encoding ); - } - else // e.g.: - { - QByteArray encoding = s.mid( encodingPos+encodingTag.length(), apostrophPos - ( encodingPos+encodingTag.length() ) ); - return QTextCodec::codecForName( encoding ); - } - } - return 0; -} - -static QTextCodec* detectEncoding( const char* buf, qint64 size, qint64& skipBytes ) -{ - if (size>=2) - { - if (buf[0]=='\xFF' && buf[1]=='\xFE' ) - { - skipBytes = 2; - return QTextCodec::codecForName( "UTF-16LE" ); - } - - if (buf[0]=='\xFE' && buf[1]=='\xFF' ) - { - skipBytes = 2; - return QTextCodec::codecForName( "UTF-16BE" ); - } - } - if (size>=3) - { - if (buf[0]=='\xEF' && buf[1]=='\xBB' && buf[2]=='\xBF' ) - { - skipBytes = 3; - return QTextCodec::codecForName( "UTF-8-BOM" ); - } - } - skipBytes = 0; - QByteArray s( buf, size ); - int xmlHeaderPos = s.indexOf( "= 0 ) - { - int xmlHeaderEnd = s.indexOf( "?>", xmlHeaderPos ); - if ( xmlHeaderEnd>=0 ) - { - QTextCodec* pCodec = getEncodingFromTag( s.mid( xmlHeaderPos, xmlHeaderEnd - xmlHeaderPos ), "encoding=" ); - if (pCodec) - return pCodec; - } - } - else // HTML - { - int metaHeaderPos = s.indexOf( "= 0) - { - int metaHeaderEnd = s.indexOf( ">", metaHeaderPos ); - if (metaHeaderEnd>=0) - { - QTextCodec* pCodec = getEncodingFromTag( s.mid( metaHeaderPos, metaHeaderEnd - metaHeaderPos ), "charset=" ); - if (pCodec) - return pCodec; - - metaHeaderPos = s.indexOf( ""1" "2"< => >1<, >2< - * Eg. >'\'\\'< => >'\< backslash is a meta character between single quotes - * Eg. > "\\" < => >\\< but not between double quotes - * Eg. >"c:\sed" 's/a/\' /g'< => >c:\sed<, >s/a/' /g< - */ -static QString getArguments( QString cmd, QString& program, QStringList& args ) -{ - program = QString(); - args.clear(); - for ( int i=0; i 0 ) - { - -#if defined(_WIN32) || defined(Q_OS_OS2) - QString catCmd = "type"; - fileNameIn1.replace( '/', "\\" ); -#else - QString catCmd = "cat"; -#endif - - // Run the first preprocessor - if ( m_pOptionDialog->m_PreProcessorCmd.isEmpty() ) - { - // No preprocessing: Read the file directly: - m_normalData.readFile( fileNameIn1 ); - } - else - { - QString fileNameInPP = fileNameIn1; - - if ( pEncoding1 != m_pOptionDialog->m_pEncodingPP ) - { - // Before running the preprocessor convert to the format that the preprocessor expects. - fileNameInPP = FileAccess::tempFileName(); - pEncoding1 = m_pOptionDialog->m_pEncodingPP; - convertFileEncoding( fileNameIn1, pEncoding, fileNameInPP, pEncoding1 ); - } - - QString ppCmd = m_pOptionDialog->m_PreProcessorCmd; - fileNameOut1 = FileAccess::tempFileName(); - - QProcess ppProcess; - ppProcess.setStandardInputFile( fileNameInPP ); - ppProcess.setStandardOutputFile( fileNameOut1 ); - QString program; - QStringList args; - QString errorReason = getArguments(ppCmd, program, args); - if ( errorReason.isEmpty() ) - { - ppProcess.start( program, args ); - ppProcess.waitForFinished(-1); - } - else - errorReason = "\n("+errorReason+")"; - //QString cmd = catCmd + " \"" + fileNameInPP + "\" | " + ppCmd + " >\"" + fileNameOut1+"\""; - //::system( encodeString(cmd) ); - bool bSuccess = errorReason.isEmpty() && m_normalData.readFile( fileNameOut1 ); - if ( fileInSize >0 && ( !bSuccess || m_normalData.m_size==0 ) ) - { - KMessageBox::error(m_pOptionDialog, - i18n("Preprocessing possibly failed. Check this command:\n\n %1" - "\n\nThe preprocessing command will be disabled now." - ).arg(ppCmd) + errorReason ); - m_pOptionDialog->m_PreProcessorCmd = ""; - m_normalData.readFile( fileNameIn1 ); - pEncoding1 = m_pEncoding; - } - if (fileNameInPP != fileNameIn1) - { - FileAccess::removeTempFile( fileNameInPP ); - } - } - - // LineMatching Preprocessor - if ( ! m_pOptionDialog->m_LineMatchingPreProcessorCmd.isEmpty() ) - { - fileNameIn2 = fileNameOut1.isEmpty() ? fileNameIn1 : fileNameOut1; - QString fileNameInPP = fileNameIn2; - pEncoding2 = pEncoding1; - if ( pEncoding2 != m_pOptionDialog->m_pEncodingPP ) - { - // Before running the preprocessor convert to the format that the preprocessor expects. - fileNameInPP = FileAccess::tempFileName(); - pEncoding2 = m_pOptionDialog->m_pEncodingPP; - convertFileEncoding( fileNameIn2, pEncoding1, fileNameInPP, pEncoding2 ); - } - - QString ppCmd = m_pOptionDialog->m_LineMatchingPreProcessorCmd; - fileNameOut2 = FileAccess::tempFileName(); - QProcess ppProcess; - ppProcess.setStandardInputFile( fileNameInPP ); - ppProcess.setStandardOutputFile( fileNameOut2 ); - QString program; - QStringList args; - QString errorReason = getArguments(ppCmd, program, args); - if ( errorReason.isEmpty() ) - { - ppProcess.start( program, args ); - ppProcess.waitForFinished(-1); - } - else - errorReason = "\n("+errorReason+")"; - //QString cmd = catCmd + " \"" + fileNameInPP + "\" | " + ppCmd + " >\"" + fileNameOut2 + "\""; - //::system( encodeString(cmd) ); - bool bSuccess = errorReason.isEmpty() && m_lmppData.readFile( fileNameOut2 ); - if ( FileAccess(fileNameIn2).size()>0 && ( !bSuccess || m_lmppData.m_size==0 ) ) - { - KMessageBox::error(m_pOptionDialog, - i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n %1" - "\n\nThe line-matching-preprocessing command will be disabled now." - ).arg(ppCmd) + errorReason ); - m_pOptionDialog->m_LineMatchingPreProcessorCmd = ""; - m_lmppData.readFile( fileNameIn2 ); - } - FileAccess::removeTempFile( fileNameOut2 ); - if (fileNameInPP != fileNameIn2) - { - FileAccess::removeTempFile( fileNameInPP ); - } - } - else if ( m_pOptionDialog->m_bIgnoreComments || m_pOptionDialog->m_bIgnoreCase ) - { - // We need a copy of the normal data. - m_lmppData.copyBufFrom( m_normalData ); - } - else - { // We don't need any lmpp data at all. - m_lmppData.reset(); - } - } - - m_normalData.preprocess( m_pOptionDialog->m_bPreserveCarriageReturn, pEncoding1 ); - m_lmppData.preprocess( false, pEncoding2 ); - - if ( m_lmppData.m_vSize < m_normalData.m_vSize ) - { - // This probably is the fault of the LMPP-Command, but not worth reporting. - m_lmppData.m_v.resize( m_normalData.m_vSize ); - for(int i=m_lmppData.m_vSize; im_bIgnoreCase ) - { - int i; - QChar* pBuf = const_cast(m_lmppData.m_unicodeBuf.unicode()); - int ucSize = m_lmppData.m_unicodeBuf.length(); - for(i=0; im_bIgnoreComments ) - { - m_lmppData.removeComments(); - int vSize = min2(m_normalData.m_vSize, m_lmppData.m_vSize); - for(int i=0; i0 && m_pBuf[i-1]=='\r') || // normal file - (i>3 && m_pBuf[i-1]=='\0' && m_pBuf[i-2]=='\r' && m_pBuf[i-3]=='\0')) // 16-bit unicode: TODO only little endian covered here - m_eLineEndStyle = eLineEndStyleDos; - else - m_eLineEndStyle = eLineEndStyleUnix; - break; // Only analyze first line - } - } - qint64 skipBytes = 0; - QTextCodec* pCodec = ::detectEncoding( m_pBuf, m_size, skipBytes ); - if ( pCodec != pEncoding ) - skipBytes=0; - - QByteArray ba = QByteArray::fromRawData( m_pBuf+skipBytes, m_size-skipBytes ); - if ( m_eLineEndStyle == eLineEndStyleUndefined ) // normally only for one liners except when old mac line end style is used - { - for( int j=0; j0 && m_v[lineIdx].pLine[lineLength-1]=='\r' ) - { - --lineLength; - } - m_v[lineIdx].pFirstNonWhiteChar = m_v[lineIdx].pLine + min2(whiteLength,lineLength); - m_v[lineIdx].size = lineLength; - lineLength = 0; - bNonWhiteFound = false; - whiteLength = 0; - ++lineIdx; - } - else - { - ++lineLength; - - if ( ! bNonWhiteFound && isWhite( p[i] ) ) - ++whiteLength; - else - bNonWhiteFound = true; - } - } - assert( lineIdx == lines ); - - m_vSize = lines; -} - - -// Must not be entered, when within a comment. -// Returns either at a newline-character p[i]=='\n' or when i==size. -// A line that contains only comments is still "white". -// Comments in white lines must remain, while comments in -// non-white lines are overwritten with spaces. -static void checkLineForComments( - QChar* p, // pointer to start of buffer - int& i, // index of current position (in, out) - int size, // size of buffer - bool& bWhite, // false if this line contains nonwhite characters (in, out) - bool& bCommentInLine, // true if any comment is within this line (in, out) - bool& bStartsOpenComment // true if the line ends within an comment (out) - ) -{ - bStartsOpenComment = false; - for(; i(m_unicodeBuf.unicode()); - bool bWithinComment=false; - int size = m_unicodeBuf.length(); - for(int i=0; ibegin(); - int lineA=0; - int lineB=0; - Diff d(0,0,0); - - for(;;) - { - if ( d.nofEquals==0 && d.diff1==0 && d.diff2==0 ) - { - if ( i!=pDiffListAB->end() ) - { - d=*i; - ++i; - } - else - break; - } - - Diff3Line d3l; - if( d.nofEquals>0 ) - { - d3l.bAEqB = true; - d3l.lineA = lineA; - d3l.lineB = lineB; - --d.nofEquals; - ++lineA; - ++lineB; - } - else if ( d.diff1>0 && d.diff2>0 ) - { - d3l.lineA = lineA; - d3l.lineB = lineB; - --d.diff1; - --d.diff2; - ++lineA; - ++lineB; - } - else if ( d.diff1>0 ) - { - d3l.lineA = lineA; - --d.diff1; - ++lineA; - } - else if ( d.diff2>0 ) - { - d3l.lineB = lineB; - --d.diff2; - ++lineB; - } - - d3ll.push_back( d3l ); - } -} - - -// Second step -void calcDiff3LineListUsingAC( - const DiffList* pDiffListAC, - Diff3LineList& d3ll - ) -{ - //////////////// - // Now insert data from C using pDiffListAC - - DiffList::const_iterator i=pDiffListAC->begin(); - Diff3LineList::iterator i3 = d3ll.begin(); - int lineA=0; - int lineC=0; - Diff d(0,0,0); - - for(;;) - { - if ( d.nofEquals==0 && d.diff1==0 && d.diff2==0 ) - { - if ( i!=pDiffListAC->end() ) - { - d=*i; - ++i; - } - else - break; - } - - Diff3Line d3l; - if( d.nofEquals>0 ) - { - // Find the corresponding lineA - while( (*i3).lineA!=lineA ) - ++i3; - - (*i3).lineC = lineC; - (*i3).bAEqC = true; - (*i3).bBEqC = (*i3).bAEqB; - - --d.nofEquals; - ++lineA; - ++lineC; - ++i3; - } - else if ( d.diff1>0 && d.diff2>0 ) - { - d3l.lineC = lineC; - d3ll.insert( i3, d3l ); - --d.diff1; - --d.diff2; - ++lineA; - ++lineC; - } - else if ( d.diff1>0 ) - { - --d.diff1; - ++lineA; - } - else if ( d.diff2>0 ) - { - d3l.lineC = lineC; - d3ll.insert( i3, d3l ); - --d.diff2; - ++lineC; - } - } -} - -// Third step -void calcDiff3LineListUsingBC( - const DiffList* pDiffListBC, - Diff3LineList& d3ll - ) -{ - //////////////// - // Now improve the position of data from C using pDiffListBC - // If a line from C equals a line from A then it is in the - // same Diff3Line already. - // If a line from C equals a line from B but not A, this - // information will be used here. - - DiffList::const_iterator i=pDiffListBC->begin(); - Diff3LineList::iterator i3b = d3ll.begin(); - Diff3LineList::iterator i3c = d3ll.begin(); - int lineB=0; - int lineC=0; - Diff d(0,0,0); - - for(;;) - { - if ( d.nofEquals==0 && d.diff1==0 && d.diff2==0 ) - { - if ( i!=pDiffListBC->end() ) - { - d=*i; - ++i; - } - else - break; - } - - Diff3Line d3l; - if( d.nofEquals>0 ) - { - // Find the corresponding lineB and lineC - while( i3b!=d3ll.end() && (*i3b).lineB!=lineB ) - ++i3b; - - while( i3c!=d3ll.end() && (*i3c).lineC!=lineC ) - ++i3c; - - assert(i3b!=d3ll.end()); - assert(i3c!=d3ll.end()); - - if ( i3b==i3c ) - { - assert( (*i3b).lineC == lineC ); - (*i3b).bBEqC = true; - } - else - { - // Is it possible to move this line up? - // Test if no other B's are used between i3c and i3b - - // First test which is before: i3c or i3b ? - Diff3LineList::iterator i3c1 = i3c; - Diff3LineList::iterator i3b1 = i3b; - while( i3c1!=i3b && i3b1!=i3c ) - { - assert(i3b1!=d3ll.end() || i3c1!=d3ll.end()); - if( i3c1!=d3ll.end() ) ++i3c1; - if( i3b1!=d3ll.end() ) ++i3b1; - } - - if( i3c1==i3b && !(*i3b).bAEqB ) // i3c before i3b - { - Diff3LineList::iterator i3 = i3c; - int nofDisturbingLines = 0; - while( i3 != i3b && i3!=d3ll.end() ) - { - if ( (*i3).lineB != -1 ) - ++nofDisturbingLines; - ++i3; - } - - if ( nofDisturbingLines>0 )//&& nofDisturbingLines < d.nofEquals*d.nofEquals+4 ) - { - // Move the disturbing lines up, out of sight. - i3 = i3c; - while( i3 != i3b ) - { - if ( (*i3).lineB != -1 ) - { - Diff3Line d3l; - d3l.lineB = (*i3).lineB; - (*i3).lineB = -1; - (*i3).bAEqB = false; - (*i3).bBEqC = false; - d3ll.insert( i3c, d3l ); - } - ++i3; - } - nofDisturbingLines=0; - } - - if ( nofDisturbingLines == 0 ) - { - // Yes, the line from B can be moved. - (*i3b).lineB = -1; // This might leave an empty line: removed later. - (*i3b).bAEqB = false; - (*i3b).bAEqC = false; - (*i3b).bBEqC = false; - (*i3c).lineB = lineB; - (*i3c).bBEqC = true; - } - } - else if( i3b1==i3c && !(*i3c).bAEqC) - { - Diff3LineList::iterator i3 = i3b; - int nofDisturbingLines = 0; - while( i3 != i3c && i3!=d3ll.end() ) - { - if ( (*i3).lineC != -1 ) - ++nofDisturbingLines; - ++i3; - } - - if ( nofDisturbingLines>0 )//&& nofDisturbingLines < d.nofEquals*d.nofEquals+4 ) - { - // Move the disturbing lines up. - i3 = i3b; - while( i3 != i3c ) - { - if ( (*i3).lineC != -1 ) - { - Diff3Line d3l; - d3l.lineC = (*i3).lineC; - (*i3).lineC = -1; - (*i3).bAEqC = false; - (*i3).bBEqC = false; - d3ll.insert( i3b, d3l ); - } - ++i3; - } - nofDisturbingLines=0; - } - - if ( nofDisturbingLines == 0 ) - { - // Yes, the line from C can be moved. - (*i3c).lineC = -1; // This might leave an empty line: removed later. - (*i3c).bAEqC = false; - (*i3c).bBEqC = false; - (*i3b).lineC = lineC; - (*i3b).bBEqC = true; - } - } - } - - --d.nofEquals; - ++lineB; - ++lineC; - ++i3b; - ++i3c; - } - else if ( d.diff1>0 ) - { - Diff3LineList::iterator i3 = i3b; - while( (*i3).lineB!=lineB ) - ++i3; - if( i3 != i3b && (*i3).bAEqB==false ) - { - // Take B from this line and move it up as far as possible - d3l.lineB = lineB; - d3ll.insert( i3b, d3l ); - (*i3).lineB = -1; - } - else - { - i3b=i3; - } - --d.diff1; - ++lineB; - ++i3b; - - if( d.diff2>0 ) - { - --d.diff2; - ++lineC; - } - } - else if ( d.diff2>0 ) - { - --d.diff2; - ++lineC; - } - } -/* - Diff3LineList::iterator it = d3ll.begin(); - int li=0; - for( ; it!=d3ll.end(); ++it, ++li ) - { - printf( "%4d %4d %4d %4d A%c=B A%c=C B%c=C\n", - li, (*it).lineA, (*it).lineB, (*it).lineC, - (*it).bAEqB ? '=' : '!', (*it).bAEqC ? '=' : '!', (*it).bBEqC ? '=' : '!' ); - } - printf("\n");*/ -} - -#ifdef _WIN32 -using ::equal; -#endif - -// Test if the move would pass a barrier. Return true if not. -static bool isValidMove( ManualDiffHelpList* pManualDiffHelpList, int line1, int line2, int winIdx1, int winIdx2 ) -{ - if (line1>=0 && line2>=0) - { - ManualDiffHelpList::const_iterator i; - for( i = pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i ) - { - const ManualDiffHelpEntry& mdhe = *i; - - // Barrier - int l1 = winIdx1 == 1 ? mdhe.lineA1 : winIdx1==2 ? mdhe.lineB1 : mdhe.lineC1 ; - int l2 = winIdx2 == 1 ? mdhe.lineA1 : winIdx2==2 ? mdhe.lineB1 : mdhe.lineC1 ; - - if ( l1>=0 && l2>=0 ) - { - if ( (line1>=l1 && line2=l2) ) - return false; - l1 = winIdx1 == 1 ? mdhe.lineA2 : winIdx1==2 ? mdhe.lineB2 : mdhe.lineC2 ; - l2 = winIdx2 == 1 ? mdhe.lineA2 : winIdx2==2 ? mdhe.lineB2 : mdhe.lineC2 ; - ++l1; - ++l2; - if ( (line1>=l1 && line2=l2) ) - return false; - } - } - } - return true; // no barrier passed. -} - -void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList ) -{ - if ( pManualDiffHelpList->empty() ) - return; - - // If a line appears unaligned in comparison to the manual alignment, correct this. - - ManualDiffHelpList::iterator iMDHL; - for( iMDHL = pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL ) - { - Diff3LineList::iterator i3 = d3ll.begin(); - int winIdxPreferred = 0; - int missingWinIdx = 0; - int alignedSum = (iMDHL->lineA1<0?0:1) + (iMDHL->lineB1<0?0:1) + (iMDHL->lineC1<0?0:1); - if (alignedSum==2) - { - // If only A & B are aligned then let C rather be aligned with A - // If only A & C are aligned then let B rather be aligned with A - // If only B & C are aligned then let A rather be aligned with B - missingWinIdx = iMDHL->lineA1<0 ? 1 : (iMDHL->lineB1<0 ? 2 : 3 ); - winIdxPreferred = missingWinIdx == 1 ? 2 : 1; - } - else if (alignedSum<=1) - { - return; - } - - // At the first aligned line, move up the two other lines into new d3ls until the second input is aligned - // Then move up the third input until all three lines are aligned. - int wi=0; - for( ; i3!=d3ll.end(); ++i3 ) - { - for ( wi=1; wi<=3; ++wi ) - { - if ( i3->getLineInFile(wi) >= 0 && iMDHL->firstLine(wi) == i3->getLineInFile(wi) ) - break; - } - if ( wi<=3 ) - break; - } - - if (wi>=1 && wi <= 3) - { - // Found manual alignment for one source - Diff3LineList::iterator iDest = i3; - - // Move lines up until the next firstLine is found. Omit wi from move and search. - int wi2=0; - for( ; i3!=d3ll.end(); ++i3 ) - { - for ( wi2=1; wi2<=3; ++wi2 ) - { - if ( wi!=wi2 && i3->getLineInFile(wi2) >= 0 && iMDHL->firstLine(wi2) == i3->getLineInFile(wi2) ) - break; - } - if (wi2>3) - { // Not yet found - // Move both others up - Diff3Line d3l; - // Move both up - if (wi==1) // Move B and C up - { - d3l.bBEqC = i3->bBEqC; - d3l.lineB = i3->lineB; - d3l.lineC = i3->lineC; - i3->lineB = -1; - i3->lineC = -1; - } - if (wi==2) // Move A and C up - { - d3l.bAEqC = i3->bAEqC; - d3l.lineA = i3->lineA; - d3l.lineC = i3->lineC; - i3->lineA = -1; - i3->lineC = -1; - } - if (wi==3) // Move A and B up - { - d3l.bAEqB = i3->bAEqB; - d3l.lineA = i3->lineA; - d3l.lineB = i3->lineB; - i3->lineA = -1; - i3->lineB = -1; - } - i3->bAEqB = false; - i3->bAEqC = false; - i3->bBEqC = false; - d3ll.insert( iDest, d3l ); - } - else - { - // align the found line with the line we already have here - if ( i3 != iDest ) - { - if (wi2==1) - { - iDest->lineA = i3->lineA; - i3->lineA = -1; - i3->bAEqB = false; - i3->bAEqC = false; - } - else if (wi2==2) - { - iDest->lineB = i3->lineB; - i3->lineB = -1; - i3->bAEqB = false; - i3->bBEqC = false; - } - else if (wi2==3) - { - iDest->lineC = i3->lineC; - i3->lineC = -1; - i3->bBEqC = false; - i3->bAEqC = false; - } - } - - if ( missingWinIdx!=0 ) - { - for( ; i3!=d3ll.end(); ++i3 ) - { - int wi3 = missingWinIdx; - if ( i3->getLineInFile(wi3) >= 0 ) - { - // not found, move the line before iDest - Diff3Line d3l; - if ( wi3==1 ) - { - if (i3->bAEqB) // Stop moving lines up if one equal is found. - break; - d3l.lineA = i3->lineA; - i3->lineA = -1; - i3->bAEqB = false; - i3->bAEqC = false; - } - if ( wi3==2 ) - { - if (i3->bAEqB) - break; - d3l.lineB = i3->lineB; - i3->lineB = -1; - i3->bAEqB = false; - i3->bBEqC = false; - } - if ( wi3==3 ) - { - if (i3->bAEqC) - break; - d3l.lineC = i3->lineC; - i3->lineC = -1; - i3->bAEqC = false; - i3->bBEqC = false; - } - d3ll.insert( iDest, d3l ); - } - } // for(), searching for wi3 - } - break; - } - } // for(), searching for wi2 - } // if, wi found - } // for (iMDHL) -} - -// Fourth step -void calcDiff3LineListTrim( - Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList - ) -{ - const Diff3Line d3l_empty; - d3ll.remove( d3l_empty ); - - Diff3LineList::iterator i3 = d3ll.begin(); - Diff3LineList::iterator i3A = d3ll.begin(); - Diff3LineList::iterator i3B = d3ll.begin(); - Diff3LineList::iterator i3C = d3ll.begin(); - - int line=0; // diff3line counters - int lineA=0; // - int lineB=0; - int lineC=0; - - ManualDiffHelpList::iterator iMDHL = pManualDiffHelpList->begin(); - // The iterator i3 and the variable line look ahead. - // The iterators i3A, i3B, i3C and corresponding lineA, lineB and lineC stop at empty lines, if found. - // If possible, then the texts from the look ahead will be moved back to the empty places. - - for( ; i3!=d3ll.end(); ++i3, ++line ) - { - if ( iMDHL!=pManualDiffHelpList->end() ) - { - if ( (i3->lineA >= 0 && i3->lineA==iMDHL->lineA1) || - (i3->lineB >= 0 && i3->lineB==iMDHL->lineB1) || - (i3->lineC >= 0 && i3->lineC==iMDHL->lineC1) ) - { - i3A = i3; - i3B = i3; - i3C = i3; - lineA = line; - lineB = line; - lineC = line; - ++iMDHL; - } - } - - if( line>lineA && (*i3).lineA != -1 && (*i3A).lineB!=-1 && (*i3A).bBEqC && - ::equal( pldA[(*i3).lineA], pldB[(*i3A).lineB], false ) && - isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineB, 1, 2 ) && - isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineC, 1, 3 ) ) - { - // Empty space for A. A matches B and C in the empty line. Move it up. - (*i3A).lineA = (*i3).lineA; - (*i3A).bAEqB = true; - (*i3A).bAEqC = true; - (*i3).lineA = -1; - (*i3).bAEqB = false; - (*i3).bAEqC = false; - ++i3A; - ++lineA; - } - - if( line>lineB && (*i3).lineB != -1 && (*i3B).lineA!=-1 && (*i3B).bAEqC && - ::equal( pldB[(*i3).lineB], pldA[(*i3B).lineA], false ) && - isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineA, 2, 1 ) && - isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineC, 2, 3 ) ) - { - // Empty space for B. B matches A and C in the empty line. Move it up. - (*i3B).lineB = (*i3).lineB; - (*i3B).bAEqB = true; - (*i3B).bBEqC = true; - (*i3).lineB = -1; - (*i3).bAEqB = false; - (*i3).bBEqC = false; - ++i3B; - ++lineB; - } - - if( line>lineC && (*i3).lineC != -1 && (*i3C).lineA!=-1 && (*i3C).bAEqB && - ::equal( pldC[(*i3).lineC], pldA[(*i3C).lineA], false )&& - isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineA, 3, 1 ) && - isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineB, 3, 2 ) ) - { - // Empty space for C. C matches A and B in the empty line. Move it up. - (*i3C).lineC = (*i3).lineC; - (*i3C).bAEqC = true; - (*i3C).bBEqC = true; - (*i3).lineC = -1; - (*i3).bAEqC = false; - (*i3).bBEqC = false; - ++i3C; - ++lineC; - } - - if( line>lineA && (*i3).lineA != -1 && !(*i3).bAEqB && !(*i3).bAEqC && - isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineB, 1, 2 ) && - isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineC, 1, 3 ) ) { - // Empty space for A. A doesn't match B or C. Move it up. - (*i3A).lineA = (*i3).lineA; - (*i3).lineA = -1; - ++i3A; - ++lineA; - } - - if( line>lineB && (*i3).lineB != -1 && !(*i3).bAEqB && !(*i3).bBEqC && - isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineA, 2, 1 ) && - isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineC, 2, 3 ) ) - { - // Empty space for B. B matches neither A nor C. Move B up. - (*i3B).lineB = (*i3).lineB; - (*i3).lineB = -1; - ++i3B; - ++lineB; - } - - if( line>lineC && (*i3).lineC != -1 && !(*i3).bAEqC && !(*i3).bBEqC && - isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineA, 3, 1 ) && - isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineB, 3, 2 ) ) - { - // Empty space for C. C matches neither A nor B. Move C up. - (*i3C).lineC = (*i3).lineC; - (*i3).lineC = -1; - ++i3C; - ++lineC; - } - - if( line>lineA && line>lineB && (*i3).lineA != -1 && (*i3).bAEqB && !(*i3).bAEqC ) - { - // Empty space for A and B. A matches B, but not C. Move A & B up. - Diff3LineList::iterator i = lineA > lineB ? i3A : i3B; - int l = lineA > lineB ? lineA : lineB; - - if ( isValidMove( pManualDiffHelpList, i->lineC, (*i3).lineA, 3, 1 ) && - isValidMove( pManualDiffHelpList, i->lineC, (*i3).lineB, 3, 2 ) ) - { - (*i).lineA = (*i3).lineA; - (*i).lineB = (*i3).lineB; - (*i).bAEqB = true; - - (*i3).lineA = -1; - (*i3).lineB = -1; - (*i3).bAEqB = false; - i3A = i; - i3B = i; - ++i3A; - ++i3B; - lineA=l+1; - lineB=l+1; - } - } - else if( line>lineA && line>lineC && (*i3).lineA != -1 && (*i3).bAEqC && !(*i3).bAEqB ) - { - // Empty space for A and C. A matches C, but not B. Move A & C up. - Diff3LineList::iterator i = lineA > lineC ? i3A : i3C; - int l = lineA > lineC ? lineA : lineC; - - if ( isValidMove( pManualDiffHelpList, i->lineB, (*i3).lineA, 2, 1 ) && - isValidMove( pManualDiffHelpList, i->lineB, (*i3).lineC, 2, 3 ) ) - { - (*i).lineA = (*i3).lineA; - (*i).lineC = (*i3).lineC; - (*i).bAEqC = true; - - (*i3).lineA = -1; - (*i3).lineC = -1; - (*i3).bAEqC = false; - i3A = i; - i3C = i; - ++i3A; - ++i3C; - lineA=l+1; - lineC=l+1; - } - } - else if( line>lineB && line>lineC && (*i3).lineB != -1 && (*i3).bBEqC && !(*i3).bAEqC ) - { - // Empty space for B and C. B matches C, but not A. Move B & C up. - Diff3LineList::iterator i = lineB > lineC ? i3B : i3C; - int l = lineB > lineC ? lineB : lineC; - - if ( isValidMove( pManualDiffHelpList, i->lineA, (*i3).lineB, 1, 2 ) && - isValidMove( pManualDiffHelpList, i->lineA, (*i3).lineC, 1, 3 ) ) - { - (*i).lineB = (*i3).lineB; - (*i).lineC = (*i3).lineC; - (*i).bBEqC = true; - - (*i3).lineB = -1; - (*i3).lineC = -1; - (*i3).bBEqC = false; - i3B = i; - i3C = i; - ++i3B; - ++i3C; - lineB=l+1; - lineC=l+1; - } - } - - if ( (*i3).lineA != -1 ) - { - lineA = line+1; - i3A = i3; - ++i3A; - } - if ( (*i3).lineB != -1 ) - { - lineB = line+1; - i3B = i3; - ++i3B; - } - if ( (*i3).lineC != -1 ) - { - lineC = line+1; - i3C = i3; - ++i3C; - } - } - - d3ll.remove( d3l_empty ); - -/* - - Diff3LineList::iterator it = d3ll.begin(); - int li=0; - for( ; it!=d3ll.end(); ++it, ++li ) - { - printf( "%4d %4d %4d %4d A%c=B A%c=C B%c=C\n", - li, (*it).lineA, (*it).lineB, (*it).lineC, - (*it).bAEqB ? '=' : '!', (*it).bAEqC ? '=' : '!', (*it).bBEqC ? '=' : '!' ); - - } -*/ -} - -void DiffBufferInfo::init( Diff3LineList* pD3ll, const Diff3LineVector* pD3lv, - const LineData* pldA, int sizeA, const LineData* pldB, int sizeB, const LineData* pldC, int sizeC ) -{ - m_pDiff3LineList = pD3ll; - m_pDiff3LineVector = pD3lv; - m_pLineDataA = pldA; - m_pLineDataB = pldB; - m_pLineDataC = pldC; - m_sizeA = sizeA; - m_sizeB = sizeB; - m_sizeC = sizeC; - Diff3LineList::iterator i3 = pD3ll->begin(); - for( ; i3!=pD3ll->end(); ++i3 ) - { - i3->m_pDiffBufferInfo = this; - } -} - -void calcWhiteDiff3Lines( - Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC - ) -{ - Diff3LineList::iterator i3 = d3ll.begin(); - - for( ; i3!=d3ll.end(); ++i3 ) - { - i3->bWhiteLineA = ( (*i3).lineA == -1 || pldA==0 || pldA[(*i3).lineA].whiteLine() || pldA[(*i3).lineA].bContainsPureComment ); - i3->bWhiteLineB = ( (*i3).lineB == -1 || pldB==0 || pldB[(*i3).lineB].whiteLine() || pldB[(*i3).lineB].bContainsPureComment ); - i3->bWhiteLineC = ( (*i3).lineC == -1 || pldC==0 || pldC[(*i3).lineC].whiteLine() || pldC[(*i3).lineC].bContainsPureComment ); - } -} - -// Just make sure that all input lines are in the output too, exactly once. -void debugLineCheck( Diff3LineList& d3ll, int size, int idx ) -{ - Diff3LineList::iterator it = d3ll.begin(); - int i=0; - - for ( it = d3ll.begin(); it!= d3ll.end(); ++it ) - { - int l=0; - if (idx==1) l=(*it).lineA; - else if (idx==2) l=(*it).lineB; - else if (idx==3) l=(*it).lineC; - else assert(false); - - if ( l!=-1 ) - { - if( l!=i ) - { - KMessageBox::error(0, i18n( - "Data loss error:\n" - "If it is reproducible please contact the author.\n" - ), i18n("Severe Internal Error") ); - assert(false); - std::cerr << "Severe Internal Error.\n"; - ::exit(-1); - } - ++i; - } - } - - if( size!=i ) - { - KMessageBox::error(0, i18n( - "Data loss error:\n" - "If it is reproducible please contact the author.\n" - ), i18n("Severe Internal Error") ); - assert(false); - std::cerr << "Severe Internal Error.\n"; - ::exit(-1); - } -} - -inline bool equal( QChar c1, QChar c2, bool /*bStrict*/ ) -{ - // If bStrict then white space doesn't match - - //if ( bStrict && ( c1==' ' || c1=='\t' ) ) - // return false; - - return c1==c2; -} - - -// My own diff-invention: -template -void calcDiff( const T* p1, int size1, const T* p2, int size2, DiffList& diffList, int match, int maxSearchRange ) -{ - diffList.clear(); - - const T* p1start = p1; - const T* p2start = p2; - const T* p1end=p1+size1; - const T* p2end=p2+size2; - for(;;) - { - int nofEquals = 0; - while( p1!=p1end && p2!=p2end && equal(*p1, *p2, false) ) - { - ++p1; - ++p2; - ++nofEquals; - } - - bool bBestValid=false; - int bestI1=0; - int bestI2=0; - int i1=0; - int i2=0; - for( i1=0; ; ++i1 ) - { - if ( &p1[i1]==p1end || ( bBestValid && i1>= bestI1+bestI2)) - { - break; - } - for(i2=0;i2=bestI1+bestI2) ) - { - break; - } - else if( equal( p2[i2], p1[i1], true ) && - ( match==1 || abs(i1-i2)<3 || ( &p2[i2+1]==p2end && &p1[i1+1]==p1end ) || - ( &p2[i2+1]!=p2end && &p1[i1+1]!=p1end && equal( p2[i2+1], p1[i1+1], false )) - ) - ) - { - if ( i1+i2 < bestI1+bestI2 || bBestValid==false ) - { - bestI1 = i1; - bestI2 = i2; - bBestValid = true; - break; - } - } - } - } - - // The match was found using the strict search. Go back if there are non-strict - // matches. - while( bestI1>=1 && bestI2>=1 && equal( p1[bestI1-1], p2[bestI2-1], false ) ) - { - --bestI1; - --bestI2; - } - - - bool bEndReached = false; - if (bBestValid) - { - // continue somehow - Diff d(nofEquals, bestI1, bestI2); - diffList.push_back( d ); - - p1 += bestI1; - p2 += bestI2; - } - else - { - // Nothing else to match. - Diff d(nofEquals, p1end-p1, p2end-p2); - diffList.push_back( d ); - - bEndReached = true; //break; - } - - // Sometimes the algorithm that chooses the first match unfortunately chooses - // a match where later actually equal parts don't match anymore. - // A different match could be achieved, if we start at the end. - // Do it, if it would be a better match. - int nofUnmatched = 0; - const T* pu1 = p1-1; - const T* pu2 = p2-1; - while ( pu1>=p1start && pu2>=p2start && equal( *pu1, *pu2, false ) ) - { - ++nofUnmatched; - --pu1; - --pu2; - } - - Diff d = diffList.back(); - if ( nofUnmatched > 0 ) - { - // We want to go backwards the nofUnmatched elements and redo - // the matching - d = diffList.back(); - Diff origBack = d; - diffList.pop_back(); - - while ( nofUnmatched > 0 ) - { - if ( d.diff1 > 0 && d.diff2 > 0 ) - { - --d.diff1; - --d.diff2; - --nofUnmatched; - } - else if ( d.nofEquals > 0 ) - { - --d.nofEquals; - --nofUnmatched; - } - - if ( d.nofEquals==0 && (d.diff1==0 || d.diff2==0) && nofUnmatched>0 ) - { - if ( diffList.empty() ) - break; - d.nofEquals += diffList.back().nofEquals; - d.diff1 += diffList.back().diff1; - d.diff2 += diffList.back().diff2; - diffList.pop_back(); - bEndReached = false; - } - } - - if ( bEndReached ) - diffList.push_back( origBack ); - else - { - - p1 = pu1 + 1 + nofUnmatched; - p2 = pu2 + 1 + nofUnmatched; - diffList.push_back( d ); - } - } - if ( bEndReached ) - break; - } - -#ifndef NDEBUG - // Verify difflist - { - int l1=0; - int l2=0; - DiffList::iterator i; - for( i = diffList.begin(); i!=diffList.end(); ++i ) - { - l1+= i->nofEquals + i->diff1; - l2+= i->nofEquals + i->diff2; - } - - //if( l1!=p1-p1start || l2!=p2-p2start ) - if( l1!=size1 || l2!=size2 ) - assert( false ); - } -#endif -} - -void fineDiff( - Diff3LineList& diff3LineList, - int selector, - const LineData* v1, - const LineData* v2, - bool& bTextsTotalEqual - ) -{ - // Finetuning: Diff each line with deltas - ProgressProxy pp; - int maxSearchLength=500; - Diff3LineList::iterator i; - int k1=0; - int k2=0; - bTextsTotalEqual = true; - int listSize = diff3LineList.size(); - int listIdx = 0; - for( i= diff3LineList.begin(); i!= diff3LineList.end(); ++i) - { - if (selector==1){ k1=i->lineA; k2=i->lineB; } - else if (selector==2){ k1=i->lineB; k2=i->lineC; } - else if (selector==3){ k1=i->lineC; k2=i->lineA; } - else assert(false); - if( (k1==-1 && k2!=-1) || (k1!=-1 && k2==-1) ) bTextsTotalEqual=false; - if( k1!=-1 && k2!=-1 ) - { - if ( v1[k1].size != v2[k2].size || memcmp( v1[k1].pLine, v2[k2].pLine, v1[k1].size<<1)!=0 ) - { - bTextsTotalEqual = false; - DiffList* pDiffList = new DiffList; - calcDiff( v1[k1].pLine, v1[k1].size, v2[k2].pLine, v2[k2].size, *pDiffList, 2, maxSearchLength ); - - // Optimize the diff list. - DiffList::iterator dli; - bool bUsefulFineDiff = false; - for( dli = pDiffList->begin(); dli!=pDiffList->end(); ++dli) - { - if( dli->nofEquals >= 4 ) - { - bUsefulFineDiff = true; - break; - } - } - - for( dli = pDiffList->begin(); dli!=pDiffList->end(); ++dli) - { - if( dli->nofEquals < 4 && (dli->diff1>0 || dli->diff2>0) - && !( bUsefulFineDiff && dli==pDiffList->begin() ) - ) - { - dli->diff1 += dli->nofEquals; - dli->diff2 += dli->nofEquals; - dli->nofEquals = 0; - } - } - - if (selector==1){ delete (*i).pFineAB; (*i).pFineAB = pDiffList; } - else if (selector==2){ delete (*i).pFineBC; (*i).pFineBC = pDiffList; } - else if (selector==3){ delete (*i).pFineCA; (*i).pFineCA = pDiffList; } - else assert(false); - } - - if ( (v1[k1].bContainsPureComment || v1[k1].whiteLine()) && (v2[k2].bContainsPureComment || v2[k2].whiteLine())) - { - if (selector==1){ i->bAEqB = true; } - else if (selector==2){ i->bBEqC = true; } - else if (selector==3){ i->bAEqC = true; } - else assert(false); - } - } - ++listIdx; - pp.setCurrent(double(listIdx)/listSize); - } -} - - -// Convert the list to a vector of pointers -void calcDiff3LineVector( Diff3LineList& d3ll, Diff3LineVector& d3lv ) -{ - d3lv.resize( d3ll.size() ); - Diff3LineList::iterator i; - int j=0; - for( i= d3ll.begin(); i!= d3ll.end(); ++i, ++j) - { - d3lv[j] = &(*i); - } - assert( j==(int)d3lv.size() ); -} - - Index: trunk/extragear/utils/kdiff3/src/common.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/common.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/common.cpp (nonexistent) @@ -1,351 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2004-2007 by Joachim Eibl * - * joachim.eibl at gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "common.h" -#include -#include -#include -#include -#include -#include -#include - -ValueMap::ValueMap() -{ -} - -ValueMap::~ValueMap() -{ -} - -void ValueMap::save( QTextStream& ts ) -{ - std::map::iterator i; - for( i=m_map.begin(); i!=m_map.end(); ++i) - { - QString key = i->first; - QString val = i->second; - ts << key << "=" << val << "\n"; - } -} - -QString ValueMap::getAsString() -{ - QString result; - std::map::iterator i; - for( i=m_map.begin(); i!=m_map.end(); ++i) - { - QString key = i->first; - QString val = i->second; - result += key + "=" + val + "\n"; - } - return result; -} - -void ValueMap::load( QTextStream& ts ) -{ - while ( !ts.atEnd() ) - { // until end of file... - QString s = ts.readLine(); // line of text excluding '\n' - int pos = s.indexOf('='); - if( pos > 0 ) // seems not to have a tag - { - QString key = s.left(pos); - QString val = s.mid(pos+1); - m_map[key] = val; - } - } -} -/* -void ValueMap::load( const QString& s ) -{ - int pos=0; - while ( pos<(int)s.length() ) - { // until end of file... - int pos2 = s.find('=', pos); - int pos3 = s.find('\n', pos2 ); - if (pos3<0) - pos3=s.length(); - if( pos2 > 0 ) // seems not to have a tag - { - QString key = s.mid(pos, pos2-pos); - QString val = s.mid(pos2+1, pos3-pos2-1); - m_map[key] = val; - } - pos = pos3; - } -} -*/ - -// safeStringJoin and safeStringSplit allow to convert a stringlist into a string and back -// safely, even if the individual strings in the list contain the separator character. -QString safeStringJoin(const QStringList& sl, char sepChar, char metaChar ) -{ - // Join the strings in the list, using the separator ',' - // If a string contains the separator character, it will be replaced with "\,". - // Any occurances of "\" (one backslash) will be replaced with "\\" (2 backslashes) - - assert(sepChar!=metaChar); - - QString sep; - sep += sepChar; - QString meta; - meta += metaChar; - - QString safeString; - - QStringList::const_iterator i; - for (i=sl.begin(); i!=sl.end(); ++i) - { - QString s = *i; - s.replace(meta, meta+meta); // "\" -> "\\" - s.replace(sep, meta+sep); // "," -> "\," - if ( i==sl.begin() ) - safeString = s; - else - safeString += sep + s; - } - return safeString; -} - -// Split a string that was joined with safeStringJoin -QStringList safeStringSplit(const QString& s, char sepChar, char metaChar ) -{ - assert(sepChar!=metaChar); - QStringList sl; - // Miniparser - int i=0; - int len=s.length(); - QString b; - for(i=0;i0 ) - { - pos = s.indexOf( sep, pos ); - --idx; - if (pos<0) break; - ++pos; - } - if ( pos>=0 ) - { - int pos2 = s.indexOf( sep, pos ); - if ( pos2>0 ) - return s.mid(pos, pos2-pos); - else - return s.mid(pos); - } - - return ""; -} - -static int num( QString& s, int idx ) -{ - return subSection( s, idx, ',').toInt(); -} - -void ValueMap::writeEntry(const QString& k, const QFont& v ) -{ - m_map[k] = v.family() + "," + QString::number(v.pointSize()) + "," + (v.bold() ? "bold" : "normal"); -} - -void ValueMap::writeEntry(const QString& k, const QColor& v ) -{ - m_map[k] = numStr(v.red()) + "," + numStr(v.green()) + "," + numStr(v.blue()); -} - -void ValueMap::writeEntry(const QString& k, const QSize& v ) -{ - m_map[k] = numStr(v.width()) + "," + numStr(v.height()); -} - -void ValueMap::writeEntry(const QString& k, const QPoint& v ) -{ - m_map[k] = numStr(v.x()) + "," + numStr(v.y()); -} - -void ValueMap::writeEntry(const QString& k, int v ) -{ - m_map[k] = numStr(v); -} - -void ValueMap::writeEntry(const QString& k, bool v ) -{ - m_map[k] = numStr(v); -} - -void ValueMap::writeEntry(const QString& k, const QString& v ) -{ - m_map[k] = v; -} - -void ValueMap::writeEntry(const QString& k, const char* v ) -{ - m_map[k] = v; -} - -void ValueMap::writeEntry(const QString& k, const QStringList& v, char separator ) -{ - m_map[k] = safeStringJoin(v, separator); -} - - -QFont ValueMap::readFontEntry(const QString& k, const QFont* defaultVal ) -{ - QFont f = *defaultVal; - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - f.setFamily( subSection( i->second, 0, ',' ) ); - f.setPointSize( subSection( i->second, 1, ',' ).toInt() ); - f.setBold( subSection( i->second, 2, ',' )=="bold" ); - //f.fromString(i->second); - } - - return f; -} - -QColor ValueMap::readColorEntry(const QString& k, const QColor* defaultVal ) -{ - QColor c= *defaultVal; - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - QString s = i->second; - c = QColor( num(s,0),num(s,1),num(s,2) ); - } - - return c; -} - -QSize ValueMap::readSizeEntry(const QString& k, const QSize* defaultVal ) -{ - QSize size = defaultVal ? *defaultVal : QSize(600,400); - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - - QString s = i->second; - size = QSize( num(s,0),num(s,1) ); - } - - return size; -} - -QPoint ValueMap::readPointEntry(const QString& k, const QPoint* defaultVal) -{ - QPoint point = defaultVal ? *defaultVal : QPoint(0,0); - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - QString s = i->second; - point = QPoint( num(s,0),num(s,1) ); - } - - return point; -} - -bool ValueMap::readBoolEntry(const QString& k, bool bDefault ) -{ - bool b = bDefault; - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - QString s = i->second; - b = (bool)num(s,0); - } - - return b; -} - -int ValueMap::readNumEntry(const QString& k, int iDefault ) -{ - int ival = iDefault; - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - QString s = i->second; - ival = num(s,0); - } - - return ival; -} - -QString ValueMap::readStringEntry(const QString& k, const QString& sDefault ) -{ - QString sval = sDefault; - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - sval = i->second; - } - - return sval; -} - -QStringList ValueMap::readListEntry(const QString& k, const QStringList& defaultVal, char separator ) -{ - QStringList strList; - - std::map::iterator i = m_map.find( k ); - if ( i!=m_map.end() ) - { - strList = safeStringSplit( i->second, separator ); - return strList; - } - else - return defaultVal; -} - -QString ValueMap::readEntry (const QString& s, const QString& defaultVal ) { return readStringEntry(s, defaultVal); } -QString ValueMap::readEntry (const QString& s, const char* defaultVal ) { return readStringEntry(s, QString::fromLatin1(defaultVal) ); } -QFont ValueMap::readEntry (const QString& s, const QFont& defaultVal ){ return readFontEntry(s,&defaultVal); } -QColor ValueMap::readEntry(const QString& s, const QColor defaultVal ){ return readColorEntry(s,&defaultVal); } -QSize ValueMap::readEntry (const QString& s, const QSize defaultVal ){ return readSizeEntry(s,&defaultVal); } -QPoint ValueMap::readEntry(const QString& s, const QPoint defaultVal ){ return readPointEntry(s,&defaultVal); } -bool ValueMap::readEntry (const QString& s, bool bDefault ){ return readBoolEntry(s,bDefault); } -int ValueMap::readEntry (const QString& s, int iDefault ){ return readNumEntry(s,iDefault); } -QStringList ValueMap::readEntry (const QString& s, const QStringList& defaultVal, char separator ){ return readListEntry(s,defaultVal,separator); } Index: trunk/extragear/utils/kdiff3/src/directorymergewindow.h =================================================================== --- trunk/extragear/utils/kdiff3/src/directorymergewindow.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/directorymergewindow.h (nonexistent) @@ -1,359 +0,0 @@ -/*************************************************************************** - directorymergewindow.h - ------------------- - begin : Sat Oct 19 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef DIRECTORY_MERGE_WINDOW_H -#define DIRECTORY_MERGE_WINDOW_H - -#include -#include -#include -#include -#include "common.h" -#include "fileaccess.h" -#include "diff.h" //TotalDiffStatus - -class OptionDialog; -class KIconLoader; -class StatusInfo; -class DirectoryMergeInfo; -class OneDirectoryInfo; -class QLabel; -class KAction; -class KToggleAction; -class KActionCollection; -class TotalDiffStatus; - -enum e_MergeOperation -{ - eTitleId, - eNoOperation, - // Operations in sync mode (with only two directories): - eCopyAToB, eCopyBToA, eDeleteA, eDeleteB, eDeleteAB, eMergeToA, eMergeToB, eMergeToAB, - - // Operations in merge mode (with two or three directories) - eCopyAToDest, eCopyBToDest, eCopyCToDest, eDeleteFromDest, eMergeABCToDest, - eMergeABToDest, - eConflictingFileTypes, // Error - eChangedAndDeleted, // Error - eConflictingAges // Equal age but files are not! -}; - -class DirMergeItem; - -enum e_Age { eNew, eMiddle, eOld, eNotThere, eAgeEnd }; - -class MergeFileInfos -{ -public: - MergeFileInfos(){ m_bEqualAB=false; m_bEqualAC=false; m_bEqualBC=false; - m_pDMI=0; m_pParent=0; - m_bExistsInA=false;m_bExistsInB=false;m_bExistsInC=false; - m_bDirA=false; m_bDirB=false; m_bDirC=false; - m_bLinkA=false; m_bLinkB=false; m_bLinkC=false; - m_bOperationComplete=false; m_bSimOpComplete = false; - m_eMergeOperation=eNoOperation; - m_ageA = eNotThere; m_ageB=eNotThere; m_ageC=eNotThere; - m_bConflictingAges=false; } - bool operator>( const MergeFileInfos& ); - QString m_subPath; - - bool m_bExistsInA; - bool m_bExistsInB; - bool m_bExistsInC; - bool m_bEqualAB; - bool m_bEqualAC; - bool m_bEqualBC; - DirMergeItem* m_pDMI; - MergeFileInfos* m_pParent; - e_MergeOperation m_eMergeOperation; - void setMergeOperation( e_MergeOperation eMOp, bool bRecursive=true ); - bool m_bDirA; - bool m_bDirB; - bool m_bDirC; - bool m_bLinkA; - bool m_bLinkB; - bool m_bLinkC; - bool m_bOperationComplete; - bool m_bSimOpComplete; - e_Age m_ageA; - e_Age m_ageB; - e_Age m_ageC; - bool m_bConflictingAges; // Equal age but files are not! - - FileAccess m_fileInfoA; - FileAccess m_fileInfoB; - FileAccess m_fileInfoC; - - TotalDiffStatus m_totalDiffStatus; -}; - -class DirMergeItem : public QTreeWidgetItem -{ -public: - DirMergeItem( QTreeWidget* pParent, const QString&, MergeFileInfos*); - DirMergeItem( DirMergeItem* pParent, const QString&, MergeFileInfos*); - ~DirMergeItem(); - MergeFileInfos* m_pMFI; - virtual bool operator<( const QTreeWidgetItem& other ) const; - //virtual void paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align ); - void init(MergeFileInfos* pMFI); -}; - -class DirectoryMergeWindow : public QTreeWidget -{ - Q_OBJECT -public: - DirectoryMergeWindow( QWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader ); - ~DirectoryMergeWindow(); - void setDirectoryMergeInfo(DirectoryMergeInfo* p){ m_pDirectoryMergeInfo=p; } - bool init( - FileAccess& dirA, - FileAccess& dirB, - FileAccess& dirC, - FileAccess& dirDest, - bool bDirectoryMerge, - bool bReload = false - ); - bool isFileSelected(); - bool isDirectoryMergeInProgress() { return m_bRealMergeStarted; } - int totalColumnWidth(); - bool isSyncMode() { return m_bSyncMode; } - bool isScanning() { return m_bScanning; } - void initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac ); - void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible, - KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC ); - void updateFileVisibilities(); - - virtual void mousePressEvent( QMouseEvent* e ); - virtual void keyPressEvent( QKeyEvent* e ); - virtual void focusInEvent( QFocusEvent* e ); - virtual void focusOutEvent( QFocusEvent* e ); - virtual void contextMenuEvent( QContextMenuEvent* e ); - QString getDirNameA(){ return m_dirA.prettyAbsPath(); } - QString getDirNameB(){ return m_dirB.prettyAbsPath(); } - QString getDirNameC(){ return m_dirC.prettyAbsPath(); } - QString getDirNameDest(){ return m_dirDest.prettyAbsPath(); } - -public slots: - void reload(); - void mergeCurrentFile(); - void compareCurrentFile(); - void slotRunOperationForAllItems(); - void slotRunOperationForCurrentItem(); - void mergeResultSaved(const QString& fileName); - void slotChooseAEverywhere(); - void slotChooseBEverywhere(); - void slotChooseCEverywhere(); - void slotAutoChooseEverywhere(); - void slotNoOpEverywhere(); - void slotFoldAllSubdirs(); - void slotUnfoldAllSubdirs(); - void slotShowIdenticalFiles(); - void slotShowDifferentFiles(); - void slotShowFilesOnlyInA(); - void slotShowFilesOnlyInB(); - void slotShowFilesOnlyInC(); - - void slotSynchronizeDirectories(); - void slotChooseNewerFiles(); - - void slotCompareExplicitlySelectedFiles(); - void slotMergeExplicitlySelectedFiles(); - - // Merge current item (merge mode) - void slotCurrentDoNothing(); - void slotCurrentChooseA(); - void slotCurrentChooseB(); - void slotCurrentChooseC(); - void slotCurrentMerge(); - void slotCurrentDelete(); - // Sync current item - void slotCurrentCopyAToB(); - void slotCurrentCopyBToA(); - void slotCurrentDeleteA(); - void slotCurrentDeleteB(); - void slotCurrentDeleteAAndB(); - void slotCurrentMergeToA(); - void slotCurrentMergeToB(); - void slotCurrentMergeToAAndB(); - - void slotSaveMergeState(); - void slotLoadMergeState(); - -protected: - class DirMergeItemDelegate; - void mergeContinue( bool bStart, bool bVerbose ); - - void prepareListView(ProgressProxy& pp); - void calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultOperation ); - void setAllMergeOperations( e_MergeOperation eDefaultOperation ); - friend class MergeFileInfos; - - bool canContinue(); - void prepareMergeStart( QTreeWidgetItem* pBegin, QTreeWidgetItem* pEnd, bool bVerbose ); - bool executeMergeOperation( MergeFileInfos& mfi, bool& bSingleFileMerge ); - - void scanDirectory( const QString& dirName, t_DirectoryList& dirList ); - void scanLocalDirectory( const QString& dirName, t_DirectoryList& dirList ); - void fastFileComparison( FileAccess& fi1, FileAccess& fi2, - bool& bEqual, bool& bError, QString& status ); - void compareFilesAndCalcAges( MergeFileInfos& mfi ); - - QString fullNameA( const MergeFileInfos& mfi ) - { return mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : m_dirA.absoluteFilePath() + "/" + mfi.m_subPath; } - QString fullNameB( const MergeFileInfos& mfi ) - { return mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : m_dirB.absoluteFilePath() + "/" + mfi.m_subPath; } - QString fullNameC( const MergeFileInfos& mfi ) - { return mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : m_dirC.absoluteFilePath() + "/" + mfi.m_subPath; } - QString fullNameDest( const MergeFileInfos& mfi ) - { if ( m_dirDestInternal.prettyAbsPath() == m_dirC.prettyAbsPath() ) return fullNameC(mfi); - else if ( m_dirDestInternal.prettyAbsPath() == m_dirB.prettyAbsPath() ) return fullNameB(mfi); - else return m_dirDestInternal.absoluteFilePath() + "/" + mfi.m_subPath; - } - - bool copyFLD( const QString& srcName, const QString& destName ); - bool deleteFLD( const QString& name, bool bCreateBackup ); - bool makeDir( const QString& name, bool bQuiet=false ); - bool renameFLD( const QString& srcName, const QString& destName ); - bool mergeFLD( const QString& nameA,const QString& nameB,const QString& nameC, - const QString& nameDest, bool& bSingleFileMerge ); - - FileAccess m_dirA; - FileAccess m_dirB; - FileAccess m_dirC; - FileAccess m_dirDest; - FileAccess m_dirDestInternal; - - QString m_dirMergeStateFilename; - - std::map m_fileMergeMap; - - bool m_bFollowDirLinks; - bool m_bFollowFileLinks; - bool m_bSimulatedMergeStarted; - bool m_bRealMergeStarted; - bool m_bError; - bool m_bSyncMode; - bool m_bDirectoryMerge; // if true, then merge is the default operation, otherwise it's diff. - bool m_bCaseSensitive; - - bool m_bScanning; // true while in init() - - OptionDialog* m_pOptions; - KIconLoader* m_pIconLoader; - DirectoryMergeInfo* m_pDirectoryMergeInfo; - StatusInfo* m_pStatusInfo; - - typedef std::list MergeItemList; - MergeItemList m_mergeItemList; - MergeItemList::iterator m_currentItemForOperation; - - DirMergeItem* m_pSelection1Item; - int m_selection1Column; - DirMergeItem* m_pSelection2Item; - int m_selection2Column; - DirMergeItem* m_pSelection3Item; - int m_selection3Column; - void selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu); - friend class DirMergeItem; - - KAction* m_pDirStartOperation; - KAction* m_pDirRunOperationForCurrentItem; - KAction* m_pDirCompareCurrent; - KAction* m_pDirMergeCurrent; - KAction* m_pDirRescan; - KAction* m_pDirChooseAEverywhere; - KAction* m_pDirChooseBEverywhere; - KAction* m_pDirChooseCEverywhere; - KAction* m_pDirAutoChoiceEverywhere; - KAction* m_pDirDoNothingEverywhere; - KAction* m_pDirFoldAll; - KAction* m_pDirUnfoldAll; - - KToggleAction* m_pDirShowIdenticalFiles; - KToggleAction* m_pDirShowDifferentFiles; - KToggleAction* m_pDirShowFilesOnlyInA; - KToggleAction* m_pDirShowFilesOnlyInB; - KToggleAction* m_pDirShowFilesOnlyInC; - - KToggleAction* m_pDirSynchronizeDirectories; - KToggleAction* m_pDirChooseNewerFiles; - - KAction* m_pDirCompareExplicit; - KAction* m_pDirMergeExplicit; - - KAction* m_pDirCurrentDoNothing; - KAction* m_pDirCurrentChooseA; - KAction* m_pDirCurrentChooseB; - KAction* m_pDirCurrentChooseC; - KAction* m_pDirCurrentMerge; - KAction* m_pDirCurrentDelete; - - KAction* m_pDirCurrentSyncDoNothing; - KAction* m_pDirCurrentSyncCopyAToB; - KAction* m_pDirCurrentSyncCopyBToA; - KAction* m_pDirCurrentSyncDeleteA; - KAction* m_pDirCurrentSyncDeleteB; - KAction* m_pDirCurrentSyncDeleteAAndB; - KAction* m_pDirCurrentSyncMergeToA; - KAction* m_pDirCurrentSyncMergeToB; - KAction* m_pDirCurrentSyncMergeToAAndB; - - KAction* m_pDirSaveMergeState; - KAction* m_pDirLoadMergeState; -signals: - void startDiffMerge(QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString,TotalDiffStatus*); - void checkIfCanContinue( bool* pbContinue ); - void updateAvailabilities(); - void statusBarMessage( const QString& msg ); -protected slots: - void onDoubleClick( QTreeWidgetItem* lvi ); - void onCurrentChanged(QTreeWidgetItem*); - void onExpanded(); -}; - -class DirectoryMergeInfo : public QFrame -{ - Q_OBJECT -public: - DirectoryMergeInfo( QWidget* pParent ); - void setInfo( - const FileAccess& APath, - const FileAccess& BPath, - const FileAccess& CPath, - const FileAccess& DestPath, - MergeFileInfos& mfi ); - QTreeWidget* getInfoList() {return m_pInfoList;} - virtual bool eventFilter( QObject* o, QEvent* e ); -signals: - void gotFocus(); -private: - QLabel* m_pInfoA; - QLabel* m_pInfoB; - QLabel* m_pInfoC; - QLabel* m_pInfoDest; - - QLabel* m_pA; - QLabel* m_pB; - QLabel* m_pC; - QLabel* m_pDest; - - QTreeWidget* m_pInfoList; -}; - - -#endif Index: trunk/extragear/utils/kdiff3/src/mergeresultwindow.cpp =================================================================== --- trunk/extragear/utils/kdiff3/src/mergeresultwindow.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/src/mergeresultwindow.cpp (nonexistent) @@ -1,3355 +0,0 @@ -/*************************************************************************** - mergeresultwindow.cpp - description - ------------------- - begin : Sun Apr 14 2002 - copyright : (C) 2002-2007 by Joachim Eibl - email : joachim.eibl at gmx.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "mergeresultwindow.h" -#include "optiondialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -//Added by qt3to4: -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -int g_bAutoSolve = true; - -#undef leftInfoWidth -#define leftInfoWidth 3 - -MergeResultWindow::MergeResultWindow( - QWidget* pParent, - OptionDialog* pOptionDialog, - QStatusBar* pStatusBar - ) -: QWidget( pParent ) -{ - setObjectName( "MergeResultWindow" ); - setFocusPolicy( Qt::ClickFocus ); - - m_firstLine = 0; - m_firstColumn = 0; - m_nofColumns = 0; - m_nofLines = 0; - m_totalSize = 0; - m_bMyUpdate = false; - m_bInsertMode = true; - m_scrollDeltaX = 0; - m_scrollDeltaY = 0; - m_bModified = false; - m_eOverviewMode=Overview::eOMNormal; - - m_pldA = 0; - m_pldB = 0; - m_pldC = 0; - m_sizeA = 0; - m_sizeB = 0; - m_sizeC = 0; - - m_pDiff3LineList = 0; - m_pTotalDiffStatus = 0; - m_pStatusBar = pStatusBar; - - m_pOptionDialog = pOptionDialog; - m_bPaintingAllowed = false; - m_delayedDrawTimer = 0; - - m_cursorXPos=0; - m_cursorOldXPos=0; - m_cursorYPos=0; - m_bCursorOn = true; - m_bCursorUpdate = false; - connect( &m_cursorTimer, SIGNAL(timeout()), this, SLOT( slotCursorUpdate() ) ); - m_cursorTimer.setSingleShot(true); - m_cursorTimer.start( 500 /*ms*/ ); - m_selection.reset(); - - setMinimumSize( QSize(20,20) ); - setFont( m_pOptionDialog->m_font ); -} - -void MergeResultWindow::init( - const LineData* pLineDataA, int sizeA, - const LineData* pLineDataB, int sizeB, - const LineData* pLineDataC, int sizeC, - const Diff3LineList* pDiff3LineList, - TotalDiffStatus* pTotalDiffStatus - ) -{ - m_firstLine = 0; - m_firstColumn = 0; - m_nofColumns = 0; - m_nofLines = 0; - m_bMyUpdate = false; - m_bInsertMode = true; - m_scrollDeltaX = 0; - m_scrollDeltaY = 0; - setModified( false ); - - m_pldA = pLineDataA; - m_pldB = pLineDataB; - m_pldC = pLineDataC; - m_sizeA = sizeA; - m_sizeB = sizeB; - m_sizeC = sizeC; - - m_pDiff3LineList = pDiff3LineList; - m_pTotalDiffStatus = pTotalDiffStatus; - - m_selection.reset(); - m_cursorXPos=0; - m_cursorOldXPos=0; - m_cursorYPos=0; - - merge( g_bAutoSolve, -1 ); - g_bAutoSolve = true; - update(); - updateSourceMask(); - - int wsc; - int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); - if (m_pStatusBar) - m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" - ,nofUnsolved,wsc) ); -} - -void MergeResultWindow::reset() -{ - m_pDiff3LineList = 0; - m_pTotalDiffStatus = 0; - m_pldA = 0; - m_pldB = 0; - m_pldC = 0; -} - -// Calculate the merge information for the given Diff3Line. -// Results will be stored in mergeDetails, bConflict, bLineRemoved and src. -void mergeOneLine( - const Diff3Line& d, e_MergeDetails& mergeDetails, bool& bConflict, - bool& bLineRemoved, int& src, bool bTwoInputs - ) -{ - mergeDetails = eDefault; - bConflict = false; - bLineRemoved = false; - src = 0; - - if ( bTwoInputs ) // Only two input files - { - if ( d.lineA!=-1 && d.lineB!=-1 ) - { - if ( d.pFineAB == 0 ) - { - mergeDetails = eNoChange; src = A; - } - else - { - mergeDetails = eBChanged; bConflict = true; - } - } - else - { - if ( d.lineA!=-1 && d.lineB==-1 ) - { - mergeDetails = eBDeleted; bConflict = true; - } - else if ( d.lineA==-1 && d.lineB!=-1 ) - { - mergeDetails = eBDeleted; bConflict = true; - } - } - return; - } - - // A is base. - if ( d.lineA!=-1 && d.lineB!=-1 && d.lineC!=-1 ) - { - if ( d.pFineAB == 0 && d.pFineBC == 0 && d.pFineCA == 0) - { - mergeDetails = eNoChange; src = A; - } - else if( d.pFineAB == 0 && d.pFineBC != 0 && d.pFineCA != 0 ) - { - mergeDetails = eCChanged; src = C; - } - else if( d.pFineAB != 0 && d.pFineBC != 0 && d.pFineCA == 0 ) - { - mergeDetails = eBChanged; src = B; - } - else if( d.pFineAB != 0 && d.pFineBC == 0 && d.pFineCA != 0 ) - { - mergeDetails = eBCChangedAndEqual; src = C; - } - else if( d.pFineAB != 0 && d.pFineBC != 0 && d.pFineCA != 0 ) - { - mergeDetails = eBCChanged; bConflict = true; - } - else - assert(false); - } - else if ( d.lineA!=-1 && d.lineB!=-1 && d.lineC==-1 ) - { - if( d.pFineAB != 0 ) - { - mergeDetails = eBChanged_CDeleted; bConflict = true; - } - else - { - mergeDetails = eCDeleted; bLineRemoved = true; src = C; - } - } - else if ( d.lineA!=-1 && d.lineB==-1 && d.lineC!=-1 ) - { - if( d.pFineCA != 0 ) - { - mergeDetails = eCChanged_BDeleted; bConflict = true; - } - else - { - mergeDetails = eBDeleted; bLineRemoved = true; src = B; - } - } - else if ( d.lineA==-1 && d.lineB!=-1 && d.lineC!=-1 ) - { - if( d.pFineBC != 0 ) - { - mergeDetails = eBCAdded; bConflict = true; - } - else // B==C - { - mergeDetails = eBCAddedAndEqual; src = C; - } - } - else if ( d.lineA==-1 && d.lineB==-1 && d.lineC!= -1 ) - { - mergeDetails = eCAdded; src = C; - } - else if ( d.lineA==-1 && d.lineB!=-1 && d.lineC== -1 ) - { - mergeDetails = eBAdded; src = B; - } - else if ( d.lineA!=-1 && d.lineB==-1 && d.lineC==-1 ) - { - mergeDetails = eBCDeleted; bLineRemoved = true; src = C; - } - else - assert(false); -} - -bool MergeResultWindow::sameKindCheck( const MergeLine& ml1, const MergeLine& ml2 ) -{ - if ( ml1.bConflict && ml2.bConflict ) - { - // Both lines have conflicts: If one is only a white space conflict and - // the other one is a real conflict, then this line returns false. - return ml1.id3l->bAEqC == ml2.id3l->bAEqC && ml1.id3l->bAEqB == ml2.id3l->bAEqB; - } - else - return ( - ( !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) - ); -} - -void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConflictsOnly, bool bWhiteSpaceOnly ) -{ - if ( !bConflictsOnly ) - { - if(m_bModified) - { - int result = KMessageBox::warningYesNo(this, - i18n("The output has been modified.\n" - "If you continue your changes will be lost."), - i18n("Warning"), - KStandardGuiItem::cont(), - KStandardGuiItem::cancel()); - if ( result==KMessageBox::No ) - return; - } - - m_mergeLineList.clear(); - m_totalSize = 0; - int lineIdx = 0; - Diff3LineList::const_iterator it; - for( it=m_pDiff3LineList->begin(); it!=m_pDiff3LineList->end(); ++it, ++lineIdx ) - { - const Diff3Line& d = *it; - - MergeLine ml; - bool bLineRemoved; - mergeOneLine( d, ml.mergeDetails, ml.bConflict, bLineRemoved, ml.srcSelect, m_pldC==0 ); - - // Automatic solving for only whitespace changes. - if ( ml.bConflict && - ( (m_pldC==0 && (d.bAEqB || d.bWhiteLineA && d.bWhiteLineB)) || - (m_pldC!=0 && (d.bAEqB && d.bAEqC || d.bWhiteLineA && d.bWhiteLineB && d.bWhiteLineC ) ) ) ) - { - ml.bWhiteSpaceConflict = true; - } - - ml.d3lLineIdx = lineIdx; - ml.bDelta = ml.srcSelect != A; - ml.id3l = it; - ml.srcRangeLength = 1; - - MergeLine* back = m_mergeLineList.empty() ? 0 : &m_mergeLineList.back(); - - bool bSame = back!=0 && sameKindCheck( ml, *back ); - if( bSame ) - { - ++back->srcRangeLength; - if ( back->bWhiteSpaceConflict && !ml.bWhiteSpaceConflict ) - back->bWhiteSpaceConflict = false; - } - else - { - ml.mergeEditLineList.setTotalSizePtr(&m_totalSize); - m_mergeLineList.push_back( ml ); - } - - if ( ! ml.bConflict ) - { - MergeLine& tmpBack = m_mergeLineList.back(); - MergeEditLine mel(ml.id3l); - mel.setSource( ml.srcSelect, bLineRemoved ); - tmpBack.mergeEditLineList.push_back(mel); - } - else if ( back==0 || ! back->bConflict || !bSame ) - { - MergeLine& tmpBack = m_mergeLineList.back(); - MergeEditLine mel(ml.id3l); - mel.setConflict(); - tmpBack.mergeEditLineList.push_back(mel); - } - } - } - - bool bSolveWhiteSpaceConflicts = false; - if ( bAutoSolve ) // when true, then the other params are not used and we can change them here. (see all invocations of merge()) - { - if ( m_pldC==0 && m_pOptionDialog->m_whiteSpace2FileMergeDefault != 0 ) // Only two inputs - { - defaultSelector = m_pOptionDialog->m_whiteSpace2FileMergeDefault; - bWhiteSpaceOnly = true; - bSolveWhiteSpaceConflicts = true; - } - else if ( m_pldC!=0 && m_pOptionDialog->m_whiteSpace3FileMergeDefault != 0 ) - { - defaultSelector = m_pOptionDialog->m_whiteSpace3FileMergeDefault; - bWhiteSpaceOnly = true; - bSolveWhiteSpaceConflicts = true; - } - } - - if ( !bAutoSolve || bSolveWhiteSpaceConflicts ) - { - // Change all auto selections - MergeLineList::iterator mlIt; - for( mlIt=m_mergeLineList.begin(); mlIt!=m_mergeLineList.end(); ++mlIt ) - { - MergeLine& ml = *mlIt; - bool bConflict = ml.mergeEditLineList.empty() || ml.mergeEditLineList.begin()->isConflict(); - if ( ml.bDelta && ( !bConflictsOnly || bConflict ) && (!bWhiteSpaceOnly || ml.bWhiteSpaceConflict )) - { - ml.mergeEditLineList.clear(); - if ( defaultSelector==-1 && ml.bDelta ) - { - MergeEditLine mel(ml.id3l);; - mel.setConflict(); - ml.bConflict = true; - ml.mergeEditLineList.push_back(mel); - } - else - { - Diff3LineList::const_iterator d3llit=ml.id3l; - int j; - - for( j=0; jlineA : - defaultSelector==2 ? d3llit->lineB : - defaultSelector==3 ? d3llit->lineC : -1; - - if ( srcLine != -1 ) - { - ml.mergeEditLineList.push_back(mel); - } - - ++d3llit; - } - - if ( ml.mergeEditLineList.empty() ) // Make a line nevertheless - { - MergeEditLine mel(ml.id3l); - mel.setRemoved( defaultSelector ); - ml.mergeEditLineList.push_back(mel); - } - } - } - } - } - - MergeLineList::iterator mlIt; - for( mlIt=m_mergeLineList.begin(); mlIt!=m_mergeLineList.end(); ++mlIt ) - { - MergeLine& ml = *mlIt; - // Remove all lines that are empty, because no src lines are there. - - int oldSrcLine = -1; - int oldSrc = -1; - MergeEditLineList::iterator melIt; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ) - { - MergeEditLine& mel = *melIt; - int melsrc = mel.src(); - - int srcLine = mel.isRemoved() ? -1 : - melsrc==1 ? mel.id3l()->lineA : - melsrc==2 ? mel.id3l()->lineB : - melsrc==3 ? mel.id3l()->lineC : -1; - - // At least one line remains because oldSrc != melsrc for first line in list - // Other empty lines will be removed - if ( srcLine == -1 && oldSrcLine==-1 && oldSrc == melsrc ) - melIt = ml.mergeEditLineList.erase( melIt ); - else - ++melIt; - - oldSrcLine = srcLine; - oldSrc = melsrc; - } - } - - if ( bAutoSolve && !bConflictsOnly ) - { - if ( m_pOptionDialog->m_bRunHistoryAutoMergeOnMergeStart ) - slotMergeHistory(); - if ( m_pOptionDialog->m_bRunRegExpAutoMergeOnMergeStart ) - slotRegExpAutoMerge(); - if ( m_pldC != 0 && ! doRelevantChangesExist() ) - emit noRelevantChangesDetected(); - } - - int nrOfSolvedConflicts = 0; - int nrOfUnsolvedConflicts = 0; - int nrOfWhiteSpaceConflicts = 0; - - MergeLineList::iterator i; - for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - if ( i->bConflict ) - ++nrOfUnsolvedConflicts; - else if ( i->bDelta ) - ++nrOfSolvedConflicts; - - if ( i->bWhiteSpaceConflict ) - ++nrOfWhiteSpaceConflicts; - } - - m_pTotalDiffStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts; - m_pTotalDiffStatus->nofSolvedConflicts = nrOfSolvedConflicts; - m_pTotalDiffStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts; - - - m_cursorXPos=0; - m_cursorOldXPos=0; - m_cursorYPos=0; - //m_firstLine = 0; // Must not set line/column without scrolling there - //m_firstColumn = 0; - - setModified(false); - - m_currentMergeLineIt = m_mergeLineList.begin(); - slotGoTop(); - - updateAvailabilities(); - update(); -} - -void MergeResultWindow::setFirstLine(int firstLine) -{ - m_firstLine = max2(0,firstLine); - update(); -} - -void MergeResultWindow::setFirstColumn(int firstCol) -{ - m_firstColumn = max2(0,firstCol); - update(); -} - -int MergeResultWindow::getNofColumns() -{ - return m_nofColumns; -} - -int MergeResultWindow::getNofLines() -{ - return m_totalSize; -} - -int MergeResultWindow::getNofVisibleColumns() -{ - QFontMetrics fm = fontMetrics(); - return width()/fm.width('W')-4; -} - -int MergeResultWindow::getNofVisibleLines() -{ - QFontMetrics fm = fontMetrics(); - return (height()-3)/fm.height()-2; -} - -void MergeResultWindow::resizeEvent( QResizeEvent* e ) -{ - QWidget::resizeEvent(e); - emit resizeSignal(); -} - -Overview::e_OverviewMode MergeResultWindow::getOverviewMode() -{ - return m_eOverviewMode; -} - -void MergeResultWindow::setOverviewMode( Overview::e_OverviewMode eOverviewMode ) -{ - m_eOverviewMode = eOverviewMode; -} - -// Check whether we should ignore current delta when moving to next/previous delta -bool MergeResultWindow::checkOverviewIgnore(MergeLineList::iterator &i) -{ - if (m_eOverviewMode == Overview::eOMNormal) return false; - if (m_eOverviewMode == Overview::eOMAvsB) - return i->mergeDetails == eCAdded || i->mergeDetails == eCDeleted || i->mergeDetails == eCChanged; - if (m_eOverviewMode == Overview::eOMAvsC) - return i->mergeDetails == eBAdded || i->mergeDetails == eBDeleted || i->mergeDetails == eBChanged; - if (m_eOverviewMode == Overview::eOMBvsC) - return i->mergeDetails == eBCAddedAndEqual || i->mergeDetails == eBCDeleted || i->mergeDetails == eBCChangedAndEqual; - return false; -} - -// Go to prev/next delta/conflict or first/last delta. -void MergeResultWindow::go( e_Direction eDir, e_EndPoint eEndPoint ) -{ - assert( eDir==eUp || eDir==eDown ); - MergeLineList::iterator i = m_currentMergeLineIt; - bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace; - if( eEndPoint==eEnd ) - { - if (eDir==eUp) i = m_mergeLineList.begin(); // first mergeline - else i = --m_mergeLineList.end(); // last mergeline - - while ( isItAtEnd(eDir==eUp, i) && ! i->bDelta ) - { - if ( eDir==eUp ) ++i; // search downwards - else --i; // search upwards - } - } - else if ( eEndPoint == eDelta && isItAtEnd(eDir!=eUp, i) ) - { - do - { - if ( eDir==eUp ) --i; - else ++i; - } - while ( isItAtEnd(eDir!=eUp, i) && ( i->bDelta == false || checkOverviewIgnore(i) || (bSkipWhiteConflicts && i->bWhiteSpaceConflict) ) ); - } - else if ( eEndPoint == eConflict && isItAtEnd(eDir!=eUp, i) ) - { - do - { - if ( eDir==eUp ) --i; - else ++i; - } - while ( isItAtEnd(eDir!=eUp, i) && (i->bConflict == false || (bSkipWhiteConflicts && i->bWhiteSpaceConflict) ) ); - } - else if ( isItAtEnd(eDir!=eUp, i) && eEndPoint == eUnsolvedConflict ) - { - do - { - if ( eDir==eUp ) --i; - else ++i; - } - while ( isItAtEnd(eDir!=eUp, i) && ! i->mergeEditLineList.begin()->isConflict() ); - } - - if ( isVisible() ) - setFocus(); - - setFastSelector( i ); -} - -bool MergeResultWindow::isDeltaAboveCurrent() -{ - bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace; - if (m_mergeLineList.empty()) return false; - MergeLineList::iterator i = m_currentMergeLineIt; - if (i == m_mergeLineList.begin()) return false; - do - { - --i; - if ( i->bDelta && !checkOverviewIgnore(i) && !( bSkipWhiteConflicts && i->bWhiteSpaceConflict ) ) return true; - } - while (i!=m_mergeLineList.begin()); - - return false; -} - -bool MergeResultWindow::isDeltaBelowCurrent() -{ - bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace; - if (m_mergeLineList.empty()) return false; - - MergeLineList::iterator i = m_currentMergeLineIt; - if (i!=m_mergeLineList.end()) - { - ++i; - for( ; i!=m_mergeLineList.end(); ++i ) - { - if ( i->bDelta && !checkOverviewIgnore(i) && !( bSkipWhiteConflicts && i->bWhiteSpaceConflict ) ) return true; - } - } - return false; -} - -bool MergeResultWindow::isConflictAboveCurrent() -{ - if (m_mergeLineList.empty()) return false; - MergeLineList::iterator i = m_currentMergeLineIt; - if (i == m_mergeLineList.begin()) return false; - - bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace; - - do - { - --i; - if ( i->bConflict && !(bSkipWhiteConflicts && i->bWhiteSpaceConflict) ) return true; - } - while (i!=m_mergeLineList.begin()); - - return false; -} - -bool MergeResultWindow::isConflictBelowCurrent() -{ - MergeLineList::iterator i = m_currentMergeLineIt; - if (m_mergeLineList.empty()) return false; - - bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace; - - if (i!=m_mergeLineList.end()) - { - ++i; - for( ; i!=m_mergeLineList.end(); ++i ) - { - if ( i->bConflict && !(bSkipWhiteConflicts && i->bWhiteSpaceConflict) ) return true; - } - } - return false; -} - -bool MergeResultWindow::isUnsolvedConflictAtCurrent() -{ - if (m_mergeLineList.empty()) return false; - MergeLineList::iterator i = m_currentMergeLineIt; - return i->mergeEditLineList.begin()->isConflict(); -} - -bool MergeResultWindow::isUnsolvedConflictAboveCurrent() -{ - if (m_mergeLineList.empty()) return false; - MergeLineList::iterator i = m_currentMergeLineIt; - if (i == m_mergeLineList.begin()) return false; - - do - { - --i; - if ( i->mergeEditLineList.begin()->isConflict() ) return true; - } - while (i!=m_mergeLineList.begin()); - - return false; -} - -bool MergeResultWindow::isUnsolvedConflictBelowCurrent() -{ - MergeLineList::iterator i = m_currentMergeLineIt; - if (m_mergeLineList.empty()) return false; - - if (i!=m_mergeLineList.end()) - { - ++i; - for( ; i!=m_mergeLineList.end(); ++i ) - { - if ( i->mergeEditLineList.begin()->isConflict() ) return true; - } - } - return false; -} - -void MergeResultWindow::slotGoTop() -{ - go( eUp, eEnd ); -} - -void MergeResultWindow::slotGoCurrent() -{ - setFastSelector( m_currentMergeLineIt ); -} - -void MergeResultWindow::slotGoBottom() -{ - go( eDown, eEnd ); -} - -void MergeResultWindow::slotGoPrevDelta() -{ - go( eUp, eDelta ); -} - -void MergeResultWindow::slotGoNextDelta() -{ - go( eDown, eDelta ); -} - -void MergeResultWindow::slotGoPrevConflict() -{ - go( eUp, eConflict ); -} - -void MergeResultWindow::slotGoNextConflict() -{ - go( eDown, eConflict ); -} - -void MergeResultWindow::slotGoPrevUnsolvedConflict() -{ - go( eUp, eUnsolvedConflict ); -} - -void MergeResultWindow::slotGoNextUnsolvedConflict() -{ - go( eDown, eUnsolvedConflict ); -} - -/** The line is given as a index in the Diff3LineList. - The function calculates the corresponding iterator. */ -void MergeResultWindow::slotSetFastSelectorLine( int line ) -{ - MergeLineList::iterator i; - for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - if ( line>=i->d3lLineIdx && line < i->d3lLineIdx + i->srcRangeLength ) - { - //if ( i->bDelta ) - { - setFastSelector( i ); - } - break; - } - } -} - -int MergeResultWindow::getNrOfUnsolvedConflicts( int* pNrOfWhiteSpaceConflicts ) -{ - int nrOfUnsolvedConflicts = 0; - if (pNrOfWhiteSpaceConflicts!=0) - *pNrOfWhiteSpaceConflicts = 0; - - MergeLineList::iterator mlIt = m_mergeLineList.begin(); - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - MergeEditLineList::iterator melIt = ml.mergeEditLineList.begin(); - if ( melIt->isConflict() ) - { - ++nrOfUnsolvedConflicts; - if ( ml.bWhiteSpaceConflict && pNrOfWhiteSpaceConflicts!=0 ) - ++ *pNrOfWhiteSpaceConflicts; - } - } - - return nrOfUnsolvedConflicts; -} - -void MergeResultWindow::showNrOfConflicts() -{ - if (!m_pOptionDialog->m_bShowInfoDialogs) - return; - int nrOfConflicts = 0; - MergeLineList::iterator i; - for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - if ( i->bConflict || i->bDelta ) - ++nrOfConflicts; - } - QString totalInfo; - if ( m_pTotalDiffStatus->bBinaryAEqB && m_pTotalDiffStatus->bBinaryAEqC ) - totalInfo += i18n("All input files are binary equal."); - else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC ) - totalInfo += i18n("All input files contain the same text."); - else { - if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("B")); - else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n",QString("A"),QString("B")); - if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("C")); - else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n",QString("A"),QString("C")); - if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("B"),QString("C")); - else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n",QString("B"),QString("C")); - } - - int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts(); - - KMessageBox::information( this, - i18n("Total number of conflicts: ") + QString::number(nrOfConflicts) + - i18n("\nNr of automatically solved conflicts: ") + QString::number(nrOfConflicts-nrOfUnsolvedConflicts) + - i18n("\nNr of unsolved conflicts: ") + QString::number(nrOfUnsolvedConflicts) + - "\n"+totalInfo, - i18n("Conflicts") - ); -} - -void MergeResultWindow::setFastSelector(MergeLineList::iterator i) -{ - if ( i==m_mergeLineList.end() ) - return; - m_currentMergeLineIt = i; - emit setFastSelectorRange( i->d3lLineIdx, i->srcRangeLength ); - - int line1 = 0; - - MergeLineList::iterator mlIt = m_mergeLineList.begin(); - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - if(mlIt==m_currentMergeLineIt) - break; - line1 += mlIt->mergeEditLineList.size(); - } - - int nofLines = m_currentMergeLineIt->mergeEditLineList.size(); - int newFirstLine = getBestFirstLine( line1, nofLines, m_firstLine, getNofVisibleLines() ); - if ( newFirstLine != m_firstLine ) - { - scroll( 0, newFirstLine - m_firstLine ); - } - - if ( m_selection.isEmpty() ) - { - m_cursorXPos = 0; - m_cursorOldXPos = 0; - m_cursorYPos = line1; - } - - update(); - updateSourceMask(); - emit updateAvailabilities(); -} - -void MergeResultWindow::choose( int selector ) -{ - if ( m_currentMergeLineIt==m_mergeLineList.end() ) - return; - - setModified(); - - // First find range for which this change works. - MergeLine& ml = *m_currentMergeLineIt; - - MergeEditLineList::iterator melIt; - - // Now check if selector is active for this range already. - bool bActive = false; - - // Remove unneeded lines in the range. - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ) - { - MergeEditLine& mel = *melIt; - if ( mel.src()==selector ) - bActive = true; - - if ( mel.src()==selector || !mel.isEditableText() || mel.isModified() ) - melIt = ml.mergeEditLineList.erase( melIt ); - else - ++melIt; - } - - if ( !bActive ) // Selected source wasn't active. - { // Append the lines from selected source here at rangeEnd. - Diff3LineList::const_iterator d3llit=ml.id3l; - int j; - - for( j=0; jlineA : - mel.src()==2 ? mel.id3l()->lineB : - mel.src()==3 ? mel.id3l()->lineC : -1; - - if ( srcLine == -1 ) - melIt = ml.mergeEditLineList.erase( melIt ); - else - ++melIt; - } - } - - if ( ml.mergeEditLineList.empty() ) - { - // Insert a dummy line: - MergeEditLine mel(ml.id3l); - - if ( bActive ) mel.setConflict(); // All src entries deleted => conflict - else mel.setRemoved(selector); // No lines in corresponding src found. - - ml.mergeEditLineList.push_back(mel); - } - - if ( m_cursorYPos >= m_totalSize ) - { - m_cursorYPos = m_totalSize-1; - m_cursorXPos = 0; - } - - update(); - updateSourceMask(); - emit updateAvailabilities(); - int wsc; - int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); - m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" - ,nofUnsolved,wsc) ); -} - -// bConflictsOnly: automatically choose for conflicts only (true) or for everywhere (false) -void MergeResultWindow::chooseGlobal(int selector, bool bConflictsOnly, bool bWhiteSpaceOnly ) -{ - resetSelection(); - - merge( false, selector, bConflictsOnly, bWhiteSpaceOnly ); - setModified( true ); - update(); - int wsc; - int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); - m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" - ,nofUnsolved,wsc) ); -} - -void MergeResultWindow::slotAutoSolve() -{ - resetSelection(); - merge( true, -1 ); - setModified( true ); - update(); - int wsc; - int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); - m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" - ,nofUnsolved,wsc) ); -} - -void MergeResultWindow::slotUnsolve() -{ - resetSelection(); - merge( false, -1 ); - setModified( true ); - update(); - int wsc; - int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); - m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" - ,nofUnsolved,wsc) ); -} - -static QString calcHistoryLead(const QString& s ) -{ - // Return the start of the line until the first white char after the first non white char. - int i; - for( i=0; ibegin(), idxBegin=0; iBegin!=pD3LList->end(); ++iBegin, ++idxBegin ) - { - if ( historyStart.exactMatch( iBegin->getString(A) ) && - historyStart.exactMatch( iBegin->getString(B) ) && - ( !bThreeFiles || historyStart.exactMatch( iBegin->getString(C) ) ) ) - { - historyLead = calcHistoryLead( iBegin->getString(A) ); - break; - } - } - // Search for end of history - for( iEnd = iBegin, idxEnd = idxBegin; iEnd!=pD3LList->end(); ++iEnd, ++idxEnd ) - { - QString sA = iEnd->getString(A); - QString sB = iEnd->getString(B); - QString sC = iEnd->getString(C); - if ( ! ((sA.isNull() || historyLead == calcHistoryLead(sA) ) && - (sB.isNull() || historyLead == calcHistoryLead(sB) ) && - (!bThreeFiles || sC.isNull() || historyLead == calcHistoryLead(sC) ) - )) - { - break; // End of the history - } - } -} - -bool findParenthesesGroups( const QString& s, QStringList& sl ) -{ - sl.clear(); - int i=0; - std::list startPosStack; - int length = s.length(); - for( i=0; i(int)parenthesesGroupList.size() ) - continue; - QString s = matchedRegExpr.cap( groupIdx ); - if ( groupIdx == 0 ) - { - key += s + " "; - continue; - } - - QString groupRegExp = parenthesesGroupList[groupIdx-1]; - if( groupRegExp.indexOf('|')<0 || groupRegExp.indexOf('(')>=0 ) - { - bool bOk = false; - int i = s.toInt( &bOk ); - if ( bOk && i>=0 && i<10000 ) - s.sprintf("%04d", i); // This should help for correct sorting of numbers. - key += s + " "; - } - else - { - // Assume that the groupRegExp consists of something like "Jan|Feb|Mar|Apr" - // s is the string that managed to match. - // Now we want to know at which position it occurred. e.g. Jan=0, Feb=1, Mar=2, etc. - QStringList sl = groupRegExp.split( '|' ); - int idx = sl.indexOf( s ); - if (idx<0) - { - // Didn't match - } - else - { - QString sIdx; - sIdx.sprintf("%02d", idx+1 ); // Up to 99 words in the groupRegExp (more than 12 aren't expected) - key += sIdx + " "; - } - } - } - return key; -} - -void MergeResultWindow::collectHistoryInformation( - int src, Diff3LineList::const_iterator iHistoryBegin, Diff3LineList::const_iterator iHistoryEnd, - HistoryMap& historyMap, - std::list< HistoryMap::iterator >& hitList // list of iterators - ) -{ - std::list< HistoryMap::iterator >::iterator itHitListFront = hitList.begin(); - Diff3LineList::const_iterator id3l = iHistoryBegin; - QString historyLead; - { - const LineData* pld = id3l->getLineData(src); - QString s( pld->pLine, pld->size ); - historyLead = calcHistoryLead(s); - } - QRegExp historyStart( m_pOptionDialog->m_historyStartRegExp ); - if ( id3l == iHistoryEnd ) - return; - ++id3l; // Skip line with "$Log ... $" - QRegExp newHistoryEntry( m_pOptionDialog->m_historyEntryStartRegExp ); - QStringList parenthesesGroups; - findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, parenthesesGroups ); - QString key; - MergeEditLineList melList; - bool bPrevLineIsEmpty = true; - bool bUseRegExp = !m_pOptionDialog->m_historyEntryStartRegExp.isEmpty(); - for(; id3l != iHistoryEnd; ++id3l ) - { - const LineData* pld = id3l->getLineData(src); - if ( !pld ) continue; - QString s( pld->pLine, pld->size ); - if (historyLead.isNull()) historyLead = calcHistoryLead(s); - QString sLine = s.mid(historyLead.length()); - if ( ( !bUseRegExp && !sLine.trimmed().isEmpty() && bPrevLineIsEmpty ) - || (bUseRegExp && newHistoryEntry.exactMatch( sLine ) ) - ) - { - if ( !key.isEmpty() && !melList.empty() ) - { - // Only insert new HistoryMapEntry if key not found; in either case p.first is a valid iterator to element key. - std::pair p = historyMap.insert(HistoryMap::value_type(key,HistoryMapEntry())); - HistoryMapEntry& hme = p.first->second; - if ( src==A ) hme.mellA = melList; - if ( src==B ) hme.mellB = melList; - if ( src==C ) hme.mellC = melList; - if ( p.second ) // Not in list yet? - { - hitList.insert( itHitListFront, p.first ); - } - } - - if ( ! bUseRegExp ) - key = sLine; - else - key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,parenthesesGroups); - - melList.clear(); - melList.push_back( MergeEditLine(id3l,src) ); - } - else if ( ! historyStart.exactMatch( s ) ) - { - melList.push_back( MergeEditLine(id3l,src) ); - } - - bPrevLineIsEmpty = sLine.trimmed().isEmpty(); - } - if ( !key.isEmpty() ) - { - // Only insert new HistoryMapEntry if key not found; in either case p.first is a valid iterator to element key. - std::pair p = historyMap.insert(HistoryMap::value_type(key,HistoryMapEntry())); - HistoryMapEntry& hme = p.first->second; - if ( src==A ) hme.mellA = melList; - if ( src==B ) hme.mellB = melList; - if ( src==C ) hme.mellC = melList; - if ( p.second ) // Not in list yet? - { - hitList.insert( itHitListFront, p.first ); - } - } - // End of the history -} - -MergeResultWindow::MergeEditLineList& MergeResultWindow::HistoryMapEntry::choice( bool bThreeInputs ) -{ - if ( !bThreeInputs ) - return mellA.empty() ? mellB : mellA; - else - { - if ( mellA.empty() ) - return mellC.empty() ? mellB : mellC; // A doesn't exist, return one that exists - else if ( ! mellB.empty() && ! mellC.empty() ) - { // A, B and C exist - return mellA; - } - else - return mellB.empty() ? mellB : mellC; // A exists, return the one that doesn't exist - } -} - -bool MergeResultWindow::HistoryMapEntry::staysInPlace( bool bThreeInputs, Diff3LineList::const_iterator& iHistoryEnd ) -{ - // The entry should stay in place if the decision made by the automerger is correct. - Diff3LineList::const_iterator& iHistoryLast = iHistoryEnd; - --iHistoryLast; - if ( !bThreeInputs ) - { - if ( !mellA.empty() && !mellB.empty() && mellA.begin()->id3l()==mellB.begin()->id3l() && - mellA.back().id3l() == iHistoryLast && mellB.back().id3l() == iHistoryLast ) - { - iHistoryEnd = mellA.begin()->id3l(); - return true; - } - else - { - return false; - } - } - else - { - if ( !mellA.empty() && !mellB.empty() && !mellC.empty() - && mellA.begin()->id3l()==mellB.begin()->id3l() && mellA.begin()->id3l()==mellC.begin()->id3l() - && mellA.back().id3l() == iHistoryLast && mellB.back().id3l() == iHistoryLast && mellC.back().id3l() == iHistoryLast ) - { - iHistoryEnd = mellA.begin()->id3l(); - return true; - } - else - { - return false; - } - } -} - -void MergeResultWindow::slotMergeHistory() -{ - Diff3LineList::const_iterator iD3LHistoryBegin; - Diff3LineList::const_iterator iD3LHistoryEnd; - int d3lHistoryBeginLineIdx = -1; - int d3lHistoryEndLineIdx = -1; - - // Search for history start, history end in the diff3LineList - findHistoryRange( QRegExp(m_pOptionDialog->m_historyStartRegExp), m_pldC!=0, m_pDiff3LineList, iD3LHistoryBegin, iD3LHistoryEnd, d3lHistoryBeginLineIdx, d3lHistoryEndLineIdx ); - - if ( iD3LHistoryBegin != m_pDiff3LineList->end() ) - { - // Now collect the historyMap information - HistoryMap historyMap; - std::list< HistoryMap::iterator > hitList; - if (m_pldC==0) - { - collectHistoryInformation( A, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList ); - collectHistoryInformation( B, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList ); - } - else - { - collectHistoryInformation( A, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList ); - collectHistoryInformation( B, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList ); - collectHistoryInformation( C, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList ); - } - - Diff3LineList::const_iterator iD3LHistoryOrigEnd = iD3LHistoryEnd; - - bool bHistoryMergeSorting = m_pOptionDialog->m_bHistoryMergeSorting && ! m_pOptionDialog->m_historyEntryStartSortKeyOrder.isEmpty() && - ! m_pOptionDialog->m_historyEntryStartRegExp.isEmpty(); - - if ( m_pOptionDialog->m_maxNofHistoryEntries==-1 ) - { - // Remove parts from the historyMap and hitList that stay in place - if ( bHistoryMergeSorting ) - { - while ( ! historyMap.empty() ) - { - HistoryMap::iterator hMapIt = historyMap.begin(); - if( hMapIt->second.staysInPlace( m_pldC!=0, iD3LHistoryEnd ) ) - historyMap.erase(hMapIt); - else - break; - } - } - else - { - while ( ! hitList.empty() ) - { - HistoryMap::iterator hMapIt = hitList.back(); - if( hMapIt->second.staysInPlace( m_pldC!=0, iD3LHistoryEnd ) ) - hitList.pop_back(); - else - break; - } - } - while (iD3LHistoryOrigEnd != iD3LHistoryEnd) - { - --iD3LHistoryOrigEnd; - --d3lHistoryEndLineIdx; - } - } - - MergeLineList::iterator iMLLStart = splitAtDiff3LineIdx(d3lHistoryBeginLineIdx); - MergeLineList::iterator iMLLEnd = splitAtDiff3LineIdx(d3lHistoryEndLineIdx); - // Now join all MergeLines in the history - MergeLineList::iterator i = iMLLStart; - if ( i != iMLLEnd ) - { - ++i; - while ( i!=iMLLEnd ) - { - iMLLStart->join(*i); - i = m_mergeLineList.erase( i ); - } - } - iMLLStart->mergeEditLineList.clear(); - // Now insert the complete history into the first MergeLine of the history - iMLLStart->mergeEditLineList.push_back( MergeEditLine( iD3LHistoryBegin, m_pldC == 0 ? B : C ) ); - QString lead = calcHistoryLead( iD3LHistoryBegin->getString(A) ); - MergeEditLine mel( m_pDiff3LineList->end() ); - mel.setString( lead ); - iMLLStart->mergeEditLineList.push_back(mel); - - int historyCount = 0; - if ( bHistoryMergeSorting ) - { - // Create a sorted history - HistoryMap::reverse_iterator hmit; - for ( hmit = historyMap.rbegin(); hmit != historyMap.rend(); ++hmit ) - { - if ( historyCount==m_pOptionDialog->m_maxNofHistoryEntries ) - break; - ++historyCount; - HistoryMapEntry& hme = hmit->second; - MergeEditLineList& mell = hme.choice(m_pldC!=0); - if (!mell.empty()) - iMLLStart->mergeEditLineList.splice( iMLLStart->mergeEditLineList.end(), mell, mell.begin(), mell.end() ); - } - } - else - { - // Create history in order of appearance - std::list< HistoryMap::iterator >::iterator hlit; - for ( hlit = hitList.begin(); hlit != hitList.end(); ++hlit ) - { - if ( historyCount==m_pOptionDialog->m_maxNofHistoryEntries ) - break; - ++historyCount; - HistoryMapEntry& hme = (*hlit)->second; - MergeEditLineList& mell = hme.choice(m_pldC!=0); - if (!mell.empty()) - iMLLStart->mergeEditLineList.splice( iMLLStart->mergeEditLineList.end(), mell, mell.begin(), mell.end() ); - } - // If the end of start is empty and the first line at the end is empty remove the last line of start - if ( !iMLLStart->mergeEditLineList.empty() && !iMLLEnd->mergeEditLineList.empty() ) - { - QString lastLineOfStart = iMLLStart->mergeEditLineList.back().getString(this); - QString firstLineOfEnd = iMLLEnd->mergeEditLineList.front().getString(this); - if ( lastLineOfStart.mid(lead.length()).trimmed().isEmpty() && firstLineOfEnd.mid(lead.length()).trimmed().isEmpty() ) - iMLLStart->mergeEditLineList.pop_back(); - } - } - setFastSelector( iMLLStart ); - update(); - } -} - -void MergeResultWindow::slotRegExpAutoMerge() -{ - if ( m_pOptionDialog->m_autoMergeRegExp.isEmpty() ) - return; - - QRegExp vcsKeywords( m_pOptionDialog->m_autoMergeRegExp ); - MergeLineList::iterator i; - for ( i=m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - if (i->bConflict ) - { - Diff3LineList::const_iterator id3l = i->id3l; - if ( vcsKeywords.exactMatch( id3l->getString(A) ) && - vcsKeywords.exactMatch( id3l->getString(B) ) && - (m_pldC==0 || vcsKeywords.exactMatch( id3l->getString(C) ))) - { - MergeEditLine& mel = *i->mergeEditLineList.begin(); - mel.setSource( m_pldC==0 ? B : C, false ); - splitAtDiff3LineIdx( i->d3lLineIdx+1 ); - } - } - } - update(); -} - -// This doesn't detect user modifications and should only be called after automatic merge -// This will only do something for three file merge. -// Irrelevant changes are those where all contributions from B are already contained in C. -// Also irrelevant are conflicts automatically solved (automerge regexp and history automerge) -// Precondition: The VCS-keyword would also be C. -bool MergeResultWindow::doRelevantChangesExist() -{ - if ( m_pldC==0 || m_mergeLineList.size() <= 1 ) - return true; - - MergeLineList::iterator i; - for ( i=m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - if ( ( i->bConflict && i->mergeEditLineList.begin()->src()!=C ) - || i->srcSelect == B ) - { - return true; - } - } - - return false; -} - -// Returns the iterator to the MergeLine after the split -MergeResultWindow::MergeLineList::iterator MergeResultWindow::splitAtDiff3LineIdx( int d3lLineIdx ) -{ - MergeLineList::iterator i; - for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - if ( i->d3lLineIdx==d3lLineIdx ) - { - // No split needed, this is the beginning of a MergeLine - return i; - } - else if ( i->d3lLineIdx > d3lLineIdx ) - { - // The split must be in the previous MergeLine - --i; - MergeLine& ml = *i; - MergeLine newML; - ml.split(newML,d3lLineIdx); - ++i; - return m_mergeLineList.insert( i, newML ); - } - } - // The split must be in the previous MergeLine - --i; - MergeLine& ml = *i; - MergeLine newML; - ml.split(newML,d3lLineIdx); - ++i; - return m_mergeLineList.insert( i, newML ); -} - -void MergeResultWindow::slotSplitDiff( int firstD3lLineIdx, int lastD3lLineIdx ) -{ - if (lastD3lLineIdx>=0) - splitAtDiff3LineIdx( lastD3lLineIdx + 1 ); - setFastSelector( splitAtDiff3LineIdx(firstD3lLineIdx) ); -} - -void MergeResultWindow::slotJoinDiffs( int firstD3lLineIdx, int lastD3lLineIdx ) -{ - MergeLineList::iterator i; - MergeLineList::iterator iMLLStart = m_mergeLineList.end(); - MergeLineList::iterator iMLLEnd = m_mergeLineList.end(); - for ( i=m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i ) - { - MergeLine& ml = *i; - if ( firstD3lLineIdx >= ml.d3lLineIdx && firstD3lLineIdx < ml.d3lLineIdx + ml.srcRangeLength ) - { - iMLLStart = i; - } - if ( lastD3lLineIdx >= ml.d3lLineIdx && lastD3lLineIdx < ml.d3lLineIdx + ml.srcRangeLength ) - { - iMLLEnd = i; - ++iMLLEnd; - break; - } - } - - bool bJoined = false; - for( i=iMLLStart; i!=iMLLEnd && i!=m_mergeLineList.end(); ) - { - if ( i==iMLLStart ) - { - ++i; - } - else - { - iMLLStart->join(*i); - i = m_mergeLineList.erase( i ); - bJoined = true; - } - } - if (bJoined) - { - iMLLStart->mergeEditLineList.clear(); - // Insert a conflict line as placeholder - iMLLStart->mergeEditLineList.push_back( MergeEditLine( iMLLStart->id3l ) ); - } - setFastSelector( iMLLStart ); -} - -void MergeResultWindow::myUpdate(int afterMilliSecs) -{ - if ( m_delayedDrawTimer ) - killTimer(m_delayedDrawTimer); - m_bMyUpdate = true; - m_delayedDrawTimer = startTimer( afterMilliSecs ); -} - -void MergeResultWindow::timerEvent(QTimerEvent*) -{ - killTimer(m_delayedDrawTimer); - m_delayedDrawTimer = 0; - - if ( m_bMyUpdate ) - { - update(); - m_bMyUpdate = false; - } - - if ( m_scrollDeltaX != 0 || m_scrollDeltaY != 0 ) - { - m_selection.end( m_selection.lastLine + m_scrollDeltaY, m_selection.lastPos + m_scrollDeltaX ); - emit scroll( m_scrollDeltaX, m_scrollDeltaY ); - killTimer(m_delayedDrawTimer); - m_delayedDrawTimer = startTimer(50); - } -} - -QString MergeResultWindow::MergeEditLine::getString( const MergeResultWindow* mrw ) -{ - if ( isRemoved() ) { return QString(); } - - if ( ! isModified() ) - { - int src = m_src; - if ( src == 0 ) { return QString(); } - const Diff3Line& d3l = *m_id3l; - const LineData* pld = 0; - assert( src == A || src == B || src == C ); - if ( src == A && d3l.lineA!=-1 ) pld = &mrw->m_pldA[ d3l.lineA ]; - else if ( src == B && d3l.lineB!=-1 ) pld = &mrw->m_pldB[ d3l.lineB ]; - else if ( src == C && d3l.lineC!=-1 ) pld = &mrw->m_pldC[ d3l.lineC ]; - - if ( pld == 0 ) - { - // assert(false); This is no error. - return QString(); - } - - return QString( pld->pLine, pld->size ); - } - else - { - return m_str; - } - return 0; -} - -/// Converts the cursor-posOnScreen into a text index, considering tabulators. -int convertToPosInText( const QString& s, int posOnScreen, int tabSize ) -{ - int localPosOnScreen = 0; - int size=s.length(); - for ( int i=0; i=posOnScreen ) - return i; - - // All letters except tabulator have width one. - int letterWidth = s[i]!='\t' ? 1 : tabber( localPosOnScreen, tabSize ); - - localPosOnScreen += letterWidth; - - if ( localPosOnScreen>posOnScreen ) - return i; - } - return size; -} - - -/// Converts the index into the text to a cursor-posOnScreen considering tabulators. -int convertToPosOnScreen( const QString& p, int posInText, int tabSize ) -{ - int posOnScreen = 0; - for ( int i=0; i height() ) - return; - - yOffset += topLineYOffset; - - QString srcName = " "; - if ( bUserModified ) srcName = "m"; - else if ( srcSelect == A && mergeDetails != eNoChange ) srcName = "A"; - else if ( srcSelect == B ) srcName = "B"; - else if ( srcSelect == C ) srcName = "C"; - - if ( rangeMark & 4 ) - { - p.fillRect( xOffset, yOffset, width(), fontHeight, m_pOptionDialog->m_currentRangeBgColor ); - } - - if( (srcSelect > 0 || bUserModified ) && !bLineRemoved ) - { - int outPos = 0; - QString s; - int size = str.length(); - for ( int i=0; im_tabSize ); - for( int j=0; jm_tabSize ),m_pOptionDialog->m_tabSize ); - int lastPosInLine = convertToPosOnScreen( str, convertToPosInText( str, m_selection.lastPosInLine(line), m_pOptionDialog->m_tabSize ), m_pOptionDialog->m_tabSize ); - int lengthInLine = max2(0,lastPosInLine - firstPosInLine); - if (lengthInLine>0) m_selection.bSelectionContainsData = true; - - if ( lengthInLine < int(s.length()) ) - { // Draw a normal line first - p.setPen( m_pOptionDialog->m_fgColor ); - p.drawText( xOffset, yOffset+fontAscent, s.mid(m_firstColumn), true ); - } - int firstPosInLine2 = max2( firstPosInLine, m_firstColumn ); - int lengthInLine2 = max2(0,lastPosInLine - firstPosInLine2); - - if( m_selection.lineWithin( line+1 ) ) - p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset, - width(), fontHeight, palette().highlight() ); - else if ( lengthInLine2>0 ) - p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset, - fontWidth*lengthInLine2, fontHeight, palette().highlight() ); - - p.setPen( palette().highlightedText().color() ); - p.drawText( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset+fontAscent, - s.mid(firstPosInLine2,lengthInLine2), true ); - } - else - { - p.setPen( m_pOptionDialog->m_fgColor ); - p.drawText( xOffset, yOffset+fontAscent, s.mid(m_firstColumn), true ); - } - - p.setPen( m_pOptionDialog->m_fgColor ); - if ( m_cursorYPos==line ) - { - m_cursorXPos = minMaxLimiter( m_cursorXPos, 0, outPos ); - m_cursorXPos = convertToPosOnScreen( str, convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize ),m_pOptionDialog->m_tabSize ); - } - - p.drawText( 1, yOffset+fontAscent, srcName, true ); - } - else if ( bLineRemoved ) - { - p.setPen( m_pOptionDialog->m_colorForConflict ); - p.drawText( xOffset, yOffset+fontAscent, i18n("") ); - p.drawText( 1, yOffset+fontAscent, srcName ); - if ( m_cursorYPos==line ) m_cursorXPos = 0; - } - else if ( srcSelect == 0 ) - { - p.setPen( m_pOptionDialog->m_colorForConflict ); - if ( bWhiteSpaceConflict ) - p.drawText( xOffset, yOffset+fontAscent, i18n("") ); - else - p.drawText( xOffset, yOffset+fontAscent, i18n("") ); - p.drawText( 1, yOffset+fontAscent, "?" ); - if ( m_cursorYPos==line ) m_cursorXPos = 0; - } - else assert(false); - - xOffset -= fontWidth; - p.setPen( m_pOptionDialog->m_fgColor ); - if ( rangeMark & 1 ) // begin mark - { - p.drawLine( xOffset, yOffset+1, xOffset, yOffset+fontHeight/2 ); - p.drawLine( xOffset, yOffset+1, xOffset-2, yOffset+1 ); - } - else - { - p.drawLine( xOffset, yOffset, xOffset, yOffset+fontHeight/2 ); - } - - if ( rangeMark & 2 ) // end mark - { - p.drawLine( xOffset, yOffset+fontHeight/2, xOffset, yOffset+fontHeight-1 ); - p.drawLine( xOffset, yOffset+fontHeight-1, xOffset-2, yOffset+fontHeight-1 ); - } - else - { - p.drawLine( xOffset, yOffset+fontHeight/2, xOffset, yOffset+fontHeight ); - } - - if ( rangeMark & 4 ) - { - p.fillRect( xOffset + 3, yOffset, 3, fontHeight, m_pOptionDialog->m_fgColor ); -/* p.setPen( blue ); - p.drawLine( xOffset+2, yOffset, xOffset+2, yOffset+fontHeight-1 ); - p.drawLine( xOffset+3, yOffset, xOffset+3, yOffset+fontHeight-1 );*/ - } -} - -void MergeResultWindow::setPaintingAllowed(bool bPaintingAllowed) -{ - m_bPaintingAllowed = bPaintingAllowed; - if ( !m_bPaintingAllowed ) - { - m_currentMergeLineIt = m_mergeLineList.end(); - reset(); - } - update(); -} - -void MergeResultWindow::paintEvent( QPaintEvent* ) -{ - if (m_pDiff3LineList==0 || !m_bPaintingAllowed) - return; - - bool bOldSelectionContainsData = m_selection.bSelectionContainsData; - const QFontMetrics& fm = fontMetrics(); - int fontHeight = fm.height(); - int fontWidth = fm.width("W"); - int fontAscent = fm.ascent(); - - if ( !m_bCursorUpdate ) // Don't redraw everything for blinking cursor? - { - m_selection.bSelectionContainsData = false; - if ( size() != m_pixmap.size() ) - m_pixmap = QPixmap(size()); - - MyPainter p(&m_pixmap, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth); - p.setFont( font() ); - p.QPainter::fillRect( rect(), m_pOptionDialog->m_bgColor ); - - //int visibleLines = height() / fontHeight; - - int lastVisibleLine = m_firstLine + getNofVisibleLines() + 5; - int nofColumns = 0; - int line = 0; - MergeLineList::iterator mlIt = m_mergeLineList.begin(); - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - if ( line > lastVisibleLine || line + ml.mergeEditLineList.size() < m_firstLine) - { - line += ml.mergeEditLineList.size(); - } - else - { - MergeEditLineList::iterator melIt; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt ) - { - if (line>=m_firstLine && line<=lastVisibleLine) - { - MergeEditLine& mel = *melIt; - MergeEditLineList::iterator melIt1 = melIt; - ++melIt1; - - int rangeMark = 0; - if ( melIt==ml.mergeEditLineList.begin() ) rangeMark |= 1; // Begin range mark - if ( melIt1==ml.mergeEditLineList.end() ) rangeMark |= 2; // End range mark - - if ( mlIt == m_currentMergeLineIt ) rangeMark |= 4; // Mark of the current line - - QString s; - s = mel.getString( this ); - if ( convertToPosOnScreen(s,s.length(),m_pOptionDialog->m_tabSize) >nofColumns) - nofColumns = s.length(); - - writeLine( p, line, s, mel.src(), ml.mergeDetails, rangeMark, - mel.isModified(), mel.isRemoved(), ml.bWhiteSpaceConflict ); - } - ++line; - } - } - } - - if ( line != m_nofLines || nofColumns != m_nofColumns ) - { - m_nofLines = line; - assert( m_nofLines == m_totalSize ); - - m_nofColumns = nofColumns; - emit resizeSignal(); - } - - p.end(); - } - - QPainter painter(this); - - int topLineYOffset = 0; - int xOffset = fontWidth * leftInfoWidth; - //int yOffset = ( m_cursorYPos - m_firstLine ) * fontHeight + topLineYOffset; - //int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset; - - if ( !m_bCursorUpdate ) - painter.drawPixmap(0,0, m_pixmap); - else - { - painter.drawPixmap(0,0, m_pixmap ); // Draw everything. (Internally cursor rect is clipped anyway.) - //if (!m_pOptionDialog->m_bRightToLeftLanguage) - // painter.drawPixmap(xCursor-2, yOffset, m_pixmap, - // xCursor-2, yOffset, 5, fontAscent+2 ); - //else - // painter.drawPixmap(width()-1-4-(xCursor-2), yOffset, m_pixmap, - // width()-1-4-(xCursor-2), yOffset, 5, fontAscent+2 ); - m_bCursorUpdate = false; - } - painter.end(); - - if ( m_bCursorOn && hasFocus() && m_cursorYPos>=m_firstLine ) - { - MyPainter painter(this, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth); - int topLineYOffset = 0; - int xOffset = fontWidth * leftInfoWidth; - - int yOffset = ( m_cursorYPos-m_firstLine ) * fontHeight + topLineYOffset; - - int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset; - - painter.setPen( m_pOptionDialog->m_fgColor ); - - painter.drawLine( xCursor, yOffset, xCursor, yOffset+fontAscent ); - painter.drawLine( xCursor-2, yOffset, xCursor+2, yOffset ); - painter.drawLine( xCursor-2, yOffset+fontAscent+1, xCursor+2, yOffset+fontAscent+1 ); - } - - if( !bOldSelectionContainsData && m_selection.bSelectionContainsData ) - emit newSelection(); -} - -void MergeResultWindow::updateSourceMask() -{ - int srcMask=0; - int enabledMask = 0; - if( !hasFocus() || m_pDiff3LineList==0 || !m_bPaintingAllowed || m_currentMergeLineIt == m_mergeLineList.end() ) - { - srcMask = 0; - enabledMask = 0; - } - else - { - enabledMask = m_pldC==0 ? 3 : 7; - MergeLine& ml = *m_currentMergeLineIt; - - srcMask = 0; - bool bModified = false; - MergeEditLineList::iterator melIt; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt ) - { - MergeEditLine& mel = *melIt; - if ( mel.src()==1 ) srcMask |= 1; - if ( mel.src()==2 ) srcMask |= 2; - if ( mel.src()==3 ) srcMask |= 4; - if ( mel.isModified() || !mel.isEditableText() ) bModified = true; - } - - if ( ml.mergeDetails == eNoChange ) - { - srcMask = 0; - enabledMask = bModified ? 1 : 0; - } - } - - emit sourceMask( srcMask, enabledMask ); -} - -void MergeResultWindow::focusInEvent( QFocusEvent* e ) -{ - updateSourceMask(); - QWidget::focusInEvent(e); -} - -void MergeResultWindow::convertToLinePos( int x, int y, int& line, int& pos ) -{ - const QFontMetrics& fm = fontMetrics(); - int fontHeight = fm.height(); - int fontWidth = fm.width('W'); - int xOffset = (leftInfoWidth-m_firstColumn)*fontWidth; - int topLineYOffset = 0; - - int yOffset = topLineYOffset - m_firstLine * fontHeight; - - line = min2( ( y - yOffset ) / fontHeight, m_totalSize-1 ); - if ( ! m_pOptionDialog->m_bRightToLeftLanguage ) - pos = ( x - xOffset ) / fontWidth; - else - pos = ( (width() - 1 - x) - xOffset ) / fontWidth; -} - -void MergeResultWindow::mousePressEvent ( QMouseEvent* e ) -{ - m_bCursorOn = true; - - int line; - int pos; - convertToLinePos( e->x(), e->y(), line, pos ); - - bool bLMB = e->button() == Qt::LeftButton; - bool bMMB = e->button() == Qt::MidButton; - bool bRMB = e->button() == Qt::RightButton; - - if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection - { - m_cursorXPos = 0; - m_cursorOldXPos = 0; - m_cursorYPos = max2(line,0); - int l = 0; - MergeLineList::iterator i = m_mergeLineList.begin(); - for(i = m_mergeLineList.begin();i!=m_mergeLineList.end(); ++i) - { - if (l==line) - break; - - l += i->mergeEditLineList.size(); - if (l>line) - break; - } - m_selection.reset(); // Disable current selection - - m_bCursorOn = true; - setFastSelector( i ); - - if (bRMB) - { - showPopupMenu( QCursor::pos() ); - } - } - else if ( bLMB ) // Normal cursor placement - { - pos = max2(pos,0); - line = max2(line,0); - if ( e->QInputEvent::modifiers() & Qt::ShiftModifier ) - { - if (m_selection.firstLine==-1) - m_selection.start( line, pos ); - m_selection.end( line, pos ); - } - else - { - // Selection - m_selection.reset(); - m_selection.start( line, pos ); - m_selection.end( line, pos ); - } - m_cursorXPos = pos; - m_cursorOldXPos = pos; - m_cursorYPos = line; - - update(); - //showStatusLine( line, m_winIdx, m_pFilename, m_pDiff3LineList, m_pStatusBar ); - } - else if ( bMMB ) // Paste clipboard - { - pos = max2(pos,0); - line = max2(line,0); - - m_selection.reset(); - m_cursorXPos = pos; - m_cursorOldXPos = pos; - m_cursorYPos = line; - - pasteClipboard( true ); - } -} - -void MergeResultWindow::mouseDoubleClickEvent( QMouseEvent* e ) -{ - if ( e->button() == Qt::LeftButton ) - { - int line; - int pos; - convertToLinePos( e->x(), e->y(), line, pos ); - m_cursorXPos = pos; - m_cursorOldXPos = pos; - m_cursorYPos = line; - - // Get the string data of the current line - - MergeLineList::iterator mlIt; - MergeEditLineList::iterator melIt; - calcIteratorFromLineNr( line, mlIt, melIt ); - QString s = melIt->getString( this ); - - if ( !s.isEmpty() ) - { - int pos1, pos2; - - calcTokenPos( s, pos, pos1, pos2, m_pOptionDialog->m_tabSize ); - - resetSelection(); - m_selection.start( line, convertToPosOnScreen( s, pos1, m_pOptionDialog->m_tabSize ) ); - m_selection.end( line, convertToPosOnScreen( s, pos2, m_pOptionDialog->m_tabSize ) ); - - update(); - // emit selectionEnd() happens in the mouseReleaseEvent. - } - } -} - -void MergeResultWindow::mouseReleaseEvent ( QMouseEvent * e ) -{ - if ( e->button() == Qt::LeftButton ) - { - if (m_delayedDrawTimer) - { - killTimer(m_delayedDrawTimer); - m_delayedDrawTimer = 0; - } - - if (m_selection.firstLine != -1 ) - { - emit selectionEnd(); - } - } -} - -void MergeResultWindow::mouseMoveEvent ( QMouseEvent * e ) -{ - int line; - int pos; - convertToLinePos( e->x(), e->y(), line, pos ); - m_cursorXPos = pos; - m_cursorOldXPos = pos; - m_cursorYPos = line; - if (m_selection.firstLine != -1 ) - { - m_selection.end( line, pos ); - myUpdate(0); - - //showStatusLine( line, m_winIdx, m_pFilename, m_pDiff3LineList, m_pStatusBar ); - - // Scroll because mouse moved out of the window - const QFontMetrics& fm = fontMetrics(); - int fontWidth = fm.width('W'); - int topLineYOffset = 0; - int deltaX=0; - int deltaY=0; - if ( ! m_pOptionDialog->m_bRightToLeftLanguage ) - { - if ( e->x() < leftInfoWidth*fontWidth ) deltaX=-1; - if ( e->x() > width() ) deltaX=+1; - } - else - { - if ( e->x() > width()-1-leftInfoWidth*fontWidth ) deltaX=-1; - if ( e->x() < fontWidth ) deltaX=+1; - } - if ( e->y() < topLineYOffset ) deltaY=-1; - if ( e->y() > height() ) deltaY=+1; - m_scrollDeltaX = deltaX; - m_scrollDeltaY = deltaY; - if ( deltaX != 0 || deltaY!= 0) - { - emit scroll( deltaX, deltaY ); - } - } -} - - -void MergeResultWindow::slotCursorUpdate() -{ - m_cursorTimer.stop(); - m_bCursorOn = !m_bCursorOn; - - if ( isVisible() ) - { - m_bCursorUpdate = true; - - const QFontMetrics& fm = fontMetrics(); - int fontWidth = fm.width("W"); - int topLineYOffset = 0; - int xOffset = fontWidth * leftInfoWidth; - int yOffset = ( m_cursorYPos - m_firstLine ) * fm.height() + topLineYOffset; - int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset; - - if (!m_pOptionDialog->m_bRightToLeftLanguage) - repaint( xCursor-2, yOffset, 5, fm.ascent()+2 ); - else - repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 ); - - m_bCursorUpdate=false; - } - - m_cursorTimer.start(500); -} - - -void MergeResultWindow::wheelEvent( QWheelEvent* e ) -{ - int d = -e->delta()*QApplication::wheelScrollLines()/120; - e->accept(); - scroll( 0, min2(d, getNofVisibleLines()) ); -} - - -void MergeResultWindow::keyPressEvent( QKeyEvent* e ) -{ - int y = m_cursorYPos; - MergeLineList::iterator mlIt; - MergeEditLineList::iterator melIt; - calcIteratorFromLineNr( y, mlIt, melIt ); - - QString str = melIt->getString( this ); - int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize ); - - bool bCtrl = ( e->QInputEvent::modifiers() & Qt::ControlModifier ) != 0 ; - bool bShift = ( e->QInputEvent::modifiers() & Qt::ShiftModifier ) != 0 ; - #ifdef _WIN32 - bool bAlt = ( e->QInputEvent::modifiers() & Qt::AltModifier ) != 0 ; - if ( bCtrl && bAlt ){ bCtrl=false; bAlt=false; } // AltGr-Key pressed. - #endif - - bool bYMoveKey = false; - // Special keys - switch ( e->key() ) - { - case Qt::Key_Escape: break; - //case Key_Tab: break; - case Qt::Key_Backtab: break; - case Qt::Key_Delete: - { - if ( deleteSelection2( str, x, y, mlIt, melIt )) break; - if( !melIt->isEditableText() ) break; - if (x>=(int)str.length()) - { - if ( yisEditableText() ) - { - QString s2 = melIt1->getString( this ); - melIt->setString( str + s2 ); - - // Remove the line - if ( mlIt1->mergeEditLineList.size()>1 ) - mlIt1->mergeEditLineList.erase( melIt1 ); - else - melIt1->setRemoved(); - } - } - } - else - { - QString s = str.left(x); - s += str.mid( x+1 ); - melIt->setString( s ); - setModified(); - } - break; - } - case Qt::Key_Backspace: - { - if ( deleteSelection2( str, x, y, mlIt, melIt )) break; - if( !melIt->isEditableText() ) break; - if (x==0) - { - if ( y>0 ) - { - setModified(); - MergeLineList::iterator mlIt1; - MergeEditLineList::iterator melIt1; - calcIteratorFromLineNr( y-1, mlIt1, melIt1 ); - if ( melIt1->isEditableText() ) - { - QString s1 = melIt1->getString( this ); - melIt1->setString( s1 + str ); - - // Remove the previous line - if ( mlIt->mergeEditLineList.size()>1 ) - mlIt->mergeEditLineList.erase( melIt ); - else - melIt->setRemoved(); - - --y; - x=str.length(); - } - } - } - else - { - QString s = str.left( x-1 ); - s += str.mid( x ); - --x; - melIt->setString( s ); - setModified(); - } - break; - } - case Qt::Key_Return: - case Qt::Key_Enter: - { - if( !melIt->isEditableText() ) break; - deleteSelection2( str, x, y, mlIt, melIt ); - setModified(); - QString indentation; - if ( m_pOptionDialog->m_bAutoIndentation ) - { // calc last indentation - MergeLineList::iterator mlIt1 = mlIt; - MergeEditLineList::iterator melIt1 = melIt; - for(;;) { - const QString s = melIt1->getString(this); - if ( !s.isEmpty() ) { - int i; - for( i=0; imergeEditLineList.begin() ) - --melIt1; - else - { - if ( mlIt1 == m_mergeLineList.begin() ) break; - --mlIt1; - melIt1 = mlIt1->mergeEditLineList.end(); - --melIt1; - } - } - } - MergeEditLine mel(mlIt->id3l); // Associate every mel with an id3l, even if not really valid. - mel.setString( indentation + str.mid(x) ); - - if ( x<(int)str.length() ) // Cut off the old line. - { - // Since ps possibly points into melIt->str, first copy it into a temporary. - QString temp = str.left(x); - melIt->setString( temp ); - } - - ++melIt; - mlIt->mergeEditLineList.insert( melIt, mel ); - x = indentation.length(); - ++y; - break; - } - case Qt::Key_Insert: m_bInsertMode = !m_bInsertMode; break; - case Qt::Key_Pause: break; - case Qt::Key_Print: break; - case Qt::Key_SysReq: break; - case Qt::Key_Home: x=0; if(bCtrl){y=0; } break; // cursor movement - case Qt::Key_End: x=INT_MAX; if(bCtrl){y=INT_MAX;} break; - - case Qt::Key_Left: - case Qt::Key_Right: - if ( (e->key()==Qt::Key_Left) ^ m_pOptionDialog->m_bRightToLeftLanguage ) // operator^: XOR - { - if ( !bCtrl ) - { - --x; - if(x<0 && y>0){--y; x=INT_MAX;} - } - else - { - while( x>0 && (str[x-1]==' ' || str[x-1]=='\t') ) --x; - while( x>0 && (str[x-1]!=' ' && str[x-1]!='\t') ) --x; - } - } - else - { - if ( !bCtrl ) - { - ++x; if(x>(int)str.length() && ytext(); - if( t.isEmpty() || bCtrl ) - { e->ignore(); return; } - else - { - if( bCtrl ) - { - e->ignore(); return; - } - else - { - if( !melIt->isEditableText() ) break; - deleteSelection2( str, x, y, mlIt, melIt ); - - setModified(); - // Characters to insert - QString s=str; - if ( t[0]=='\t' && m_pOptionDialog->m_bReplaceTabs ) - { - int spaces = (m_cursorXPos / m_pOptionDialog->m_tabSize + 1)*m_pOptionDialog->m_tabSize - m_cursorXPos; - t.fill( ' ', spaces ); - } - if ( m_bInsertMode ) - s.insert( x, t ); - else - s.replace( x, t.length(), t ); - - melIt->setString( s ); - x += t.length(); - bShift = false; - } - } - } - } - - y = minMaxLimiter( y, 0, m_totalSize-1 ); - - calcIteratorFromLineNr( y, mlIt, melIt ); - str = melIt->getString( this ); - - x = minMaxLimiter( x, 0, (int)str.length() ); - - int newFirstLine = m_firstLine; - int newFirstColumn = m_firstColumn; - - if ( y m_firstLine + getNofVisibleLines() ) - newFirstLine = y - getNofVisibleLines(); - - if (bYMoveKey) - x=convertToPosInText( str, m_cursorOldXPos, m_pOptionDialog->m_tabSize ); - - int xOnScreen = convertToPosOnScreen( str, x, m_pOptionDialog->m_tabSize ); - if ( xOnScreen m_firstColumn + getNofVisibleColumns() ) - newFirstColumn = xOnScreen - getNofVisibleColumns(); - - if ( bShift ) - { - if (m_selection.firstLine==-1) - m_selection.start( m_cursorYPos, m_cursorXPos ); - - m_selection.end( y, xOnScreen ); - } - else - m_selection.reset(); - - m_cursorYPos = y; - m_cursorXPos = xOnScreen; - if ( m_cursorXPos>m_nofColumns ) - { - m_nofColumns = m_cursorXPos; - emit resizeSignal(); - } - if ( ! bYMoveKey ) - m_cursorOldXPos = m_cursorXPos; - - m_bCursorOn = false; - - if ( newFirstLine!=m_firstLine || newFirstColumn!=m_firstColumn ) - { - m_bCursorOn = true; - scroll( newFirstColumn-m_firstColumn, newFirstLine-m_firstLine ); - return; - } - - m_bCursorOn = true; - update(); -} - -void MergeResultWindow::calcIteratorFromLineNr( - int line, - MergeResultWindow::MergeLineList::iterator& mlIt, - MergeResultWindow::MergeEditLineList::iterator& melIt - ) -{ - for( mlIt = m_mergeLineList.begin(); mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - if ( line > ml.mergeEditLineList.size() ) - { - line -= ml.mergeEditLineList.size(); - } - else - { - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt ) - { - --line; - if (line<0) return; - } - } - } - assert(false); -} - - -QString MergeResultWindow::getSelection() -{ - QString selectionString; - - int line = 0; - MergeLineList::iterator mlIt = m_mergeLineList.begin(); - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - MergeEditLineList::iterator melIt; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt ) - { - MergeEditLine& mel = *melIt; - - if ( m_selection.lineWithin(line) ) - { - int outPos = 0; - if (mel.isEditableText()) - { - const QString str = mel.getString( this ); - - // Consider tabs - - for( int i=0; im_tabSize ); - } - - if( m_selection.within( line, outPos ) ) - { - selectionString += str[i]; - } - - outPos += spaces; - } - } - else if ( mel.isConflict() ) - { - selectionString += i18n(""); - } - - if( m_selection.within( line, outPos ) ) - { - #ifdef _WIN32 - selectionString += '\r'; - #endif - selectionString += '\n'; - } - } - - ++line; - } - } - - return selectionString; -} - -bool MergeResultWindow::deleteSelection2( QString& s, int& x, int& y, - MergeLineList::iterator& mlIt, MergeEditLineList::iterator& melIt ) -{ - if (m_selection.firstLine!=-1 && m_selection.bSelectionContainsData ) - { - deleteSelection(); - y = m_cursorYPos; - calcIteratorFromLineNr( y, mlIt, melIt ); - s = melIt->getString( this ); - x = convertToPosInText( s, m_cursorXPos, m_pOptionDialog->m_tabSize ); - return true; - } - return false; -} - -void MergeResultWindow::deleteSelection() -{ - if ( m_selection.firstLine==-1 || !m_selection.bSelectionContainsData ) - { - return; - } - setModified(); - - int line = 0; - MergeLineList::iterator mlItFirst; - MergeEditLineList::iterator melItFirst; - QString firstLineString; - - int firstLine = -1; - int lastLine = -1; - - MergeLineList::iterator mlIt; - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - MergeEditLineList::iterator melIt; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt ) - { - MergeEditLine& mel = *melIt; - - if ( mel.isEditableText() && m_selection.lineWithin(line) ) - { - if ( firstLine==-1 ) - firstLine = line; - lastLine = line; - } - - ++line; - } - } - - if ( firstLine == -1 ) - { - return; // Nothing to delete. - } - - line = 0; - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - MergeEditLineList::iterator melIt, melIt1; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ) - { - MergeEditLine& mel = *melIt; - melIt1 = melIt; - ++melIt1; - - if ( mel.isEditableText() && m_selection.lineWithin(line) ) - { - QString lineString = mel.getString( this ); - - int firstPosInLine = m_selection.firstPosInLine(line); - int lastPosInLine = m_selection.lastPosInLine(line); - - if ( line==firstLine ) - { - mlItFirst = mlIt; - melItFirst = melIt; - int pos = convertToPosInText( lineString, firstPosInLine, m_pOptionDialog->m_tabSize ); - firstLineString = lineString.left( pos ); - } - - if ( line==lastLine ) - { - // This is the last line in the selection - int pos = convertToPosInText( lineString, lastPosInLine, m_pOptionDialog->m_tabSize ); - firstLineString += lineString.mid( pos ); // rest of line - melItFirst->setString( firstLineString ); - } - - if ( line!=firstLine ) - { - // Remove the line - if ( mlIt->mergeEditLineList.size()>1 ) - mlIt->mergeEditLineList.erase( melIt ); - else - melIt->setRemoved(); - } - } - - ++line; - melIt = melIt1; - } - } - - m_cursorYPos = m_selection.beginLine(); - m_cursorXPos = m_selection.beginPos(); - m_cursorOldXPos = m_cursorXPos; - - m_selection.reset(); -} - -void MergeResultWindow::pasteClipboard( bool bFromSelection ) -{ - if (m_selection.firstLine != -1 ) - deleteSelection(); - - setModified(); - - int y = m_cursorYPos; - MergeLineList::iterator mlIt; - MergeEditLineList::iterator melIt, melItAfter; - calcIteratorFromLineNr( y, mlIt, melIt ); - melItAfter = melIt; - ++melItAfter; - QString str = melIt->getString( this ); - int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize ); - - if ( !QApplication::clipboard()->supportsSelection() ) - bFromSelection = false; - - QString clipBoard = QApplication::clipboard()->text( bFromSelection ? QClipboard::Selection : QClipboard::Clipboard ); - - QString currentLine = str.left(x); - QString endOfLine = str.mid(x); - int i; - int len = clipBoard.length(); - for( i=0; isetString( currentLine ); - MergeEditLine mel(mlIt->id3l); // Associate every mel with an id3l, even if not really valid. - melIt = mlIt->mergeEditLineList.insert( melItAfter, mel ); - currentLine = ""; - x=0; - ++y; - } - else - { - currentLine += c; - ++x; - } - } - - currentLine += endOfLine; - melIt->setString( currentLine ); - - m_cursorYPos = y; - m_cursorXPos = convertToPosOnScreen( currentLine, x, m_pOptionDialog->m_tabSize ); - m_cursorOldXPos = m_cursorXPos; - - update(); -} - -void MergeResultWindow::resetSelection() -{ - m_selection.reset(); - update(); -} - -void MergeResultWindow::setModified(bool bModified) -{ - if (bModified != m_bModified) - { - m_bModified = bModified; - emit modifiedChanged(m_bModified); - } -} - -/// Saves and returns true when successful. -bool MergeResultWindow::saveDocument( const QString& fileName, QTextCodec* pEncoding, e_LineEndStyle eLineEndStyle ) -{ - // Are still conflicts somewhere? - if ( getNrOfUnsolvedConflicts()>0 ) - { - KMessageBox::error( this, - i18n("Not all conflicts are solved yet.\n" - "File not saved.\n"), - i18n("Conflicts Left")); - return false; - } - - if ( eLineEndStyle==eLineEndStyleConflict || eLineEndStyle==eLineEndStyleUndefined ) - { - KMessageBox::error( this, - i18n("There is a line end style conflict. Please choose the line end style manually.\n" - "File not saved.\n"), - i18n("Conflicts Left")); - return false; - } - - update(); - - FileAccess file( fileName, true /*bWantToWrite*/ ); - if ( m_pOptionDialog->m_bDmCreateBakFiles && file.exists() ) - { - bool bSuccess = file.createBackup(".orig"); - if ( !bSuccess ) - { - KMessageBox::error( this, file.getStatusText() + i18n("\n\nCreating backup failed. File not saved."), i18n("File Save Error") ); - return false; - } - } - - QByteArray dataArray; - QTextStream textOutStream(&dataArray, QIODevice::WriteOnly); - if ( pEncoding->name()=="UTF-8" ) - textOutStream.setGenerateByteOrderMark( false ); // Shouldn't be necessary. Bug in Qt or docs - else - textOutStream.setGenerateByteOrderMark( true ); // Only for UTF-16 - textOutStream.setCodec( pEncoding ); - - int line = 0; - MergeLineList::iterator mlIt = m_mergeLineList.begin(); - for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt) - { - MergeLine& ml = *mlIt; - MergeEditLineList::iterator melIt; - for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt ) - { - MergeEditLine& mel = *melIt; - - if ( mel.isEditableText() ) - { - QString str = mel.getString( this ); - - if (line>0) // Prepend line feed, but not for first line - { - if ( eLineEndStyle == eLineEndStyleDos ) - { str.prepend("\r\n"); } - else - { str.prepend("\n"); } - } - - textOutStream << str; - ++line; - } - } - } - textOutStream.flush(); - bool bSuccess = file.writeFile( dataArray.data(), dataArray.size() ); - if ( ! bSuccess ) - { - KMessageBox::error( this, i18n("Error while writing."), i18n("File Save Error") ); - return false; - } - - setModified( false ); - update(); - - return true; -} - -QString MergeResultWindow::getString( int lineIdx ) -{ - MergeResultWindow::MergeLineList::iterator mlIt; - MergeResultWindow::MergeEditLineList::iterator melIt; - calcIteratorFromLineNr( lineIdx, mlIt, melIt ); - QString s = melIt->getString( this ); - return s; -} - -bool MergeResultWindow::findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive ) -{ - int it = d3vLine; - int endIt = bDirDown ? getNofLines() : -1; - int step = bDirDown ? 1 : -1; - int startPos = posInLine; - - for( ; it!=endIt; it+=step ) - { - QString line = getString( it ); - if ( !line.isEmpty() ) - { - int pos = line.indexOf( s, startPos, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive ); - if ( pos != -1 ) - { - d3vLine = it; - posInLine = pos; - return true; - } - - startPos = 0; - } - } - return false; -} - -void MergeResultWindow::setSelection( int firstLine, int startPos, int lastLine, int endPos ) -{ - if ( lastLine >= getNofLines() ) - { - lastLine = getNofLines()-1; - QString s = getString( lastLine ); - endPos = s.length(); - } - m_selection.reset(); - m_selection.start( firstLine, convertToPosOnScreen( getString(firstLine), startPos, m_pOptionDialog->m_tabSize ) ); - m_selection.end( lastLine, convertToPosOnScreen( getString(lastLine), endPos, m_pOptionDialog->m_tabSize ) ); - update(); -} - -Overview::Overview( OptionDialog* pOptions ) -//: QWidget( pParent, 0, Qt::WNoAutoErase ) -{ - m_pDiff3LineList = 0; - m_pOptions = pOptions; - m_bTripleDiff = false; - m_eOverviewMode = eOMNormal; - m_nofLines = 1; - m_bPaintingAllowed = false; - setFixedWidth(20); -} - -void Overview::init( Diff3LineList* pDiff3LineList, bool bTripleDiff ) -{ - m_pDiff3LineList = pDiff3LineList; - m_bTripleDiff = bTripleDiff; - m_pixmap = QPixmap( QSize(0,0) ); // make sure that a redraw happens - update(); -} - -void Overview::reset() -{ - m_pDiff3LineList = 0; -} - -void Overview::slotRedraw() -{ - m_pixmap = QPixmap( QSize(0,0) ); // make sure that a redraw happens - update(); -} - -void Overview::setRange( int firstLine, int pageHeight ) -{ - m_firstLine = firstLine; - m_pageHeight = pageHeight; - update(); -} -void Overview::setFirstLine( int firstLine ) -{ - m_firstLine = firstLine; - update(); -} - -void Overview::setOverviewMode( e_OverviewMode eOverviewMode ) -{ - m_eOverviewMode = eOverviewMode; - slotRedraw(); -} - -Overview::e_OverviewMode Overview::getOverviewMode() -{ - return m_eOverviewMode; -} - -void Overview::mousePressEvent( QMouseEvent* e ) -{ - int h = height()-1; - int h1 = h * m_pageHeight / max2(1,m_nofLines)+3; - if ( h>0 ) - emit setLine( ( e->y() - h1/2 )*m_nofLines/h ); -} - -void Overview::mouseMoveEvent( QMouseEvent* e ) -{ - mousePressEvent(e); -} - -void Overview::setPaintingAllowed( bool bAllowPainting ) -{ - if (m_bPaintingAllowed != bAllowPainting) - { - m_bPaintingAllowed = bAllowPainting; - if ( m_bPaintingAllowed ) update(); - else reset(); - } -} - -void Overview::drawColumn( QPainter& p, e_OverviewMode eOverviewMode, int x, int w, int h, int nofLines ) -{ - p.setPen(Qt::black); - p.drawLine( x, 0, x, h ); - - if (nofLines==0) return; - - int line = 0; - int oldY = 0; - int oldConflictY = -1; - int wrapLineIdx=0; - Diff3LineList::const_iterator i; - for( i = m_pDiff3LineList->begin(); i!= m_pDiff3LineList->end(); ) - { - const Diff3Line& d3l = *i; - int y = h * (line+1) / nofLines; - e_MergeDetails md; - bool bConflict; - bool bLineRemoved; - int src; - mergeOneLine( d3l, md, bConflict, bLineRemoved, src, !m_bTripleDiff ); - - QColor c = m_pOptions->m_bgColor; - bool bWhiteSpaceChange = false; - //if( bConflict ) c=m_pOptions->m_colorForConflict; - //else - if ( eOverviewMode==eOMNormal ) - { - switch( md ) - { - case eDefault: - case eNoChange: - c = m_pOptions->m_bgColor; - break; - - case eBAdded: - case eBDeleted: - case eBChanged: - c = bConflict ? m_pOptions->m_colorForConflict : m_pOptions->m_colorB; - bWhiteSpaceChange = d3l.bAEqB || d3l.bWhiteLineA && d3l.bWhiteLineB; - break; - - case eCAdded: - case eCDeleted: - case eCChanged: - bWhiteSpaceChange = d3l.bAEqC || d3l.bWhiteLineA && d3l.bWhiteLineC; - c = bConflict ? m_pOptions->m_colorForConflict : m_pOptions->m_colorC; - break; - - case eBCChanged: // conflict - case eBCChangedAndEqual: // possible conflict - case eBCDeleted: // possible conflict - case eBChanged_CDeleted: // conflict - case eCChanged_BDeleted: // conflict - case eBCAdded: // conflict - case eBCAddedAndEqual: // possible conflict - c=m_pOptions->m_colorForConflict; - break; - default: assert(false); break; - } - } - else if ( eOverviewMode==eOMAvsB ) - { - switch( md ) - { - case eDefault: - case eNoChange: - case eCAdded: - case eCDeleted: - case eCChanged: break; - default: c = m_pOptions->m_colorForConflict; - bWhiteSpaceChange = d3l.bAEqB || d3l.bWhiteLineA && d3l.bWhiteLineB; - break; - } - } - else if ( eOverviewMode==eOMAvsC ) - { - switch( md ) - { - case eDefault: - case eNoChange: - case eBAdded: - case eBDeleted: - case eBChanged: break; - default: c = m_pOptions->m_colorForConflict; - bWhiteSpaceChange = d3l.bAEqC || d3l.bWhiteLineA && d3l.bWhiteLineC; - break; - } - } - else if ( eOverviewMode==eOMBvsC ) - { - switch( md ) - { - case eDefault: - case eNoChange: - case eBCChangedAndEqual: - case eBCDeleted: - case eBCAddedAndEqual: break; - default: c=m_pOptions->m_colorForConflict; - bWhiteSpaceChange = d3l.bBEqC || d3l.bWhiteLineB && d3l.bWhiteLineC; - break; - } - } - - if (!bWhiteSpaceChange || m_pOptions->m_bShowWhiteSpace ) - { - // Make sure that lines with conflict are not overwritten. - if ( c == m_pOptions->m_colorForConflict ) - { - p.fillRect(x+1, oldY, w, max2(1,y-oldY), bWhiteSpaceChange ? QBrush(c,Qt::Dense4Pattern) : QBrush(c) ); - oldConflictY = oldY; - } - else if ( c!=m_pOptions->m_bgColor && oldY>oldConflictY ) - { - p.fillRect(x+1, oldY, w, max2(1,y-oldY), bWhiteSpaceChange ? QBrush(c,Qt::Dense4Pattern) : QBrush(c) ); - } - } - - oldY = y; - - ++line; - if ( m_pOptions->m_bWordWrap ) - { - ++wrapLineIdx; - if(wrapLineIdx>=d3l.linesNeededForDisplay) - { - wrapLineIdx=0; - ++i; - } - } - else - { - ++i; - } - } -} - -void Overview::paintEvent( QPaintEvent* ) -{ - if (m_pDiff3LineList==0 || !m_bPaintingAllowed ) return; - int h = height()-1; - int w = width(); - - - if ( m_pixmap.size() != size() ) - { - if ( m_pOptions->m_bWordWrap ) - { - m_nofLines = 0; - Diff3LineList::const_iterator i; - for( i = m_pDiff3LineList->begin(); i!= m_pDiff3LineList->end(); ++i ) - { - m_nofLines += i->linesNeededForDisplay; - } - } - else - { - m_nofLines = m_pDiff3LineList->size(); - } - - m_pixmap = QPixmap( size() ); - - QPainter p(&m_pixmap); - p.fillRect( rect(), m_pOptions->m_bgColor ); - - if ( !m_bTripleDiff || m_eOverviewMode == eOMNormal ) - { - drawColumn( p, eOMNormal, 0, w, h, m_nofLines ); - } - else - { - drawColumn( p, eOMNormal, 0, w/2, h, m_nofLines ); - drawColumn( p, m_eOverviewMode, w/2, w/2, h, m_nofLines ); - } - } - - QPainter painter( this ); - painter.drawPixmap( 0,0, m_pixmap ); - - int y1 = h * m_firstLine / m_nofLines-1; - int h1 = h * m_pageHeight / m_nofLines+3; - painter.setPen(Qt::black); - painter.drawRect( 1, y1, w-1, h1 ); -} - -WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog) -{ - m_pOptionDialog = pOptionDialog; - setAutoFillBackground(true); - - QHBoxLayout* pHLayout = new QHBoxLayout(this); - pHLayout->setMargin(2); - pHLayout->setSpacing(2); - - m_pLabel = new QLabel(i18n("Output")+":"); - pHLayout->addWidget( m_pLabel ); - - m_pFileNameLineEdit = new QLineEdit(); - pHLayout->addWidget( m_pFileNameLineEdit, 6 ); - m_pFileNameLineEdit->installEventFilter( this ); - m_pFileNameLineEdit->setReadOnly( true ); - - //m_pBrowseButton = new QPushButton("..."); - //pHLayout->addWidget( m_pBrowseButton, 0 ); - //connect( m_pBrowseButton, SIGNAL(clicked()), this, SLOT(slotBrowseButtonClicked())); - - m_pModifiedLabel = new QLabel(i18n("[Modified]")); - pHLayout->addWidget( m_pModifiedLabel ); - m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->sizeHint() ); - m_pModifiedLabel->setText(""); - - pHLayout->addStretch(1); - - m_pEncodingLabel = new QLabel(i18n("Encoding for saving")+":"); - pHLayout->addWidget( m_pEncodingLabel ); - - m_pEncodingSelector = new QComboBox(); - m_pEncodingSelector->setSizeAdjustPolicy( QComboBox::AdjustToContents ); - pHLayout->addWidget( m_pEncodingSelector, 2 ); - setEncodings(0,0,0); - - m_pLineEndStyleLabel = new QLabel( i18n("Line end style:") ); - pHLayout->addWidget( m_pLineEndStyleLabel ); - m_pLineEndStyleSelector = new QComboBox(); - m_pLineEndStyleSelector->setSizeAdjustPolicy( QComboBox::AdjustToContents ); - pHLayout->addWidget( m_pLineEndStyleSelector ); - setLineEndStyles(eLineEndStyleUndefined,eLineEndStyleUndefined,eLineEndStyleUndefined); -} - -void WindowTitleWidget::setFileName( const QString& fileName ) -{ - m_pFileNameLineEdit->setText( QDir::toNativeSeparators(fileName) ); -} - -QString WindowTitleWidget::getFileName() -{ - return m_pFileNameLineEdit->text(); -} - -static QString getLineEndStyleName( e_LineEndStyle eLineEndStyle ) -{ - if ( eLineEndStyle == eLineEndStyleDos ) - return "DOS"; - else if ( eLineEndStyle == eLineEndStyleUnix ) - return "Unix"; - return QString(); -} - -void WindowTitleWidget::setLineEndStyles( e_LineEndStyle eLineEndStyleA, e_LineEndStyle eLineEndStyleB, e_LineEndStyle eLineEndStyleC) -{ - m_pLineEndStyleSelector->clear(); - QString dosUsers; - if ( eLineEndStyleA == eLineEndStyleDos ) - dosUsers += "A"; - if ( eLineEndStyleB == eLineEndStyleDos ) - dosUsers += (dosUsers.isEmpty() ? "" : ", ") + QString("B"); - if ( eLineEndStyleC == eLineEndStyleDos ) - dosUsers += (dosUsers.isEmpty() ? "" : ", ") + QString("C"); - QString unxUsers; - if ( eLineEndStyleA == eLineEndStyleUnix ) - unxUsers += "A"; - if ( eLineEndStyleB == eLineEndStyleUnix ) - unxUsers += (unxUsers.isEmpty() ? "" : ", ") + QString("B"); - if ( eLineEndStyleC == eLineEndStyleUnix ) - unxUsers += (unxUsers.isEmpty() ? "" : ", ") + QString("C"); - - m_pLineEndStyleSelector->addItem( i18n("Unix") + (unxUsers.isEmpty() ? "" : " (" + unxUsers + ")" ) ); - m_pLineEndStyleSelector->addItem( i18n("DOS") + (dosUsers.isEmpty() ? "" : " (" + dosUsers + ")" ) ); - - e_LineEndStyle autoChoice = (e_LineEndStyle)m_pOptionDialog->m_lineEndStyle; - - if ( m_pOptionDialog->m_lineEndStyle == eLineEndStyleAutoDetect ) - { - if ( eLineEndStyleA != eLineEndStyleUndefined && eLineEndStyleB != eLineEndStyleUndefined && eLineEndStyleC != eLineEndStyleUndefined ) - { - if ( eLineEndStyleA == eLineEndStyleB ) - autoChoice = eLineEndStyleC; - else if ( eLineEndStyleA == eLineEndStyleC ) - autoChoice = eLineEndStyleB; - else - autoChoice = eLineEndStyleConflict; //conflict (not likely while only two values exist) - } - else - { - e_LineEndStyle c1, c2; - if ( eLineEndStyleA == eLineEndStyleUndefined ) { c1 = eLineEndStyleB; c2 = eLineEndStyleC; } - else if( eLineEndStyleB == eLineEndStyleUndefined ) { c1 = eLineEndStyleA; c2 = eLineEndStyleC; } - else /*if( eLineEndStyleC == eLineEndStyleUndefined )*/ { c1 = eLineEndStyleA; c2 = eLineEndStyleB; } - if ( c1 == c2 && c1!=eLineEndStyleUndefined ) - autoChoice = c1; - else - autoChoice = eLineEndStyleConflict; - } - } - - if ( autoChoice == eLineEndStyleUnix ) - m_pLineEndStyleSelector->setCurrentIndex(0); - else if ( autoChoice == eLineEndStyleDos ) - m_pLineEndStyleSelector->setCurrentIndex(1); - else if ( autoChoice == eLineEndStyleConflict ) - { - m_pLineEndStyleSelector->addItem( i18n("Conflict") ); - m_pLineEndStyleSelector->setCurrentIndex(2); - } -} - -e_LineEndStyle WindowTitleWidget::getLineEndStyle( ) -{ - - int current = m_pLineEndStyleSelector->currentIndex(); - if (current == 0) - return eLineEndStyleUnix; - else if (current == 1) - return eLineEndStyleDos; - else - return eLineEndStyleConflict; -} - -void WindowTitleWidget::setEncodings( QTextCodec* pCodecForA, QTextCodec* pCodecForB, QTextCodec* pCodecForC ) -{ - m_pEncodingSelector->clear(); - - // First sort codec names: - std::map names; - QList mibs = QTextCodec::availableMibs(); - foreach(int i, mibs) - { - QTextCodec* c = QTextCodec::codecForMib(i); - if ( c!=0 ) - names[QString(c->name())]=c; - } - - if ( pCodecForA ) - m_pEncodingSelector->addItem( i18n("Codec from") + " A: " + pCodecForA->name(), QVariant::fromValue((void*)pCodecForA) ); - if ( pCodecForB ) - m_pEncodingSelector->addItem( i18n("Codec from") + " B: " + pCodecForB->name(), QVariant::fromValue((void*)pCodecForB) ); - if ( pCodecForC ) - m_pEncodingSelector->addItem( i18n("Codec from") + " C: " + pCodecForC->name(), QVariant::fromValue((void*)pCodecForC) ); - - std::map::iterator it; - for(it=names.begin();it!=names.end();++it) - { - m_pEncodingSelector->addItem( it->first, QVariant::fromValue((void*)it->second) ); - } - m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->sizeHint() ); - - if ( pCodecForC && pCodecForB && pCodecForA ) - { - if ( pCodecForA == pCodecForB ) - m_pEncodingSelector->setCurrentIndex( 2 ); // C - else if ( pCodecForA == pCodecForC ) - m_pEncodingSelector->setCurrentIndex( 1 ); // B - else - m_pEncodingSelector->setCurrentIndex( 2 ); // C - } - else if ( pCodecForA && pCodecForB ) - m_pEncodingSelector->setCurrentIndex( 1 ); // B - else - m_pEncodingSelector->setCurrentIndex( 0 ); -} - -QTextCodec* WindowTitleWidget::getEncoding() -{ - return (QTextCodec*)m_pEncodingSelector->itemData( m_pEncodingSelector->currentIndex() ).value(); -} - -void WindowTitleWidget::setEncoding(QTextCodec* pEncoding) -{ - int idx = m_pEncodingSelector->findText( pEncoding->name() ); - if (idx>=0) - m_pEncodingSelector->setCurrentIndex( idx ); -} - -//void WindowTitleWidget::slotBrowseButtonClicked() -//{ -// QString current = m_pFileNameLineEdit->text(); -// -// KUrl newURL = KFileDialog::getSaveUrl( current, 0, this, i18n("Select file (not saving yet)")); -// if ( !newURL.isEmpty() ) -// { -// m_pFileNameLineEdit->setText( newURL.url() ); -// } -//} - -void WindowTitleWidget::slotSetModified( bool bModified ) -{ - m_pModifiedLabel->setText( bModified ? i18n("[Modified]") : "" ); -} - -bool WindowTitleWidget::eventFilter( QObject* o, QEvent* e ) -{ - if ( e->type()==QEvent::FocusIn || e->type()==QEvent::FocusOut ) - { - QPalette p = m_pLabel->palette(); - - QColor c1 = m_pOptionDialog->m_fgColor; - QColor c2 = Qt::lightGray; - if ( e->type()==QEvent::FocusOut ) - c2 = m_pOptionDialog->m_bgColor; - - p.setColor(QPalette::Window, c2); - setPalette( p ); - - p.setColor(QPalette::WindowText, c1); - m_pLabel->setPalette( p ); - m_pEncodingLabel->setPalette( p ); - m_pEncodingSelector->setPalette( p ); - } - if (o == m_pFileNameLineEdit && e->type()==QEvent::Drop) - { - QDropEvent* d = static_cast(e); - - if ( d->mimeData()->hasUrls() ) - { - QList lst = d->mimeData()->urls(); - - if ( lst.count() > 0 ) - { - static_cast(o)->setText( lst[0].toString() ); - static_cast(o)->setFocus(); - return true; - } - } - } - return false; -} - -//#include "mergeresultwindow.moc" Index: trunk/extragear/utils/kdiff3/COPYING =================================================================== --- trunk/extragear/utils/kdiff3/COPYING (revision 1510721) +++ trunk/extragear/utils/kdiff3/COPYING (nonexistent) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Index: trunk/extragear/utils/kdiff3/INSTALL =================================================================== --- trunk/extragear/utils/kdiff3/INSTALL (revision 1510721) +++ trunk/extragear/utils/kdiff3/INSTALL (nonexistent) @@ -1,3 +0,0 @@ -Build instructions can be found at -http://techbase.kde.org/Getting_Started/Build/KDE4 - Index: trunk/extragear/utils/kdiff3/config-kdiff3.h.cmake =================================================================== --- trunk/extragear/utils/kdiff3/config-kdiff3.h.cmake (revision 1510721) +++ trunk/extragear/utils/kdiff3/config-kdiff3.h.cmake (nonexistent) @@ -1,244 +0,0 @@ -/* config-kdiff3.h.cmake. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_CARBON_CARBON_H - -/* Define if you have the CoreAudio API */ -#undef HAVE_COREAUDIO - -/* Define to 1 if you have the header file. */ -#undef HAVE_CRT_EXTERNS_H - -/* Defines if your system has the crypt function */ -#undef HAVE_CRYPT - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define if you have libjpeg */ -#undef HAVE_LIBJPEG - -/* Define if you have libpng */ -#undef HAVE_LIBPNG - -/* Define if you have a working libpthread (will enable threaded code) */ -#undef HAVE_LIBPTHREAD - -/* Define if you have libz */ -#undef HAVE_LIBZ - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define if your system needs _NSGetEnviron to set up the environment */ -#undef HAVE_NSGETENVIRON - -/* Define if you have res_init */ -#undef HAVE_RES_INIT - -/* Define if you have the res_init prototype */ -#undef HAVE_RES_INIT_PROTO - -/* Define if you have a STL implementation by SGI */ -#undef HAVE_SGI_STL - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define if you have strlcat */ -#undef HAVE_STRLCAT - -/* Define if you have the strlcat prototype */ -#undef HAVE_STRLCAT_PROTO - -/* Define if you have strlcpy */ -#undef HAVE_STRLCPY - -/* Define if you have the strlcpy prototype */ -#undef HAVE_STRLCPY_PROTO - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_BITYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - -/* Suffix for lib directories */ -#undef KDELIBSUFF - -/* Define a safe value for MAXPATHLEN */ -#undef KDEMAXPATHLEN - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of `char *', as computed by sizeof. */ -#undef SIZEOF_CHAR_P - -/* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT - -/* The size of `long', as computed by sizeof. */ -#undef SIZEOF_LONG - -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Defined if compiling without arts */ -#undef WITHOUT_ARTS - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system - * headers and I'm too lazy to write a configure test as long as only - * unixware is related - */ -#ifdef _UNIXWARE -#define HAVE_BOOLEAN -#endif - - - -/* - * AIX defines FD_SET in terms of bzero, but fails to include - * that defines bzero. - */ - -#if defined(_AIX) -#include -#endif - - - -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include -# include -# define environ (*_NSGetEnviron()) -#endif - - - -#if !defined(HAVE_RES_INIT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -int res_init(void); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCAT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcat(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCPY_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcpy(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - - -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ - -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include -#include -#else -#include -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif - - - -#if defined(__SVR4) && !defined(__svr4__) -#define __svr4__ 1 -#endif - - -/* type to use in place of socklen_t if not defined */ -#undef kde_socklen_t - -/* type to use in place of socklen_t if not defined (deprecated, use - kde_socklen_t) */ -#undef ksize_t Index: trunk/extragear/utils/kdiff3/KDiff3.kdevses =================================================================== --- trunk/extragear/utils/kdiff3/KDiff3.kdevses (revision 1510721) +++ trunk/extragear/utils/kdiff3/KDiff3.kdevses (nonexistent) @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/extragear/utils/kdiff3/TODO =================================================================== --- trunk/extragear/utils/kdiff3/TODO (revision 1510721) +++ trunk/extragear/utils/kdiff3/TODO (nonexistent) @@ -1,119 +0,0 @@ -This file contains some feature-wishes for future KDiff3-versions. - -TODO -==== - -- Fix drawing in columns A/B/C-directory window -- Qt4-translation files -- Double clicking into empty area causes crash -- Option window is too big (within KDE). (Scrollable?) -- Windows issues: - - Diff-Ext-For-KDiff3 included in the installer - - language selection from within KDiff3 -- Export to html-format file -- Export to diff-format output (and import?) -- Export to diff3-format output (and import?) -- Use diff-output as input -- Variable width fonts. - - - Use regular expression to ignore certain patterns - - Start without visible compare widgets. (? what did I mean by that) - -- Hardlinks -performance support -- Manual alignment during merge should tell user his data will be lost -- Installer for windows for users. -- "List Only Deltas" causes directory merge to delete files - (https://sourceforge.net/tracker/index.php?func=detail&aid=1004853&group_id=58666&atid=488548) -- Diff-view for binary files -- Diff-view for pictures - -> > What I find weird is that KDiff3 first creates the 3-way merge view (so -> > the window splits in 4 parts), then closes that and reopens in 2-way -> > diff view. I've never seen the binary package do that. Can this be fixed? - - -- Only show different lines. - -- ftp: Abbruch beim Einlesen von Verzeichnis stoppt nicht vollständig - -- Projekt-Verwaltung: Die ganze Config-Datei (=Projektdatei) an einen benutzerdefinierten Ort zu legen. (Keine Angabe->Default) -- Bei Combobox-History alle Elemente von (A/B/C/Out) anzeigen. - -- Test on empty floppy drive. - --I suppose this has been asked before, but are there any plans to use - colors for change/insert/delete (i.e. blue = change, green = insert, red - = delete)? - -> I want to compare two revisions of a file (eventually I wanna do this on -> two directory hierarchies of files) and have an output of how many lines -> of code were added, modified, and deleted for each file and overall. - -> Also, for "Send To" from Windows, it would be nice if I could pick one -> file via Send To, find the second file (if it's in a different -> directory), and click "Send To" again to compare. I.e., when user does -> "Send To", if one instance is already open and waiting for a second -> file, the first instance is used. - - -- kdiff3 does not preserve the permissions of files it overwrites during a 'save' operation. - -- Insbesondere Ausführbarkeit "x" und Schreibschutz "w" sollten erhalten bleiben. - -- Under Windows: Shortcut Ctrl-Shift-2 (for select B everywhere doesn't work.) -- Paste from Clipboard doesn't work. - -- Bug: Comment section isn't recognized as nonwhite difference if several lines are between /* and */ on one side. - - -- Overview-option to show only remaining conflicts. -- Overview bar for merge-window and for directory-window. - -- ??? The gutters (kdiff3 have 2 "gutters") fonts and background-foreground colors sholud be configured other - than the "general" foreground-background colors. Otherwise they are confused with the main dialog. - -- Try to autodetect the line-end-style -- Ignore cvs-keywords like $Revision: x.y$ - -- Undo function in the merge-editor. -- More viewing options for directory widget. - -- And one observation. When select Cyrillic charset - it looks like it was - not saved. When open this dialog again - Latin charset is selected anyway. -- Add options to specify charset. -- Ask before saving to a file that already exists (optionally). -- Don't overwrite existing .orig-file, when saving the second time. - -- File Menu: Close (Ctrl-F4): Close current file (check if saved and forget the data) -- Dirview: - - Multiselections: Changing Operations or applying ops for all selected items. - - Optionally show size/date for A/B/C - - Choose what to see (all or only different items) - - If only different items are visible: copy the others nevertheless to destdir. - - Warnung wenn Datum in B oder C älter als A ist. - - Zielverzeichnis nachträglich änderbar - - Bei Kopie von Remote nach lokal: Auf jeden Fall das modification Datum setzen. - - Ctrl-Space doesn't work when a file comparison takes place. - - Option to allow case-insensitive filename-matching. -- Options to show/suppress annoying messages - -- What's this-Help. -- Tip of the day. - -More Statistics before the merge begins: -- How many files are there? -- How many files are equal/different? -- How many files would be copies/merged/ignored? - -- Allow to view and merge CVS-conflict files (and diff3-output) and allow to save output - with conflicts in diff3 output-format. - -- Provide configure-rules for systems without KDE. (I need help here.) - -- Allow different comment-styles (e.g. via a regexp for comments) - -- Possibility to jump to next difference in the same line (for very long lines). - -- Allow analysis of unified directory-diff/patch-file. - -- LineEdit for Save-Filename Index: trunk/extragear/utils/kdiff3/doc/README =================================================================== --- trunk/extragear/utils/kdiff3/doc/README (revision 1510721) +++ trunk/extragear/utils/kdiff3/doc/README (nonexistent) @@ -1,80 +0,0 @@ -README for the Documentation -============================ -Author: Joachim Eibl, 2004-02-22 - -The following text contains some info about how the docs are created. -It helps me remember certain details. Most users probably aren't -interested in these things. - -Docbook references: -http://i18n.kde.org/doc/markup/index.html -http://opensource.bureau-cornavin.com/crash-course/index.html - -Each directory contains the documentation for a different translation. -The textual information is in the index.docbook of every subdirectory. - -I wrote the English version in en/index.docbook. The other translations -were done by the KDE-Internationalization-Team. They are doing a great -job! - - -The command meinproc (which is part of KDE) can be used to convert this -file into HTML. - -meinproc index.docbook - -If you prefer everything in one big HTML/Postscript/PDF-file: - LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl - (The LANG=de_DE prevents that meinproc writes the file in UTF-8 encoding, which isn't understood by html2ps.) -Create ps-file: - html2ps -D -u -n index.html >index.ps - (For the -D to work add the line "Ghostscript: 1;" in the "package"-section of file /usr/lib/html2ps/html2psrc.) -Create pdf-file: - ps2pdf index.ps index.pdf - -The script createpdfdoc does these steps for all subdirectories. - -During normal installation on KDE a compressed file is generated: -meinproc --check --cache index.cache.bz2 index.docbook - - -As a service for non-KDE-users the en-directory also contains the -HTML-version of the English documentation. - -After running meinproc the HTML-files contain some references to files -in help:/common/ which contains stylesheets and KDE-graphics which make -the result look much prettier. Because on non-KDE-systems this is not -available, I placed a copy of these files in doc/en/common. -To correct the references, I run the following command, which removes -the "help:/"-part of the references, and only the "common/"-part remains. - -for i in *.html; do sed -i "s/help:\///g" $i; done - -(sed-option "-i" means in-place, "s/orig/repl/" is the replacement-command, -"g" replaces every occurance in the line, not only the first.) - -The screenshots were made with the English KDE-version and therefore are -placed in the en-directory. But since for the other translations no new -screenshots were made yet, they only contain links to the English -screenshots. These links are created en-bloc with this command. (But -first you must cd into each subdirectory.) - -for i in `ls ../en | grep png`; do ln -s ../en/$i $i; done - -Command to retrieve other translations from cvs: - -cvs co kde-i18n/subdirs -#for i in `cat kde-i18n/subdirs`; do cvs co kde-i18n/$i/docs/kdeextragear-1/kdiff3/index.docbook; done -for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/docs/extragear-utils/kdiff3/index.docbook -O $i.docbook; done - -If a new translation is available, -- create a new directory, -- copy the index.docbook file there, -- copy a Makefile.am there and correct it, -- edit the doc/Makefile.am to include the new subdir, -- create the links for the graphics, -- and don't forget to run make -f Makefile.cvs in the top directory. - - - - Index: trunk/extragear/utils/kdiff3/doc/createpdfdoc =================================================================== --- trunk/extragear/utils/kdiff3/doc/createpdfdoc (revision 1510721) +++ trunk/extragear/utils/kdiff3/doc/createpdfdoc (nonexistent) @@ -1,8 +0,0 @@ -for i in `find * -maxdepth 0 -type d`; do -cd $i -echo $i -LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl -html2ps -D -u -n index.html >index.ps -ps2pdf index.ps ../kdiff3_$i.pdf -cd .. -done Index: trunk/extragear/utils/kdiff3/cmake/modules/FindLibKonq.cmake =================================================================== --- trunk/extragear/utils/kdiff3/cmake/modules/FindLibKonq.cmake (revision 1510721) +++ trunk/extragear/utils/kdiff3/cmake/modules/FindLibKonq.cmake (nonexistent) @@ -1,39 +0,0 @@ -# - Try to find konqueror library -# Once done this will define -# -# LIBKONQ_FOUND - system has libkonq library -# LIBKONQ_INCLUDE_DIR - the LIBKONQ include directory -# LIBKONQ_LIBRARY - the libkonq library -# -# Original file: FindMarbleWidget.cmake (found in digikam-0.10.0-beta2) -# copyright 2008 by Patrick Spendrin -# use this file as you like -# -# Modifications to find libkonq by Joachim Eibl 2008 - -if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - - # Already in cache - set(LIBKONQ_FOUND TRUE) - -else(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h ) - - find_library(LIBKONQ_LIBRARY konq) - - if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - set(LIBKONQ_FOUND TRUE) - endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - - if(LIBKONQ_FOUND) - if (NOT LIBKONQ_FIND_QUIETLY) - message(STATUS "Found libkonq: ${LIBKONQ_LIBRARY}") - endif (NOT LIBKONQ_FIND_QUIETLY) - else(LIBKONQ_FOUND) - if(LIBKONQ_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find KDE4 libkonq library") - endif(LIBKONQ_FIND_REQUIRED) - endif(LIBKONQ_FOUND) - - mark_as_advanced(LIBKONQ_INCLUDE_DIR LIBKONQ_LIBRARY) -endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) Index: trunk/extragear/utils/kdiff3/NEWS =================================================================== --- trunk/extragear/utils/kdiff3/NEWS (revision 1510721) +++ trunk/extragear/utils/kdiff3/NEWS (nonexistent) @@ -1 +0,0 @@ -See the ChangeLog Index: trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/Messages.sh =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/Messages.sh (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/Messages.sh (nonexistent) @@ -1,2 +0,0 @@ -#! /usr/bin/env bash -$XGETTEXT -kaliasLocal `find -name \*.cpp -o -name \*.h` -o $podir/kdiff3fileitemactionplugin.pot Index: trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/CMakeLists.txt =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/CMakeLists.txt (nonexistent) @@ -1,4 +0,0 @@ -kde4_add_plugin(kdiff3fileitemaction kdiff3fileitemaction.cpp) -target_link_libraries(kdiff3fileitemaction ${KDE4_KIO_LIBS} ${LibKDiff3_LIBRARIES}) -install(TARGETS kdiff3fileitemaction DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES kdiff3fileitemaction.desktop DESTINATION ${SERVICES_INSTALL_DIR}) Index: trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop (nonexistent) @@ -1,96 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service -Name=Compare/Merge Files/Directories with KDiff3 -Name[bg]=Сравняване/Сливане на файлове/директории с KDiff3 -Name[bs]=Poredi/Spoji datoteke/Direktorije sa KDiff3 -Name[ca]=Compara/fusiona fitxers/directoris amb KDiff3 -Name[ca@valencia]=Compara/fusiona fitxers/directoris amb KDiff3 -Name[cs]=Porovnat/spojit soubory/adresáře pomocí KDiff3 -Name[da]=Sammenlign/sammenflet filer/mapper med KDiff3 -Name[de]=Dateien und Ordner vergleichen und zusammenführen mit KDiff3 -Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων με το KDiff3 -Name[en_GB]=Compare/Merge Files/Directories with KDiff3 -Name[es]=Comparar/fusionar archivos/directorios con KDiff3 -Name[et]=Failide/kataloogide võrdlemine/liitmine KDiff3-ga -Name[fi]=Vertaa ja yhdistä tiedostoja sekä hakemistoja KDiff3:lla -Name[fr]=Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 » -Name[ga]=Cuir Comhaid/Comhadlanna i gComparáid agus Cumaisc iad le KDiff3 -Name[gl]=Compara e fusiona ficheiros e directorios con KDiff3 -Name[hi]=केडिफ़३ के साथ तुलना करें/मिलाएं फ़ाइलें/डिरेक्ट्रीज़ -Name[hne]=केडिफ३ के साथ तुलना करव/मिलाव फाइल/डिरेक्टरीज मन ल -Name[hu]=Fájlok/Könyvtárat KDiff3-mal való összehasonlítása/egyesítése -Name[it]=Confronta o fondi file e cartelle con KDiff3 -Name[ja]=KDiff3 でファイルやディレクトリを比較/マージ -Name[km]=ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត​ជាមួយ KDiff3 -Name[ko]=KDiff3으로 파일과 디렉터리를 비교하거나 병합합니다 -Name[lt]=Palyginti/Sulieti failus/Direktorijas su KDiff3 -Name[ml]=ഫയലുകള്‍/അറകള്‍ താരതമ്യം ചെയ്യുക/കെഡിഫ്3 ഉപയോഗിച്ചു് ലയിപ്പിക്കുക -Name[nb]=Samenlikne/flette filer/mapper med KDiff3 -Name[nds]=Verglieken Tosamenföhren vun Dateien/Ornern mit KDiff3 -Name[nl]=Bestanden/mappen vergelijken/samenvoegen met KDiff3 -Name[nn]=Samanlikn/flett filer og mapper med KDiff3 -Name[pl]=Porównaj/Scal pliki/katalogi przy pomocy KDiff3 -Name[pt]=Comparar/Juntar os Ficheiros/Pastas com o KDiff3 -Name[pt_BR]=Comparar/Mesclar arquivos/pastas com o KDiff3 -Name[ro]=Compară/îmbină fișiere/directoare cu KDiff3 -Name[ru]=Сравнение и объединение файлов и каталогов в KDiff3 -Name[sk]=Porovnať/zlúčiť súbory/adresáre s KDiff3 -Name[sl]=Primerjajte/združujte datoteke/mape z KDiff3 -Name[sr]=Поређење и стапање фајлова и фасцикли К‑диф3 -Name[sr@ijekavian]=Поређење и стапање фајлова и фасцикли К‑диф3 -Name[sr@ijekavianlatin]=Poređenje i stapanje fajlova i fascikli KDiff3 -Name[sr@latin]=Poređenje i stapanje fajlova i fascikli KDiff3 -Name[sv]=Jämför, sammanfoga filer, kataloger med Kdiff3 -Name[tr]=KDiff3 ile Dosyaları/Dizinleri Karşılaştır/Birleştir -Name[uk]=Порівнюйте або з’єднуйте файли або теки з KDiff3 -Name[x-test]=xxCompare/Merge Files/Directories with KDiff3xx -Name[zh_CN]=使用 KDiff3 比较/合并文件或目录 -Name[zh_TW]=用 KDiff3 比較/合併檔案與目錄 -X-KDE-Library=kdiff3fileitemaction -X-KDE-Submenu=KDiff3 -X-KDE-Submenu[ast]=KDiff3 -X-KDE-Submenu[bg]=KDiff3 -X-KDE-Submenu[bs]=KDiff3 -X-KDE-Submenu[ca]=KDiff3 -X-KDE-Submenu[ca@valencia]=KDiff3 -X-KDE-Submenu[cs]=KDiff3 -X-KDE-Submenu[da]=KDiff3 -X-KDE-Submenu[de]=KDiff3 -X-KDE-Submenu[el]=KDiff3 -X-KDE-Submenu[en_GB]=KDiff3 -X-KDE-Submenu[es]=KDiff3 -X-KDE-Submenu[et]=KDiff3 -X-KDE-Submenu[fi]=KDiff3 -X-KDE-Submenu[fr]=KDiff3 -X-KDE-Submenu[ga]=KDiff3 -X-KDE-Submenu[gl]=KDiff3 -X-KDE-Submenu[hu]=KDiff3 -X-KDE-Submenu[it]=KDiff3 -X-KDE-Submenu[km]=KDiff3 -X-KDE-Submenu[ko]=KDiff3 -X-KDE-Submenu[lt]=KDiff3 -X-KDE-Submenu[mr]=के-डिफ3 -X-KDE-Submenu[nb]=KDiff3 -X-KDE-Submenu[nds]=KDiff3 -X-KDE-Submenu[nl]=KDiff3 -X-KDE-Submenu[nn]=KDiff3 -X-KDE-Submenu[pl]=KDiff3 -X-KDE-Submenu[pt]=KDiff3 -X-KDE-Submenu[pt_BR]=KDiff3 -X-KDE-Submenu[ru]=KDiff3 -X-KDE-Submenu[sk]=KDiff3 -X-KDE-Submenu[sl]=KDiff3 -X-KDE-Submenu[sr]=К‑диф3 -X-KDE-Submenu[sr@ijekavian]=К‑диф3 -X-KDE-Submenu[sr@ijekavianlatin]=KDiff3 -X-KDE-Submenu[sr@latin]=KDiff3 -X-KDE-Submenu[sv]=Kdiff3 -X-KDE-Submenu[tr]=KDiff3 -X-KDE-Submenu[ug]=KDiff3 -X-KDE-Submenu[uk]=KDiff3 -X-KDE-Submenu[x-test]=xxKDiff3xx -X-KDE-Submenu[zh_CN]=KDiff3 -X-KDE-Submenu[zh_TW]=KDiff3 -ServiceTypes=KFileItemAction/Plugin -MimeType=application/octet-stream; Index: trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.cpp =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.cpp (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.cpp (nonexistent) @@ -1,296 +0,0 @@ -/* This file is part of the KDiff3 project - - Copyright (C) 2008 Joachim Eibl - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; version 2 - of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include "kdiff3fileitemaction.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//#include - - -static QStringList* s_pHistory=0; - -class KDiff3PluginHistory -{ - KConfig* m_pConfig; - KConfigGroup* m_pConfigGroup; -public: - KDiff3PluginHistory() - { - m_pConfig = 0; - if (s_pHistory==0) - { - //std::cout << "New History: " << instanceName << std::endl; - s_pHistory = new QStringList; - m_pConfig = new KConfig( "kdiff3fileitemactionrc", KConfig::SimpleConfig ); - m_pConfigGroup = new KConfigGroup( m_pConfig, "KDiff3Plugin" ); - *s_pHistory = m_pConfigGroup->readEntry("HistoryStack", QStringList() ); - } - } - - ~KDiff3PluginHistory() - { - //std::cout << "Delete History" << std::endl; - if ( s_pHistory && m_pConfigGroup ) - m_pConfigGroup->writeEntry("HistoryStack",*s_pHistory); - delete s_pHistory; - delete m_pConfigGroup; - delete m_pConfig; - s_pHistory = 0; - m_pConfig = 0; - } -}; - -static KDiff3PluginHistory s_history; - - -K_PLUGIN_FACTORY(KDiff3FileItemActionFactory, registerPlugin();) -K_EXPORT_PLUGIN(KDiff3FileItemActionFactory("kdiff3fileitemactionplugin")) - -KDiff3FileItemAction::KDiff3FileItemAction (QObject* pParent, const QVariantList & /*args*/) -: KFileItemActionPlugin(pParent) -{ -} - -QList KDiff3FileItemAction::actions( const KFileItemListProperties& fileItemInfos, QWidget* pParentWidget ) const -{ - QList< QAction* > actions; - - if (KStandardDirs::findExe("kdiff3").isNull ()) - return actions; - - KDiff3FileItemAction *pThis = const_cast(this); - //pThis->m_fileItemInfos = fileItemInfos; - pThis->m_pParentWidget = pParentWidget; - - QAction *pMenuAction = new QAction(KIcon("kdiff3"), i18n("KDiff3 ..."), pThis); - QMenu *pActionMenu = new QMenu(); - pMenuAction->setMenu( pActionMenu ); - - - // remember currently selected files (copy to a QStringList) - KUrl::List itemList = fileItemInfos.urlList(); - foreach ( const KUrl& item, itemList ) - { - //m_urlList.append( item.url() ); - pThis->m_list.append( item.url() ); - } - - - /* Menu structure: - KDiff3 -> (1 File selected): Save 'selection' for later comparison (push onto history stack) - Compare 'selection' with first file on history stack. - Compare 'selection' with -> choice from history stack - Merge 'selection' with first file on history stack. - Merge 'selection' with last two files on history stack. - (2 Files selected): Compare 's1' with 's2' - Merge 's1' with 's2' - (3 Files selected): Compare 's1', 's2' and 's3' - */ - - QAction* pAction = 0; - QString s; - - if(m_list.count() == 1) - { - int historyCount = s_pHistory ? s_pHistory->count() : 0; - s = i18n("Compare with %1", (historyCount>0 ? s_pHistory->front() : QString()) ); - pAction = new QAction ( s,pThis ); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareWith())); - pAction->setEnabled( m_list.count()>0 && historyCount>0 ); - pActionMenu->addAction(pAction); - - s = i18n("Merge with %1", historyCount>0 ? s_pHistory->front() : QString() ); - pAction = new QAction( s, pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotMergeWith())); - pAction->setEnabled( m_list.count()>0 && historyCount>0 ); - pActionMenu->addAction (pAction); - - s = i18n("Save '%1' for later", ( m_list.front() ) ); - pAction = new QAction ( s, pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotSaveForLater())); - pAction->setEnabled( m_list.count()>0 ); - pActionMenu->addAction(pAction); - - pAction = new QAction (i18n("3-way merge with base"), pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotMergeThreeWay())); - pAction->setEnabled( m_list.count()>0 && historyCount>=2 ); - pActionMenu->addAction (pAction); - - if ( s_pHistory && !s_pHistory->empty() ) - { - QAction* pHistoryMenuAction = new QAction( i18n("Compare with ..."), pThis ); - QMenu* pHistoryMenu = new QMenu(); - pHistoryMenuAction->setMenu( pHistoryMenu ); - pHistoryMenu->setEnabled( m_list.count()>0 && historyCount>0 ); - pActionMenu->addAction(pHistoryMenuAction); - for (QStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i) - { - pAction = new QAction( *i, pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareWithHistoryItem())); - pHistoryMenu->addAction (pAction); - } - - pAction = new QAction (i18n("Clear list"), pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotClearList())); - pActionMenu->addAction (pAction); - pAction->setEnabled( historyCount>0 ); - } - } - else if(m_list.count() == 2) - { - pAction = new QAction (i18n("Compare"), pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareTwoFiles())); - pActionMenu->addAction (pAction); - } - else if ( m_list.count() == 3 ) - { - pAction = new QAction (i18n("3 way comparison"), pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotCompareThreeFiles())); - pActionMenu->addAction (pAction); - } - pAction = new QAction (i18n("About KDiff3 menu plugin ..."), pThis); - connect( pAction, SIGNAL(triggered(bool)), this, SLOT(slotAbout())); - pActionMenu->addAction (pAction); - - //pMenu->addSeparator(); - //pMenu->addAction( pActionMenu ); - //pMenu->addSeparator(); - actions << pMenuAction; - return actions; -} - -KDiff3FileItemAction::~KDiff3FileItemAction () -{ -} - -void KDiff3FileItemAction::slotCompareWith() -{ - if ( m_list.count() > 0 && s_pHistory && ! s_pHistory->empty() ) - { - QStringList args; - args << s_pHistory->front(); - args << m_list.front(); - KProcess::startDetached("kdiff3", args); - } -} - -void KDiff3FileItemAction::slotCompareWithHistoryItem() -{ - const QAction* pAction = dynamic_cast( sender() ); - if ( m_list.count() > 0 && pAction ) - { - QStringList args; - args << pAction->text(); - args << m_list.front(); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3FileItemAction::slotCompareTwoFiles() -{ - if ( m_list.count() == 2 ) - { - QStringList args; - args << m_list.front(); - args << m_list.back(); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3FileItemAction::slotCompareThreeFiles() -{ - if ( m_list.count() == 3 ) - { - QStringList args; - args << m_list[0]; - args << m_list[1]; - args << m_list[2]; - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3FileItemAction::slotMergeWith() -{ - if ( m_list.count() > 0 && s_pHistory && ! s_pHistory->empty() ) - { - QStringList args; - args << s_pHistory->front(); - args << m_list.front(); - args << ( "-o" + m_list.front() ); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3FileItemAction::slotMergeThreeWay() -{ - if ( m_list.count() > 0 && s_pHistory && s_pHistory->count()>=2 ) - { - QStringList args; - args << (*s_pHistory)[1]; - args << (*s_pHistory)[0]; - args << m_list.front(); - args << ("-o" + m_list.front()); - KProcess::startDetached ("kdiff3", args); - } -} - -void KDiff3FileItemAction::slotSaveForLater() -{ - if ( !m_list.isEmpty() && s_pHistory ) - { - while ( s_pHistory->count()>=10 ) - s_pHistory->pop_back(); - s_pHistory->push_front( m_list.front() ); - } -} - -void KDiff3FileItemAction::slotClearList() -{ - if ( s_pHistory ) - s_pHistory->clear(); -} - -void KDiff3FileItemAction::slotAbout() -{ - QString s = i18n("KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" - "KDiff3 homepage: http://kdiff3.sourceforge.net\n\n"); - s += i18n("Using the contextmenu extension:\n" - "For simple comparison of two selected files choose \"Compare\".\n" - "If the other file is somewhere else \"Save\" the first file for later. " - "It will appear in the \"Compare With ...\" submenu. " - "Then use \"Compare With\" on second file.\n" - "For a 3-way merge first \"Save\" the base file, then the branch to merge and " - "choose \"3-way merge with base\" on the other branch which will be used as destination.\n" - "Same also applies to directory comparison and merge."); - KMessageBox::information(m_pParentWidget, s, i18n("About KDiff3 File Item Action Plugin") ); -} - Index: trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.h =================================================================== --- trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.h (revision 1510721) +++ trunk/extragear/utils/kdiff3/kdiff3fileitemactionplugin/kdiff3fileitemaction.h (nonexistent) @@ -1,55 +0,0 @@ -/* This file is part of the KDiff3 project - - Copyright (C) 2008 Joachim Eibl - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; version 2 - of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#ifndef _KDIFF3FILEITEMACTIONPLUGIN_H_ -#define _KDIFF3FILEITEMACTIONPLUGIN_H_ - -#include -#include -#include - -class QStringList; - -class KDiff3FileItemAction : public KFileItemActionPlugin -{ - Q_OBJECT -public: - KDiff3FileItemAction (QObject* pParent, const QVariantList & args); - virtual ~KDiff3FileItemAction(); - // implement pure virtual method from KonqPopupMenuPlugin - virtual QList actions( const KFileItemListProperties& fileItemInfos, QWidget* pParentWidget ) const; - -private slots: - void slotCompareWith(); - void slotCompareTwoFiles(); - void slotCompareThreeFiles(); - void slotMergeWith(); - void slotMergeThreeWay(); - void slotSaveForLater(); - void slotClearList(); - void slotCompareWithHistoryItem(); - void slotAbout(); - -private: - QStringList m_list; - QWidget* m_pParentWidget; - //KFileItemListProperties m_fileItemInfos; -}; -#endif Index: trunk/extragear/utils/kdiff3/Doxyfile =================================================================== --- trunk/extragear/utils/kdiff3/Doxyfile (revision 1510721) +++ trunk/extragear/utils/kdiff3/Doxyfile (nonexistent) @@ -1,236 +0,0 @@ -# Doxyfile 1.3.7-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = kdiff3 -PROJECT_NUMBER = 0.9.85 -OUTPUT_DIRECTORY = -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = /home/joachim/kdiff3 -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.C \ - *.H \ - *.tlh \ - *.diff \ - *.patch \ - *.moc \ - *.xpm -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO Index: trunk/extragear/utils/kdiff3/AUTHORS =================================================================== --- trunk/extragear/utils/kdiff3/AUTHORS (revision 1510721) +++ trunk/extragear/utils/kdiff3/AUTHORS (nonexistent) @@ -1,2 +0,0 @@ -Joachim Eibl -Valentin Rusu (KDE4 porting) Index: trunk/extragear/utils/CMakeLists.txt =================================================================== --- trunk/extragear/utils/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/CMakeLists.txt (revision 1510722) @@ -1,17 +1,16 @@ project(extragear-utils) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules ) # search packages used by KDE find_package(KDE4 REQUIRED) include (KDE4Defaults) include (MacroLibrary) include(MacroOptionalAddSubdirectory) macro_optional_add_subdirectory(doc) macro_optional_add_subdirectory(kpager) -macro_optional_add_subdirectory(kdiff3) macro_optional_add_subdirectory(keurocalc) macro_display_feature_log() Index: trunk/extragear/utils/doc/kdiff3/white_space.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/white_space.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/white_space.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/white_space.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/white_space.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/CMakeLists.txt =================================================================== --- trunk/extragear/utils/doc/kdiff3/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/CMakeLists.txt (nonexistent) @@ -1,4 +0,0 @@ -########### install files ############### -# -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) -kde4_create_manpage(man-kdiff3.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) Index: trunk/extragear/utils/doc/kdiff3/merge_current.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/merge_current.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/merge_current.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/merge_current.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/merge_current.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/letter_by_letter.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/letter_by_letter.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/letter_by_letter.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/letter_by_letter.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/letter_by_letter.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/triple_diff.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/triple_diff.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/triple_diff.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/triple_diff.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/triple_diff.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/screenshot_merge.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/screenshot_merge.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/screenshot_merge.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/screenshot_merge.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/screenshot_merge.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/open_dialog.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/open_dialog.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/open_dialog.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/open_dialog.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/open_dialog.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/screenshot_diff.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/screenshot_diff.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/screenshot_diff.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/screenshot_diff.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/screenshot_diff.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/index.docbook =================================================================== --- trunk/extragear/utils/doc/kdiff3/index.docbook (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/index.docbook (nonexistent) @@ -1,2121 +0,0 @@ - -KDiff3"> - - - - -]> - - - - - - -The &kdiff3; Handbook - - - - -Joachim -Eibl - -
- joachim.eibl at gmx.de -
 - - - - - -2002-2007 -Joachim Eibl - - - -&FDLNotice; - - - -2007-31-03 -0.9.92 - - - - - &kdiff3; is a file and directory diff and merge tool which - -compares and merges two or three text input files or directories, -shows the differences line by line and character by character(!), -provides an automatic merge-facility, -has an editor for comfortable solving of merge-conflicts, -provides networktransparency via KIO, -has options to highlight or hide changes in white-space or comments, -supports Unicode, UTF-8 and other file encodings, -prints differences, -supports version control keyword and history merging. - - - This document describes &kdiff3;-version 0.9.92. - - - - - - -KDE -kdeextragear -kdiff3 -diff -merge -CVS -triplediff -compare -files -directories -version control -three-way-merge -in-line-differences -synchronise -kpart -kio -networktransparent -editor -white space -comments - - - - -Introduction -Yet Another Diff Frontend? - -Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it. - -&kdiff3; started because I had to do a difficult merge. Merging is necessary when several -people work on the same files in a project. A merge can be somewhat automated, when the -merge-tool not only has the new modified files (called "branches"), but also the original file -(called "base"). The merge tool will automatically choose any modification that was only -done in one branch. When several contributors change the same lines, then the merge tool -detects a conflict which must be solved manually. - -The merge then was difficult because one contributor had changed many things and corrected -the indentation in many places. Another contributor also had changed much text in the same file, -which resulted in several merge conflicts. - -The tool I used then, only showed the changed lines, but not what had changed within these -lines. And there was no information about where only the indentation was changed. The merge -was a little nightmare. - -So this was the start. The first version could show differences within a line and showed white space differences. -Later many other features were added to increase the usefulness. - -For example if you want to compare some text quickly, then you can copy it to the clipboard and -paste it into either diff window. - -A feature that required a big effort was the directory comparison and merge facility, which turned -the program almost into a full file browser. - -I hope &kdiff3; works for you too. Have fun! - -Joachim Eibl (2003) - - - -Screenshots and Features -This screenshot shows the difference between two text files -(Using an early version of &kdiff3;): - - - - - - 3-way-merging is fully supported. This is useful if two people change code independently. - The original file (the base) is used to help &kdiff3; to automatically select the correct - changes. - The merge-editor below the diff-windows allows you to solve conflicts, while showing you the output you will get. - You can even edit the output. - This screenshot shows three input files being merged: - - - - - - -&kdiff3; also helps you to compare and merge complete directories. -This screenshot shows &kdiff3; during a directory merge: - - - - - - - -More Features - Line-By-Line And Char-By-Char Diff-Viewer -By using the possibilities of a graphical color display &kdiff3; shows - exactly what the difference is. When you have to do many code-reviews, you will like this. - - - - - - - See White-Space Differences At One Glance -Spaces and tabs that differ appear visibly. When lines differ only - in the amount of white space this can be seen at one look in the summary - column on the left side. (No more worries when people change the indentation.) - - - - - - - Triple-Diff - Analyze three files and see where they differ. - - The left/middle/right windows are named A/B/C and have the blue/green/magenta - color respectively. - - If one file is the same and one file is different on a line then the - color shows which file is different. The red color means that both other - files are different. - - - - - - - Comfortable Merge Of Two Or Three Input Files - &kdiff3; can be used to merge two or three input files and automatically - merges as much as possible. The result is presented in an editable window - where most conflicts can be solved with a single mouseclick: Select the - buttons A/B/C from the button-bar to select the source that should be used. - You can also select more than one source. Since this output window is an - editor even conflicts which need further corrections can be solved here without - requiring another tool. - - - -And ... - - Fast navigation via buttons. - A mouse-click into a summary column sync's all windows to show the same position. - Select and copy from any window and paste into the merge result window. - Overview column that shows where the changes and conflicts are. - The colors are adjustable to your specific preferences. - Adjustable Tab size. - Option to insert spaces instead of tabs. - Open files comfortably via dialog or specify files on the command line. - Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3) - Show the line numbers for each line. - Paste clipboard or drag text into a diff input window. - Networktransparency via KIO. - Can be used as diff-viewer in KDevelop 3. - Word-wrap for long lines. - Support for Unicode, UTF-8 and other codecs. - Support for right to left languages. - ... - - - - - -File Comparison And Merge - -Command-Line Options - -Comparing 2 files: - - kdiff3 file1 file2 - - - -Merging 2 files: - - kdiff3 file1 file2 -m - kdiff3 file1 file2 -o outputfile - - - -Comparing 3 files: - - kdiff3 file1 file2 file3 - - - -Merging 3 files: - - kdiff3 file1 file2 file3 -m - kdiff3 file1 file2 file3 -o outputfile - - - Note that file1 will be treated as - base of file2 and - file3. - - - -Special case: Files with the same name - -If all files have the same name but are in different directories, you can -reduce typework by specifying the filename only for the first file. E.g.: - - - kdiff3 dir1/filename dir2 dir3 - - - -Commandline for starting a directory comparison or merge: -This is very similar, but now it's about directories. - - kdiff3 dir1 dir2 - kdiff3 dir1 dir2 -o destdir - kdiff3 dir1 dir2 dir3 - kdiff3 dir1 dir2 dir3 -o destdir - -For directory comparison and merge you can continue to read here. - - -Other command line options -To see all available command line options type - -kdiff3 --help - -Example output: - -Options: - -m, --merge Merge the input. - -b, --base file Explicit base file. For compatibility with certain tools. - -o, --output file Output file. Implies -m. E.g.: -o newfile.txt - --out file Output file, again. (For compatibility with certain tools.) - --auto No GUI if all conflicts are auto-solvable. (Needs -o file) - --qall Don't solve conflicts automatically. (For compatibility...) - --L1 alias1 Visible name replacement for input file 1 (base). - --L2 alias2 Visible name replacement for input file 2. - --L3 alias3 Visible name replacement for input file 3. - -L, --fname alias Alternative visible name replacement. Supply this once for every input. - --cs string Override a config setting. Use once for every setting. E.g.: --cs "AutoAdvance=1" - --confighelp Show list of config settings and current values. - --config file Use a different config file. - -The option allows you to adjust a configuration value that is otherwise only adjustable via the configure dialogs. -But be aware that when &kdiff3; then terminates the changed value will be stored along with the other settings. -With you can find out the names of the available items and current values. -Via you can specify a different config file. When you often use &kdiff3; -with completely different setups this allows you to easily switch between them. - -Ignorable command line options -Many people want to use &kdiff3; with some version control system. -But when that version control system calls &kdiff3; using command line parameters that &kdiff3; doesn't recognise, then &kdiff3; terminates with an error. -The integration settings allow to specify command line parameters that should be ignored by &kdiff3;. -They will appear in the usage help like in this example: - - --foo Ignored. (User defined.) - - - Command line options to ignore: - A list of options, separated via semicolon ';'. When one of these options appears on the commandline, - then &kdiff3; will ignore it and run without reporting an error. - (Default is "u;query;html;abort"). - -When this isn't enough, then it is recommended to write a shell script that does the option translation. - - - - -Open-Dialog - - Since many input files must be selectable, the program has a special open dialog: - - - - - - The open dialog allows to edit the filenames by hand, selecting a file - via the file-browser ("File...") or allows to choose recent files from - the drop-down lists. If you open the dialog again, then the current names - still remain there. The third input file is not required. If the - entry for "C" remains empty, then only a two file diff analysis will be - done. - - You can also select a directory via "Dir...". If for A a directory is specified - then a directory-comparison/merge starts. If A specifies a file but B, C or - the output specify a directory, then &kdiff3; uses the filename from A in the - specified directories. - - If "Merge" is selected, then the "Output"-line becomes editable. But it - is not required to specify the output filename immediately. You can also - postpone this until saving. - - The "Configure..."-button opens the options-dialog, so that you can set - the options before running the analysis. - - - -Paste and Drop Input - - Sometimes you want to compare parts of a text that is not an own file. &kdiff3; also - allows you to paste text from the clipboard into the diff input window that has the focus. - The diff analysis happens immediately then. - In the open dialog you need not specify files then, but just close it via "Cancel". - - You can also use drag and drop: Drag a file from a file manager - or selected text from an editor and drop it onto a diff input window. - - What's the idea? Sometimes a file contains two similar functions, but checking how similar - they really are is a big effort if you first must create two files and then load them. Now - you can simply copy, paste and compare the relevant sections. - - Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input - is supported. - - Warning: Some editors still interpret the drag and drop into another program like cut - (instead of copy) and paste. Your original data might be lost then. - - - -Comparing Files And Interpreting The Information In The Input Windows - - - -Info Line - At the top of each text window is its "info line". The info lines of - the input windows contain a letter "A", "B" or "C", the editable filename, - a button for browsing, and the line number of the first visible line in the window. - (Note that window "C" is optional.) Each info line appears in a different color. - - When you selected another file via browsing or finished editing the filename here - by pressing enter, the new file will be loaded and - compared with the already loaded file(s). -Coloring - The three input windows are assigned the letters "A", "B" and "C". - "A" has color blue, "B" has green and "C" has magenta. (These are the - defaults, but can be changed in the Settings-Menu.) - - When a difference is detected then the color shows which input file - differs. When both other input files differ then the color used to express - this is red by default ("Conflict color" in the Settings). - This colorscheme is especially useful in the case of three input files, which will be - seen in the next section (Merging). -Summary Column - Left of each text is the "summary column". If differences occurred on a - line then the summary column shows the respective color. For a white-space-only - difference the summary is chequered. For programming languages where white - space is not so important this is useful to see at one glance if anything - of importance was modified. (In C/C++ white space is only interesting within - strings, comments, for the preprocessor, and some only very esoteric situations.) - - The vertical line separating the summary column and the text is interrupted - if the input file had no lines there. When word-wrap is enabled then this vertical - line appears dotted for wrapped lines. -Overview Column - On the right side a "overview"-column is visible left of the vertical scrollbar. - It shows the compressed summary column of input "A". All the differences - and conflicts are visible at one glance. When only two input windows are - used, then all differences appear red here because every difference is - also a conflict. A black rectangle frames the visible part of the inputs. - For very long input files, when the number of input lines is bigger than - the height of the overview column in pixels, then several input lines share - one overview line. A conflict then has top priority over simple differences, - which have priority over no change, so that no difference or conflict is - lost here. By clicking into this overview column the corresponding text - will be shown. -Manually Aligning Lines - Sometimes the algorithm places the wrong lines next to each other. Or you want to compare - one piece of text with text at a completely different position in the other file. - For these situations you can manually instruct &kdiff3; to align certain lines. - Mark the text for which you want to improve the alignment with the mouse as you would - for copy and paste in the first diff view and then choose "Add Manual Diff Alignment" - in the "Diffview"-menu (keyboard shortcut "Ctrl-Y") . An orange bar will appear in - the summary column next to the chosen text. Repeat this for the second and - (if available) third diff view. &kdiff3; will immediately recalculate the differences everytime you do this, - and will align the chosen lines. Of course some of the previously matching lines in between - might not match anymore. - - Currently merging doesn't support the use of manual diff help. -Manually Joining and Splitting Diff Sections - In some cases &kdiff3; will see too many or too few diff sections for merging. In such a - case you can join or split existing sections. - - Add new sections by first selecting text in the lines that belong together in either input window (as for copying to the clipboard). - Then choose "Split Diff At Selection" in the "Merge" menu. - Splits will be added above the first line and below the last line of the selected text. - If you only want to add one section, then select text beginning at another section-split. - - For joining sections in either input window select something in the lines from the sections to join. - (You can join several sections in one step too.) Then choose "Join selected Diffs" in the "Merge"-menu. - - - - -Merging And The Merge Output Editor Window - - - - - The merge output editor window (below the diff input windows) also has an info line at the top showing "Output:", the - filename and "[Modified]" if you edited something. Usually it will contain - some text through the automatic merge facilities, but often it will also - contain conflicts. - - !!! Saving is disabled until all conflicts are resolved !!! (Use the "Go - to prev/next unsolved conflicts"-buttons to find the remaining conflicts.) - - With only two input files every difference is also a conflict that must - be solved manually. - - With three input files the first file is treated as base, while the - second and third input files contain modifications. When at any line only - either input B or input C have changed but not both then the changed source - will automatically be selected. Only when B and C have changed on the same - lines, then the tool detects a conflict that must be solved manually. - When B and C are the same, but not the same as A, then C is selected. -The Summary Column - The merge output editor window also has a summary column on the left. It shows the - letter of the input from which a line was selected or nothing if all three - sources where equal on a line. For conflicts it shows a questionmark "?" - and the line shows "<Merge Conflict>", all in red. Because solving - conflicts line by line would take very long, the lines are grouped into - groups that have the same difference and conflict characteristics. - But only-white-space-conflicts are separated from non-white-space-conflicts - in order to ease the merging of files were the indentation changed for many - lines. -Setting The Current Group And Synchronising Merge And Diff View Position - When clicking into the summary column with the left mouse button in either - window then the beginning of the group belonging to that line will shown in all windows. - This group then becomes the "current group". It is highlighted with the - "Current range (diff) background color" and - a black bar appears on the left side of the text. -Choosing Inputs A, B or C For Current Conflict And Editing - The button bar below the menubar contains three input selector buttons - containing the letters "A", "B" and "C". Click the input selector - button to insert (or remove if already inserted) the lines from the respective source. - To choose the lines from several inputs click the respective buttons in the - needed order. For example if you want that the lines from "B" appear before - the lines from "A" in the output, first click "B", then "A". - - If you use the auto-advance option - ("Automatically go to next unsolved conflict after source selection"), - you should disable this before choosing lines from several inputs or if you want to - edit the lines after your choice. Otherwise &kdiff3; will jump to the next - conflict after choosing the first input. - - It is often helpful directly edit the merge output. - The summary column will show "m" for every line that was manually modified. - When for instance the differences are aligned in a way that simply choosing - the inputs won't be satisfactory, then you can mark the needed text and use - normal copy and paste to put it into the merge output. - - Sometimes, when a line is removed either by automatic merge or by editing - and no other lines remain in that group, then the text <No src line> - will appear in that line. This is just a placeholder for the group for - when you might change your mind and select some source again. This text won't - appear in the saved file or in any selections you want to copy and paste. - - The text "<Merge Conflict>" will appear in the clipboard if you - copy and paste some text containing such a line. But still be careful to - do so. -Choosing Input A, B, or C for All Conflicts - The normal merge will start by solving simple conflicts automatically. - But the "Merge"-menu provides some actions for other common needs. - If you have to select the same source for most conflicts, then you can - choose "A", "B" or "C" everywhere, or only for the remaining unsolved - conflicts, or for unsolved white space conflicts. If you want to decide every - single delta yourself, you can "Set deltas to conflicts". Or if you want to - return to the automatic choices of &kdiff3; then select - "Automatically solve simple conflicts". &kdiff3; then restarts the merge. - For actions that change your previous modifications &kdiff3; will ask for your - confirmation before proceeding. - - Note: When choosing either source for unsolved white space conflicts and - the options "Ignore Numbers" or "Ignore C/C++ Comments" are used then changes in - numbers or comments will be treated like white space too. - -Automatic Merge of Version Control Keywords and History (Log) -Many version control systems support special keywords in the file. (e.g. "$Date$", -"$Header$", "$Author$", "$Log$" etc.) During the -check-in the version control system (VCS) changes these lines. For instance -"$Date$" will turn into "$Date: 2005/03/22 18:45:01 $". Since this line will -be different in every version of the file, it would require manual interaction -during the merge. - -&kdiff3; offers automatic merge for these items. For simple lines that match the -"Auto merge regular expression"-option in all input-files &kdiff3; will choose -the line from B or - if available - from C. (Additionally it is necessary that the lines -in question line up in the comparison and the previous line contains no conflict.) -This auto merge can either be run immediately after a merge starts (activate the option -"Run regular expression auto merge on merge start") or later via the merge -menu "Run Regular Expression Auto Merge". - -Automatic merge for version control history (also called "log") is also supported. -The history automerge can either run immediately when the merge starts by activating the -option "Merge version control history on merge start" or later via the merge menu -"Automatically Solve History Conflicts". - -Usually the version control history begins with a line containing the keyword "$Log$". -This must be matched by the "History start regular expression"-option. -&kdiff3; detects which subsequent lines are in the history by analysing the leading characters -that came before the "$Log$"-keyword. If the same "leading comment"-characters also appears in the following -lines, then they are also included in the history. - -During each check-in the VCS writes a unique line specifying version-, date- and time-information -followed by lines with user comments. -These lines form one history-entry. This history section grows with every check-in and the -most recent entries appear at the top (after the history start line). - -When for parallel development two or more developers check-in a branch of the file then -the merge history will contain several entries that appear as conflicts during the merge -of the branches. Since merging these can become very tedious, &kdiff3; offers support with two -possible strategies: Just insert the history information from both contributors at the top -or sort the history information by a user defined key. - -The just-insert-all-entries-method is easier to configure. &kdiff3; just needs a method to -detect, which lines belong to one history entry. Most VCS insert an empty line after each -history entry. If there are no other empty lines, this is a sufficient criterion for &kdiff3;. -Just set an empty "History entry start regular expression". If the empty line criterion -isn't sufficient, you can specify a regular expression to detect the history entry start. - -Note that &kdiff3; will remove duplicate history entries. If a history entry appeared several times -in the history of a input file, only one entry will remain in the output. - -If you want to sort the history, then you have to specify how the sort key should be built. -Use parentheses in the "History entry start regular expression" to group parts of the regular -expression that should later be used for the sort key. -Then specify the "History entry start sort key order" specifying a comma "," separated list of -numbers referring to the position of the group in the regular expression. - -Because this is not so easy to get right immediately, you are able to test and improve -the regular expressions and key-generation in a dedicated dialog by pressing the -"Test your regular expressions"-button. -Example: Assume a history that looks like this: - -/************************************************************************** -** HISTORY: $Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp $ -** -** \main\integration_branch_12 2 Apr 2001 10:45:41 tom -** Merged branch simon_branch_15. -** -** \main\henry_bugfix_branch_7\1 30 Mar 2001 19:22:05 henry -** Improved the speed for subroutine convertToMesh(). -** Fixed crash. -**************************************************************************/ - -The history start line matches the regular expression ".*\$Log.*\$.*". Then follow -the history entries. - -The line with the "$Log$"-keyword begins with two "*" after which follows a space. -&kdiff3; uses the first non-white-space string as "leading comment" and assumes that -the history ends in the first line without this leading comment. In this example the -last line ends with a string that also starts with two "*", but instead of a space -character more "*" follow. Hence this line ends the history. - -If history sorting isn't required then the history entry start line regular expression -could look like this. (This line is split in two because it wouldn't fit otherwise.) - -\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) - [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.* - -For details about regular expressions please see the -regular expression documentation by Trolltech. -Note that "\s" (with lowercase "s") matches any white space and "\S" (with uppercase "S") matches any non-white-space. -In our example the history entry start contains first the version info with reg. exp. "\\main\\\S+", the date consisting of day "[0-9]+", month "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" and year "[0-9][0-9][0-9][0-9]", the time "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" and finally the developers login name ".*". - -Note that the "leading comment"-characters (in the example "**") will already be removed by &kdiff3; -before trying to match, hence the regular expression begins with a match for none or more white-space characters "\s*". -Because comment characters can differ in each file (e.g. C/C++ uses other comment characters than a Perl script) -&kdiff3; takes care of the leading comment characters and you should not specify them in the regular expression. - -If you require a sorted history. Then the sortkey must be calculated. For this the -relevant parts in the regular expression must be grouped by parentheses. -(The extra parentheses can also stay in if history sorting is disabled.) - -\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) - ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*) - -The parentheses now contain 1. version info, 2. day, 3. month, 4. year, 5. time, 6. name. -But if we want to sort by date and time, we need to construct a key with the elements in a different order of appearance: -First the year, followed by month, day, time, version info and name. Hence the sortkey order to specify is "4,3,2,5,1,6". - -Because month names aren't good for sorting ("Apr" would be first) &kdiff3; detects in which order -the month names were given and uses that number instead ("Apr"->"04"). -And if a pure number is found it will be transformed to a 4-digit value with leading zeros for sorting. -Finally the resulting sort key for the first history entry start line will be: - -2001 04 0002 10:45:41 integration_branch_12 tom - - -For more information also see Merge Settings. - - - - -Navigation And Editing - - Much navigation will be done with the scroll bars and the mouse but - you can also navigate with the keys. If you click into either window then - you can use the cursor buttons left, right, up, down, page up, page down, - home, end, ctrl-home, ctrl-end as you would in other programs. The overview-column - next to the vertical scroll bar of the input files can also be used for - navigating by clicking into it. - - You can also use the wheel mouse to scroll up and down. - - In the merge output editor you can also use the other keys for editing. - You can toggle between insert and overwrite mode with the insert key. (Default - is insert-mode.) - - A left-mouse-button-click into any summary column will synchronise all - windows to show the beginning of the same group of lines (as explained - in section "Setting The Current Group And Synchronising Merge And Diff View Position"). - - The button bar also contains nine navigation buttons with which you can - jump to the current/first/last difference, to the next/previous difference - (ctrl-down/ctrl-up), to the next/previous conflict (ctrl-pgdown/ctrl-pgup), - or to the next/previous unsolved conflict. Note that for &kdiff3; a "conflict" - that was not automatically solved at the start of the merge stays a "conflict" - even if it is solved. Hence the necessity to distinguish "unsolved conflicts". - -Auto-Advance - - There also is a button "Automatically go to next unsolved conflict after - source selection" (Auto-Advance). If you enable this, then, when one source - is selected, &kdiff3; will jump to and select the next unsolved conflict - automatically. This can help when you always want to choose one source only. - When you need both sources, or you want to edit after selecting, then you - probably want to switch this off. Before proceeding to the next unsolved conflict - &kdiff3; shows you the effect of your choice for a short time. This delay is - adjustable in the Diff- & Merge-Settings: You can - specify the "Auto-Advance delay" in milli seconds between 0 and 2000. Hint: - Tired of many clicks? - Use a small Auto-Advance-delay and the shortcuts - Ctrl-1/2/3 to select A/B/C for many conflicts. - - - - -Select, Copy And Paste - - The input windows don't show a cursor, so selections must be made - with the mouse by clicking with the left mouse button at the start, holding - down the mousebutton and moving to the end, where you release the mouse - button again. You can also select a word by double clicking it. In the merge - output editor you can also select via the keyboard by holding the "shift"-button - and navigation with the cursor keys. - - If the selection exceeds the visible range you can move the mouse over the - window borders which causes &kdiff3; to scroll in that direction. - - For very large selections you can also use the navigation keys while holding down - the mouse. E.g. use page up and page down to quickly go to a certain position. At the - end position release the mouse button. - - In order to select everything in the current window use menu "Edit"->"Select All" (Ctrl-A). - - To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert). - But there exists an option "Auto Copy Selection". If this is enabled, - then whatever you select is copied immediately and you don't need to explicitly - copy. But pay attention when using this because the contents of the clipboard - might then be destroyed accidentally. - - "Cut" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the - selected text. - - "Paste" (Ctrl-V or Shift-Insert) inserts the text in the clipboard at the - cursorposition or over the current selection. - If you paste to either diff input window the contents of the clipboard will - be shown in that window and the comparison will restart immediately. This is - useful if you want to quickly grab a piece of text from somewhere and - compare it with something else without first creating files. - - - -Saving - - Saving will only be allowed, when all conflicts were solved. If the file - already exists and the "Backup files"-option is enabled then the existing - file will be renamed with an ".orig"-extension, but if such a file exists - it will be deleted. When you exit or start another diff-analysis and data - wasn't saved yet, then &kdiff3; will ask if you want to save, cancel or proceed - without saving. (&kdiff3; does not catch any signals. So if you "kill" &kdiff3; - then your data will be lost.) - - Line endings are saved according to the normal method on the underlying - operating system. For Unices each line ends with an linefeed-character "\n", - while for Win32-based systems each line ends with a carriage-return + a linefeed - "\r\n". &kdiff3; does not preserve the line-endings of the input files, which - also means that you shouldn't use &kdiff3; with binary files. - - - -Finding Strings - - You can search for a string in any text-window of &kdiff3;. The "Find ..."-command - (Ctrl-F) in the Edit-menu opens a dialog that lets you specify the string - to search for. You can also select the windows which should be searched. - Searching will always start at the top. Use the "Find Next"-command (F3) - to proceed to the next occurrence. If you select to search several windows then the first - window will be searched from top to bottom before the search starts in the next - window at the top again, etc. - - - -Printing - - &kdiff3; supports printing for textfile differences. The "Print..."-command (Ctrl-P) - in the File-menu opens a dialog that allows you to select the printer and to adjust - other options. - - There are several possibilities to adjust the range. Due to different printing - dialogs on different operating systems, the method to achieve certain range selections varies. - - - All:Print everything. - Current:Print a page starting at the first visible line in the window. - (On systems without this option this can be achieved by specifying page number 10000 for printing.) - Selection: - Before choosing to print select text with the mouse (like for copy and paste) - in one of the diff input windows to define the start and end line. If no text - in one of the diff input windows was selected, then this won't be an available - choice. (On systems without this option this can be achived by specifying page - number 9999 for printing.) - Range:Specify the first and last page. - - - - Other important options for printing will be taken from the normal options: - - Font, font size - Show line numbers - Word wrap - Colors - etc. - - - Landscape formatting is also recommended for printing. - - - -Options - - Options and the recent-file-list will be saved when you exit the program, - and reloaded when you start it. (Menu Settings->Configure &kdiff3; ...) - -Font - - Select a fixed width font. (On some systems this dialog will also - present variable width fonts, but you should not use them.) - - - Italic Font for Deltas: If you select this, then text differences - will be drawn with the italic version of the selected font. If the font - doesn't support italic, then this does nothing. - - - - -Colors - - Foreground color: Usually black. - Background color: Usually white. - Diff Background color: Usually light gray. - Color A: Usually dark blue. - Color B: Usually dark green. - Color C: Usually dark magenta. - Conflict Color: Usually red. - Current range background color: Usually light yellow. - Current range diff background color: Usually dark yellow. - Color for manually aligned difference ranges: Usually orange. - Newest file color in directory comparison: Usually green. - Oldest file color in directory comparison: Usually red. - Middle age file color in directory comparison: Usually dark yellow. - Color for missing files in directory comparison: Usually black. - - - Changing the colors for directory comparison will be effective only when starting the next directory comparison. - - - On systems with only 16 or 256 colors some colors are not available in pure - form. On such systems the "Defaults"-button will choose a pure color. - - - -Editor Settings - - Tab inserts spaces: If this is disabled and you press the - tabulator key, a tab-character is inserted, otherwise the appropriate - amount of characters is inserted. - Tab size: Can be adjusted for your specific needs. Default is 8. - Auto indentation: When pressing Enter or Return the indentation - of the previous line is used for the new line. - Auto copy selection: Every selection is immediately copied - to the clipboard when active and you needn't explicitly copy it. - Line end style: When saving you can select what line - end style you prefer. The default setting is the common choice for the used operating system. - - - -Diff Settings - - When comparing files, &kdiff3; first it tries to match lines that are equal - in all input files. Only during this step it might ignore white space. The - second step compares each line. In this step white space will not be ignored. - Also during the merge white space will not be ignored. - - - - Ignore numbers: Default is off. Number characters ('0'-'9', '.', '-') - will be ignored in the first part of the analysis in which the line matching is - done. In the result the differences will be shown nevertheless, but they are treated - as white space. - - Ignore C/C++ comments: Default is off. - Changes in comments will be treated like changes in white space. - - Ignore case: Default is off. - Case-differences of characters (like 'A' vs. 'a') will be treated like changes in white space. - - Preprocessor-Command: - See next section. - - Line-Matching Preprocessor-Command: - See next section. - - Try Hard: - Try hard to find an even smaller delta. (Default is on.) This will probably - be effective for complicated and big files. And slow for very big files. - - - - -Merge Settings - - Auto Advance Delay (ms): When in auto-advance-mode this setting specifies - how long to show the result of the selection before jumping to the next unsolved - conflict. - - White space 2/3-file merge default: - Automatically solve all white-space conflict by choosing the specified file. - (Default is manual choice.) Useful if white space really isn't important in many files. - If you need this only occasionally better use "Choose A/B/C For All Unsolved Whitespace Conflicts" - in the merge menu. Note that if you enable either "Ignore numbers" or "Ignore C/C++ comments" - then this auto-choice also applies for conflicts in numbers or comments. - - Auto merge regular expression: - Regular expression for lines where &kdiff3; should automatically choose one source. See also Automatic Merge ... - - Run regular expression auto merge on merge start: - If activated &kdiff3; runs the automatic merge using the "Auto merge regular expression" when a merge is started. - - History start regular expression: - Regular expression for the start of the merge history entry. - Usually this line contains the "$Log$"-keyword. - Default value: ".*\$Log.*\$.*" - - History entry start regular expression: - A merge history entry consists of several lines. - Specify the regular expression to detect the first line (without the leading comment). - Use parentheses to group the keys you want to use for sorting. - If left empty, then &kdiff3; assumes that empty lines separate history entries. - See also Automatic Merge ... - - History merge sorting: - Enable version control history sorting. - - History entry start sort key order: - Each parentheses used in the regular expression for the history start entry - groups a key that can be used for sorting. - Specify the list of keys (that are numbered in order of occurrence - starting with 1) using ',' as separator (e.g. "4,5,6,1,2,3,7"). - If left empty, then no sorting will be done. - See also Automatic Merge ... - - Merge version control history on merge start: - If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started. - - Max number of history entries: - &kdiff3; truncates the history list after the specified number of entries. Use -1 to avoid truncation. (Default is -1). - - Test your regular expressions - This button shows a dialog that allows you to improve and test the regular expressions above. - Just copy the respective data from your files into the example lines. The "Match results" - will immediately show whether the match succeeds or not. - The "Sort key result" will display the key used for history merge sorting. - - Irrelevant merge command: - Specify a command of your own that should be called when &kdiff3; detects - that for a three file merge the file from B doesn't contribute any - relevant data that isn't already contained in the file from C. - The command is called with the three filenames as parameters. - Data matched by the "Auto merge regular expression" or in the - history isn't considered relevant. - - - - - -Directory Merge - - These options are concerned with scanning the directory and handling the - merge: See the Directory Comparison/Merge - Docs for details. - -Yet there is one option here that is also relevant for saving single files: - - - Backup files: When a file is saved and an older version already - exists, then the original version will be renamed with an ".orig" extension. - If an old backup file with ".orig" extension already exists then this will - be deleted without backup. - - - - -Regional and Language Options - - Language:Adjust the language of the user interface. Changing this option doesn't affect the running program. You have to exit and restart &kdiff3; so that the language is changed. (This option is not available in the KDE version of &kdiff3; because the language is adjustable in the global KDE settings.) - - Use the same encoding for everything: The following encoding options can be adjusted separately for each item or if this option is true, all values will take the first value. - - Local Encoding:Above the codec-selectors appears a note that tells you what the local encoding is. (This is not adjustable but for your information just in case you don't know your local encoding, but need to select it.) - - File Encoding for A/B/C: Adjust the file encoding for input files. This has an effect on how the special characters are interpreted. Since you can adjust each codec separately you can even compare and merge files that were saved using different codecs. - - File Encoding for Merge Output and Saving: When you have edited a file, then you can adjust which encoding will be used when saving to disk. - - File Encoding for Preprocessor Files:When you define preprocessors then they might not be able to operate on your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only take 8-bit-ascii.) With this option you can define the encoding of preprocessor output. - - Right To Left Language:Some languages are written right to left. When this option is enabled, &kdiff3; draws the text from right to left in the diff input windows and in the merge output window. Note that if you start &kdiff3; with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by Qt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options. - - - - - -Miscellaneous -(These options and actions are available in menus or the buttonbar.) - - Show line numbers: You can select if line numbers should be - shown for the input files. - Show space and tabulator characters for differences: Sometimes - the visible spaces and tabs are disturbing. You can turn this off. - Show white space: Turn this off to suppress - any highlighting of white-space-only changes in the text or overview-columns. - (Note that this also applies to changes in numbers or comments if the options "Ignore numbers" - or "Ignore C/C++ comments" are active.) - Overview options: - These choices are only available when you compare three files. In normal mode all - differences are shown in one color-coded overview-column. But sometimes you are - especially interested in the differences between only two of these three files. - Selecting "A vs. B", "A vs. C" or "B vs. C"-overview will show a second overview - column with the required information next to the normal overview. - - Word wrap diff windows: - Wrap lines when their length would exceed the width of a window. - - Show Window A/B/C: Sometimes you want to use the space on - the screen better for long lines. Hide the windows that are not important. - (In the Windows-menu.) - Toggle Split Orientation: - Switch between diff windows shown next to each other (A left of B left of C) or above - each other (A above B above C). This should also help for long lines. (In the Windows-menu.) - - Start a merge quickly: - Sometimes you are viewing the deltas and decide to merge. - - "Merge current file" in the Directory-menu also works if you only compare - two files. A single click starts the merge and uses the filename of the last - input-file as the default output filename. (When this is used to restart - a merge, then the output filename will be preserved.) - - - -Configuring Keyboard-Shortcuts - - Currently only the KDE-version supports user-configurable keyboard-shortcuts. - (Menu Settings->Configure Shortcuts...) - - - - -Preprocessor Commands - -&kdiff3; supports two preprocessor options. - - - Preprocessor-Command: - When any file is read, it will be piped through this external command. - The output of this command will be visible instead of the original file. - You can write your own preprocessor that fulfills your specific needs. - Use this to cut away disturbing parts of the file, or to automatically - correct the indentation etc. - - Line-Matching Preprocessor-Command: - When any file is read, it will be piped through this external command. If - a preprocessor-command (see above) is also specified, then the output of the - preprocessor is the input of the line-matching preprocessor. - The output will only be used during the line matching phase of the analysis. - You can write your own preprocessor that fulfills your specific needs. - Each input line must have a corresponding output line. - - - - -The idea is to allow the user greater flexibility while configuring the diff-result. -But this requires an external program, and many users don't want to write one themselves. -The good news is that very often sed or perl -will do the job. - -Example: Simple testcase: Consider file a.txt (6 lines): - - aa - ba - ca - da - ea - fa - -And file b.txt (3 lines): - - cg - dg - eg - -Without a preprocessor the following lines would be placed next to each other: - - aa - cg - ba - dg - ca - eg - da - ea - fa - -This is probably not wanted since the first letter contains the actually interesting information. -To help the matching algorithm to ignore the second letter we can use a line matching preprocessor -command, that replaces 'g' with 'a': - - sed 's/g/a/' - -With this command the result of the comparison would be: - - aa - ba - ca - cg - da - dg - ea - eg - fa - -Internally the matching algorithm sees the files after running the line matching preprocessor, -but on the screen the file is unchanged. (The normal preprocessor would change the data also on -the screen.) - - -<command>sed</command> Basics - -This section only introduces some very basic features of sed. For more -information see info:/sed or - -http://www.gnu.org/software/sed/manual/html_mono/sed.html. -A precompiled version for Windows can be found at -http://unxutils.sourceforge.net. -Note that the following examples assume that the sed-command is in some -directory in the PATH-environment variable. If this is not the case, you have to specify the full absolute -path for the command. - -Also note that the following examples use the single quotation mark (') which won't work for Windows. -On Windows you should use the double quotation marks (") instead. - -In this context only the sed-substitute-command is used: - - sed 's/REGEXP/REPLACEMENT/FLAGS' - -Before you use a new command within &kdiff3;, you should first test it in a console. -Here the echo-command is useful. Example: - - echo abrakadabra | sed 's/a/o/' - -> obrakadabra - -This example shows a very simple sed-command that replaces the first occurance -of "a" with "o". If you want to replace all occurances then you need the "g"-flag: - - echo abrakadabra | sed 's/a/o/g' - -> obrokodobro - -The "|"-symbol is the pipe-command that transfers the output of the previous -command to the input of the following command. If you want to test with a longer file -then you can use cat on Unix-like systems or type -on Windows-like systems. sed will do the substitution for each line. - - cat filename | sed options - - - -Examples For <command>sed</command>-Use In &kdiff3; -Ignoring Other Types Of Comments - -Currently &kdiff3; understands only C/C++ comments. Using the -Line-Matching-Preprocessor-Command you can also ignore -other types of comments, by converting them into C/C++-comments. - -Example: To ignore comments starting with "#", you would like to convert them -to "//". Note that you also must enable the "Ignore C/C++-Comments" option to get -an effect. An appropriate Line-Matching-Preprocessor-Command would be: - - - sed 's/#/\/\//' - -Since for sed the "/"-character has a special meaning, it is necessary to place the -"\"-character before each "/" in the replacement-string. Sometimes the "\" is required -to add or remove a special meaning of certain characters. The single quotation marks (') before -and after the substitution-command are important now, because otherwise the shell will -try to interpret some special characters like '#', '$' or '\' before passing them to -sed. Note that on Windows you will need the double quotation marks (") here. Windows -substitutes other characters like '%', so you might have to experiment a little bit. - - -Caseinsensitive Diff - -Use the following Line-Matching-Preprocessor-Command to convert all input to uppercase: - - sed 's/\(.*\)/\U\1/' - -Here the ".*" is a regular expression that matches any string and in this context matches -all characters in the line. -The "\1" in the replacement string refers to the matched text within the first pair of "\(" and "\)". -The "\U" converts the inserted text to uppercase. - - - -Ignoring Version Control Keywords - -CVS and other version control systems use several keywords to insert automatically -generated strings (info:/cvs/Keyword substitution). -All of them follow the pattern "$KEYWORD generated text$". We now need a -Line-Matching-Preprocessor-Command that removes only the generated text: - - sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' - -The "\|" separates the possible keywords. You might want to modify this list -according to your needs. -The "\" before the "$" is necessary because otherwise the "$" matches the end of the line. - - -While experimenting with sed you might come to understand and even like -these regular expressions. They are useful because there are many other programs that also -support similar things. - - - -Ignoring Numbers - -Ignoring numbers actually is a built-in option. But as another example, this is how -it would look as a Line-Matching-Preprocessor-command. - - sed 's/[0123456789.-]//g' - -Any character within '[' and ']' is a match and will be replaced with nothing. - - - -Ignoring Certain Columns - -Sometimes a text is very strictly formatted, and contains columns that you always want to ignore, while there are -other columns you want to preserve for analysis. In the following example the first five columns (characters) are -ignored, the next ten columns are preserved, then again five columns are ignored and the rest of the line is preserved. - - sed 's/.....\(..........\).....\(.*\)/\1\2/' - -Each dot '.' matches any single character. The "\1" and "\2" in the replacement string refer to the matched text within the first -and second pair of "\(" and "\)" denoting the text to be preserved. - - - -Combining Several Substitutions - -Sometimes you want to apply several substitutions at once. You can then use the -semicolon ';' to separate these from each other. Example: - - echo abrakadabra | sed 's/a/o/g;s/\(.*\)/\U\1/' - -> OBROKODOBRO - - - - -Using <command>perl</command> instead of <command>sed</command> - -Instead of sed you might want to use something else like -perl. - - perl -p -e 's/REGEXP/REPLACEMENT/FLAGS' - -But some details are different in perl. Note that where -sed needed "\(" and "\)" perl -requires the simpler "(" and ")" without preceding '\'. Example: - - sed 's/\(.*\)/\U\1/' - perl -p -e 's/(.*)/\U\1/' - - - - - -Order Of Preprocessor Execution - -The data is piped through all internal and external preprocessors in the -following order: - - -Normal preprocessor, -Line-Matching-Preprocessor, -Ignore case (conversion to uppercase), -Detection of C/C++ comments, -Ignore numbers, -Ignore white space - - -The data after the normal preprocessor will be preserved for display and merging. The -other operations only modify the data that the line-matching-diff-algorithm sees. - -In the rare cases where you use a normal preprocessor note that -the line-matching-preprocessor sees the output of the normal preprocessor as input. - - - -Warning - -The preprocessor-commands are often very useful, but as with any option that modifies -your texts or hides away certain differences automatically, you might accidentally overlook -certain differences and in the worst case destroy important data. - -For this reason during a merge if a normal preprocessor-command is being used &kdiff3; -will tell you so and ask you if it should be disabled or not. -But it won't warn you if a Line-Matching-Preprocessor-command is active. The merge will not complete until -all conflicts are solved. If you disabled "Show White Space" then the differences that -were removed with the Line-Matching-Preprocessor-command will also be invisible. If the -Save-button remains disabled during a merge (because of remaining conflicts), make sure to enable -"Show White Space". If you don't want to merge these less important differences manually -you can select "Choose [A|B|C] For All Unsolved White space Conflicts" in the Merge-menu. - - - - - - -Directory Comparison and Merge with &kdiff3; -Introduction into Directory Comparison and Merge - - Often programmers must modify many files in a directory to achieve their - purpose. For this &kdiff3; also lets you compare and merge complete directories - recursively! - - Even though comparing and merging directories seems to be quite obvious, - there are several details that you should know about. Most important is of - course the fact that now many files might be affected by each operation. - If you don't have backups of your original data, then it can be very hard - or even impossible to return to the original state. So before starting a merge, - make sure that your data is safe, and going back is possible. If you make - an archive or use some version control system is your decision, but even - experienced programmers and integrators need the old sources now and then. - And note that even though I (the author of &kdiff3;) try to do my best, I can't - guarantee that there are no bugs. According to the GNU-GPL there is NO WARRANTY - whatsoever for this program. So be humble and always keep in mind: - -
- To err is human, but to really mess things up you need a computer. -
- -So this is what this program can do for you: &kdiff3; ... - - - ... reads and compares two or three directories recursively, - ... takes special care of symbolic links, - ... lets you browse files on mouse double click, - ... for each item proposes a merge operation, which you can change - before starting the directory merge, - ... lets you simulate the merge and lists the actions that would - take place, without actually doing them, - ... lets you really do the merge, and lets you interact whenever - manual interaction is needed, - ... lets you run the selected operation for all items (key F7) or the selected item (key F6), - ... lets you continue the merge after manual interaction with key F7, - ... optionally creates backups, with the ".orig" extension, - ... - - - -Starting Directory Comparison Or Merge - - This is very similar to the single file merge and comparison. You just - have to specify directories on the command line or in the file-open - dialog. - -Compare/Merge two directories: - - kdiff3 dir1 dir2 - kdiff3 dir1 dir2 -o destdir - - - If no destination directory is specified, then &kdiff3; will use dir2. - - - -Compare/Merge three directories: - - kdiff3 dir1 dir2 dir3 - kdiff3 dir1 dir2 dir3 -o destdir - - - When three directories are merged then dir1 - is used as the base for the merge. - If no destination directory is specified, then &kdiff3; will use dir3 - as the destination directory for the merge. - - - - Note that only the comparison starts automatically, not the merge. For this you first must - select a menu entry or the key F7. (More details later.) - - - - -Directory Merge Visible Information - - While reading the directories a message-box appears that informs you of - the progress. If you abort the directory scan, then only files that have - been compared until then will be listed. - - When the directory scan is complete then &kdiff3; will show a listbox with - the results left, ... - - - - - - ... and details about the currently selected item on the right: - - - - - - -The Name Column - - Each file and directory that was found during the scan is shown here in - a tree. You can select an item by clicking it with the mouse once. - - The directories are collapsed by default. You can expand and collapse - them by clicking on the "+"/"-" or by double-clicking the item or - by using the left/right-arrow-keys. The "Directory"-menu also contains two - actions "Fold all subdirs" and "Unfold all subdirs" with which you can - collapse or expand all directories at once. - - If you double-click a file item then the file comparison starts and the - file-diff-window will appear. - - - The image in the name column reflects the file type in the first - directory ("A"). It can be one of these: - - - Normal file - Normal directory (directory-image) - Link to a file (file-image with a link arrow) - Link to a directory (directory-image with a link arrow) - - - If the file type is different in the other directories, then this is visible - in the columns A/B/C and in the window that shows the details about the selected - item. Note that for such a case no merge operation can be selected automatically. - When starting the merge, then the user will be informed of problems of that - kind. - - - -The Columns A/B/C and the Coloring Scheme - - As can be seen in the image above the colors red, green, yellow and black - are used in the columns A/B/C. - - - Black: This item doesn't exist in this directory. - Green: Newest item. - Yellow: Older than green, newer than red. - Red: Oldest item. - - - But for items that were identical in the comparison their color also is - identical even if the age is not. - - Directories are considered equal if all items they contain are identical. - Then they also will have the same color. But the age of a directory is not - considered for its color. - - The idea for this coloring scheme I came upon in - dirdiff. The colors - resemble the colors of a leaf that is green when new, turns yellow later and red - when old. - - -The Operation Column - - After comparing the directories &kdiff3; also evaluates a proposal for a - merge operation. This is shown in the "Operation" column. You can modify - the operation by clicking on the operation you want to change. A small menu - will popup and allows you to select an operation for that item. (You can also - select the most needed operations via keyboard. - Ctrl+1/2/3/4/Del will select A/B/C/Merge/Delete respectively if available.) - This operation will be executed during the merge. It depends on the item and - on the merge-mode you are in, what operations are available. The merge-mode is one of - - - Three directory-merge ("A" is treated as older base of both). - Two directory-merge. - Two directory-sync-mode (activate via option "Synchronize Directories"). - - - In three directory merge the operation proposal will be: If for an item ... - - - ... all three directories are equal: Copy from C - ... A and C are equal but B is not: Copy from B (or if B does not - exist, delete the destination if exists) - ... A and B are equal but C is not: Copy from C (or if C does not - exist, delete the destination if exists) - ... B and C are equal but A is not: Copy from C (or if C does not - exist, delete the destination if exists) - ... only A exists: Delete the destination (if exists) - ... only B exists: Copy from B - ... only C exists: Copy from C - ... A, B and C are not equal: Merge - ... A, B and C don't have the same file type (e.g. A is a directory, - B is a file): "Error: Conflicting File Types". While such items exist the - directory merge cannot start. - - - In two directory merge the operation proposal will be: If for an item ... - - - ... both directories are equal: Copy from B - ... A exists, but not B: Copy from A - ... B exists, but not A: Copy from B - ... A and B exist but are not equal: Merge - ... A and B don't have the same file type (e.g. A is a directory, - B is a file): "Error: Conflicting File Types". While such items exist the - directory merge cannot start. - - - Sync-mode is active if only two directories and no explicit destination - were specified and if the option "Synchronize directories" is active. &kdiff3; - then selects a default operation so that both directories are the same afterwards. - If for an item ... - - - ... both directories are equal: Nothing will be done. - ... A exists, but not B: Copy A to B - ... B exists, but not A: Copy B to A - ... A and B exist, but are not equal: Merge and store the result - in both directories. (For the user the visible save-filename is B, - but then &kdiff3; copies B also to A.) - ... A and B don't have the same file type (e.g. A is a directory, - B is a file): "Error: Conflicting File Types". While such items exist the - directory merge cannot start. - - - When two directories are merged and the option "Copy newer instead of merging" is selected, - then &kdiff3; looks at the dates and proposes to choose the newer file. If the files are not - equal but have equal dates, then the operation will contain - "Error: Dates are equal but files are not." While such items exist the - directory merge cannot start. - - - -The Status Column - - During the merge one file after the other will be processed. The status - column will show "Done" for items where the merge operation has succeeded, - and other texts if something unexpected happened. When a merge is complete, - then you should make a last check to see if the status for all items is - agreeable. - - - -Statistics Columns - - When the file comparison mode "Full Analysis" is enabled in the options, then - &kdiff3; will show extra columns containing the numbers of unsolved, solved, nonwhite and whitespace - conflicts. (The solved-column will only show when comparing or merging three directories.) - - - -Selecting Listed Files - - Several options influence which files are listed here. Some are accessible in the - settings dialog. The Directory-menu contains the entries: - - "Show Identical Files": Files that have been detected equal in all input directories. - "Show Different Files": Files that exist in two or more directories but are not equal. - "Show Files only in A": Files that exist only in A, but not in B or C. - "Show Files only in B": Files that exist only in B, but not in A or C. - "Show Files only in C": Files that exist only in C, but not in A or B. - - - Activate only the "Show"-options for the items you want listed. If for example you only want to list all items that - exist either in A or in B but not in both, you'll have to activate "Show Files only in A" and "Show Files only in B" - and deactivate all others ("Show Identical Files", "Show Different Files", "Show Files only in C"). - The list will be updated immediately to reflect the change. - - These options also apply for directories with one exception: Disabling "Show Different Files" will not hide - any complete directories. This will work only for files within. - - Note that of these only the "Show Identical Files"-option is persistant. The others are enabled when starting &kdiff3;. - - - - - - -Doing A Directory Merge - - You can either merge the currently selected item (file or directory), or all items. - When you have made all your operation choices (in all subdirectories too) - then you can start the merge. - - Be aware that if you didn't specify a destination directory explicitly, - then the destination will be "C" in three directory mode, "B" in two directory - merge mode, and in sync-mode it will be "A" or/and "B". - - If you have specified a destination directory also check that all items - that should be in the output, are in the tree. There are some options that - cause certain items to be omitted from the directory comparison and merge. - Check these options to avoid unpleasant surprises: - - - "Recursive Directories": If this is off, then items in subdirectories - will not be found. - "Pattern"/"Anti-Pattern": Include/exclude items that match - "Find hidden files and directories" - "Show"-options (Show Identical/Different Files, Files only in A/B/C) - - - If you change the settings in order to list more files, you must do a rescan via menu "Directory"->"Rescan" yourself. - (The reason for this is that for faster comparison-speed &kdiff3; omits the comparison for files suppressed by these criteria.) - If you changed your file and dir patterns to exclude files, then the file-list will immediately be updated on closing - the options-dialog. - - Note that when you write to a completely new directory then you usually also want to copy the identical files. - In that case enable the "Show Identical Files"-option. If your destination-directory is one of the inputs, - then this isn't necessary because the file is already there. - - If you are satisfied so far, the rest is easy. - - To merge all items: Select "Start/Continue directory merge" in the "Directory"-menu - or press F7 (which is the default shortcut). - To merge only the current item: Select "Run Operation For Current Item" - or press F6. - - If due to conflicting filetypes still some items with invalid operations - exist, then a messagebox will appear and these items will be pointed out, - so you can select a valid operation for the item. - - If you merge all items a dialog will appear giving you the options "Do it", "Simulate - it" and "Cancel". - - - Select "Simulate it" if you want to see what would be done without - actually doing it. A verbose list of all operations will be shown. - Otherwise select "Do it" to really start merging. - - - Then &kdiff3; will run the specified operation for all items. If manual - interaction is required (single file merge), then a merge window will open - (see the big screenshot). - - When you have finished with manually merging a file, again select "Start/Continue directory - merge" or the key F7. If you haven't saved it yet, a dialog will ask you to - do so. Then &kdiff3; will continue with the next item. - - When &kdiff3; encounters an error, it will tell you so and will show the - verbose-status-information. At the bottom of this list, there will be some - error messages which should help you to understand the cause of the problem. - When you continue merging (F7 key) &kdiff3; will give you the choice to retry - or skip the item that caused the problem. This means that before continuing - you can choose another operation or solve the problem by other means. - - When the merge is complete, then &kdiff3; will inform you via a message - box. - - If some items were merged individually before running the directorymerge then - &kdiff3; remembers this (while this - merge-session goes on), and doesn't merge them again when later the merge for - all items is run. Even when the merge was skipped or nothing was saved these - items count as completed. Only when you change the merge operation the - "Done"-status of the item will be removed and it can be merged again. - - - -Options for Comparing and Merging Directories - - The &kdiff3;-preferences (menu "Settings"->"Configure &kdiff3;") has - a section called "Directory Merge" with these options: - - - - Recursive Directories: Select whether to search directories - recursively. - File Pattern(s): Only files that match any pattern here will - be put in the tree. More than one pattern may be specified here by using - the semicolon ";" as separator. Valid wildcards: '*' and '?'. (e.g. "*.cpp;*.h"). - Default is "*". This pattern is not used on directories. - File Anti-Pattern(s): Files that match this pattern - will be excluded from the tree. More than one pattern may be specified here - via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default - is "*.orig;*.o;*.obj". - Directory Anti-Pattern(s): Directories that match this pattern - will be excluded from the tree. More than one pattern may be specified here - via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default - is "CVS;deps;.svn". - Use CVS-Ignore: - Ignore files and directories that would also be ignored by CVS. - Many automatically generated files are ignored by CVS. - The big advantage is that this can be directory specific via a local ".cvsignore"-file. - (See info:/cvs/cvsignore.) - Find Hidden Files and Directories: On some file systems files - have an "Hidden"-attribute. On other systems a filename starting with a dot - "." causes it to be hidden. This option allows you to decide whether to - include these files in the tree or not. Default is on. - Follow File Links: For links to files: When disabled, then - the symbolic links are compared. When enabled, then the files behind the - links are compared. Default is off. - Follow Directory Links: For links to directories: When disabled, - then the symbolic links will be compared. When enabled then the link will - be treated like a directory and it will be scanned recursively. (Note that - the program doesn't check if the link is "recursive". So for example a directory - that contains a link to the directory would cause an infinite loop, and after - some time when the stack overflows or all memory is used up, crash the program.) - Default is off. - Case Sensitive Filename Comparison: - Default is false on Windows, true for other operating systems. - File Comparison Mode: - - Binary Comparison: - This is the default file comparison mode. - - Full Analysis: - Do a full analysis of each file and show the statistics information columns. - (Number of solved, unsolved, nonwhite and white conflicts.) - The full analysis is slower than a simple binary analysis, and much - slower when used on files that don't contain text. - (Specify the appropriate file-antipatterns.) - - Trust the modification date: If you compare big directories - over a slow network, it might be faster to compare the modification dates - and file length alone. But this speed improvement comes with the price of - a little uncertainty. Use this option with care. Default is off. - Trust the size: - Similar to trusting the modification date. No real comparison happens. Two - files are considered equal if their file-sizes are equal. This is useful - when the file-copy operation didn't preserve the modification date. - Use this option with care. Default is off. - - - Synchronize Directories: Activates "Sync-Mode" when two directories - are compared and no explicit destination directory was specified. In this - mode the proposed operations will be chosen so that both source directories - are equal afterwards. Also the merge result will be written to both directories. - Default is off. - Copy newer instead of merging: Instead of merging the proposed - operation will copy the newer source if changes happened. (Considered unsafe, - because it implies that you know, that the other file hasn't been edited - too. Check to make sure in every case.) Default is off. - Backup files: If a file or complete directory is replaced - by another or is deleted then the original version will be renamed with an - ".orig" extension. If an old backup file with ".orig" extension already exists - then this will be deleted without backup. This also affects the normal merging - of single files, not only in directory-merge mode. Default is on. - - - -Other Functions in Directory Merge Window -Split/Full Screen Mode - - Usually the directory merge list view remains visible while a single file - is compared or merged. With the mouse you can move the splitter bar that - separates the file list from the text-diff windows. If you don't want this, - you can disable "Split Screen View" in the "Directory"-menu. Then you can - use "Toggle View" in the "Directory"-menu to switch between the file list - and the text-diff view that then occupy the full screen. - - -Comparing or Merging a Single File - - Probably you will prefer a simple double mouse click on a file in order - to compare it. Nevertheless there also exists an entry in the "Directory"-menu. - You can also directly merge a single file by selecting it and - choosing "Merge current file" in the "Merge"-Menu. On saving the - result, the status will be set to done, and the file will not be merged again - if a directory merge is started. - - But note that this status information will be lost when you rerun a directory - scan: "Directory"-menu: "Rescan" - - -Comparing or Merging Files with Different Names - - Sometimes you need to compare or merge files with different names (e.g. the current - file and the backup in the same folder). - - Select the exact file by clicking onto the icon in the column A, B or C. The first - file selected thus will be marked with an "A", the second and third with "B" and "C" - regardless on what column they are in. Only up to three files can be chosen like this. - - Proceed by choosing "Compare Explicitly Selected Files" or "Merge Explicitly - Selected Files" from the "Directory"-menu. For your convenience these menu entries - also appear as context menu when you right-click the last selected file. - - The comparison or merge of a file will happen in the same window. - If this method is used for directories a new window will be opened. - - - - - -Miscellaneous Topics - -Networktransparency via KIO -KIO-Slaves - -KDE supports networktransparency via KIO-slaves. &kdiff3; uses this -for reading input files and for scanning directories. -This means that you can specify files and directories on local and -remote resources via URLs. - -Example: - - - kdiff3 test.cpp ftp://ftp.faraway.org/test.cpp - kdiff3 tar:/home/hacker/archive.tar.gz/dir ./dir - - -The first line compares a local file with a file on an FTP-server. The second line -compares a directory within an compressed archive with a local directory. - -Other KIO-slaves that are interesting are: - - -Files from the WWW (http:), -Files from the FTP (ftp:), -Encrypted file transfer (fish:, sftp:), -Windows-resources (smb:), -Local files (file:), - - -Other things that are possible, but probably less useful are: - - -Man-pages (man:), -Info-pages (info:), - - - -How To Write URLs - - An URL has a different syntax compared with paths for local files and directories. - Some things should be considered: - - - - A path can be relative and can contain "." or "..". This is not possible for URLs - which are always absolute. - - Special characters must be written with "escaping". ("#"->"%23", space->"%20", etc.) - E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23". - - When URLs don't work as expected, try to open them in Konqueror first. - - - - - -Capabilities of KIO-Slaves - - Networktransparency has one drawback: Not all resources have the same capabilities. - - Sometimes this is due to the file system of the server, sometimes due to the protocol. - Here is a short list of restrictions: - - - - Sometimes there is no support for links. - - Or there is no way to distinguish if a link points to a file or a directory; always - assuming a file. (ftp:, sftp:). - - Can't always determine the filesize. - - Limited support for permissions. - - No possibility to modify permissions or modification time, so permissions or time - of a copy will differ from the original. (See the option "Trust the size".) - (To modify permissions or modification time is only possible for local files.) - - - - - - - - -Questions and Answers - -&reporting.bugs; -&updating.documentation; - - - - - Why is it called "&kdiff3;"? - - Tools named "KDiff" and "KDiff2" (now called "Kompare") already exist. Also "KDiff3" should suggest - that it can merge like the "diff3"-tool in the Diff-Tool collection. - - - - Why did I release it under GPL? - - I'm using GPL programs for a very long time now and learned very much - by having a look at many of the sources. Hence this is my "Thank You" - to all programmers that also did so or will do the same. - - - - Some buttons and functions are missing. What's wrong? - - You compiled from source but you probably didn't specify the correct KDE-prefix. - By default &kdiff3; is installed in /usr/local but then KDE can't - find the user-interface resource file (i.e. kdiff3ui.rc). The README-file contains - more information about the correct prefix. - - - - Often lines that are similar but not identical appear next to each other - but sometimes not. Why? - - Lines where only the amount of white space characters is different - are treated as "equal" at first, while just one different non-white character - causes the lines to be "different". If similar lines appear next to each - other, this actually is coincidence but this fortunately is often the case. - See also Manual Diff Help. - - - - Why must all conflicts be solved before the merge result can be saved? - - For each equal or different section the editor in the merge result - window remembers where it begins or ends. This is needed so that conflicts - can be solved manually by simply selecting the source button (A, B or C). - This information is lost while saving as text and it is too much effort to - create a special file format that supports saving and restoring all necessary - information. - - - - How can I synchronise the diff and merge views, so that all views show the same text position? - - Click into the summary column left of the text. (See also here.) - - - - Why does the editor in the merge result window not have an "undo"-function? - - This was too much effort until now. You can always - restore a version from one source (A, B or C) by clicking the respective - button. For big editing the use of another editor is recommended anyway. - - - - When I removed some text, then suddenly "<No src line>" appeared - and cannot be deleted. What does that mean and how can one remove this? - - For each equal or different section the editor in the merge result - window remembers where it begins or ends. "<No src line>" means - that there is nothing left in a section, not even a new line character. - This can happen either while merging automatically or by editing. This is - no problem, since this hint won't appear in the saved file. If you want - the original source back just select the section (click on the left summary - column) and then click the source button with the needed contents (A/B or - C). - - - - Why doesn't &kdiff3; support syntax-highlighting? - - &kdiff3; already uses many colors for difference highlighting. More - highlighting would be confusing. Use another editor for this. - - - - Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files? - - Although &kdiff3; will analyse any kind of file the result will probably - not be very satisfactory for you. - - &kdiff3; was made to compare pure text files. OpenOffice, Word, Excel etc. - store much more information in the files (about fonts, pictures, pages, - colors etc.) which &kdiff3; doesn't know about. So &kdiff3; will - show you the contents of the file interpreted as pure text, but - this might be unreadable or at least it will look very odd. - - Since most programs nowadays store their contents in XML-format, you might - be able to read it as pure text. So if the change was only small, - &kdiff3; still might help you. - - The best solution if you only want to compare the text (without embedded - objects like pictures) is to use "Select All" and "Copy" in your program - to copy the interesting text to the clipboard and then in &kdiff3; paste the - text into either diff input window. - (See also Select, Copy And Paste.) - - - - Where has the directory option "List only deltas" gone? - - There are now several "Show"-options in the directory menu. - Disabling "Show identical files" will achieve what enabling "List only deltas" used to do. - - - - How can I make a big selection in the diff input window - because scrolling takes so long? - - Start the selection as usual (click and hold the left mouse button). - Then use the navigation keys (e.g. page up, page down) while holding the left mouse button down. - (See also Select, Copy And Paste.) - - - - There is so much information here, but your question is still not answered? - - Please send me your question. I appreciate every comment. - - - - - - - -Credits and License - - -&kdiff3; - File and Directory Comparison and Merge Tool - - -Program copyright 2002-2007 Joachim Eibl joachim.eibl at gmx.de - - -Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you! - - - -Documentation Copyright © 2002-2007 Joachim Eibl joachim.eibl at gmx.de - - - - -&underFDL; - - -&underGPL; - - - - -Installation - - -How to obtain &kdiff3; - - -You can download the latest version of &kdiff3; from its homepage http://kdiff3.sourceforge.net. - -&kdiff3; is also available for other platforms. See the homepage for details. - - - - - - -Requirements - - - In order to successfully use all features of &kdiff3;, you need &kde; > 4.4. - - For information about how to run &kdiff3; on other platforms without KDE please see the - homepage. - -You can find a list of changes at http://kdiff3.sourceforge.net/ChangeLog -or in the "ChangeLog"-file of the source package. - - - - -Compilation and Installation - -Information how to compile and install &kdiff3; on a system with &kde; you find in the -README file in the base directory of the &kdiff3; distribution - -Since &kdiff3; uses cmake -you should have no trouble compiling it. Should you -run into problems please report them to the &kde; mailing lists. - -If you don't use KDE follow the instructions for Qt-only systems in the README file. - - - - -&documentation.index; - - - Index: trunk/extragear/utils/doc/kdiff3/dirbrowser.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/dirbrowser.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/dirbrowser.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/dirbrowser.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/dirbrowser.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/iteminfo.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/iteminfo.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/iteminfo.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/iteminfo.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/iteminfo.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/kdiff3/man-kdiff3.1.docbook =================================================================== --- trunk/extragear/utils/doc/kdiff3/man-kdiff3.1.docbook (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/man-kdiff3.1.docbook (nonexistent) @@ -1,129 +0,0 @@ - - -]> - - - -&kde; User's Manual -2005-09-08 -K Desktop Environment - - - -kdiff3 -1 - - -kdiff3 -compares two or three input files or folders - - - - - kdiff3 QToptions - KDEoptions - kdiff3options - File1 - File2 - File3 - - - -Description -This manual page documents briefly the -kdiff3 tool. - -This manual page was written for the Debian distribution -because the original program does not have a manual page. -For comprehensive help, please see the KDiff3 Handbook. - - -kdiff3 is a file and folder diff and merge tool which - -compares and merges two or three text input files or folders -shows the differences line by line and character by character -provides an automatic merge-facility -and has an intuitive graphical user interface -has an editor for comfortable solving of merge-conflicts -provides networktransparency via KIO -has options to highlight or hide changes in white-space or comments -supports Unicode, UTF-8 and other file encodings -prints differences -supports version control keyword and history merging - - - - - -Options -This program follows the usual &GNU; command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. For a full summary of options, run -kdiff3 --help. - - - - - -Merge the input. - - - - - -Explicit base file. For compatibility with certain tools. - - - - - -Output file. Implies -m. E.g.: -o newfile.txt - - - - - -Output file, again. (For compatibility with certain tools.) - - - - - -No GUI if all conflicts are auto-solvable. (Needs -o file) - - - - - -Don't solve conflicts automatically. (For compatibility...) - - - - - -Visible name replacement. Supply this once for every input. - - - - - -Show version of program. - - - - - -Author -This manual page was written by Eike Sauer <eikes@cs.tu-berlin.de> for -the Debian system (but may be used by others). Permission is -granted to copy, distribute and/or modify this document under -the terms of the &GNU; General Public License, Version 2 -(or, at your option, any later version published by the Free -Software Foundation). - -On Debian systems, the complete text of the &GNU; General Public -License can be found in /usr/share/common-licenses/GPL. - - - Index: trunk/extragear/utils/doc/kdiff3/dirmergebig.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/extragear/utils/doc/kdiff3/dirmergebig.png =================================================================== --- trunk/extragear/utils/doc/kdiff3/dirmergebig.png (revision 1510721) +++ trunk/extragear/utils/doc/kdiff3/dirmergebig.png (nonexistent) Property changes on: trunk/extragear/utils/doc/kdiff3/dirmergebig.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/extragear/utils/doc/CMakeLists.txt =================================================================== --- trunk/extragear/utils/doc/CMakeLists.txt (revision 1510721) +++ trunk/extragear/utils/doc/CMakeLists.txt (revision 1510722) @@ -1,3 +1,2 @@ add_subdirectory(kpager) add_subdirectory(keurocalc) -add_subdirectory(kdiff3)