annotate kdiff3/src-QT4/pdiff.cpp @ 113:7bca1f1340f6 tip

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