annotate kdiff3/src-QT4/pdiff.cpp @ 80:fcd146072e0c

0.9.93
author joachim99
date Tue, 06 Jan 2009 17:51:29 +0000
parents 1184fc843210
children fa1a49fc1ec1
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@58 2 pdiff.cpp - Implementation for class KDiff3App
joachim99@58 3 ---------------
joachim99@69 4 begin : Mon March 18 20:04:50 CET 2002
joachim99@77 5 copyright : (C) 2002-2007 by Joachim Eibl
joachim99@69 6 email : joachim.eibl at gmx.de
joachim99@8 7 ***************************************************************************/
joachim99@8 8
joachim99@8 9 /***************************************************************************
joachim99@8 10 * *
joachim99@8 11 * This program is free software; you can redistribute it and/or modify *
joachim99@8 12 * it under the terms of the GNU General Public License as published by *
joachim99@8 13 * the Free Software Foundation; either version 2 of the License, or *
joachim99@8 14 * (at your option) any later version. *
joachim99@8 15 * *
joachim99@8 16 ***************************************************************************/
joachim99@8 17
joachim99@69 18 #include "difftextwindow.h"
joachim99@69 19 #include "mergeresultwindow.h"
joachim99@8 20 #include "directorymergewindow.h"
joachim99@69 21 #include "smalldialogs.h"
joachim99@8 22
joachim99@8 23 #include <iostream>
joachim99@8 24 #include <algorithm>
joachim99@8 25 #include <ctype.h>
joachim99@8 26
joachim99@8 27 #include <qclipboard.h>
joachim99@8 28 #include <qscrollbar.h>
joachim99@8 29 #include <qlayout.h>
joachim99@69 30 #include <qcheckbox.h>
joachim99@8 31 #include <qsplitter.h>
joachim99@8 32 #include <qdir.h>
joachim99@8 33 #include <qfile.h>
joachim99@69 34 #include <qlineedit.h>
joachim99@69 35 #include <qcombobox.h>
joachim99@75 36 #include <QDropEvent>
joachim99@75 37 #include <QUrl>
joachim99@75 38 #include <QProcess>
joachim99@75 39
joachim99@75 40 #include <klocale.h>
joachim99@75 41 #include <kmessagebox.h>
joachim99@75 42 #include <kfontdialog.h>
joachim99@75 43 #include <kstatusbar.h>
joachim99@75 44
joachim99@75 45
joachim99@8 46 #include <assert.h>
joachim99@8 47
joachim99@8 48 #include "kdiff3.h"
joachim99@8 49 #include "optiondialog.h"
joachim99@8 50 #include "fileaccess.h"
joachim99@8 51 #ifdef _WIN32
joachim99@8 52 #include <windows.h>
joachim99@8 53 #else
joachim99@8 54 #include <unistd.h>
joachim99@80 55 #include <kshortcutsdialog.h>
joachim99@8 56 #endif
joachim99@8 57
joachim99@51 58 #include "gnudiff_diff.h"
joachim99@51 59
joachim99@8 60 bool g_bIgnoreWhiteSpace = true;
joachim99@8 61 bool g_bIgnoreTrivialMatches = true;
joachim99@8 62
joachim99@8 63
joachim99@58 64 bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList )
joachim99@8 65 {
joachim99@66 66 ProgressProxy pp;
joachim99@68 67 static GnuDiff gnuDiff; // All values are initialized with zeros.
joachim99@68 68
joachim99@66 69 pp.setCurrent(0);
joachim99@51 70
joachim99@8 71 diffList.clear();
joachim99@69 72 if ( p1[0].pLine==0 || p2[0].pLine==0 || size1==0 || size2==0 )
joachim99@51 73 {
joachim99@51 74 Diff d( 0,0,0);
joachim99@51 75 if ( p1[0].pLine==0 && p2[0].pLine==0 && size1 == size2 )
joachim99@51 76 d.nofEquals = size1;
joachim99@69 77 else
joachim99@53 78 {
joachim99@53 79 d.diff1=size1;
joachim99@53 80 d.diff2=size2;
joachim99@53 81 }
joachim99@51 82
joachim99@51 83 diffList.push_back(d);
joachim99@51 84 }
joachim99@53 85 else
joachim99@68 86 {
joachim99@53 87 GnuDiff::comparison comparisonInput;
joachim99@53 88 memset( &comparisonInput, 0, sizeof(comparisonInput) );
joachim99@53 89 comparisonInput.parent = 0;
joachim99@69 90 comparisonInput.file[0].buffer = p1[0].pLine;//ptr to buffer
joachim99@68 91 comparisonInput.file[0].buffered = (p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size); // size of buffer
joachim99@69 92 comparisonInput.file[1].buffer = p2[0].pLine;//ptr to buffer
joachim99@68 93 comparisonInput.file[1].buffered = (p2[size2-1].pLine-p2[0].pLine+p2[size2-1].size); // size of buffer
joachim99@68 94
joachim99@53 95 gnuDiff.ignore_white_space = GnuDiff::IGNORE_ALL_SPACE; // I think nobody needs anything else ...
joachim99@53 96 gnuDiff.bIgnoreWhiteSpace = true;
joachim99@53 97 gnuDiff.bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers;
joachim99@53 98 gnuDiff.minimal = m_pOptionDialog->m_bTryHard;
joachim99@66 99 gnuDiff.ignore_case = false;
joachim99@53 100 GnuDiff::change* script = gnuDiff.diff_2_files( &comparisonInput );
joachim99@68 101
joachim99@53 102 int equalLinesAtStart = comparisonInput.file[0].prefix_lines;
joachim99@53 103 int currentLine1 = 0;
joachim99@53 104 int currentLine2 = 0;
joachim99@53 105 GnuDiff::change* p=0;
joachim99@53 106 for (GnuDiff::change* e = script; e; e = p)
joachim99@51 107 {
joachim99@53 108 Diff d(0,0,0);
joachim99@53 109 d.nofEquals = e->line0 - currentLine1;
joachim99@53 110 assert( d.nofEquals == e->line1 - currentLine2 );
joachim99@53 111 d.diff1 = e->deleted;
joachim99@53 112 d.diff2 = e->inserted;
joachim99@53 113 currentLine1 += d.nofEquals + d.diff1;
joachim99@53 114 currentLine2 += d.nofEquals + d.diff2;
joachim99@53 115 diffList.push_back(d);
joachim99@68 116
joachim99@53 117 p = e->link;
joachim99@53 118 free (e);
joachim99@51 119 }
joachim99@68 120
joachim99@66 121 if ( diffList.empty() )
joachim99@51 122 {
joachim99@66 123 Diff d(0,0,0);
joachim99@66 124 d.nofEquals = min2(size1,size2);
joachim99@66 125 d.diff1 = size1 - d.nofEquals;
joachim99@66 126 d.diff2 = size2 - d.nofEquals;
joachim99@66 127 diffList.push_back(d);
joachim99@66 128 /* Diff d(0,0,0);
joachim99@66 129 d.nofEquals = equalLinesAtStart;
joachim99@66 130 if ( gnuDiff.files[0].missing_newline != gnuDiff.files[1].missing_newline )
joachim99@66 131 {
joachim99@66 132 d.diff1 = gnuDiff.files[0].missing_newline ? 0 : 1;
joachim99@66 133 d.diff2 = gnuDiff.files[1].missing_newline ? 0 : 1;
joachim99@66 134 ++d.nofEquals;
joachim99@66 135 }
joachim99@66 136 else if ( !gnuDiff.files[0].missing_newline )
joachim99@66 137 {
joachim99@66 138 ++d.nofEquals;
joachim99@68 139 }
joachim99@66 140 diffList.push_back(d);
joachim99@66 141 */
joachim99@66 142 }
joachim99@66 143 else
joachim99@66 144 {
joachim99@66 145 diffList.front().nofEquals += equalLinesAtStart;
joachim99@53 146 currentLine1 += equalLinesAtStart;
joachim99@53 147 currentLine2 += equalLinesAtStart;
joachim99@68 148
joachim99@53 149 int nofEquals = min2(size1-currentLine1,size2-currentLine2);
joachim99@53 150 if ( nofEquals==0 )
joachim99@53 151 {
joachim99@53 152 diffList.back().diff1 += size1-currentLine1;
joachim99@53 153 diffList.back().diff2 += size2-currentLine2;
joachim99@53 154 }
joachim99@53 155 else
joachim99@53 156 {
joachim99@53 157 Diff d( nofEquals,size1-currentLine1-nofEquals,size2-currentLine2-nofEquals);
joachim99@53 158 diffList.push_back(d);
joachim99@53 159 }
joachim99@68 160
joachim99@66 161 /*
joachim99@66 162 if ( gnuDiff.files[0].missing_newline != gnuDiff.files[1].missing_newline )
joachim99@66 163 {
joachim99@66 164 diffList.back().diff1 += gnuDiff.files[0].missing_newline ? 0 : 1;
joachim99@66 165 diffList.back().diff2 += gnuDiff.files[1].missing_newline ? 0 : 1;
joachim99@66 166 }
joachim99@66 167 else if ( !gnuDiff.files[0].missing_newline )
joachim99@66 168 {
joachim99@66 169 ++ diffList.back().nofEquals;
joachim99@66 170 }
joachim99@66 171 */
joachim99@53 172 }
joachim99@51 173 }
joachim99@68 174
joachim99@51 175 #ifndef NDEBUG
joachim99@51 176 // Verify difflist
joachim99@51 177 {
joachim99@51 178 int l1=0;
joachim99@51 179 int l2=0;
joachim99@51 180 DiffList::iterator i;
joachim99@51 181 for( i = diffList.begin(); i!=diffList.end(); ++i )
joachim99@51 182 {
joachim99@51 183 l1+= i->nofEquals + i->diff1;
joachim99@51 184 l2+= i->nofEquals + i->diff2;
joachim99@51 185 }
joachim99@51 186
joachim99@51 187 //if( l1!=p1-p1start || l2!=p2-p2start )
joachim99@51 188 if( l1!=size1 || l2!=size2 )
joachim99@51 189 assert( false );
joachim99@51 190 }
joachim99@51 191 #endif
joachim99@51 192
joachim99@66 193 pp.setCurrent(1.0);
joachim99@51 194
joachim99@51 195 return true;
joachim99@8 196 }
joachim99@8 197
joachim99@69 198 bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList,
joachim99@69 199 int winIdx1, int winIdx2 )
joachim99@69 200 {
joachim99@69 201 diffList.clear();
joachim99@69 202 DiffList diffList2;
joachim99@8 203
joachim99@69 204 int l1begin = 0;
joachim99@69 205 int l2begin = 0;
joachim99@69 206 ManualDiffHelpList::const_iterator i;
joachim99@69 207 for( i = m_manualDiffHelpList.begin(); i!=m_manualDiffHelpList.end(); ++i )
joachim99@69 208 {
joachim99@69 209 const ManualDiffHelpEntry& mdhe = *i;
joachim99@69 210
joachim99@69 211 int l1end = winIdx1 == 1 ? mdhe.lineA1 : winIdx1==2 ? mdhe.lineB1 : mdhe.lineC1 ;
joachim99@69 212 int l2end = winIdx2 == 1 ? mdhe.lineA1 : winIdx2==2 ? mdhe.lineB1 : mdhe.lineC1 ;
joachim99@69 213
joachim99@69 214 if ( l1end>=0 && l2end>=0 )
joachim99@69 215 {
joachim99@69 216 runDiff( p1+l1begin, l1end-l1begin, p2+l2begin, l2end-l2begin, diffList2 );
joachim99@69 217 diffList.splice( diffList.end(), diffList2 );
joachim99@69 218 l1begin = l1end;
joachim99@69 219 l2begin = l2end;
joachim99@69 220
joachim99@69 221 l1end = winIdx1 == 1 ? mdhe.lineA2 : winIdx1==2 ? mdhe.lineB2 : mdhe.lineC2 ;
joachim99@69 222 l2end = winIdx2 == 1 ? mdhe.lineA2 : winIdx2==2 ? mdhe.lineB2 : mdhe.lineC2 ;
joachim99@69 223
joachim99@69 224 if ( l1end>=0 && l2end>=0 )
joachim99@69 225 {
joachim99@69 226 ++l1end; // point to line after last selected line
joachim99@69 227 ++l2end;
joachim99@69 228 runDiff( p1+l1begin, l1end-l1begin, p2+l2begin, l2end-l2begin, diffList2 );
joachim99@69 229 diffList.splice( diffList.end(), diffList2 );
joachim99@69 230 l1begin = l1end;
joachim99@69 231 l2begin = l2end;
joachim99@69 232 }
joachim99@69 233 }
joachim99@69 234 }
joachim99@69 235 runDiff( p1+l1begin, size1-l1begin, p2+l2begin, size2-l2begin, diffList2 );
joachim99@69 236 diffList.splice( diffList.end(), diffList2 );
joachim99@69 237 return true;
joachim99@69 238 }
joachim99@69 239
joachim99@69 240 void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles )
joachim99@8 241 {
joachim99@66 242 ProgressProxy pp;
joachim99@66 243 // When doing a full analysis in the directory-comparison, then the statistics-results
joachim99@66 244 // will be stored in the given TotalDiffStatus. Otherwise it will be 0.
joachim99@66 245 bool bGUI = pTotalDiffStatus == 0;
joachim99@66 246 if (pTotalDiffStatus==0)
joachim99@66 247 pTotalDiffStatus = &m_totalDiffStatus;
joachim99@66 248
joachim99@8 249 bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn;
joachim99@8 250
joachim99@8 251 bool bVisibleMergeResultWindow = ! m_outputFilename.isEmpty();
joachim99@66 252 if ( bVisibleMergeResultWindow && bGUI )
joachim99@8 253 {
joachim99@8 254 bPreserveCarriageReturn = false;
joachim99@69 255
joachim99@58 256 QString msg;
joachim99@69 257
joachim99@58 258 if ( !m_pOptionDialog->m_PreProcessorCmd.isEmpty() )
joachim99@58 259 {
joachim99@58 260 msg += "- " + i18n("PreprocessorCmd: ") + m_pOptionDialog->m_PreProcessorCmd + "\n";
joachim99@58 261 }
joachim99@58 262 if ( !msg.isEmpty() )
joachim99@58 263 {
joachim99@58 264 int result = KMessageBox::warningYesNo( this,
joachim99@58 265 i18n("The following option(s) you selected might change data:\n") + msg +
joachim99@58 266 i18n("\nMost likely this is not wanted during a merge.\n"
joachim99@58 267 "Do you want to disable these settings or continue with these settings active?"),
joachim99@68 268 i18n("Option Unsafe for Merging"),
joachim99@80 269 KGuiItem( i18n("Use These Options During Merge") ),
joachim99@80 270 KGuiItem( i18n("Disable Unsafe Options") )
joachim99@58 271 );
joachim99@69 272
joachim99@58 273 if (result == KMessageBox::No )
joachim99@58 274 {
joachim99@58 275 m_pOptionDialog->m_PreProcessorCmd = "";
joachim99@58 276 }
joachim99@58 277 }
joachim99@8 278 }
joachim99@8 279
joachim99@58 280 // Because of the progressdialog paintevents can occur, but data is invalid,
joachim99@58 281 // so painting must be suppressed.
joachim99@8 282 if (m_pDiffTextWindow1) m_pDiffTextWindow1->setPaintingAllowed( false );
joachim99@8 283 if (m_pDiffTextWindow2) m_pDiffTextWindow2->setPaintingAllowed( false );
joachim99@8 284 if (m_pDiffTextWindow3) m_pDiffTextWindow3->setPaintingAllowed( false );
joachim99@8 285 if (m_pOverview) m_pOverview->setPaintingAllowed( false );
joachim99@58 286 if (m_pMergeResultWindow) m_pMergeResultWindow->setPaintingAllowed( false );
joachim99@8 287
joachim99@69 288 m_diff3LineList.clear();
joachim99@8 289
joachim99@69 290 if ( bLoadFiles )
joachim99@69 291 {
joachim99@69 292 m_manualDiffHelpList.clear();
joachim99@69 293
joachim99@69 294 if( m_sd3.isEmpty() )
joachim99@69 295 pp.setMaxNofSteps( 4 ); // Read 2 files, 1 comparison, 1 finediff
joachim99@69 296 else
joachim99@69 297 pp.setMaxNofSteps( 9 ); // Read 3 files, 3 comparisons, 3 finediffs
joachim99@69 298
joachim99@69 299 // First get all input data.
joachim99@69 300 pp.setInformation(i18n("Loading A"));
joachim99@75 301 m_sd1.readAndPreprocess(m_pOptionDialog->m_pEncodingA, m_pOptionDialog->m_bAutoDetectUnicodeA );
joachim99@69 302 pp.step();
joachim99@69 303
joachim99@69 304 pp.setInformation(i18n("Loading B"));
joachim99@75 305 m_sd2.readAndPreprocess(m_pOptionDialog->m_pEncodingB, m_pOptionDialog->m_bAutoDetectUnicodeB );
joachim99@69 306 pp.step();
joachim99@69 307 }
joachim99@8 308 else
joachim99@69 309 {
joachim99@69 310 if( m_sd3.isEmpty() )
joachim99@69 311 pp.setMaxNofSteps( 2 ); // 1 comparison, 1 finediff
joachim99@69 312 else
joachim99@69 313 pp.setMaxNofSteps( 6 ); // 3 comparisons, 3 finediffs
joachim99@69 314 }
joachim99@8 315
joachim99@66 316 pTotalDiffStatus->reset();
joachim99@8 317 // Run the diff.
joachim99@8 318 if ( m_sd3.isEmpty() )
joachim99@8 319 {
joachim99@66 320 pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
joachim99@66 321 pp.setInformation(i18n("Diff: A <-> B"));
joachim99@69 322
joachim99@69 323 runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
joachim99@8 324
joachim99@66 325 pp.step();
joachim99@8 326
joachim99@66 327 pp.setInformation(i18n("Linediff: A <-> B"));
joachim99@8 328 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
joachim99@66 329 fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
joachim99@66 330 if ( m_sd1.getSizeBytes()==0 ) pTotalDiffStatus->bTextAEqB=false;
joachim99@8 331
joachim99@66 332 pp.step();
joachim99@8 333 }
joachim99@8 334 else
joachim99@8 335 {
joachim99@69 336 if (bLoadFiles)
joachim99@69 337 {
joachim99@69 338 pp.setInformation(i18n("Loading C"));
joachim99@75 339 m_sd3.readAndPreprocess(m_pOptionDialog->m_pEncodingC, m_pOptionDialog->m_bAutoDetectUnicodeC );
joachim99@69 340 pp.step();
joachim99@69 341 }
joachim99@8 342
joachim99@66 343 pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
joachim99@66 344 pTotalDiffStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 );
joachim99@66 345 pTotalDiffStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 );
joachim99@8 346
joachim99@66 347 pp.setInformation(i18n("Diff: A <-> B"));
joachim99@69 348 runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
joachim99@66 349 pp.step();
joachim99@66 350 pp.setInformation(i18n("Diff: B <-> C"));
joachim99@69 351 runDiff( m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_sd3.getLineDataForDiff(), m_sd3.getSizeLines(), m_diffList23,2,3 );
joachim99@66 352 pp.step();
joachim99@66 353 pp.setInformation(i18n("Diff: A <-> C"));
joachim99@69 354 runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd3.getLineDataForDiff(), m_sd3.getSizeLines(), m_diffList13,1,3 );
joachim99@66 355 pp.step();
joachim99@8 356
joachim99@8 357 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
joachim99@8 358 calcDiff3LineListUsingAC( &m_diffList13, m_diff3LineList );
joachim99@69 359 correctManualDiffAlignment( m_diff3LineList, &m_manualDiffHelpList );
joachim99@69 360 calcDiff3LineListTrim( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff(), &m_manualDiffHelpList );
joachim99@8 361
joachim99@80 362 if ( m_pOptionDialog->m_bDiff3AlignBC )
joachim99@80 363 {
joachim99@80 364 calcDiff3LineListUsingBC( &m_diffList23, m_diff3LineList );
joachim99@80 365 correctManualDiffAlignment( m_diff3LineList, &m_manualDiffHelpList );
joachim99@80 366 calcDiff3LineListTrim( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff(), &m_manualDiffHelpList );
joachim99@80 367 }
joachim99@58 368 debugLineCheck( m_diff3LineList, m_sd1.getSizeLines(), 1 );
joachim99@58 369 debugLineCheck( m_diff3LineList, m_sd2.getSizeLines(), 2 );
joachim99@58 370 debugLineCheck( m_diff3LineList, m_sd3.getSizeLines(), 3 );
joachim99@8 371
joachim99@66 372 pp.setInformation(i18n("Linediff: A <-> B"));
joachim99@66 373 fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
joachim99@66 374 pp.step();
joachim99@66 375 pp.setInformation(i18n("Linediff: B <-> C"));
joachim99@66 376 fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDiffStatus->bTextBEqC );
joachim99@66 377 pp.step();
joachim99@66 378 pp.setInformation(i18n("Linediff: A <-> C"));
joachim99@66 379 fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqC );
joachim99@66 380 pp.step();
joachim99@66 381 if ( m_sd1.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextAEqC=false; }
joachim99@66 382 if ( m_sd2.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextBEqC=false; }
joachim99@8 383 }
joachim99@69 384 m_diffBufferInfo.init( &m_diff3LineList, &m_diff3LineVector,
joachim99@69 385 m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(),
joachim99@69 386 m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(),
joachim99@69 387 m_sd3.getLineDataForDiff(), m_sd3.getSizeLines() );
joachim99@58 388 calcWhiteDiff3Lines( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff() );
joachim99@8 389 calcDiff3LineVector( m_diff3LineList, m_diff3LineVector );
joachim99@8 390
joachim99@8 391 // Calc needed lines for display
joachim99@8 392 m_neededLines = m_diff3LineList.size();
joachim99@8 393
joachim99@75 394 QList<int> oldHeights;
joachim99@75 395 if ( m_pDirectoryMergeSplitter->isVisible() )
joachim99@75 396 oldHeights = m_pMainSplitter->sizes();
joachim99@75 397
joachim99@8 398 initView();
joachim99@75 399
joachim99@75 400 if ( m_pDirectoryMergeSplitter->isVisible() )
joachim99@66 401 {
joachim99@75 402 if (oldHeights.count() < 2)
joachim99@75 403 oldHeights.append(0);
joachim99@75 404 if (oldHeights[1]==0) // Distribute the available space evenly between the two widgets.
joachim99@75 405 {
joachim99@75 406 oldHeights[1] = oldHeights[0]/2;
joachim99@75 407 oldHeights[0] -= oldHeights[1];
joachim99@75 408 }
joachim99@75 409 m_pMainSplitter->setSizes( oldHeights );
joachim99@66 410 }
joachim99@75 411
joachim99@75 412 m_pMainWidget->setVisible( bGUI );
joachim99@8 413
joachim99@8 414 m_bTripleDiff = ! m_sd3.isEmpty();
joachim99@8 415
joachim99@75 416 m_pMergeResultWindowTitle->setEncodings( m_sd1.getEncoding(), m_sd2.getEncoding(), m_sd3.getEncoding() );
joachim99@75 417 if ( ! m_pOptionDialog->m_bAutoSelectOutEncoding )
joachim99@75 418 m_pMergeResultWindowTitle->setEncoding( m_pOptionDialog->m_pEncodingOut );
joachim99@75 419
joachim99@80 420 m_pMergeResultWindowTitle->setLineEndStyles( m_sd1.getLineEndStyle(), m_sd2.getLineEndStyle(), m_sd3.getLineEndStyle() );
joachim99@80 421
joachim99@66 422 if ( bGUI )
joachim99@66 423 {
joachim99@69 424 const ManualDiffHelpList* pMDHL = &m_manualDiffHelpList;
joachim99@66 425 m_pDiffTextWindow1->init( m_sd1.getAliasName(),
joachim99@69 426 m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff );
joachim99@66 427 m_pDiffTextWindow2->init( m_sd2.getAliasName(),
joachim99@69 428 m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff );
joachim99@66 429 m_pDiffTextWindow3->init( m_sd3.getAliasName(),
joachim99@69 430 m_sd3.getLineDataForDisplay(), m_sd3.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff );
joachim99@69 431
joachim99@75 432 m_pDiffTextWindowFrame3->setVisible(m_bTripleDiff);
joachim99@66 433 }
joachim99@8 434
joachim99@8 435 m_bOutputModified = bVisibleMergeResultWindow;
joachim99@8 436
joachim99@8 437 m_pMergeResultWindow->init(
joachim99@69 438 m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(),
joachim99@69 439 m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(),
joachim99@69 440 m_bTripleDiff ? m_sd3.getLineDataForDisplay() : 0, m_sd3.getSizeLines(),
joachim99@8 441 &m_diff3LineList,
joachim99@75 442 pTotalDiffStatus
joachim99@8 443 );
joachim99@75 444 m_pMergeResultWindowTitle->setFileName( m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename );
joachim99@69 445
joachim99@66 446 if ( !bGUI )
joachim99@66 447 {
joachim99@66 448 // We now have all needed information. The rest below is only for GUI-activation.
joachim99@69 449 m_sd1.reset();
joachim99@69 450 m_sd2.reset();
joachim99@69 451 m_sd3.reset();
joachim99@66 452 return;
joachim99@66 453 }
joachim99@69 454
joachim99@8 455 m_pOverview->init(&m_diff3LineList, m_bTripleDiff );
joachim99@8 456 m_pDiffVScrollBar->setValue( 0 );
joachim99@8 457 m_pHScrollBar->setValue( 0 );
joachim99@66 458 m_pMergeVScrollBar->setValue( 0 );
joachim99@8 459
joachim99@8 460 m_pDiffTextWindow1->setPaintingAllowed( true );
joachim99@8 461 m_pDiffTextWindow2->setPaintingAllowed( true );
joachim99@8 462 m_pDiffTextWindow3->setPaintingAllowed( true );
joachim99@8 463 m_pOverview->setPaintingAllowed( true );
joachim99@58 464 m_pMergeResultWindow->setPaintingAllowed( true );
joachim99@58 465
joachim99@8 466
joachim99@8 467 if ( !bVisibleMergeResultWindow )
joachim99@8 468 m_pMergeWindowFrame->hide();
joachim99@8 469 else
joachim99@8 470 m_pMergeWindowFrame->show();
joachim99@8 471
joachim99@8 472 // Calc max width for display
joachim99@8 473 m_maxWidth = max2( m_pDiffTextWindow1->getNofColumns(), m_pDiffTextWindow2->getNofColumns() );
joachim99@8 474 m_maxWidth = max2( m_maxWidth, m_pDiffTextWindow3->getNofColumns() );
joachim99@8 475 m_maxWidth += 5;
joachim99@8 476
joachim99@66 477 // Try to create a meaningful but not too long caption
joachim99@66 478 if ( !isPart() )
joachim99@66 479 {
joachim99@66 480 // 1. If the filenames are equal then show only one filename
joachim99@66 481 QString caption;
joachim99@66 482 QString a1 = m_sd1.getAliasName();
joachim99@66 483 QString a2 = m_sd2.getAliasName();
joachim99@66 484 QString a3 = m_sd3.getAliasName();
joachim99@66 485 QString f1, f2, f3;
joachim99@66 486 int p1,p2,p3;
joachim99@75 487 if ( !a1.isEmpty() && (p1=a1.lastIndexOf('/'))>=0 )
joachim99@66 488 f1 = a1.mid( p1+1 );
joachim99@75 489 if ( !a2.isEmpty() && (p2=a2.lastIndexOf('/'))>=0 )
joachim99@66 490 f2 = a2.mid( p2+1 );
joachim99@75 491 if ( !a3.isEmpty() && (p3=a3.lastIndexOf('/'))>=0 )
joachim99@66 492 f3 = a3.mid( p3+1 );
joachim99@66 493 if ( !f1.isEmpty() )
joachim99@66 494 {
joachim99@66 495 if ( ( f2.isEmpty() && f3.isEmpty() ) ||
joachim99@66 496 (f2.isEmpty() && f1==f3) || ( f3.isEmpty() && f1==f2 ) || (f1==f2 && f1==f3))
joachim99@66 497 caption = ".../"+f1;
joachim99@66 498 }
joachim99@66 499 else if ( ! f2.isEmpty() )
joachim99@66 500 {
joachim99@66 501 if ( f3.isEmpty() || f2==f3 )
joachim99@66 502 caption = ".../"+f2;
joachim99@66 503 }
joachim99@66 504 else if ( ! f3.isEmpty() )
joachim99@66 505 caption = ".../"+f3;
joachim99@69 506
joachim99@66 507 // 2. If the files don't have the same name then show all names
joachim99@66 508 if ( caption.isEmpty() && (!f1.isEmpty() || !f2.isEmpty() || !f3.isEmpty()) )
joachim99@66 509 {
joachim99@68 510 caption = ( f1.isEmpty()? QString("") : QString(".../")+f1 );
joachim99@68 511 caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? QString("") : QString(".../")+f2 );
joachim99@68 512 caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? QString("") : QString(".../")+f3 ) ;
joachim99@69 513 }
joachim99@69 514
joachim99@75 515 m_pKDiff3Shell->setWindowTitle( caption.isEmpty() ? QString("KDiff3") : caption+QString(" - KDiff3"));
joachim99@66 516 }
joachim99@69 517
joachim99@69 518 if ( bLoadFiles )
joachim99@8 519 {
joachim99@69 520 if ( bVisibleMergeResultWindow && !bAuto )
joachim99@69 521 m_pMergeResultWindow->showNrOfConflicts();
joachim99@69 522 else if ( !bAuto &&
joachim99@69 523 // Avoid showing this message during startup without parameters.
joachim99@69 524 !( m_sd1.getAliasName().isEmpty() && m_sd2.getAliasName().isEmpty() && m_sd3.getAliasName().isEmpty() ) &&
joachim99@69 525 ( m_sd1.isValid() && m_sd2.isValid() && m_sd3.isValid() )
joachim99@69 526 )
joachim99@69 527 {
joachim99@69 528 QString totalInfo;
joachim99@69 529 if ( pTotalDiffStatus->bBinaryAEqB && pTotalDiffStatus->bBinaryAEqC )
joachim99@69 530 totalInfo += i18n("All input files are binary equal.");
joachim99@69 531 else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC )
joachim99@69 532 totalInfo += i18n("All input files contain the same text, but are not binary equal.");
joachim99@69 533 else {
joachim99@80 534 if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("B"));
joachim99@80 535 else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n",QString("A"),QString("B"));
joachim99@80 536 if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("C"));
joachim99@80 537 else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n",QString("A"),QString("C"));
joachim99@80 538 if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("B"),QString("C"));
joachim99@80 539 else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n",QString("B"),QString("C"));
joachim99@69 540 }
joachim99@69 541
joachim99@69 542 if ( !totalInfo.isEmpty() )
joachim99@69 543 KMessageBox::information( this, totalInfo );
joachim99@8 544 }
joachim99@8 545
joachim99@69 546 if ( bVisibleMergeResultWindow && (!m_sd1.isText() || !m_sd2.isText() || !m_sd3.isText()) )
joachim99@8 547 {
joachim99@69 548 KMessageBox::information( this, i18n(
joachim99@69 549 "Some inputfiles don't seem to be pure textfiles.\n"
joachim99@69 550 "Note that the KDiff3-merge was not meant for binary data.\n"
joachim99@69 551 "Continue at your own risk.") );
joachim99@69 552 }
joachim99@8 553 }
joachim99@8 554
joachim99@8 555 QTimer::singleShot( 10, this, SLOT(slotAfterFirstPaint()) );
joachim99@69 556
joachim99@53 557 if ( bVisibleMergeResultWindow && m_pMergeResultWindow )
joachim99@53 558 {
joachim99@53 559 m_pMergeResultWindow->setFocus();
joachim99@53 560 }
joachim99@53 561 else if(m_pDiffTextWindow1)
joachim99@53 562 {
joachim99@53 563 m_pDiffTextWindow1->setFocus();
joachim99@53 564 }
joachim99@8 565 }
joachim99@8 566
joachim99@8 567
joachim99@8 568 void KDiff3App::resizeDiffTextWindow(int newWidth, int newHeight)
joachim99@8 569 {
joachim99@69 570 m_DTWHeight = newHeight;
joachim99@69 571
joachim99@66 572 recalcWordWrap();
joachim99@66 573
joachim99@8 574 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
joachim99@8 575 m_pDiffVScrollBar->setPageStep( newHeight );
joachim99@8 576 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
joachim99@8 577
joachim99@8 578 // The second window has a somewhat inverse width
joachim99@8 579
joachim99@8 580 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
joachim99@8 581 m_pHScrollBar->setPageStep( newWidth );
joachim99@8 582 }
joachim99@8 583
joachim99@8 584 void KDiff3App::resizeMergeResultWindow()
joachim99@8 585 {
joachim99@8 586 MergeResultWindow* p = m_pMergeResultWindow;
joachim99@8 587 m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) );
joachim99@8 588 m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() );
joachim99@8 589
joachim99@8 590 // The second window has a somewhat inverse width
joachim99@8 591 // m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
joachim99@8 592 // m_pHScrollBar->setPageStep( newWidth );
joachim99@8 593 }
joachim99@8 594
joachim99@8 595 void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY )
joachim99@8 596 {
joachim99@8 597 if ( deltaY!= 0 )
joachim99@8 598 {
joachim99@8 599 m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->value() + deltaY );
joachim99@8 600 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
joachim99@8 601 }
joachim99@8 602 if ( deltaX!= 0)
joachim99@69 603 m_pHScrollBar->QScrollBar::setValue( m_pHScrollBar->value() + deltaX );
joachim99@8 604 }
joachim99@8 605
joachim99@8 606 void KDiff3App::scrollMergeResultWindow( int deltaX, int deltaY )
joachim99@8 607 {
joachim99@8 608 if ( deltaY!= 0 )
joachim99@8 609 m_pMergeVScrollBar->setValue( m_pMergeVScrollBar->value() + deltaY );
joachim99@8 610 if ( deltaX!= 0)
joachim99@8 611 m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX );
joachim99@8 612 }
joachim99@8 613
joachim99@8 614 void KDiff3App::setDiff3Line( int line )
joachim99@8 615 {
joachim99@8 616 m_pDiffVScrollBar->setValue( line );
joachim99@8 617 }
joachim99@8 618
joachim99@8 619 void KDiff3App::sourceMask( int srcMask, int enabledMask )
joachim99@8 620 {
joachim99@80 621 chooseA->blockSignals(true);
joachim99@80 622 chooseB->blockSignals(true);
joachim99@80 623 chooseC->blockSignals(true);
joachim99@8 624 chooseA->setChecked( (srcMask & 1) != 0 );
joachim99@8 625 chooseB->setChecked( (srcMask & 2) != 0 );
joachim99@8 626 chooseC->setChecked( (srcMask & 4) != 0 );
joachim99@80 627 chooseA->blockSignals(false);
joachim99@80 628 chooseB->blockSignals(false);
joachim99@80 629 chooseC->blockSignals(false);
joachim99@8 630 chooseA->setEnabled( (enabledMask & 1) != 0 );
joachim99@8 631 chooseB->setEnabled( (enabledMask & 2) != 0 );
joachim99@8 632 chooseC->setEnabled( (enabledMask & 4) != 0 );
joachim99@8 633 }
joachim99@8 634
joachim99@8 635
joachim99@8 636
joachim99@8 637 // Function uses setMinSize( sizeHint ) before adding the widget.
joachim99@8 638 // void addWidget(QBoxLayout* layout, QWidget* widget);
joachim99@8 639 template <class W, class L>
joachim99@8 640 void addWidget( L* layout, W* widget)
joachim99@8 641 {
joachim99@8 642 QSize s = widget->sizeHint();
joachim99@8 643 widget->setMinimumSize( QSize(max2(s.width(),0),max2(s.height(),0) ) );
joachim99@8 644 layout->addWidget( widget );
joachim99@8 645 }
joachim99@8 646
joachim99@8 647 void KDiff3App::initView()
joachim99@8 648 {
joachim99@8 649 // set the main widget here
joachim99@8 650 if ( m_pMainWidget != 0 )
joachim99@8 651 {
joachim99@8 652 return;
joachim99@8 653 //delete m_pMainWidget;
joachim99@8 654 }
joachim99@75 655 m_pMainWidget = new QWidget(m_pMainSplitter); // Contains vertical splitter and horiz scrollbar
joachim99@75 656 QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget);
joachim99@75 657 pVLayout->setMargin(0);
joachim99@75 658 pVLayout->setSpacing(0);
joachim99@8 659
joachim99@75 660 QSplitter* pVSplitter = new QSplitter();
joachim99@75 661 pVSplitter->setOpaqueResize(false);
joachim99@69 662 pVSplitter->setOrientation( Qt::Vertical );
joachim99@8 663 pVLayout->addWidget( pVSplitter );
joachim99@75 664 pVSplitter->show();
joachim99@8 665
joachim99@75 666 QWidget* pDiffWindowFrame = new QWidget( pVSplitter ); // Contains diff windows, overview and vert scrollbar
joachim99@75 667 QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame );
joachim99@75 668 pDiffHLayout->setMargin(0);
joachim99@75 669 pDiffHLayout->setSpacing(0);
joachim99@80 670 pVSplitter->addWidget(pDiffWindowFrame);
joachim99@80 671 //pDiffWindowFrame->show();
joachim99@75 672 m_pDiffWindowSplitter = new QSplitter();
joachim99@75 673 m_pDiffWindowSplitter->setOpaqueResize(false);
joachim99@8 674
joachim99@69 675 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
joachim99@8 676 pDiffHLayout->addWidget( m_pDiffWindowSplitter );
joachim99@80 677 //m_pDiffWindowSplitter->show();
joachim99@8 678
joachim99@75 679 m_pOverview = new Overview( m_pOptionDialog );
joachim99@8 680 pDiffHLayout->addWidget(m_pOverview);
joachim99@8 681 connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) );
joachim99@8 682 //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint()));
joachim99@8 683
joachim99@69 684 m_pDiffVScrollBar = new QScrollBar( Qt::Vertical, pDiffWindowFrame );
joachim99@8 685 pDiffHLayout->addWidget( m_pDiffVScrollBar );
joachim99@8 686
joachim99@69 687 m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 );
joachim99@80 688 m_pDiffWindowSplitter->addWidget(m_pDiffTextWindowFrame1);
joachim99@80 689 //m_pDiffTextWindowFrame1->show();
joachim99@69 690 m_pDiffTextWindowFrame2 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 2 );
joachim99@80 691 m_pDiffWindowSplitter->addWidget(m_pDiffTextWindowFrame2);
joachim99@80 692 //m_pDiffTextWindowFrame2->show();
joachim99@69 693 m_pDiffTextWindowFrame3 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 3 );
joachim99@80 694 m_pDiffWindowSplitter->addWidget(m_pDiffTextWindowFrame3);
joachim99@69 695 m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow();
joachim99@69 696 m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow();
joachim99@69 697 m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow();
joachim99@69 698 connect(m_pDiffTextWindowFrame1, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int)));
joachim99@69 699 connect(m_pDiffTextWindowFrame2, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int)));
joachim99@69 700 connect(m_pDiffTextWindowFrame3, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int)));
joachim99@8 701
joachim99@8 702 // Merge window
joachim99@69 703 m_pMergeWindowFrame = new QWidget( pVSplitter );
joachim99@80 704 pVSplitter->addWidget(m_pMergeWindowFrame);
joachim99@75 705 QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame );
joachim99@75 706 pMergeHLayout->setMargin(0);
joachim99@75 707 pMergeHLayout->setSpacing(0);
joachim99@75 708 QVBoxLayout* pMergeVLayout = new QVBoxLayout();
joachim99@75 709 pMergeHLayout->addLayout( pMergeVLayout, 1 );
joachim99@75 710
joachim99@75 711 m_pMergeResultWindowTitle = new WindowTitleWidget(m_pOptionDialog);
joachim99@75 712 pMergeVLayout->addWidget( m_pMergeResultWindowTitle );
joachim99@8 713
joachim99@66 714 m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() );
joachim99@75 715 pMergeVLayout->addWidget( m_pMergeResultWindow, 1 );
joachim99@8 716
joachim99@69 717 m_pMergeVScrollBar = new QScrollBar( Qt::Vertical, m_pMergeWindowFrame );
joachim99@8 718 pMergeHLayout->addWidget( m_pMergeVScrollBar );
joachim99@8 719
joachim99@80 720 m_pMainSplitter->addWidget(m_pMainWidget);
joachim99@80 721
joachim99@8 722 autoAdvance->setEnabled(true);
joachim99@8 723
joachim99@75 724 QList<int> sizes = pVSplitter->sizes();
joachim99@8 725 int total = sizes[0] + sizes[1];
joachim99@8 726 sizes[0]=total/2; sizes[1]=total/2;
joachim99@8 727 pVSplitter->setSizes( sizes );
joachim99@8 728
joachim99@8 729 m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts
joachim99@75 730 m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking
joachim99@8 731
joachim99@75 732 QHBoxLayout* pHScrollBarLayout = new QHBoxLayout();
joachim99@75 733 pVLayout->addLayout( pHScrollBarLayout );
joachim99@75 734 m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, &m_pOptionDialog->m_bRightToLeftLanguage );
joachim99@8 735 pHScrollBarLayout->addWidget( m_pHScrollBar );
joachim99@8 736 m_pCornerWidget = new QWidget( m_pMainWidget );
joachim99@8 737 pHScrollBarLayout->addWidget( m_pCornerWidget );
joachim99@8 738
joachim99@8 739
joachim99@8 740 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pOverview, SLOT(setFirstLine(int)));
joachim99@8 741 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int)));
joachim99@68 742 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, SLOT(setFirstColumn(int)));
joachim99@8 743 connect( m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
joachim99@8 744 connect( m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
joachim99@8 745 connect( m_pDiffTextWindow1, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
joachim99@8 746 m_pDiffTextWindow1->installEventFilter( this );
joachim99@8 747
joachim99@8 748 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int)));
joachim99@68 749 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, SLOT(setFirstColumn(int)));
joachim99@8 750 connect( m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
joachim99@8 751 connect( m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
joachim99@8 752 connect( m_pDiffTextWindow2, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
joachim99@8 753 m_pDiffTextWindow2->installEventFilter( this );
joachim99@8 754
joachim99@8 755 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int)));
joachim99@68 756 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, SLOT(setFirstColumn(int)));
joachim99@8 757 connect( m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
joachim99@8 758 connect( m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
joachim99@8 759 connect( m_pDiffTextWindow3, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
joachim99@8 760 m_pDiffTextWindow3->installEventFilter( this );
joachim99@8 761
joachim99@69 762
joachim99@8 763 MergeResultWindow* p = m_pMergeResultWindow;
joachim99@8 764 connect( m_pMergeVScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstLine(int)));
joachim99@8 765
joachim99@68 766 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), p, SLOT(setFirstColumn(int)));
joachim99@8 767 connect( p, SIGNAL(scroll(int,int)), this, SLOT(scrollMergeResultWindow(int,int)));
joachim99@8 768 connect( p, SIGNAL(sourceMask(int,int)), this, SLOT(sourceMask(int,int)));
joachim99@8 769 connect( p, SIGNAL( resizeSignal() ),this, SLOT(resizeMergeResultWindow()));
joachim99@8 770 connect( p, SIGNAL( selectionEnd() ), this, SLOT( slotSelectionEnd() ) );
joachim99@8 771 connect( p, SIGNAL( newSelection() ), this, SLOT( slotSelectionStart() ) );
joachim99@75 772 connect( p, SIGNAL( modifiedChanged(bool) ), this, SLOT( slotOutputModified(bool) ) );
joachim99@75 773 connect( p, SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, SLOT( slotSetModified(bool) ) );
joachim99@8 774 connect( p, SIGNAL( updateAvailabilities() ), this, SLOT( slotUpdateAvailabilities() ) );
joachim99@8 775 connect( p, SIGNAL( showPopupMenu(const QPoint&) ), this, SLOT(showPopupMenu(const QPoint&)));
joachim99@69 776 connect( p, SIGNAL( noRelevantChangesDetected() ), this, SLOT(slotNoRelevantChangesDetected()));
joachim99@8 777 sourceMask(0,0);
joachim99@8 778
joachim99@8 779
joachim99@8 780 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, SLOT(setFastSelectorRange(int,int)));
joachim99@8 781 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, SLOT(setFastSelectorRange(int,int)));
joachim99@8 782 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, SLOT(setFastSelectorRange(int,int)));
joachim99@8 783 connect(m_pDiffTextWindow1, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
joachim99@8 784 connect(m_pDiffTextWindow2, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
joachim99@8 785 connect(m_pDiffTextWindow3, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
joachim99@66 786 connect(m_pDiffTextWindow1, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
joachim99@66 787 connect(m_pDiffTextWindow2, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
joachim99@66 788 connect(m_pDiffTextWindow3, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
joachim99@66 789 connect(m_pDirectoryMergeInfo, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
joachim99@8 790
joachim99@8 791 connect( m_pDiffTextWindow1, SIGNAL( resizeSignal(int,int) ),this, SLOT(resizeDiffTextWindow(int,int)));
joachim99@66 792 // The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one.
joachim99@69 793 connect( m_pDiffTextWindow2, SIGNAL( resizeSignal(int,int) ),this, SLOT(slotRecalcWordWrap()));
joachim99@69 794 connect( m_pDiffTextWindow3, SIGNAL( resizeSignal(int,int) ),this, SLOT(slotRecalcWordWrap()));
joachim99@8 795
joachim99@8 796 m_pDiffTextWindow1->setFocus();
joachim99@8 797 m_pMainWidget->setMinimumSize(50,50);
joachim99@8 798 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
joachim99@8 799 showWindowA->setChecked( true );
joachim99@8 800 showWindowB->setChecked( true );
joachim99@8 801 showWindowC->setChecked( true );
joachim99@8 802 }
joachim99@8 803
joachim99@69 804 static int calcManualDiffFirstDiff3LineIdx( const Diff3LineVector& d3lv, const ManualDiffHelpEntry& mdhe )
joachim99@69 805 {
joachim99@69 806 unsigned int i;
joachim99@69 807 for( i = 0; i<d3lv.size(); ++i )
joachim99@69 808 {
joachim99@69 809 const Diff3Line& d3l = *d3lv[i];
joachim99@80 810 if ( (mdhe.lineA1>=0 && mdhe.lineA1==d3l.lineA) ||
joachim99@80 811 (mdhe.lineB1>=0 && mdhe.lineB1==d3l.lineB) ||
joachim99@80 812 (mdhe.lineC1>=0 && mdhe.lineC1==d3l.lineC) )
joachim99@69 813 return i;
joachim99@69 814 }
joachim99@69 815 return -1;
joachim99@69 816 }
joachim99@69 817
joachim99@8 818 void KDiff3App::slotAfterFirstPaint()
joachim99@8 819 {
joachim99@8 820 int newHeight = m_pDiffTextWindow1->getNofVisibleLines();
joachim99@8 821 int newWidth = m_pDiffTextWindow1->getNofVisibleColumns();
joachim99@8 822 m_DTWHeight = newHeight;
joachim99@69 823
joachim99@69 824 recalcWordWrap();
joachim99@69 825
joachim99@8 826 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
joachim99@8 827 m_pDiffVScrollBar->setPageStep( newHeight );
joachim99@8 828 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
joachim99@8 829
joachim99@8 830 // The second window has a somewhat inverse width
joachim99@8 831 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
joachim99@8 832 m_pHScrollBar->setPageStep( newWidth );
joachim99@8 833
joachim99@69 834 int d3l=-1;
joachim99@69 835 if ( ! m_manualDiffHelpList.empty() )
joachim99@69 836 d3l = calcManualDiffFirstDiff3LineIdx( m_diff3LineVector, m_manualDiffHelpList.front() );
joachim99@69 837 if ( d3l>=0 && m_pDiffTextWindow1 )
joachim99@69 838 {
joachim99@69 839 int line = m_pDiffTextWindow1->convertDiff3LineIdxToLine( d3l );
joachim99@69 840 m_pDiffVScrollBar->setValue( max2(0,line-1) );
joachim99@69 841 }
joachim99@69 842 else
joachim99@69 843 {
joachim99@69 844 m_pMergeResultWindow->slotGoTop();
joachim99@77 845 if ( ! m_outputFilename.isEmpty() && ! m_pMergeResultWindow->isUnsolvedConflictAtCurrent() )
joachim99@77 846 m_pMergeResultWindow->slotGoNextUnsolvedConflict();
joachim99@69 847 }
joachim99@8 848
joachim99@8 849 if (m_pCornerWidget)
joachim99@8 850 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
joachim99@8 851
joachim99@8 852 slotUpdateAvailabilities();
joachim99@80 853 setUpdatesEnabled(true);
joachim99@80 854 // Workaround for a Qt-bug
joachim99@80 855 QList<QTreeView*> treeViews = findChildren<QTreeView*>();
joachim99@80 856 foreach( QTreeView* pTreeView, treeViews )
joachim99@80 857 {
joachim99@80 858 pTreeView->setUpdatesEnabled(true);
joachim99@80 859 }
joachim99@8 860 }
joachim99@8 861
joachim99@8 862 void KDiff3App::resizeEvent(QResizeEvent* e)
joachim99@8 863 {
joachim99@8 864 QSplitter::resizeEvent(e);
joachim99@8 865 if (m_pCornerWidget)
joachim99@8 866 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
joachim99@8 867 }
joachim99@8 868
joachim99@8 869
joachim99@8 870 bool KDiff3App::eventFilter( QObject* o, QEvent* e )
joachim99@8 871 {
joachim99@8 872 if( o == m_pMergeResultWindow )
joachim99@8 873 {
joachim99@8 874 if ( e->type() == QEvent::KeyPress )
joachim99@8 875 { // key press
joachim99@8 876 QKeyEvent *k = (QKeyEvent*)e;
joachim99@75 877 if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ControlModifier)!=0 )
joachim99@8 878 {
joachim99@8 879 slotEditCopy();
joachim99@8 880 return true;
joachim99@8 881 }
joachim99@75 882 if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 )
joachim99@8 883 {
joachim99@8 884 slotEditPaste();
joachim99@8 885 return true;
joachim99@8 886 }
joachim99@75 887 if (k->key()==Qt::Key_Delete && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 )
joachim99@8 888 {
joachim99@8 889 slotEditCut();
joachim99@8 890 return true;
joachim99@8 891 }
joachim99@80 892 if ( k->key()==Qt::Key_Escape && m_pKDiff3Shell && m_pOptionDialog->m_bEscapeKeyQuits )
joachim99@80 893 {
joachim99@80 894 m_pKDiff3Shell->close();
joachim99@80 895 return true;
joachim99@80 896 }
joachim99@8 897 }
joachim99@8 898 return QSplitter::eventFilter( o, e ); // standard event processing
joachim99@8 899 }
joachim99@8 900
joachim99@8 901 if ( e->type() == QEvent::KeyPress ) // key press
joachim99@8 902 {
joachim99@8 903 QKeyEvent *k = (QKeyEvent*)e;
joachim99@80 904 if ( k->key()==Qt::Key_Escape && m_pKDiff3Shell && m_pOptionDialog->m_bEscapeKeyQuits )
joachim99@80 905 {
joachim99@80 906 m_pKDiff3Shell->close();
joachim99@80 907 return true;
joachim99@80 908 }
joachim99@8 909
joachim99@75 910 bool bCtrl = (k->QInputEvent::modifiers() & Qt::ControlModifier) != 0;
joachim99@8 911 if (k->key()==Qt::Key_Insert && bCtrl )
joachim99@8 912 {
joachim99@8 913 slotEditCopy();
joachim99@8 914 return true;
joachim99@8 915 }
joachim99@75 916 if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 )
joachim99@8 917 {
joachim99@8 918 slotEditPaste();
joachim99@8 919 return true;
joachim99@8 920 }
joachim99@8 921 int deltaX=0;
joachim99@8 922 int deltaY=0;
joachim99@8 923 int pageSize = m_DTWHeight;
joachim99@8 924 switch( k->key() )
joachim99@8 925 {
joachim99@69 926 case Qt::Key_Down: if (!bCtrl) ++deltaY; break;
joachim99@69 927 case Qt::Key_Up: if (!bCtrl) --deltaY; break;
joachim99@69 928 case Qt::Key_PageDown: if (!bCtrl) deltaY+=pageSize; break;
joachim99@69 929 case Qt::Key_PageUp: if (!bCtrl) deltaY-=pageSize; break;
joachim99@69 930 case Qt::Key_Left: if (!bCtrl) --deltaX; break;
joachim99@69 931 case Qt::Key_Right: if (!bCtrl) ++deltaX; break;
joachim99@69 932 case Qt::Key_Home: if ( bCtrl ) m_pDiffVScrollBar->setValue( 0 );
joachim99@8 933 else m_pHScrollBar->setValue( 0 );
joachim99@8 934 break;
joachim99@75 935 case Qt::Key_End: if ( bCtrl ) m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->maximum() );
joachim99@75 936 else m_pHScrollBar->setValue( m_pHScrollBar->maximum() );
joachim99@8 937 break;
joachim99@8 938 default: break;
joachim99@8 939 }
joachim99@8 940
joachim99@8 941 scrollDiffTextWindow( deltaX, deltaY );
joachim99@8 942
joachim99@8 943 return true; // eat event
joachim99@8 944 }
joachim99@58 945 else if (e->type() == QEvent::Wheel ) // wheel event
joachim99@58 946 {
joachim99@8 947 QWheelEvent *w = (QWheelEvent*)e;
joachim99@8 948 w->accept();
joachim99@8 949
joachim99@8 950 int deltaX=0;
joachim99@8 951
joachim99@8 952 int d=w->delta();
joachim99@8 953 int deltaY = -d/120 * QApplication::wheelScrollLines();
joachim99@8 954
joachim99@8 955 scrollDiffTextWindow( deltaX, deltaY );
joachim99@8 956 return true;
joachim99@8 957 }
joachim99@8 958 else if (e->type() == QEvent::Drop )
joachim99@8 959 {
joachim99@8 960 QDropEvent* pDropEvent = static_cast<QDropEvent*>(e);
joachim99@8 961 pDropEvent->accept();
joachim99@8 962
joachim99@75 963 if ( pDropEvent->mimeData()->hasUrls() )
joachim99@8 964 {
joachim99@8 965 #ifdef KREPLACEMENTS_H
joachim99@75 966 QList<QUrl> urlList = pDropEvent->mimeData()->urls();
joachim99@75 967 if ( canContinue() && !urlList.isEmpty() )
joachim99@8 968 {
joachim99@8 969 raise();
joachim99@75 970 QString filename = urlList.first().toLocalFile();
joachim99@8 971 if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename );
joachim99@8 972 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename );
joachim99@8 973 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename );
joachim99@8 974 init();
joachim99@8 975 }
joachim99@8 976 #else
joachim99@80 977 KUrl::List urlList = KUrl::List::fromMimeData( pDropEvent->mimeData() );
joachim99@8 978 if ( canContinue() && !urlList.isEmpty() )
joachim99@8 979 {
joachim99@8 980 raise();
joachim99@8 981 FileAccess fa( urlList.first().url() );
joachim99@8 982 if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa );
joachim99@8 983 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa );
joachim99@8 984 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa );
joachim99@8 985 init();
joachim99@8 986 }
joachim99@8 987 #endif
joachim99@8 988 }
joachim99@75 989 else if ( pDropEvent->mimeData()->hasText() )
joachim99@8 990 {
joachim99@75 991 QString text = pDropEvent->mimeData()->text();
joachim99@75 992 if ( canContinue() )
joachim99@8 993 {
joachim99@8 994 raise();
joachim99@58 995 if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text);
joachim99@58 996 else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text);
joachim99@58 997 else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text);
joachim99@8 998 init();
joachim99@8 999 }
joachim99@8 1000 }
joachim99@8 1001
joachim99@8 1002 return true;
joachim99@8 1003 }
joachim99@8 1004 return QSplitter::eventFilter( o, e ); // standard event processing
joachim99@8 1005 }
joachim99@8 1006
joachim99@8 1007
joachim99@8 1008
joachim99@8 1009
joachim99@8 1010 void KDiff3App::slotFileOpen()
joachim99@8 1011 {
joachim99@8 1012 if ( !canContinue() ) return;
joachim99@8 1013
joachim99@8 1014 if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() )
joachim99@8 1015 {
joachim99@8 1016 int result = KMessageBox::warningYesNo(this,
joachim99@8 1017 i18n("You are currently doing a directory merge. Are you sure, you want to abort?"),
joachim99@80 1018 i18n("Warning"),
joachim99@80 1019 KGuiItem( i18n("Abort") ),
joachim99@80 1020 KGuiItem( i18n("Continue Merging") ) );
joachim99@8 1021 if ( result!=KMessageBox::Yes )
joachim99@8 1022 return;
joachim99@8 1023 }
joachim99@8 1024
joachim99@8 1025
joachim99@8 1026 slotStatusMsg(i18n("Opening files..."));
joachim99@8 1027
joachim99@8 1028 for(;;)
joachim99@8 1029 {
joachim99@8 1030 OpenDialog d(this,
joachim99@75 1031 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameA() : m_sd1.isFromBuffer() ? QString("") : m_sd1.getAliasName() ),
joachim99@75 1032 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameB() : m_sd2.isFromBuffer() ? QString("") : m_sd2.getAliasName() ),
joachim99@75 1033 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? QString("") : m_sd3.getAliasName() ),
joachim99@75 1034 m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(),
joachim99@75 1035 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? QString("") : m_outputFilename ),
joachim99@8 1036 SLOT(slotConfigure()), m_pOptionDialog );
joachim99@8 1037 int status = d.exec();
joachim99@8 1038 if ( status == QDialog::Accepted )
joachim99@8 1039 {
joachim99@69 1040 m_sd1.setFilename( d.m_pLineA->currentText() );
joachim99@69 1041 m_sd2.setFilename( d.m_pLineB->currentText() );
joachim99@69 1042 m_sd3.setFilename( d.m_pLineC->currentText() );
joachim99@8 1043
joachim99@8 1044 if( d.m_pMerge->isChecked() )
joachim99@8 1045 {
joachim99@69 1046 if ( d.m_pLineOut->currentText().isEmpty() )
joachim99@8 1047 {
joachim99@8 1048 m_outputFilename = "unnamed.txt";
joachim99@8 1049 m_bDefaultFilename = true;
joachim99@8 1050 }
joachim99@8 1051 else
joachim99@8 1052 {
joachim99@69 1053 m_outputFilename = d.m_pLineOut->currentText();
joachim99@8 1054 m_bDefaultFilename = false;
joachim99@8 1055 }
joachim99@8 1056 }
joachim99@8 1057 else
joachim99@8 1058 m_outputFilename = "";
joachim99@8 1059
joachim99@69 1060 bool bSuccess = improveFilenames(false);
joachim99@66 1061 if ( !bSuccess )
joachim99@66 1062 continue;
joachim99@69 1063
joachim99@8 1064 if ( m_bDirCompare )
joachim99@8 1065 {
joachim99@8 1066 m_pDirectoryMergeSplitter->show();
joachim99@8 1067 if ( m_pMainWidget!=0 )
joachim99@8 1068 {
joachim99@8 1069 m_pMainWidget->hide();
joachim99@8 1070 }
joachim99@8 1071 break;
joachim99@8 1072 }
joachim99@8 1073 else
joachim99@8 1074 {
joachim99@8 1075 m_pDirectoryMergeSplitter->hide();
joachim99@8 1076 init();
joachim99@8 1077
joachim99@80 1078 if ( (! m_sd1.isEmpty() && !m_sd1.hasData()) ||
joachim99@80 1079 (! m_sd2.isEmpty() && !m_sd2.hasData()) ||
joachim99@80 1080 (! m_sd3.isEmpty() && !m_sd3.hasData()) )
joachim99@8 1081 {
joachim99@8 1082 QString text( i18n("Opening of these files failed:") );
joachim99@8 1083 text += "\n\n";
joachim99@58 1084 if ( ! m_sd1.isEmpty() && !m_sd1.hasData() )
joachim99@8 1085 text += " - " + m_sd1.getAliasName() + "\n";
joachim99@58 1086 if ( ! m_sd2.isEmpty() && !m_sd2.hasData() )
joachim99@8 1087 text += " - " + m_sd2.getAliasName() + "\n";
joachim99@58 1088 if ( ! m_sd3.isEmpty() && !m_sd3.hasData() )
joachim99@8 1089 text += " - " + m_sd3.getAliasName() + "\n";
joachim99@8 1090
joachim99@8 1091 KMessageBox::sorry( this, text, i18n("File open error") );
joachim99@8 1092 continue;
joachim99@8 1093 }
joachim99@8 1094 }
joachim99@8 1095 }
joachim99@8 1096 break;
joachim99@8 1097 }
joachim99@8 1098
joachim99@8 1099 slotUpdateAvailabilities();
joachim99@8 1100 slotStatusMsg(i18n("Ready."));
joachim99@8 1101 }
joachim99@8 1102
joachim99@8 1103 void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
joachim99@66 1104 QString an1, QString an2, QString an3, TotalDiffStatus* pTotalDiffStatus )
joachim99@8 1105 {
joachim99@8 1106 if ( !canContinue() ) return;
joachim99@8 1107
joachim99@68 1108 if(fn1=="" && fn2=="" && fn3=="" && ofn=="" && m_pMainWidget!=0 )
joachim99@68 1109 {
joachim99@68 1110 m_pMainWidget->hide();
joachim99@68 1111 return;
joachim99@68 1112 }
joachim99@68 1113
joachim99@8 1114 slotStatusMsg(i18n("Opening files..."));
joachim99@8 1115
joachim99@8 1116 m_sd1.setFilename( fn1 );
joachim99@8 1117 m_sd2.setFilename( fn2 );
joachim99@8 1118 m_sd3.setFilename( fn3 );
joachim99@8 1119
joachim99@8 1120 m_sd1.setAliasName( an1 );
joachim99@8 1121 m_sd2.setAliasName( an2 );
joachim99@8 1122 m_sd3.setAliasName( an3 );
joachim99@8 1123
joachim99@8 1124 if ( ! ofn.isEmpty() )
joachim99@8 1125 {
joachim99@8 1126 m_outputFilename = ofn;
joachim99@8 1127 m_bDefaultFilename = false;
joachim99@8 1128 }
joachim99@8 1129 else
joachim99@8 1130 {
joachim99@8 1131 m_outputFilename = "";
joachim99@8 1132 m_bDefaultFilename = true;
joachim99@8 1133 }
joachim99@8 1134
joachim99@66 1135 bool bDirCompare = m_bDirCompare;
joachim99@69 1136 improveFilenames(true); // Create new window for KDiff3 for directory comparison.
joachim99@68 1137
joachim99@66 1138 if( m_bDirCompare )
joachim99@8 1139 {
joachim99@8 1140 }
joachim99@8 1141 else
joachim99@8 1142 {
joachim99@66 1143 m_bDirCompare = bDirCompare; // Don't allow this to change here.
joachim99@66 1144 init( false, pTotalDiffStatus );
joachim99@8 1145
joachim99@66 1146 if ( pTotalDiffStatus!=0 )
joachim99@66 1147 return;
joachim99@69 1148
joachim99@80 1149 if ( (! m_sd1.isEmpty() && ! m_sd1.hasData()) ||
joachim99@80 1150 (! m_sd2.isEmpty() && ! m_sd2.hasData()) ||
joachim99@80 1151 (! m_sd3.isEmpty() && ! m_sd3.hasData()) )
joachim99@8 1152 {
joachim99@8 1153 QString text( i18n("Opening of these files failed:") );
joachim99@8 1154 text += "\n\n";
joachim99@58 1155 if ( ! m_sd1.isEmpty() && !m_sd1.hasData() )
joachim99@8 1156 text += " - " + m_sd1.getAliasName() + "\n";
joachim99@58 1157 if ( ! m_sd2.isEmpty() && !m_sd2.hasData() )
joachim99@8 1158 text += " - " + m_sd2.getAliasName() + "\n";
joachim99@58 1159 if ( ! m_sd3.isEmpty() && !m_sd3.hasData() )
joachim99@8 1160 text += " - " + m_sd3.getAliasName() + "\n";
joachim99@8 1161
joachim99@8 1162 KMessageBox::sorry( this, text, i18n("File open error") );
joachim99@8 1163 }
joachim99@8 1164 else
joachim99@8 1165 {
joachim99@8 1166 if ( m_pDirectoryMergeWindow!=0 && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
joachim99@8 1167 {
joachim99@8 1168 slotDirViewToggle();
joachim99@8 1169 }
joachim99@8 1170 }
joachim99@8 1171 }
joachim99@8 1172 slotStatusMsg(i18n("Ready."));
joachim99@8 1173 }
joachim99@8 1174
joachim99@69 1175
joachim99@69 1176 void KDiff3App::slotFileNameChanged(const QString& fileName, int winIdx)
joachim99@69 1177 {
joachim99@69 1178 QString fn1 = m_sd1.getFilename();
joachim99@69 1179 QString an1 = m_sd1.getAliasName();
joachim99@69 1180 QString fn2 = m_sd2.getFilename();
joachim99@69 1181 QString an2 = m_sd2.getAliasName();
joachim99@69 1182 QString fn3 = m_sd3.getFilename();
joachim99@69 1183 QString an3 = m_sd3.getAliasName();
joachim99@69 1184 if (winIdx==1) { fn1 = fileName; an1 = ""; }
joachim99@69 1185 if (winIdx==2) { fn2 = fileName; an2 = ""; }
joachim99@69 1186 if (winIdx==3) { fn3 = fileName; an3 = ""; }
joachim99@69 1187
joachim99@69 1188 slotFileOpen2( fn1, fn2, fn3, m_outputFilename, an1, an2, an3, 0 );
joachim99@69 1189 }
joachim99@69 1190
joachim99@69 1191
joachim99@8 1192 void KDiff3App::slotEditCut()
joachim99@8 1193 {
joachim99@8 1194 slotStatusMsg(i18n("Cutting selection..."));
joachim99@8 1195
joachim99@8 1196 QString s;
joachim99@8 1197 if ( m_pMergeResultWindow!=0 )
joachim99@8 1198 {
joachim99@8 1199 s = m_pMergeResultWindow->getSelection();
joachim99@8 1200 m_pMergeResultWindow->deleteSelection();
joachim99@8 1201
joachim99@8 1202 m_pMergeResultWindow->update();
joachim99@8 1203 }
joachim99@8 1204
joachim99@8 1205 if ( !s.isNull() )
joachim99@8 1206 {
joachim99@58 1207 QApplication::clipboard()->setText( s, QClipboard::Clipboard );
joachim99@8 1208 }
joachim99@8 1209
joachim99@8 1210 slotStatusMsg(i18n("Ready."));
joachim99@8 1211 }
joachim99@8 1212
joachim99@8 1213 void KDiff3App::slotEditCopy()
joachim99@8 1214 {
joachim99@8 1215 slotStatusMsg(i18n("Copying selection to clipboard..."));
joachim99@8 1216 QString s;
joachim99@8 1217 if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection();
joachim99@8 1218 if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection();
joachim99@8 1219 if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection();
joachim99@8 1220 if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
joachim99@8 1221 if ( !s.isNull() )
joachim99@8 1222 {
joachim99@58 1223 QApplication::clipboard()->setText( s, QClipboard::Clipboard );
joachim99@8 1224 }
joachim99@8 1225
joachim99@8 1226 slotStatusMsg(i18n("Ready."));
joachim99@8 1227 }
joachim99@8 1228
joachim99@8 1229 void KDiff3App::slotEditPaste()
joachim99@8 1230 {
joachim99@8 1231 slotStatusMsg(i18n("Inserting clipboard contents..."));
joachim99@8 1232
joachim99@8 1233 if ( m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() )
joachim99@8 1234 {
joachim99@66 1235 m_pMergeResultWindow->pasteClipboard(false);
joachim99@8 1236 }
joachim99@8 1237 else if ( canContinue() )
joachim99@8 1238 {
joachim99@8 1239 if ( m_pDiffTextWindow1->hasFocus() )
joachim99@8 1240 {
joachim99@66 1241 m_sd1.setData( QApplication::clipboard()->text(QClipboard::Clipboard) );
joachim99@8 1242 init();
joachim99@8 1243 }
joachim99@8 1244 else if ( m_pDiffTextWindow2->hasFocus() )
joachim99@8 1245 {
joachim99@66 1246 m_sd2.setData( QApplication::clipboard()->text(QClipboard::Clipboard) );
joachim99@8 1247 init();
joachim99@8 1248 }
joachim99@8 1249 else if ( m_pDiffTextWindow3->hasFocus() )
joachim99@8 1250 {
joachim99@66 1251 m_sd3.setData( QApplication::clipboard()->text(QClipboard::Clipboard) );
joachim99@8 1252 init();
joachim99@8 1253 }
joachim99@8 1254 }
joachim99@8 1255
joachim99@8 1256 slotStatusMsg(i18n("Ready."));
joachim99@8 1257 }
joachim99@8 1258
joachim99@69 1259 void KDiff3App::slotEditSelectAll()
joachim99@69 1260 {
joachim99@69 1261 int l=0,p=0; // needed as dummy return values
joachim99@69 1262 if ( m_pMergeResultWindow && m_pMergeResultWindow->hasFocus() ) { m_pMergeResultWindow->setSelection( 0,0,m_pMergeResultWindow->getNofLines(),0); }
joachim99@69 1263 else if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->hasFocus() ) { m_pDiffTextWindow1 ->setSelection( 0,0,m_pDiffTextWindow1->getNofLines(),0,l,p); }
joachim99@69 1264 else if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->hasFocus() ) { m_pDiffTextWindow2 ->setSelection( 0,0,m_pDiffTextWindow2->getNofLines(),0,l,p); }
joachim99@69 1265 else if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->hasFocus() ) { m_pDiffTextWindow3 ->setSelection( 0,0,m_pDiffTextWindow3->getNofLines(),0,l,p); }
joachim99@69 1266
joachim99@69 1267 slotStatusMsg(i18n("Ready."));
joachim99@69 1268 }
joachim99@8 1269
joachim99@8 1270 void KDiff3App::slotGoCurrent()
joachim99@8 1271 {
joachim99@8 1272 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoCurrent();
joachim99@8 1273 }
joachim99@8 1274 void KDiff3App::slotGoTop()
joachim99@8 1275 {
joachim99@8 1276 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoTop();
joachim99@8 1277 }
joachim99@8 1278 void KDiff3App::slotGoBottom()
joachim99@8 1279 {
joachim99@8 1280 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoBottom();
joachim99@8 1281 }
joachim99@8 1282 void KDiff3App::slotGoPrevUnsolvedConflict()
joachim99@8 1283 {
joachim99@8 1284 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevUnsolvedConflict();
joachim99@8 1285 }
joachim99@8 1286 void KDiff3App::slotGoNextUnsolvedConflict()
joachim99@8 1287 {
joachim99@8 1288 m_bTimerBlock = false;
joachim99@8 1289 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextUnsolvedConflict();
joachim99@8 1290 }
joachim99@8 1291 void KDiff3App::slotGoPrevConflict()
joachim99@8 1292 {
joachim99@8 1293 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevConflict();
joachim99@8 1294 }
joachim99@8 1295 void KDiff3App::slotGoNextConflict()
joachim99@8 1296 {
joachim99@8 1297 m_bTimerBlock = false;
joachim99@8 1298 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextConflict();
joachim99@8 1299 }
joachim99@8 1300 void KDiff3App::slotGoPrevDelta()
joachim99@8 1301 {
joachim99@8 1302 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevDelta();
joachim99@8 1303 }
joachim99@8 1304 void KDiff3App::slotGoNextDelta()
joachim99@8 1305 {
joachim99@8 1306 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextDelta();
joachim99@8 1307 }
joachim99@51 1308
joachim99@53 1309 void KDiff3App::choose( int choice )
joachim99@8 1310 {
joachim99@53 1311 if (!m_bTimerBlock )
joachim99@8 1312 {
joachim99@53 1313 if ( m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->hasFocus() )
joachim99@8 1314 {
joachim99@53 1315 if (choice==A) m_pDirectoryMergeWindow->slotCurrentChooseA();
joachim99@53 1316 if (choice==B) m_pDirectoryMergeWindow->slotCurrentChooseB();
joachim99@53 1317 if (choice==C) m_pDirectoryMergeWindow->slotCurrentChooseC();
joachim99@53 1318
joachim99@53 1319 chooseA->setChecked(false);
joachim99@53 1320 chooseB->setChecked(false);
joachim99@53 1321 chooseC->setChecked(false);
joachim99@53 1322 }
joachim99@53 1323 else if ( m_pMergeResultWindow )
joachim99@53 1324 {
joachim99@53 1325 m_pMergeResultWindow->choose( choice );
joachim99@53 1326 if ( autoAdvance->isChecked() )
joachim99@53 1327 {
joachim99@53 1328 m_bTimerBlock = true;
joachim99@53 1329 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
joachim99@53 1330 }
joachim99@8 1331 }
joachim99@8 1332 }
joachim99@8 1333 }
joachim99@53 1334
joachim99@53 1335 void KDiff3App::slotChooseA() { choose( A ); }
joachim99@53 1336 void KDiff3App::slotChooseB() { choose( B ); }
joachim99@53 1337 void KDiff3App::slotChooseC() { choose( C ); }
joachim99@51 1338
joachim99@51 1339 // bConflictsOnly automatically choose for conflicts only (true) or for everywhere
joachim99@68 1340 static void mergeChooseGlobal( MergeResultWindow* pMRW, int selector, bool bConflictsOnly, bool bWhiteSpaceOnly )
joachim99@8 1341 {
joachim99@51 1342 if ( pMRW )
joachim99@8 1343 {
joachim99@51 1344 pMRW->chooseGlobal(selector, bConflictsOnly, bWhiteSpaceOnly );
joachim99@8 1345 }
joachim99@8 1346 }
joachim99@8 1347
joachim99@68 1348 void KDiff3App::slotChooseAEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, A, false, false ); }
joachim99@68 1349 void KDiff3App::slotChooseBEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, B, false, false ); }
joachim99@68 1350 void KDiff3App::slotChooseCEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, C, false, false ); }
joachim99@68 1351 void KDiff3App::slotChooseAForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, A, true, false ); }
joachim99@68 1352 void KDiff3App::slotChooseBForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, B, true, false ); }
joachim99@68 1353 void KDiff3App::slotChooseCForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, C, true, false ); }
joachim99@68 1354 void KDiff3App::slotChooseAForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, A, true, true ); }
joachim99@68 1355 void KDiff3App::slotChooseBForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, B, true, true ); }
joachim99@68 1356 void KDiff3App::slotChooseCForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, C, true, true ); }
joachim99@51 1357
joachim99@8 1358
joachim99@8 1359 void KDiff3App::slotAutoSolve()
joachim99@8 1360 {
joachim99@8 1361 if (m_pMergeResultWindow )
joachim99@8 1362 {
joachim99@8 1363 m_pMergeResultWindow->slotAutoSolve();
joachim99@8 1364 // m_pMergeWindowFrame->show(); incompatible with bPreserveCarriageReturn
joachim99@8 1365 m_pMergeResultWindow->showNrOfConflicts();
joachim99@8 1366 slotUpdateAvailabilities();
joachim99@8 1367 }
joachim99@8 1368 }
joachim99@8 1369
joachim99@8 1370 void KDiff3App::slotUnsolve()
joachim99@8 1371 {
joachim99@8 1372 if (m_pMergeResultWindow )
joachim99@8 1373 {
joachim99@8 1374 m_pMergeResultWindow->slotUnsolve();
joachim99@8 1375 }
joachim99@8 1376 }
joachim99@8 1377
joachim99@69 1378 void KDiff3App::slotMergeHistory()
joachim99@69 1379 {
joachim99@69 1380 if (m_pMergeResultWindow )
joachim99@69 1381 {
joachim99@69 1382 m_pMergeResultWindow->slotMergeHistory();
joachim99@69 1383 }
joachim99@69 1384 }
joachim99@69 1385
joachim99@69 1386 void KDiff3App::slotRegExpAutoMerge()
joachim99@69 1387 {
joachim99@69 1388 if (m_pMergeResultWindow )
joachim99@69 1389 {
joachim99@69 1390 m_pMergeResultWindow->slotRegExpAutoMerge();
joachim99@69 1391 }
joachim99@69 1392 }
joachim99@69 1393
joachim99@69 1394 void KDiff3App::slotSplitDiff()
joachim99@69 1395 {
joachim99@69 1396 int firstLine = -1;
joachim99@69 1397 int lastLine = -1;
joachim99@69 1398 DiffTextWindow* pDTW=0;
joachim99@69 1399 if ( m_pDiffTextWindow1 ) { pDTW=m_pDiffTextWindow1; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
joachim99@69 1400 if ( firstLine<0 && m_pDiffTextWindow2 ) { pDTW=m_pDiffTextWindow2; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
joachim99@69 1401 if ( firstLine<0 && m_pDiffTextWindow3 ) { pDTW=m_pDiffTextWindow3; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
joachim99@69 1402 if ( pDTW && firstLine>=0 && m_pMergeResultWindow)
joachim99@69 1403 {
joachim99@69 1404 pDTW->resetSelection();
joachim99@69 1405
joachim99@69 1406 m_pMergeResultWindow->slotSplitDiff( firstLine, lastLine );
joachim99@69 1407 }
joachim99@69 1408 }
joachim99@69 1409
joachim99@69 1410 void KDiff3App::slotJoinDiffs()
joachim99@69 1411 {
joachim99@69 1412 int firstLine = -1;
joachim99@69 1413 int lastLine = -1;
joachim99@69 1414 DiffTextWindow* pDTW=0;
joachim99@69 1415 if ( m_pDiffTextWindow1 ) { pDTW=m_pDiffTextWindow1; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
joachim99@69 1416 if ( firstLine<0 && m_pDiffTextWindow2 ) { pDTW=m_pDiffTextWindow2; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
joachim99@69 1417 if ( firstLine<0 && m_pDiffTextWindow3 ) { pDTW=m_pDiffTextWindow3; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
joachim99@69 1418 if ( pDTW && firstLine>=0 && m_pMergeResultWindow)
joachim99@69 1419 {
joachim99@69 1420 pDTW->resetSelection();
joachim99@69 1421
joachim99@69 1422 m_pMergeResultWindow->slotJoinDiffs( firstLine, lastLine );
joachim99@69 1423 }
joachim99@69 1424 }
joachim99@8 1425
joachim99@8 1426 void KDiff3App::slotConfigure()
joachim99@8 1427 {
joachim99@8 1428 m_pOptionDialog->setState();
joachim99@80 1429 m_pOptionDialog->incrementInitialSize ( QSize(0,40) );
joachim99@8 1430 m_pOptionDialog->exec();
joachim99@8 1431 slotRefresh();
joachim99@8 1432 }
joachim99@8 1433
joachim99@8 1434 void KDiff3App::slotConfigureKeys()
joachim99@8 1435 {
joachim99@80 1436 KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this);
joachim99@8 1437 }
joachim99@8 1438
joachim99@8 1439 void KDiff3App::slotRefresh()
joachim99@8 1440 {
joachim99@51 1441 if (m_pDiffTextWindow1!=0)
joachim99@51 1442 {
joachim99@51 1443 m_pDiffTextWindow1->setFont(m_pOptionDialog->m_font);
joachim99@51 1444 m_pDiffTextWindow1->update();
joachim99@28 1445 }
joachim99@28 1446 if (m_pDiffTextWindow2!=0)
joachim99@51 1447 {
joachim99@51 1448 m_pDiffTextWindow2->setFont(m_pOptionDialog->m_font);
joachim99@51 1449 m_pDiffTextWindow2->update();
joachim99@28 1450 }
joachim99@28 1451 if (m_pDiffTextWindow3!=0)
joachim99@51 1452 {
joachim99@51 1453 m_pDiffTextWindow3->setFont(m_pOptionDialog->m_font);
joachim99@51 1454 m_pDiffTextWindow3->update();
joachim99@28 1455 }
joachim99@28 1456 if (m_pMergeResultWindow!=0)
joachim99@51 1457 {
joachim99@51 1458 m_pMergeResultWindow->setFont(m_pOptionDialog->m_font);
joachim99@51 1459 m_pMergeResultWindow->update();
joachim99@28 1460 }
joachim99@68 1461 if (m_pHScrollBar!=0)
joachim99@68 1462 {
joachim99@68 1463 m_pHScrollBar->setAgain();
joachim99@68 1464 }
joachim99@8 1465 if ( m_pDiffWindowSplitter!=0 )
joachim99@8 1466 {
joachim99@69 1467 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
joachim99@69 1468 }
joachim99@69 1469 if ( m_pDirectoryMergeWindow )
joachim99@69 1470 {
joachim99@69 1471 m_pDirectoryMergeWindow->updateFileVisibilities();
joachim99@8 1472 }
joachim99@8 1473 }
joachim99@8 1474
joachim99@8 1475 void KDiff3App::slotSelectionStart()
joachim99@8 1476 {
joachim99@8 1477 //editCopy->setEnabled( false );
joachim99@8 1478 //editCut->setEnabled( false );
joachim99@8 1479
joachim99@8 1480 const QObject* s = sender();
joachim99@8 1481 if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection();
joachim99@8 1482 if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection();
joachim99@8 1483 if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection();
joachim99@8 1484 if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection();
joachim99@8 1485 }
joachim99@8 1486
joachim99@8 1487 void KDiff3App::slotSelectionEnd()
joachim99@8 1488 {
joachim99@8 1489 //const QObject* s = sender();
joachim99@8 1490 //editCopy->setEnabled(true);
joachim99@8 1491 //editCut->setEnabled( s==m_pMergeResultWindow );
joachim99@8 1492 if ( m_pOptionDialog->m_bAutoCopySelection )
joachim99@8 1493 {
joachim99@8 1494 slotEditCopy();
joachim99@8 1495 }
joachim99@58 1496 else
joachim99@58 1497 {
joachim99@58 1498 QClipboard *clipBoard = QApplication::clipboard();
joachim99@58 1499
joachim99@58 1500 if (clipBoard->supportsSelection ())
joachim99@69 1501 {
joachim99@58 1502 QString s;
joachim99@58 1503 if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection();
joachim99@58 1504 if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection();
joachim99@58 1505 if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection();
joachim99@58 1506 if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
joachim99@58 1507 if ( !s.isNull() )
joachim99@58 1508 {
joachim99@58 1509 clipBoard->setText( s, QClipboard::Selection );
joachim99@58 1510 }
joachim99@58 1511 }
joachim99@58 1512 }
joachim99@8 1513 }
joachim99@8 1514
joachim99@8 1515 void KDiff3App::slotClipboardChanged()
joachim99@8 1516 {
joachim99@8 1517 QString s = QApplication::clipboard()->text();
joachim99@8 1518 //editPaste->setEnabled(!s.isEmpty());
joachim99@8 1519 }
joachim99@8 1520
joachim99@75 1521 void KDiff3App::slotOutputModified(bool bModified)
joachim99@8 1522 {
joachim99@75 1523 if ( bModified && !m_bOutputModified )
joachim99@8 1524 {
joachim99@8 1525 m_bOutputModified=true;
joachim99@8 1526 slotUpdateAvailabilities();
joachim99@8 1527 }
joachim99@8 1528 }
joachim99@8 1529
joachim99@8 1530 void KDiff3App::slotAutoAdvanceToggled()
joachim99@8 1531 {
joachim99@8 1532 m_pOptionDialog->m_bAutoAdvance = autoAdvance->isChecked();
joachim99@8 1533 }
joachim99@8 1534
joachim99@66 1535 void KDiff3App::slotWordWrapToggled()
joachim99@66 1536 {
joachim99@66 1537 m_pOptionDialog->m_bWordWrap = wordWrap->isChecked();
joachim99@66 1538 recalcWordWrap();
joachim99@66 1539 }
joachim99@66 1540
joachim99@69 1541 void KDiff3App::slotRecalcWordWrap()
joachim99@66 1542 {
joachim99@69 1543 recalcWordWrap();
joachim99@69 1544 }
joachim99@69 1545
joachim99@69 1546 void KDiff3App::recalcWordWrap(int nofVisibleColumns) // nofVisibleColumns is >=0 only for printing, otherwise the really visible width is used
joachim99@69 1547 {
joachim99@69 1548 bool bPrinting = nofVisibleColumns>=0;
joachim99@66 1549 int firstD3LIdx = 0;
joachim99@66 1550 if( m_pDiffTextWindow1 )
joachim99@66 1551 firstD3LIdx = m_pDiffTextWindow1->convertLineToDiff3LineIdx( m_pDiffTextWindow1->getFirstLine() );
joachim99@66 1552
joachim99@66 1553 // Convert selection to D3L-coords (converting back happens in DiffTextWindow::recalcWordWrap()
joachim99@66 1554 if ( m_pDiffTextWindow1 )
joachim99@66 1555 m_pDiffTextWindow1->convertSelectionToD3LCoords();
joachim99@66 1556 if ( m_pDiffTextWindow2 )
joachim99@66 1557 m_pDiffTextWindow2->convertSelectionToD3LCoords();
joachim99@66 1558 if ( m_pDiffTextWindow3 )
joachim99@66 1559 m_pDiffTextWindow3->convertSelectionToD3LCoords();
joachim99@69 1560
joachim99@69 1561
joachim99@66 1562 if ( !m_diff3LineList.empty() && m_pOptionDialog->m_bWordWrap )
joachim99@69 1563 {
joachim99@66 1564 Diff3LineList::iterator i;
joachim99@66 1565 int sumOfLines=0;
joachim99@66 1566 for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i )
joachim99@66 1567 {
joachim99@66 1568 Diff3Line& d3l = *i;
joachim99@66 1569 d3l.linesNeededForDisplay = 1;
joachim99@66 1570 d3l.sumLinesNeededForDisplay = sumOfLines;
joachim99@66 1571 sumOfLines += d3l.linesNeededForDisplay;
joachim99@66 1572 }
joachim99@69 1573
joachim99@66 1574 // Let every window calc how many lines will be needed.
joachim99@66 1575 if ( m_pDiffTextWindow1 )
joachim99@69 1576 m_pDiffTextWindow1->recalcWordWrap(true,0,nofVisibleColumns);
joachim99@66 1577 if ( m_pDiffTextWindow2 )
joachim99@69 1578 m_pDiffTextWindow2->recalcWordWrap(true,0,nofVisibleColumns);
joachim99@66 1579 if ( m_pDiffTextWindow3 )
joachim99@69 1580 m_pDiffTextWindow3->recalcWordWrap(true,0,nofVisibleColumns);
joachim99@69 1581
joachim99@66 1582 sumOfLines=0;
joachim99@66 1583 for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i )
joachim99@66 1584 {
joachim99@66 1585 Diff3Line& d3l = *i;
joachim99@66 1586 d3l.sumLinesNeededForDisplay = sumOfLines;
joachim99@66 1587 sumOfLines += d3l.linesNeededForDisplay;
joachim99@66 1588 }
joachim99@69 1589
joachim99@66 1590 // Finish the initialisation:
joachim99@66 1591 if ( m_pDiffTextWindow1 )
joachim99@69 1592 m_pDiffTextWindow1->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
joachim99@66 1593 if ( m_pDiffTextWindow2 )
joachim99@69 1594 m_pDiffTextWindow2->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
joachim99@66 1595 if ( m_pDiffTextWindow3 )
joachim99@69 1596 m_pDiffTextWindow3->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
joachim99@66 1597
joachim99@66 1598 m_neededLines = sumOfLines;
joachim99@66 1599 }
joachim99@66 1600 else
joachim99@66 1601 {
joachim99@66 1602 m_neededLines = m_diff3LineVector.size();
joachim99@66 1603 if ( m_pDiffTextWindow1 )
joachim99@69 1604 m_pDiffTextWindow1->recalcWordWrap(false,0,0);
joachim99@66 1605 if ( m_pDiffTextWindow2 )
joachim99@69 1606 m_pDiffTextWindow2->recalcWordWrap(false,0,0);
joachim99@66 1607 if ( m_pDiffTextWindow3 )
joachim99@69 1608 m_pDiffTextWindow3->recalcWordWrap(false,0,0);
joachim99@66 1609 }
joachim99@69 1610 if (bPrinting)
joachim99@69 1611 return;
joachim99@69 1612
joachim99@80 1613 if (m_pOverview)
joachim99@80 1614 m_pOverview->slotRedraw();
joachim99@66 1615 if ( m_pDiffTextWindow1 )
joachim99@66 1616 {
joachim99@66 1617 m_pDiffTextWindow1->setFirstLine( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) );
joachim99@66 1618 m_pDiffTextWindow1->update();
joachim99@66 1619 }
joachim99@66 1620 if ( m_pDiffTextWindow2 )
joachim99@66 1621 {
joachim99@66 1622 m_pDiffTextWindow2->setFirstLine( m_pDiffTextWindow2->convertDiff3LineIdxToLine( firstD3LIdx ) );
joachim99@66 1623 m_pDiffTextWindow2->update();
joachim99@66 1624 }
joachim99@66 1625 if ( m_pDiffTextWindow3 )
joachim99@66 1626 {
joachim99@66 1627 m_pDiffTextWindow3->setFirstLine( m_pDiffTextWindow3->convertDiff3LineIdxToLine( firstD3LIdx ) );
joachim99@66 1628 m_pDiffTextWindow3->update();
joachim99@66 1629 }
joachim99@66 1630
joachim99@66 1631 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - m_DTWHeight) );
joachim99@66 1632 if ( m_pDiffTextWindow1 )
joachim99@66 1633 {
joachim99@66 1634 m_pDiffVScrollBar->setValue( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) );
joachim99@69 1635
joachim99@66 1636 m_maxWidth = max3( m_pDiffTextWindow1->getNofColumns(),
joachim99@66 1637 m_pDiffTextWindow2->getNofColumns(),
joachim99@66 1638 m_pDiffTextWindow3->getNofColumns() ) + (m_pOptionDialog->m_bWordWrap ? 0 : 5);
joachim99@69 1639
joachim99@66 1640 m_pHScrollBar->setRange(0, max2( 0, m_maxWidth - m_pDiffTextWindow1->getNofVisibleColumns() ) );
joachim99@66 1641 m_pHScrollBar->setPageStep( m_pDiffTextWindow1->getNofVisibleColumns() );
joachim99@66 1642 m_pHScrollBar->setValue(0);
joachim99@66 1643 }
joachim99@66 1644 }
joachim99@66 1645
joachim99@8 1646 void KDiff3App::slotShowWhiteSpaceToggled()
joachim99@8 1647 {
joachim99@51 1648 m_pOptionDialog->m_bShowWhiteSpaceCharacters = showWhiteSpaceCharacters->isChecked();
joachim99@8 1649 m_pOptionDialog->m_bShowWhiteSpace = showWhiteSpace->isChecked();
joachim99@51 1650 showWhiteSpaceCharacters->setEnabled( showWhiteSpace->isChecked() );
joachim99@8 1651 if ( m_pDiffTextWindow1!=0 )
joachim99@8 1652 m_pDiffTextWindow1->update();
joachim99@8 1653 if ( m_pDiffTextWindow2!=0 )
joachim99@8 1654 m_pDiffTextWindow2->update();
joachim99@8 1655 if ( m_pDiffTextWindow3!=0 )
joachim99@8 1656 m_pDiffTextWindow3->update();
joachim99@51 1657 if ( m_pOverview!=0 )
joachim99@51 1658 m_pOverview->slotRedraw();
joachim99@8 1659 }
joachim99@8 1660
joachim99@8 1661 void KDiff3App::slotShowLineNumbersToggled()
joachim99@8 1662 {
joachim99@8 1663 m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked();
joachim99@8 1664 if ( m_pDiffTextWindow1!=0 )
joachim99@8 1665 m_pDiffTextWindow1->update();
joachim99@8 1666 if ( m_pDiffTextWindow2!=0 )
joachim99@8 1667 m_pDiffTextWindow2->update();
joachim99@8 1668 if ( m_pDiffTextWindow3!=0 )
joachim99@8 1669 m_pDiffTextWindow3->update();
joachim99@8 1670 }
joachim99@8 1671
joachim99@66 1672 /// Return true for success, else false
joachim99@69 1673 bool KDiff3App::improveFilenames( bool bCreateNewInstance )
joachim99@8 1674 {
joachim99@66 1675 m_bDirCompare = false;
joachim99@69 1676
joachim99@8 1677 FileAccess f1(m_sd1.getFilename());
joachim99@8 1678 FileAccess f2(m_sd2.getFilename());
joachim99@8 1679 FileAccess f3(m_sd3.getFilename());
joachim99@8 1680 FileAccess f4(m_outputFilename);
joachim99@8 1681
joachim99@8 1682 if ( f1.isFile() && f1.exists() )
joachim99@8 1683 {
joachim99@8 1684 if ( f2.isDir() )
joachim99@8 1685 {
joachim99@8 1686 f2.addPath( f1.fileName() );
joachim99@8 1687 if ( f2.isFile() && f2.exists() )
joachim99@8 1688 m_sd2.setFileAccess( f2 );
joachim99@8 1689 }
joachim99@8 1690 if ( f3.isDir() )
joachim99@8 1691 {
joachim99@8 1692 f3.addPath( f1.fileName() );
joachim99@8 1693 if ( f3.isFile() && f3.exists() )
joachim99@8 1694 m_sd3.setFileAccess( f3 );
joachim99@8 1695 }
joachim99@8 1696 if ( f4.isDir() )
joachim99@8 1697 {
joachim99@8 1698 f4.addPath( f1.fileName() );
joachim99@8 1699 if ( f4.isFile() && f4.exists() )
joachim99@80 1700 m_outputFilename = f4.absoluteFilePath();
joachim99@8 1701 }
joachim99@8 1702 }
joachim99@8 1703 else if ( f1.isDir() )
joachim99@8 1704 {
joachim99@66 1705 m_bDirCompare = true;
joachim99@69 1706 if (bCreateNewInstance)
joachim99@69 1707 {
joachim99@80 1708 emit createNewInstance( f1.absoluteFilePath(), f2.absoluteFilePath(), f3.absoluteFilePath() );
joachim99@69 1709 }
joachim99@69 1710 else
joachim99@69 1711 {
joachim99@69 1712 FileAccess destDir;
joachim99@69 1713 if (!m_bDefaultFilename) destDir = f4;
joachim99@69 1714 m_pDirectoryMergeSplitter->show();
joachim99@69 1715 if (m_pMainWidget!=0) m_pMainWidget->hide();
joachim99@80 1716 setUpdatesEnabled(true);
joachim99@69 1717
joachim99@69 1718 bool bSuccess = m_pDirectoryMergeWindow->init(
joachim99@69 1719 f1, f2, f3,
joachim99@69 1720 destDir, // Destdirname
joachim99@69 1721 !m_outputFilename.isEmpty()
joachim99@69 1722 );
joachim99@66 1723
joachim99@75 1724 m_bDirCompare = true; // This seems redundant but it might have been reset during full analysis.
joachim99@69 1725
joachim99@69 1726 if (bSuccess)
joachim99@69 1727 {
joachim99@69 1728 m_sd1.reset();
joachim99@69 1729 if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,0,0,0,false);
joachim99@69 1730 m_sd2.reset();
joachim99@69 1731 if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,0,0,0,false);
joachim99@69 1732 m_sd3.reset();
joachim99@69 1733 if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,0,0,0,false);
joachim99@69 1734 }
joachim99@69 1735 slotUpdateAvailabilities();
joachim99@69 1736 return bSuccess;
joachim99@66 1737 }
joachim99@8 1738 }
joachim99@66 1739 return true;
joachim99@8 1740 }
joachim99@8 1741
joachim99@8 1742 void KDiff3App::slotReload()
joachim99@8 1743 {
joachim99@8 1744 if ( !canContinue() ) return;
joachim99@8 1745
joachim99@8 1746 init();
joachim99@8 1747 }
joachim99@8 1748
joachim99@8 1749 bool KDiff3App::canContinue()
joachim99@8 1750 {
joachim99@8 1751 // First test if anything must be saved.
joachim99@8 1752 if(m_bOutputModified)
joachim99@8 1753 {
joachim99@8 1754 int result = KMessageBox::warningYesNoCancel(this,
joachim99@8 1755 i18n("The merge result hasn't been saved."),
joachim99@80 1756 i18n("Warning"),
joachim99@80 1757 KGuiItem( i18n("Save && Continue") ),
joachim99@80 1758 KGuiItem( i18n("Continue Without Saving") ) );
joachim99@8 1759 if ( result==KMessageBox::Cancel )
joachim99@8 1760 return false;
joachim99@8 1761 else if ( result==KMessageBox::Yes )
joachim99@8 1762 {
joachim99@8 1763 slotFileSave();
joachim99@8 1764 if ( m_bOutputModified )
joachim99@8 1765 {
joachim99@8 1766 KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") );
joachim99@8 1767 return false;
joachim99@8 1768 }
joachim99@8 1769 }
joachim99@8 1770 }
joachim99@8 1771
joachim99@8 1772 m_bOutputModified = false;
joachim99@8 1773 return true;
joachim99@8 1774 }
joachim99@8 1775
joachim99@8 1776 void KDiff3App::slotCheckIfCanContinue( bool* pbContinue )
joachim99@8 1777 {
joachim99@8 1778 if (pbContinue!=0) *pbContinue = canContinue();
joachim99@8 1779 }
joachim99@8 1780
joachim99@8 1781
joachim99@8 1782 void KDiff3App::slotDirShowBoth()
joachim99@8 1783 {
joachim99@8 1784 if( dirShowBoth->isChecked() )
joachim99@8 1785 {
joachim99@80 1786 if ( m_pDirectoryMergeSplitter )
joachim99@80 1787 m_pDirectoryMergeSplitter->setVisible( m_bDirCompare );
joachim99@8 1788
joachim99@8 1789 if ( m_pMainWidget!=0 )
joachim99@8 1790 m_pMainWidget->show();
joachim99@8 1791 }
joachim99@8 1792 else
joachim99@8 1793 {
joachim99@8 1794 if ( m_pMainWidget!=0 )
joachim99@8 1795 {
joachim99@8 1796 m_pMainWidget->show();
joachim99@8 1797 m_pDirectoryMergeSplitter->hide();
joachim99@8 1798 }
joachim99@8 1799 else if ( m_bDirCompare )
joachim99@8 1800 {
joachim99@8 1801 m_pDirectoryMergeSplitter->show();
joachim99@8 1802 }
joachim99@8 1803 }
joachim99@8 1804
joachim99@8 1805 slotUpdateAvailabilities();
joachim99@8 1806 }
joachim99@8 1807
joachim99@8 1808
joachim99@8 1809 void KDiff3App::slotDirViewToggle()
joachim99@8 1810 {
joachim99@8 1811 if ( m_bDirCompare )
joachim99@8 1812 {
joachim99@8 1813 if( ! m_pDirectoryMergeSplitter->isVisible() )
joachim99@8 1814 {
joachim99@8 1815 m_pDirectoryMergeSplitter->show();
joachim99@8 1816 if (m_pMainWidget!=0)
joachim99@8 1817 m_pMainWidget->hide();
joachim99@8 1818 }
joachim99@8 1819 else
joachim99@8 1820 {
joachim99@8 1821 if (m_pMainWidget!=0)
joachim99@8 1822 {
joachim99@8 1823 m_pDirectoryMergeSplitter->hide();
joachim99@8 1824 m_pMainWidget->show();
joachim99@8 1825 }
joachim99@8 1826 }
joachim99@8 1827 }
joachim99@8 1828 slotUpdateAvailabilities();
joachim99@8 1829 }
joachim99@8 1830
joachim99@8 1831 void KDiff3App::slotShowWindowAToggled()
joachim99@8 1832 {
joachim99@8 1833 if ( m_pDiffTextWindow1!=0 )
joachim99@8 1834 {
joachim99@75 1835 m_pDiffTextWindowFrame1->setVisible( showWindowA->isChecked() );
joachim99@8 1836 slotUpdateAvailabilities();
joachim99@8 1837 }
joachim99@8 1838 }
joachim99@8 1839
joachim99@8 1840 void KDiff3App::slotShowWindowBToggled()
joachim99@8 1841 {
joachim99@8 1842 if ( m_pDiffTextWindow2!=0 )
joachim99@8 1843 {
joachim99@75 1844 m_pDiffTextWindowFrame2->setVisible( showWindowB->isChecked() );
joachim99@8 1845 slotUpdateAvailabilities();
joachim99@8 1846 }
joachim99@8 1847 }
joachim99@8 1848
joachim99@8 1849 void KDiff3App::slotShowWindowCToggled()
joachim99@8 1850 {
joachim99@8 1851 if ( m_pDiffTextWindow3!=0 )
joachim99@8 1852 {
joachim99@75 1853 m_pDiffTextWindowFrame3->setVisible( showWindowC->isChecked() );
joachim99@8 1854 slotUpdateAvailabilities();
joachim99@8 1855 }
joachim99@8 1856 }
joachim99@8 1857
joachim99@8 1858 void KDiff3App::slotEditFind()
joachim99@8 1859 {
joachim99@8 1860 m_pFindDialog->currentLine = 0;
joachim99@8 1861 m_pFindDialog->currentPos = 0;
joachim99@8 1862 m_pFindDialog->currentWindow = 1;
joachim99@8 1863
joachim99@8 1864 if ( QDialog::Accepted == m_pFindDialog->exec() )
joachim99@8 1865 {
joachim99@8 1866 slotEditFindNext();
joachim99@8 1867 }
joachim99@8 1868 }
joachim99@8 1869
joachim99@8 1870 void KDiff3App::slotEditFindNext()
joachim99@8 1871 {
joachim99@68 1872 QString s = m_pFindDialog->m_pSearchString->text();
joachim99@8 1873 if ( s.isEmpty() )
joachim99@8 1874 {
joachim99@8 1875 slotEditFind();
joachim99@8 1876 return;
joachim99@8 1877 }
joachim99@8 1878
joachim99@8 1879 bool bDirDown = true;
joachim99@8 1880 bool bCaseSensitive = m_pFindDialog->m_pCaseSensitive->isChecked();
joachim99@8 1881
joachim99@8 1882 int d3vLine = m_pFindDialog->currentLine;
joachim99@8 1883 int posInLine = m_pFindDialog->currentPos;
joachim99@66 1884 int l=0;
joachim99@66 1885 int p=0;
joachim99@8 1886 if ( m_pFindDialog->currentWindow == 1 )
joachim99@8 1887 {
joachim99@8 1888 if ( m_pFindDialog->m_pSearchInA->isChecked() && m_pDiffTextWindow1!=0 &&
joachim99@8 1889 m_pDiffTextWindow1->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1890 {
joachim99@66 1891 m_pDiffTextWindow1->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(), l, p );
joachim99@66 1892 m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2);
joachim99@66 1893 m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1894 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1895 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1896 return;
joachim99@8 1897 }
joachim99@8 1898 m_pFindDialog->currentWindow = 2;
joachim99@8 1899 m_pFindDialog->currentLine = 0;
joachim99@8 1900 m_pFindDialog->currentPos = 0;
joachim99@8 1901 }
joachim99@8 1902
joachim99@8 1903 d3vLine = m_pFindDialog->currentLine;
joachim99@8 1904 posInLine = m_pFindDialog->currentPos;
joachim99@8 1905 if ( m_pFindDialog->currentWindow == 2 )
joachim99@8 1906 {
joachim99@8 1907 if ( m_pFindDialog->m_pSearchInB->isChecked() && m_pDiffTextWindow2!=0 &&
joachim99@8 1908 m_pDiffTextWindow2->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1909 {
joachim99@66 1910 m_pDiffTextWindow2->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(),l,p );
joachim99@66 1911 m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2);
joachim99@66 1912 m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1913 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1914 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1915 return;
joachim99@8 1916 }
joachim99@8 1917 m_pFindDialog->currentWindow = 3;
joachim99@8 1918 m_pFindDialog->currentLine = 0;
joachim99@8 1919 m_pFindDialog->currentPos = 0;
joachim99@8 1920 }
joachim99@8 1921
joachim99@8 1922 d3vLine = m_pFindDialog->currentLine;
joachim99@8 1923 posInLine = m_pFindDialog->currentPos;
joachim99@8 1924 if ( m_pFindDialog->currentWindow == 3 )
joachim99@8 1925 {
joachim99@8 1926 if ( m_pFindDialog->m_pSearchInC->isChecked() && m_pDiffTextWindow3!=0 &&
joachim99@8 1927 m_pDiffTextWindow3->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1928 {
joachim99@66 1929 m_pDiffTextWindow3->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(),l,p );
joachim99@66 1930 m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2);
joachim99@66 1931 m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1932 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1933 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1934 return;
joachim99@8 1935 }
joachim99@8 1936 m_pFindDialog->currentWindow = 4;
joachim99@8 1937 m_pFindDialog->currentLine = 0;
joachim99@8 1938 m_pFindDialog->currentPos = 0;
joachim99@8 1939 }
joachim99@8 1940
joachim99@8 1941 d3vLine = m_pFindDialog->currentLine;
joachim99@8 1942 posInLine = m_pFindDialog->currentPos;
joachim99@8 1943 if ( m_pFindDialog->currentWindow == 4 )
joachim99@8 1944 {
joachim99@8 1945 if ( m_pFindDialog->m_pSearchInOutput->isChecked() && m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() &&
joachim99@8 1946 m_pMergeResultWindow->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1947 {
joachim99@8 1948 m_pMergeResultWindow->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
joachim99@8 1949 m_pMergeVScrollBar->setValue(d3vLine - m_pMergeVScrollBar->pageStep()/2);
joachim99@8 1950 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1951 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1952 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1953 return;
joachim99@8 1954 }
joachim99@8 1955 m_pFindDialog->currentWindow = 5;
joachim99@8 1956 m_pFindDialog->currentLine = 0;
joachim99@8 1957 m_pFindDialog->currentPos = 0;
joachim99@8 1958 }
joachim99@8 1959
joachim99@51 1960 KMessageBox::information(this,i18n("Search complete."),i18n("Search Complete"));
joachim99@8 1961 m_pFindDialog->currentWindow = 1;
joachim99@8 1962 m_pFindDialog->currentLine = 0;
joachim99@8 1963 m_pFindDialog->currentPos = 0;
joachim99@8 1964 }
joachim99@8 1965
joachim99@8 1966 void KDiff3App::slotMergeCurrentFile()
joachim99@8 1967 {
joachim99@8 1968 if ( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() )
joachim99@8 1969 {
joachim99@8 1970 m_pDirectoryMergeWindow->mergeCurrentFile();
joachim99@8 1971 }
joachim99@8 1972 else if ( m_pMainWidget != 0 && m_pMainWidget->isVisible() )
joachim99@8 1973 {
joachim99@8 1974 if ( !canContinue() ) return;
joachim99@8 1975 if ( m_outputFilename.isEmpty() )
joachim99@8 1976 {
joachim99@58 1977 if ( !m_sd3.isEmpty() && !m_sd3.isFromBuffer() )
joachim99@8 1978 {
joachim99@8 1979 m_outputFilename = m_sd3.getFilename();
joachim99@8 1980 }
joachim99@58 1981 else if ( !m_sd2.isEmpty() && !m_sd2.isFromBuffer() )
joachim99@8 1982 {
joachim99@8 1983 m_outputFilename = m_sd2.getFilename();
joachim99@8 1984 }
joachim99@58 1985 else if ( !m_sd1.isEmpty() && !m_sd1.isFromBuffer() )
joachim99@8 1986 {
joachim99@8 1987 m_outputFilename = m_sd1.getFilename();
joachim99@8 1988 }
joachim99@8 1989 else
joachim99@8 1990 {
joachim99@8 1991 m_outputFilename = "unnamed.txt";
joachim99@8 1992 m_bDefaultFilename = true;
joachim99@8 1993 }
joachim99@8 1994 }
joachim99@8 1995 init();
joachim99@8 1996 }
joachim99@8 1997 }
joachim99@8 1998
joachim99@8 1999 void KDiff3App::slotWinFocusNext()
joachim99@8 2000 {
joachim99@8 2001 QWidget* focus = qApp->focusWidget();
joachim99@8 2002 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
joachim99@8 2003 {
joachim99@8 2004 slotDirViewToggle();
joachim99@8 2005 }
joachim99@8 2006
joachim99@8 2007 std::list<QWidget*> visibleWidgetList;
joachim99@66 2008 if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
joachim99@66 2009 if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
joachim99@66 2010 if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
joachim99@66 2011 if ( m_pMergeResultWindow && m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
joachim99@8 2012 if ( m_bDirCompare /*m_pDirectoryMergeWindow->isVisible()*/ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
joachim99@8 2013 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
joachim99@8 2014
joachim99@8 2015 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
joachim99@8 2016 ++i;
joachim99@66 2017 if ( i==visibleWidgetList.end() )
joachim99@66 2018 i = visibleWidgetList.begin();
joachim99@8 2019 if ( i!=visibleWidgetList.end() )
joachim99@8 2020 {
joachim99@8 2021 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
joachim99@8 2022 {
joachim99@8 2023 slotDirViewToggle();
joachim99@8 2024 }
joachim99@8 2025 (*i)->setFocus();
joachim99@8 2026 }
joachim99@8 2027 }
joachim99@8 2028
joachim99@8 2029 void KDiff3App::slotWinFocusPrev()
joachim99@8 2030 {
joachim99@8 2031 QWidget* focus = qApp->focusWidget();
joachim99@8 2032 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
joachim99@8 2033 {
joachim99@8 2034 slotDirViewToggle();
joachim99@8 2035 }
joachim99@8 2036
joachim99@8 2037 std::list<QWidget*> visibleWidgetList;
joachim99@66 2038 if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
joachim99@66 2039 if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
joachim99@66 2040 if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
joachim99@66 2041 if ( m_pMergeResultWindow && m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
joachim99@8 2042 if (m_bDirCompare /* m_pDirectoryMergeWindow->isVisible() */ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
joachim99@8 2043 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
joachim99@8 2044
joachim99@8 2045 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
joachim99@73 2046 if ( i==visibleWidgetList.begin() )
joachim99@73 2047 i=visibleWidgetList.end();
joachim99@8 2048 --i;
joachim99@8 2049 if ( i!=visibleWidgetList.end() )
joachim99@8 2050 {
joachim99@8 2051 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
joachim99@8 2052 {
joachim99@8 2053 slotDirViewToggle();
joachim99@8 2054 }
joachim99@8 2055 (*i)->setFocus();
joachim99@8 2056 }
joachim99@8 2057 }
joachim99@8 2058
joachim99@8 2059 void KDiff3App::slotWinToggleSplitterOrientation()
joachim99@8 2060 {
joachim99@8 2061 if ( m_pDiffWindowSplitter!=0 )
joachim99@8 2062 {
joachim99@8 2063 m_pDiffWindowSplitter->setOrientation(
joachim99@69 2064 m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical
joachim99@8 2065 );
joachim99@51 2066
joachim99@69 2067 m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal;
joachim99@8 2068 }
joachim99@8 2069 }
joachim99@8 2070
joachim99@66 2071 void KDiff3App::slotOverviewNormal()
joachim99@69 2072 {
joachim99@80 2073 if ( m_pOverview != 0 )
joachim99@80 2074 m_pOverview->setOverviewMode( Overview::eOMNormal );
joachim99@80 2075 if ( m_pMergeResultWindow !=0 )
joachim99@80 2076 m_pMergeResultWindow->setOverviewMode( Overview::eOMNormal );
joachim99@66 2077 slotUpdateAvailabilities();
joachim99@66 2078 }
joachim99@66 2079
joachim99@66 2080 void KDiff3App::slotOverviewAB()
joachim99@66 2081 {
joachim99@80 2082 if ( m_pOverview != 0 )
joachim99@80 2083 m_pOverview->setOverviewMode( Overview::eOMAvsB );
joachim99@69 2084 m_pMergeResultWindow->setOverviewMode( Overview::eOMAvsB );
joachim99@66 2085 slotUpdateAvailabilities();
joachim99@66 2086 }
joachim99@66 2087
joachim99@66 2088 void KDiff3App::slotOverviewAC()
joachim99@66 2089 {
joachim99@80 2090 if ( m_pOverview != 0 )
joachim99@80 2091 m_pOverview->setOverviewMode( Overview::eOMAvsC );
joachim99@80 2092 if ( m_pMergeResultWindow !=0 )
joachim99@80 2093 m_pMergeResultWindow->setOverviewMode( Overview::eOMAvsC );
joachim99@66 2094 slotUpdateAvailabilities();
joachim99@66 2095 }
joachim99@66 2096
joachim99@66 2097 void KDiff3App::slotOverviewBC()
joachim99@66 2098 {
joachim99@80 2099 if ( m_pOverview != 0 )
joachim99@80 2100 m_pOverview->setOverviewMode( Overview::eOMBvsC );
joachim99@80 2101 if ( m_pMergeResultWindow !=0 )
joachim99@80 2102 m_pMergeResultWindow->setOverviewMode( Overview::eOMBvsC );
joachim99@66 2103 slotUpdateAvailabilities();
joachim99@66 2104 }
joachim99@69 2105
joachim99@69 2106 void KDiff3App::slotNoRelevantChangesDetected()
joachim99@69 2107 {
joachim99@69 2108 if ( m_bTripleDiff && ! m_outputFilename.isEmpty() )
joachim99@69 2109 {
joachim99@69 2110 //KMessageBox::information( this, "No relevant changes detected", "KDiff3" );
joachim99@69 2111 if (!m_pOptionDialog->m_IrrelevantMergeCmd.isEmpty())
joachim99@69 2112 {
joachim99@69 2113 QString cmd = m_pOptionDialog->m_IrrelevantMergeCmd + " \"" + m_sd1.getAliasName()+ "\" \"" + m_sd2.getAliasName() + "\" \"" + m_sd3.getAliasName();
joachim99@75 2114 QProcess process;
joachim99@75 2115 process.start( cmd );
joachim99@75 2116 process.waitForFinished(-1);
joachim99@75 2117 //::system( cmd.local8Bit() );
joachim99@69 2118 }
joachim99@69 2119 }
joachim99@69 2120 }
joachim99@69 2121
joachim99@69 2122 static void insertManualDiffHelp( ManualDiffHelpList* pManualDiffHelpList, int winIdx, int firstLine, int lastLine )
joachim99@69 2123 {
joachim99@69 2124 // The manual diff help list must be sorted and compact.
joachim99@69 2125 // "Compact" means that upper items can't be empty if lower items contain data.
joachim99@69 2126
joachim99@69 2127 // First insert the new item without regarding compactness.
joachim99@69 2128 // If the new item overlaps with previous items then the previous items will be removed.
joachim99@69 2129
joachim99@69 2130 ManualDiffHelpEntry mdhe;
joachim99@69 2131 mdhe.firstLine( winIdx ) = firstLine;
joachim99@69 2132 mdhe.lastLine( winIdx ) = lastLine;
joachim99@69 2133
joachim99@69 2134 ManualDiffHelpList::iterator i;
joachim99@69 2135 for( i=pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i )
joachim99@69 2136 {
joachim99@69 2137 int& l1 = i->firstLine( winIdx );
joachim99@69 2138 int& l2 = i->lastLine( winIdx );
joachim99@69 2139 if (l1>=0 && l2>=0)
joachim99@69 2140 {
joachim99@80 2141 if ( (firstLine<=l1 && lastLine>=l1) || (firstLine <=l2 && lastLine>=l2) )
joachim99@69 2142 {
joachim99@69 2143 // overlap
joachim99@69 2144 l1 = -1;
joachim99@69 2145 l2 = -1;
joachim99@69 2146 }
joachim99@69 2147 if ( firstLine<l1 && lastLine<l1 )
joachim99@69 2148 {
joachim99@69 2149 // insert before this position
joachim99@69 2150 pManualDiffHelpList->insert( i, mdhe );
joachim99@69 2151 break;
joachim99@69 2152 }
joachim99@69 2153 }
joachim99@69 2154 }
joachim99@69 2155 if ( i == pManualDiffHelpList->end() )
joachim99@69 2156 {
joachim99@69 2157 pManualDiffHelpList->insert( i, mdhe );
joachim99@69 2158 }
joachim99@69 2159
joachim99@69 2160 // Now make the list compact
joachim99@69 2161 for( int wIdx=1; wIdx<=3; ++wIdx )
joachim99@69 2162 {
joachim99@69 2163 ManualDiffHelpList::iterator iEmpty = pManualDiffHelpList->begin();
joachim99@69 2164 for( i=pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i )
joachim99@69 2165 {
joachim99@69 2166 if ( iEmpty->firstLine(wIdx) >= 0 )
joachim99@69 2167 {
joachim99@69 2168 ++iEmpty;
joachim99@69 2169 continue;
joachim99@69 2170 }
joachim99@69 2171 if ( i->firstLine(wIdx)>=0 ) // Current item is not empty -> move it to the empty place
joachim99@69 2172 {
joachim99@69 2173 iEmpty->firstLine(wIdx) = i->firstLine(wIdx);
joachim99@69 2174 iEmpty->lastLine(wIdx) = i->lastLine(wIdx);
joachim99@69 2175 i->firstLine(wIdx) = -1;
joachim99@69 2176 i->lastLine(wIdx) = -1;
joachim99@69 2177 ++iEmpty;
joachim99@69 2178 }
joachim99@69 2179 }
joachim99@69 2180 }
joachim99@69 2181 pManualDiffHelpList->remove( ManualDiffHelpEntry() ); // Remove all completely empty items.
joachim99@69 2182 }
joachim99@69 2183
joachim99@69 2184 void KDiff3App::slotAddManualDiffHelp()
joachim99@69 2185 {
joachim99@69 2186 int firstLine = -1;
joachim99@69 2187 int lastLine = -1;
joachim99@69 2188 int winIdx = -1;
joachim99@69 2189 if ( m_pDiffTextWindow1 ) { m_pDiffTextWindow1->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=1; }
joachim99@69 2190 if ( firstLine<0 && m_pDiffTextWindow2 ) { m_pDiffTextWindow2->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=2; }
joachim99@69 2191 if ( firstLine<0 && m_pDiffTextWindow3 ) { m_pDiffTextWindow3->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=3; }
joachim99@69 2192
joachim99@69 2193 if ( firstLine<0 || lastLine <0 || lastLine<firstLine )
joachim99@69 2194 KMessageBox::information( this, i18n("Nothing is selected in either diff input window."), i18n("Error while adding manual diff range") );
joachim99@69 2195 else
joachim99@69 2196 {
joachim99@69 2197 /*
joachim99@69 2198 ManualDiffHelpEntry mdhe;
joachim99@69 2199 if (!m_manualDiffHelpList.empty()) mdhe = m_manualDiffHelpList.front();
joachim99@69 2200 if ( winIdx==1 ) { mdhe.lineA1 = firstLine; mdhe.lineA2 = lastLine; }
joachim99@69 2201 if ( winIdx==2 ) { mdhe.lineB1 = firstLine; mdhe.lineB2 = lastLine; }
joachim99@69 2202 if ( winIdx==3 ) { mdhe.lineC1 = firstLine; mdhe.lineC2 = lastLine; }
joachim99@69 2203 m_manualDiffHelpList.clear();
joachim99@69 2204 m_manualDiffHelpList.push_back( mdhe );
joachim99@69 2205 */
joachim99@69 2206
joachim99@69 2207 insertManualDiffHelp( &m_manualDiffHelpList, winIdx, firstLine, lastLine );
joachim99@69 2208
joachim99@69 2209 init( false, 0, false ); // Init without reload
joachim99@69 2210 slotRefresh();
joachim99@69 2211 }
joachim99@69 2212 }
joachim99@69 2213
joachim99@69 2214 void KDiff3App::slotClearManualDiffHelpList()
joachim99@69 2215 {
joachim99@69 2216 m_manualDiffHelpList.clear();
joachim99@69 2217 init( false, 0, false ); // Init without reload
joachim99@69 2218 slotRefresh();
joachim99@69 2219 }
joachim99@69 2220
joachim99@8 2221 void KDiff3App::slotUpdateAvailabilities()
joachim99@8 2222 {
joachim99@80 2223 if (m_pMainSplitter==0)
joachim99@80 2224 return;
joachim99@80 2225
joachim99@58 2226 bool bTextDataAvailable = ( m_sd1.hasData() || m_sd2.hasData() || m_sd3.hasData() );
joachim99@69 2227
joachim99@8 2228 if( dirShowBoth->isChecked() )
joachim99@8 2229 {
joachim99@80 2230 if ( m_pDirectoryMergeSplitter!=0 )
joachim99@80 2231 m_pDirectoryMergeSplitter->setVisible( m_bDirCompare );
joachim99@8 2232
joachim99@8 2233 if ( m_pMainWidget!=0 && !m_pMainWidget->isVisible() &&
joachim99@66 2234 bTextDataAvailable && !m_pDirectoryMergeWindow->isScanning()
joachim99@8 2235 )
joachim99@8 2236 m_pMainWidget->show();
joachim99@8 2237 }
joachim99@69 2238
joachim99@8 2239
joachim99@8 2240 bool bDiffWindowVisible = m_pMainWidget != 0 && m_pMainWidget->isVisible();
joachim99@8 2241 bool bMergeEditorVisible = m_pMergeWindowFrame !=0 && m_pMergeWindowFrame->isVisible();
joachim99@8 2242
joachim99@53 2243 m_pDirectoryMergeWindow->updateAvailabilities( m_bDirCompare, bDiffWindowVisible, chooseA, chooseB, chooseC );
joachim99@8 2244
joachim99@8 2245 dirShowBoth->setEnabled( m_bDirCompare );
joachim99@8 2246 dirViewToggle->setEnabled(
joachim99@8 2247 m_bDirCompare &&
joachim99@80 2248 ((!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && m_pMainWidget->isVisible()) ||
joachim99@80 2249 (m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && !m_pMainWidget->isVisible() && bTextDataAvailable) )
joachim99@8 2250 );
joachim99@69 2251
joachim99@53 2252 bool bDirWindowHasFocus = m_pDirectoryMergeSplitter->isVisible() && m_pDirectoryMergeWindow->hasFocus();
joachim99@8 2253
joachim99@51 2254 showWhiteSpaceCharacters->setEnabled( bDiffWindowVisible );
joachim99@8 2255 autoAdvance->setEnabled( bMergeEditorVisible );
joachim99@8 2256 autoSolve->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@8 2257 unsolve->setEnabled( bMergeEditorVisible );
joachim99@53 2258 if ( !bDirWindowHasFocus )
joachim99@53 2259 {
joachim99@53 2260 chooseA->setEnabled( bMergeEditorVisible );
joachim99@53 2261 chooseB->setEnabled( bMergeEditorVisible );
joachim99@53 2262 chooseC->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@53 2263 }
joachim99@8 2264 chooseAEverywhere->setEnabled( bMergeEditorVisible );
joachim99@8 2265 chooseBEverywhere->setEnabled( bMergeEditorVisible );
joachim99@8 2266 chooseCEverywhere->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@51 2267 chooseAForUnsolvedConflicts->setEnabled( bMergeEditorVisible );
joachim99@51 2268 chooseBForUnsolvedConflicts->setEnabled( bMergeEditorVisible );
joachim99@51 2269 chooseCForUnsolvedConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@51 2270 chooseAForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible );
joachim99@51 2271 chooseBForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible );
joachim99@51 2272 chooseCForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@69 2273 mergeHistory->setEnabled( bMergeEditorVisible );
joachim99@69 2274 mergeRegExp->setEnabled( bMergeEditorVisible );
joachim99@8 2275 showWindowA->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow2->isVisible() || m_pDiffTextWindow3->isVisible() ) );
joachim99@8 2276 showWindowB->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow3->isVisible() ));
joachim99@8 2277 showWindowC->setEnabled( bDiffWindowVisible && m_bTripleDiff && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow2->isVisible() ) );
joachim99@8 2278 editFind->setEnabled( bDiffWindowVisible );
joachim99@8 2279 editFindNext->setEnabled( bDiffWindowVisible );
joachim99@8 2280 m_pFindDialog->m_pSearchInC->setEnabled( m_bTripleDiff );
joachim99@8 2281 m_pFindDialog->m_pSearchInOutput->setEnabled( bMergeEditorVisible );
joachim99@8 2282
joachim99@8 2283 bool bSavable = bMergeEditorVisible && m_pMergeResultWindow->getNrOfUnsolvedConflicts()==0;
joachim99@8 2284 fileSave->setEnabled( m_bOutputModified && bSavable );
joachim99@8 2285 fileSaveAs->setEnabled( bSavable );
joachim99@8 2286
joachim99@8 2287 goTop->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
joachim99@8 2288 goBottom->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
joachim99@8 2289 goCurrent->setEnabled( bDiffWindowVisible );
joachim99@8 2290 goPrevUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictAboveCurrent() );
joachim99@8 2291 goNextUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictBelowCurrent() );
joachim99@8 2292 goPrevConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictAboveCurrent() );
joachim99@8 2293 goNextConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictBelowCurrent() );
joachim99@8 2294 goPrevDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
joachim99@8 2295 goNextDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
joachim99@69 2296
joachim99@66 2297 overviewModeNormal->setEnabled( m_bTripleDiff && bDiffWindowVisible );
joachim99@66 2298 overviewModeAB->setEnabled( m_bTripleDiff && bDiffWindowVisible );
joachim99@66 2299 overviewModeAC->setEnabled( m_bTripleDiff && bDiffWindowVisible );
joachim99@66 2300 overviewModeBC->setEnabled( m_bTripleDiff && bDiffWindowVisible );
joachim99@66 2301 Overview::e_OverviewMode overviewMode = m_pOverview==0 ? Overview::eOMNormal : m_pOverview->getOverviewMode();
joachim99@66 2302 overviewModeNormal->setChecked( overviewMode == Overview::eOMNormal );
joachim99@66 2303 overviewModeAB->setChecked( overviewMode == Overview::eOMAvsB );
joachim99@66 2304 overviewModeAC->setChecked( overviewMode == Overview::eOMAvsC );
joachim99@66 2305 overviewModeBC->setChecked( overviewMode == Overview::eOMBvsC );
joachim99@8 2306
joachim99@8 2307 winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=0 );
joachim99@8 2308 }