annotate kdiff3/src/pdiff.cpp @ 8:86d21651c8db

KDiff3 version 0.9.70
author joachim99
date Mon, 06 Oct 2003 18:50:45 +0000
parents
children 675b2ed580b2
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@8 2 kdiff.cpp - description
joachim99@8 3 -------------------
joachim99@8 4 begin : Mon Mär 18 20:04:50 CET 2002
joachim99@8 5 copyright : (C) 2002 by Joachim Eibl
joachim99@8 6 email : joachim.eibl@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@8 18 /***************************************************************************
joachim99@8 19 * $Log$
joachim99@8 20 * Revision 1.1 2003/10/06 18:38:48 joachim99
joachim99@8 21 * KDiff3 version 0.9.70
joachim99@8 22 * *
joachim99@8 23 ***************************************************************************/
joachim99@8 24
joachim99@8 25 #include "diff.h"
joachim99@8 26 #include "directorymergewindow.h"
joachim99@8 27
joachim99@8 28 #include <iostream>
joachim99@8 29 #include <algorithm>
joachim99@8 30 #include <ctype.h>
joachim99@8 31 #include <qaccel.h>
joachim99@8 32
joachim99@8 33 #include <kfiledialog.h>
joachim99@8 34 #include <klocale.h>
joachim99@8 35 #include <kmessagebox.h>
joachim99@8 36 #include <kfontdialog.h>
joachim99@8 37 #include <kstatusbar.h>
joachim99@8 38 #include <kkeydialog.h>
joachim99@8 39
joachim99@8 40 #include <qclipboard.h>
joachim99@8 41 #include <qscrollbar.h>
joachim99@8 42 #include <qlayout.h>
joachim99@8 43 #include <qsplitter.h>
joachim99@8 44 #include <qlabel.h>
joachim99@8 45 #include <qpushbutton.h>
joachim99@8 46 #include <qlineedit.h>
joachim99@8 47 #include <qcheckbox.h>
joachim99@8 48 #include <qcombobox.h>
joachim99@8 49 #include <qdir.h>
joachim99@8 50 #include <qfile.h>
joachim99@8 51 #include <qvbuttongroup.h>
joachim99@8 52 #include <qradiobutton.h>
joachim99@8 53 #include <qdragobject.h>
joachim99@8 54 #include <assert.h>
joachim99@8 55
joachim99@8 56 #include "kdiff3.h"
joachim99@8 57 #include "optiondialog.h"
joachim99@8 58 #include "fileaccess.h"
joachim99@8 59 #ifdef _WIN32
joachim99@8 60 #include <windows.h>
joachim99@8 61 #else
joachim99@8 62 #include <unistd.h>
joachim99@8 63 #endif
joachim99@8 64
joachim99@8 65 //using namespace std;
joachim99@8 66
joachim99@8 67 int g_tabSize = 8;
joachim99@8 68 bool g_bIgnoreWhiteSpace = true;
joachim99@8 69 bool g_bIgnoreTrivialMatches = true;
joachim99@8 70
joachim99@8 71
joachim99@8 72 QString createTempFile( const LineData* p, int size, bool bIgnoreWhiteSpace, bool bIgnoreNumbers )
joachim99@8 73 {
joachim99@8 74 QString fileName = FileAccess::tempFileName();
joachim99@8 75
joachim99@8 76 QFile file( fileName );
joachim99@8 77 bool bSuccess = file.open( IO_WriteOnly );
joachim99@8 78 if ( !bSuccess ) return "";
joachim99@8 79 for (int l=0; l<size; ++l)
joachim99@8 80 {
joachim99@8 81 // We don't want any white space in the diff output
joachim99@8 82 QCString s( p[l].size+1 );
joachim99@8 83 int is=0;
joachim99@8 84 for(int j=0; j<p[l].size; ++j )
joachim99@8 85 {
joachim99@8 86 char c = p[l].pLine[j];
joachim99@8 87 if ( !( bIgnoreWhiteSpace && isWhite( c ) ||
joachim99@8 88 bIgnoreNumbers && (isdigit( c ) || c=='-' || c=='.' )
joachim99@8 89 )
joachim99@8 90 )
joachim99@8 91 {
joachim99@8 92 if ( c=='\0' ) // Replace zeros with something else.
joachim99@8 93 s[is]=(char)0xFF;
joachim99@8 94 else
joachim99@8 95 s[is]=c;
joachim99@8 96 ++is;
joachim99@8 97 }
joachim99@8 98 }
joachim99@8 99 s[is]='\n';
joachim99@8 100 ++is;
joachim99@8 101 if( is != file.writeBlock( &s[0], is ) )
joachim99@8 102 return "";
joachim99@8 103 }
joachim99@8 104 return fileName;
joachim99@8 105 }
joachim99@8 106
joachim99@8 107 bool KDiff3App::runDiff( LineData* p1, int size1, LineData* p2, int size2, DiffList& diffList )
joachim99@8 108 {
joachim99@8 109 diffList.clear();
joachim99@8 110 //QString errorString;
joachim99@8 111
joachim99@8 112 if ( m_pOptionDialog->m_bUseExternalDiff )
joachim99@8 113 {
joachim99@8 114 bool bSuccess=false;
joachim99@8 115
joachim99@8 116 bool bIgnoreWhiteSpace = m_pOptionDialog->m_bIgnoreWhiteSpace;
joachim99@8 117 bool bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers;
joachim99@8 118
joachim99@8 119 // Create two temp files (Remove all white spaces and carriage returns here)
joachim99@8 120 // (Make sure that no existing files are overwritten.)
joachim99@8 121 g_pProgressDialog->setSubCurrent(0);
joachim99@8 122 QString fileName1 = createTempFile( p1, size1, bIgnoreWhiteSpace, bIgnoreNumbers );
joachim99@8 123 g_pProgressDialog->setSubCurrent(0.25);
joachim99@8 124 QString fileName2 = createTempFile( p2, size2, bIgnoreWhiteSpace, bIgnoreNumbers );
joachim99@8 125 g_pProgressDialog->setSubCurrent(0.5);
joachim99@8 126 QString fileNameOut = FileAccess::tempFileName();
joachim99@8 127
joachim99@8 128 if ( !fileName1.isEmpty() && !fileName2.isEmpty() )
joachim99@8 129 {
joachim99@8 130 QString cmd;
joachim99@8 131 #ifdef _WIN32
joachim99@8 132 // Under Windows it's better to search for diff.exe
joachim99@8 133 char buf[200];
joachim99@8 134 int r= SearchPathA( 0, "diff.exe", 0, sizeof(buf), buf, 0 );
joachim99@8 135
joachim99@8 136 if (r!=0) { cmd = buf; }
joachim99@8 137 #else
joachim99@8 138 // under Un*x I assume that a diff command is in the PATH
joachim99@8 139 cmd = "diff";
joachim99@8 140 #endif
joachim99@8 141 if ( !cmd.isEmpty() )
joachim99@8 142 {
joachim99@8 143 cmd += " -a "; // -a = treat all files as text
joachim99@8 144 if ( m_pOptionDialog->m_bTryHard )
joachim99@8 145 cmd += "--minimal ";
joachim99@8 146 //if ( m_pOptionDialog->m_bIgnoreWhiteSpace ) This I do myself, see below
joachim99@8 147 // cmd += "--ignore-all-space ";
joachim99@8 148 cmd += fileName1+" "+fileName2+" >"+fileNameOut;
joachim99@8 149 // Run diff
joachim99@8 150 //int status1 = ::system( 0 ); // ==0 if shell not found
joachim99@8 151 int status = ::system( cmd.ascii() );
joachim99@8 152 #ifdef WEXITSTATUS
joachim99@8 153 status = WEXITSTATUS(status);
joachim99@8 154 #endif
joachim99@8 155 //if (status<0)
joachim99@8 156 //{
joachim99@8 157 // errorString = strerror( errno );
joachim99@8 158 //}
joachim99@8 159 bSuccess = status>=0 && status!=127;
joachim99@8 160 }
joachim99@8 161 }
joachim99@8 162
joachim99@8 163 g_pProgressDialog->setSubCurrent(0.75);
joachim99@8 164
joachim99@8 165 int currentLine1 = 0;
joachim99@8 166 int currentLine2 = 0;
joachim99@8 167 if ( bSuccess )
joachim99@8 168 {
joachim99@8 169 // Parse the output and create the difflist
joachim99@8 170 QFile f( fileNameOut );
joachim99@8 171 bSuccess = f.open(IO_ReadOnly);
joachim99@8 172 if (bSuccess)
joachim99@8 173 {
joachim99@8 174 const QByteArray buf = f.readAll();
joachim99@8 175 unsigned int bufSize=buf.size();
joachim99@8 176 unsigned int pos=0;
joachim99@8 177 for(pos=0;pos<bufSize;++pos)
joachim99@8 178 {
joachim99@8 179 unsigned int lineStart = pos;
joachim99@8 180 // Find end of line
joachim99@8 181 while( buf.at(pos)!='\n' && pos<bufSize )
joachim99@8 182 ++pos;
joachim99@8 183
joachim99@8 184 // parse it
joachim99@8 185 char c = buf.at(lineStart);
joachim99@8 186 if ( c == '>' || c == '-' || c=='<' )
joachim99@8 187 continue; // Not interested in the data
joachim99@8 188 else
joachim99@8 189 {
joachim99@8 190 QCString line( &buf.at(lineStart), pos-lineStart+1 );
joachim99@8 191 int pa = line.find('a'); // add
joachim99@8 192 int pc = line.find('c'); // change
joachim99@8 193 int pd = line.find('d'); // delete
joachim99@8 194 int p = pa>0 ? pa : (pc > 0 ? pc : pd);
joachim99@8 195 if (p<0) break; // Unexpected error
joachim99@8 196 QCString left = line.left(p);
joachim99@8 197 QCString right = line.mid(p+1);
joachim99@8 198 int pcommaleft = left.find(',');
joachim99@8 199 int pcommaright = right.find(',');
joachim99@8 200 int l1top=-1, l1bottom=-1, l2top=-1, l2bottom=-1;
joachim99@8 201 if (pcommaleft>0)
joachim99@8 202 {
joachim99@8 203 l1top = left.left(pcommaleft).toInt();
joachim99@8 204 l1bottom = left.mid(pcommaleft+1).toInt();
joachim99@8 205 }
joachim99@8 206 else
joachim99@8 207 {
joachim99@8 208 l1top = left.toInt();
joachim99@8 209 l1bottom = l1top;
joachim99@8 210 }
joachim99@8 211 if (pcommaright>0)
joachim99@8 212 {
joachim99@8 213 l2top = right.left(pcommaright).toInt();
joachim99@8 214 l2bottom = right.mid(pcommaright+1).toInt();
joachim99@8 215 }
joachim99@8 216 else
joachim99@8 217 {
joachim99@8 218 l2top = right.toInt();
joachim99@8 219 l2bottom = l2top;
joachim99@8 220 }
joachim99@8 221
joachim99@8 222 Diff d(0,0,0);
joachim99@8 223
joachim99@8 224 if ( pa>0 )
joachim99@8 225 {
joachim99@8 226 d.nofEquals = l1top - currentLine1;
joachim99@8 227 d.diff1 = 0;
joachim99@8 228 d.diff2 = l2bottom - l2top + 1;
joachim99@8 229 assert( d.nofEquals == l2top - 1 - currentLine2 );
joachim99@8 230 }
joachim99@8 231 else if ( pd>0 )
joachim99@8 232 {
joachim99@8 233 d.nofEquals = l2top - currentLine2;
joachim99@8 234 d.diff1 = l1bottom - l1top + 1;
joachim99@8 235 d.diff2 = 0;
joachim99@8 236 assert( d.nofEquals == l1top - 1 - currentLine1 );
joachim99@8 237 }
joachim99@8 238 else if ( pc>0 )
joachim99@8 239 {
joachim99@8 240 d.nofEquals = l1top - 1 - currentLine1;
joachim99@8 241 d.diff1 = l1bottom - l1top + 1;
joachim99@8 242 d.diff2 = l2bottom - l2top + 1;
joachim99@8 243 assert( d.nofEquals == l2top - 1 - currentLine2 );
joachim99@8 244 }
joachim99@8 245 else
joachim99@8 246 assert(false);
joachim99@8 247
joachim99@8 248 currentLine1 += d.nofEquals + d.diff1;
joachim99@8 249 currentLine2 += d.nofEquals + d.diff2;
joachim99@8 250 diffList.push_back(d);
joachim99@8 251 }
joachim99@8 252 }
joachim99@8 253 if (size1-currentLine1==size2-currentLine2 )
joachim99@8 254 {
joachim99@8 255 Diff d( size1-currentLine1,0,0);
joachim99@8 256 diffList.push_back(d);
joachim99@8 257 currentLine1=size1;
joachim99@8 258 currentLine2=size2;
joachim99@8 259 }
joachim99@8 260
joachim99@8 261 if ( currentLine1 == size1 && currentLine2 == size2 )
joachim99@8 262 bSuccess = true;
joachim99@8 263 }
joachim99@8 264 }
joachim99@8 265 if ( currentLine1==0 && currentLine2==0 )
joachim99@8 266 {
joachim99@8 267 Diff d( 0, size1, size2 );
joachim99@8 268 diffList.push_back(d);
joachim99@8 269 }
joachim99@8 270
joachim99@8 271 FileAccess::removeFile( fileName1 );
joachim99@8 272 FileAccess::removeFile( fileName2 );
joachim99@8 273 FileAccess::removeFile( fileNameOut );
joachim99@8 274 g_pProgressDialog->setSubCurrent(1.0);
joachim99@8 275
joachim99@8 276 if ( !bSuccess )
joachim99@8 277 {
joachim99@8 278 KMessageBox::sorry(this,
joachim99@8 279 i18n("Running the external diff failed.\n"
joachim99@8 280 "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n"
joachim99@8 281 "The external diff option will be disabled now and the internal diff will be used."),
joachim99@8 282 i18n("KDiff3 Warning"));
joachim99@8 283 m_pOptionDialog->m_bUseExternalDiff = false;
joachim99@8 284 }
joachim99@8 285 }
joachim99@8 286
joachim99@8 287 if ( ! m_pOptionDialog->m_bUseExternalDiff )
joachim99@8 288 {
joachim99@8 289 g_pProgressDialog->setSubCurrent(0.0);
joachim99@8 290 if ( size1>0 && p1!=0 && p1->occurances==0 )
joachim99@8 291 {
joachim99@8 292 prepareOccurances( p1, size1 );
joachim99@8 293 }
joachim99@8 294 g_pProgressDialog->setSubCurrent(0.25);
joachim99@8 295
joachim99@8 296 if ( size2>0 && p2!=0 && p2->occurances==0 )
joachim99@8 297 {
joachim99@8 298 prepareOccurances( p2, size2 );
joachim99@8 299 }
joachim99@8 300 g_pProgressDialog->setSubCurrent(0.5);
joachim99@8 301
joachim99@8 302 calcDiff( p1, size1, p2, size2, diffList, 2, m_pOptionDialog->m_maxSearchLength );
joachim99@8 303
joachim99@8 304 g_pProgressDialog->setSubCurrent(1.0);
joachim99@8 305 }
joachim99@8 306 return true;
joachim99@8 307 }
joachim99@8 308
joachim99@8 309
joachim99@8 310 void KDiff3App::init( bool bAuto )
joachim99@8 311 {
joachim99@8 312 bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn;
joachim99@8 313
joachim99@8 314 bool bVisibleMergeResultWindow = ! m_outputFilename.isEmpty();
joachim99@8 315 if ( bVisibleMergeResultWindow )
joachim99@8 316 {
joachim99@8 317 bPreserveCarriageReturn = false;
joachim99@8 318 }
joachim99@8 319
joachim99@8 320 g_bIgnoreWhiteSpace = m_pOptionDialog->m_bIgnoreWhiteSpace;
joachim99@8 321 g_bIgnoreTrivialMatches = m_pOptionDialog->m_bIgnoreTrivialMatches;
joachim99@8 322
joachim99@8 323 m_diff3LineList.clear();
joachim99@8 324
joachim99@8 325 bool bUseLineMatchingPP = !m_pOptionDialog->m_LineMatchingPreProcessorCmd.isEmpty();
joachim99@8 326 bool bUpCase = m_pOptionDialog->m_bUpCase;
joachim99@8 327
joachim99@8 328 if (m_pDiffTextWindow1) m_pDiffTextWindow1->setPaintingAllowed( false );
joachim99@8 329 if (m_pDiffTextWindow2) m_pDiffTextWindow2->setPaintingAllowed( false );
joachim99@8 330 if (m_pDiffTextWindow3) m_pDiffTextWindow3->setPaintingAllowed( false );
joachim99@8 331 if (m_pOverview) m_pOverview->setPaintingAllowed( false );
joachim99@8 332
joachim99@8 333
joachim99@8 334 if( m_sd3.isEmpty() )
joachim99@8 335 g_pProgressDialog->setMaximum( 4 ); // Read 2 files, 1 comparison, 1 finediff
joachim99@8 336 else
joachim99@8 337 g_pProgressDialog->setMaximum( 9 ); // Read 3 files, 3 comparisons, 3 finediffs
joachim99@8 338
joachim99@8 339 g_pProgressDialog->start();
joachim99@8 340
joachim99@8 341 // First get all input data.
joachim99@8 342 g_pProgressDialog->setInformation(i18n("Loading A"));
joachim99@8 343 m_sd1.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase );
joachim99@8 344 m_sdlm1.readLMPPFile( &m_sd1, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase );
joachim99@8 345 g_pProgressDialog->step();
joachim99@8 346
joachim99@8 347 g_pProgressDialog->setInformation(i18n("Loading B"));
joachim99@8 348 m_sd2.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase );
joachim99@8 349 m_sdlm2.readLMPPFile( &m_sd2, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase );
joachim99@8 350 g_pProgressDialog->step();
joachim99@8 351
joachim99@8 352 m_sd3.m_bIsText = true;
joachim99@8 353 int maxSearchLength = m_pOptionDialog->m_maxSearchLength;
joachim99@8 354 m_totalDiffStatus.reset();
joachim99@8 355 // Run the diff.
joachim99@8 356 if ( m_sd3.isEmpty() )
joachim99@8 357 {
joachim99@8 358 m_totalDiffStatus.bBinaryAEqB = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd2.m_size && memcmp(m_sd1.m_pBuf,m_sd2.m_pBuf,m_sd1.m_size)==0);
joachim99@8 359 g_pProgressDialog->setInformation(i18n("Diff: A <-> B"));
joachim99@8 360 if ( !bUseLineMatchingPP )
joachim99@8 361 runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd2.m_v[0], m_sd2.m_vSize, m_diffList12 );
joachim99@8 362 else
joachim99@8 363 runDiff( &m_sdlm1.m_v[0], m_sdlm1.m_vSize, &m_sdlm2.m_v[0], m_sdlm2.m_vSize, m_diffList12 );
joachim99@8 364
joachim99@8 365 g_pProgressDialog->step();
joachim99@8 366
joachim99@8 367 g_pProgressDialog->setInformation(i18n("Linediff: A <-> B"));
joachim99@8 368 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
joachim99@8 369 fineDiff( m_diff3LineList, 1, &m_sd1.m_v[0], &m_sd2.m_v[0], maxSearchLength, m_totalDiffStatus.bTextAEqB );
joachim99@8 370 if ( m_sd1.m_size==0 ) m_totalDiffStatus.bTextAEqB=false;
joachim99@8 371
joachim99@8 372 g_pProgressDialog->step();
joachim99@8 373 }
joachim99@8 374 else
joachim99@8 375 {
joachim99@8 376 g_pProgressDialog->setInformation(i18n("Loading C"));
joachim99@8 377 m_sd3.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase );
joachim99@8 378 m_sdlm3.readLMPPFile( &m_sd3, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase );
joachim99@8 379 g_pProgressDialog->step();
joachim99@8 380
joachim99@8 381 m_totalDiffStatus.bBinaryAEqB = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd2.m_size && memcmp(m_sd1.m_pBuf,m_sd2.m_pBuf,m_sd1.m_size)==0);
joachim99@8 382 m_totalDiffStatus.bBinaryAEqC = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd3.m_size && memcmp(m_sd1.m_pBuf,m_sd3.m_pBuf,m_sd1.m_size)==0);
joachim99@8 383 m_totalDiffStatus.bBinaryBEqC = (m_sd3.m_size!=0 && m_sd3.m_size==m_sd2.m_size && memcmp(m_sd3.m_pBuf,m_sd2.m_pBuf,m_sd3.m_size)==0);
joachim99@8 384
joachim99@8 385 if ( !bUseLineMatchingPP )
joachim99@8 386 {
joachim99@8 387 g_pProgressDialog->setInformation(i18n("Diff: A <-> B"));
joachim99@8 388 runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd2.m_v[0], m_sd2.m_vSize, m_diffList12 );
joachim99@8 389 g_pProgressDialog->step();
joachim99@8 390 g_pProgressDialog->setInformation(i18n("Diff: B <-> C"));
joachim99@8 391 runDiff( &m_sd2.m_v[0], m_sd2.m_vSize, &m_sd3.m_v[0], m_sd3.m_vSize, m_diffList23 );
joachim99@8 392 g_pProgressDialog->step();
joachim99@8 393 g_pProgressDialog->setInformation(i18n("Diff: A <-> C"));
joachim99@8 394 runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd3.m_v[0], m_sd3.m_vSize, m_diffList13 );
joachim99@8 395 g_pProgressDialog->step();
joachim99@8 396 }
joachim99@8 397 else
joachim99@8 398 {
joachim99@8 399 g_pProgressDialog->setInformation(i18n("Diff: A <-> B"));
joachim99@8 400 runDiff( &m_sdlm1.m_v[0], m_sd1.m_vSize, &m_sdlm2.m_v[0], m_sd2.m_vSize, m_diffList12 );
joachim99@8 401 g_pProgressDialog->step();
joachim99@8 402 g_pProgressDialog->setInformation(i18n("Diff: B <-> C"));
joachim99@8 403 runDiff( &m_sdlm2.m_v[0], m_sd2.m_vSize, &m_sdlm3.m_v[0], m_sd3.m_vSize, m_diffList23 );
joachim99@8 404 g_pProgressDialog->step();
joachim99@8 405 g_pProgressDialog->setInformation(i18n("Diff: A <-> C"));
joachim99@8 406 runDiff( &m_sdlm1.m_v[0], m_sd1.m_vSize, &m_sdlm3.m_v[0], m_sd3.m_vSize, m_diffList13 );
joachim99@8 407 g_pProgressDialog->step();
joachim99@8 408 }
joachim99@8 409
joachim99@8 410 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
joachim99@8 411 calcDiff3LineListUsingAC( &m_diffList13, m_diff3LineList );
joachim99@8 412 calcDiff3LineListTrim( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] );
joachim99@8 413
joachim99@8 414 calcDiff3LineListUsingBC( &m_diffList23, m_diff3LineList );
joachim99@8 415 calcDiff3LineListTrim( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] );
joachim99@8 416 debugLineCheck( m_diff3LineList, m_sd1.m_vSize, 1 );
joachim99@8 417 debugLineCheck( m_diff3LineList, m_sd2.m_vSize, 2 );
joachim99@8 418 debugLineCheck( m_diff3LineList, m_sd3.m_vSize, 3 );
joachim99@8 419
joachim99@8 420 g_pProgressDialog->setInformation(i18n("Linediff: A <-> B"));
joachim99@8 421 fineDiff( m_diff3LineList, 1, &m_sd1.m_v[0], &m_sd2.m_v[0], maxSearchLength, m_totalDiffStatus.bTextAEqB );
joachim99@8 422 g_pProgressDialog->step();
joachim99@8 423 g_pProgressDialog->setInformation(i18n("Linediff: B <-> C"));
joachim99@8 424 fineDiff( m_diff3LineList, 2, &m_sd2.m_v[0], &m_sd3.m_v[0], maxSearchLength, m_totalDiffStatus.bTextBEqC );
joachim99@8 425 g_pProgressDialog->step();
joachim99@8 426 g_pProgressDialog->setInformation(i18n("Linediff: A <-> C"));
joachim99@8 427 fineDiff( m_diff3LineList, 3, &m_sd3.m_v[0], &m_sd1.m_v[0], maxSearchLength, m_totalDiffStatus.bTextAEqC );
joachim99@8 428 g_pProgressDialog->step();
joachim99@8 429 if ( m_sd1.m_size==0 ) { m_totalDiffStatus.bTextAEqB=false; m_totalDiffStatus.bTextAEqC=false; }
joachim99@8 430 if ( m_sd2.m_size==0 ) { m_totalDiffStatus.bTextAEqB=false; m_totalDiffStatus.bTextBEqC=false; }
joachim99@8 431 }
joachim99@8 432 calcWhiteDiff3Lines( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] );
joachim99@8 433 calcDiff3LineVector( m_diff3LineList, m_diff3LineVector );
joachim99@8 434
joachim99@8 435 // Calc needed lines for display
joachim99@8 436 m_neededLines = m_diff3LineList.size();
joachim99@8 437
joachim99@8 438 m_pDirectoryMergeWindow->allowResizeEvents(false);
joachim99@8 439 initView();
joachim99@8 440 m_pDirectoryMergeWindow->allowResizeEvents(true);
joachim99@8 441
joachim99@8 442 m_bTripleDiff = ! m_sd3.isEmpty();
joachim99@8 443
joachim99@8 444 m_pDiffTextWindow1->init( m_sd1.getAliasName(),
joachim99@8 445 &m_sd1.m_v[0], m_sd1.m_vSize, &m_diff3LineVector, 1, m_bTripleDiff );
joachim99@8 446 m_pDiffTextWindow2->init( m_sd2.getAliasName(),
joachim99@8 447 &m_sd2.m_v[0], m_sd2.m_vSize, &m_diff3LineVector, 2, m_bTripleDiff );
joachim99@8 448 m_pDiffTextWindow3->init( m_sd3.getAliasName(),
joachim99@8 449 &m_sd3.m_v[0], m_sd3.m_vSize, &m_diff3LineVector, 3, m_bTripleDiff );
joachim99@8 450
joachim99@8 451 if (m_bTripleDiff) m_pDiffTextWindow3->show();
joachim99@8 452 else m_pDiffTextWindow3->hide();
joachim99@8 453
joachim99@8 454 m_bOutputModified = bVisibleMergeResultWindow;
joachim99@8 455
joachim99@8 456 m_pMergeResultWindow->init(
joachim99@8 457 &m_sd1.m_v[0],
joachim99@8 458 &m_sd2.m_v[0],
joachim99@8 459 m_bTripleDiff ? &m_sd3.m_v[0] : 0,
joachim99@8 460 &m_diff3LineList,
joachim99@8 461 &m_totalDiffStatus,
joachim99@8 462 m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename
joachim99@8 463 );
joachim99@8 464
joachim99@8 465 m_pOverview->init(&m_diff3LineList, m_bTripleDiff );
joachim99@8 466 m_pDiffVScrollBar->setValue( 0 );
joachim99@8 467 m_pHScrollBar->setValue( 0 );
joachim99@8 468
joachim99@8 469 g_pProgressDialog->hide();
joachim99@8 470 m_pDiffTextWindow1->setPaintingAllowed( true );
joachim99@8 471 m_pDiffTextWindow2->setPaintingAllowed( true );
joachim99@8 472 m_pDiffTextWindow3->setPaintingAllowed( true );
joachim99@8 473 m_pOverview->setPaintingAllowed( true );
joachim99@8 474
joachim99@8 475 if ( !bVisibleMergeResultWindow )
joachim99@8 476 m_pMergeWindowFrame->hide();
joachim99@8 477 else
joachim99@8 478 m_pMergeWindowFrame->show();
joachim99@8 479
joachim99@8 480 // Calc max width for display
joachim99@8 481 m_maxWidth = max2( m_pDiffTextWindow1->getNofColumns(), m_pDiffTextWindow2->getNofColumns() );
joachim99@8 482 m_maxWidth = max2( m_maxWidth, m_pDiffTextWindow3->getNofColumns() );
joachim99@8 483 m_maxWidth += 5;
joachim99@8 484
joachim99@8 485 if ( bVisibleMergeResultWindow && !bAuto )
joachim99@8 486 m_pMergeResultWindow->showNrOfConflicts();
joachim99@8 487 else if ( !bAuto )
joachim99@8 488 {
joachim99@8 489 QString totalInfo;
joachim99@8 490 if ( m_totalDiffStatus.bBinaryAEqB && m_totalDiffStatus.bBinaryAEqC )
joachim99@8 491 totalInfo += i18n("All input files are binary equal.");
joachim99@8 492 else if ( m_totalDiffStatus.bTextAEqB && m_totalDiffStatus.bTextAEqC )
joachim99@8 493 totalInfo += i18n("All input files contain the same text.");
joachim99@8 494 else {
joachim99@8 495 if ( m_totalDiffStatus.bBinaryAEqB ) totalInfo += i18n("Files A and B are binary equal.\n");
joachim99@8 496 else if ( m_totalDiffStatus.bTextAEqB ) totalInfo += i18n("Files A and B have equal text. \n");
joachim99@8 497 if ( m_totalDiffStatus.bBinaryAEqC ) totalInfo += i18n("Files A and C are binary equal.\n");
joachim99@8 498 else if ( m_totalDiffStatus.bTextAEqC ) totalInfo += i18n("Files A and C have equal text. \n");
joachim99@8 499 if ( m_totalDiffStatus.bBinaryBEqC ) totalInfo += i18n("Files B and C are binary equal.\n");
joachim99@8 500 else if ( m_totalDiffStatus.bTextBEqC ) totalInfo += i18n("Files B and C have equal text. \n");
joachim99@8 501 }
joachim99@8 502
joachim99@8 503 if ( !totalInfo.isEmpty() )
joachim99@8 504 KMessageBox::information( this, totalInfo );
joachim99@8 505 }
joachim99@8 506
joachim99@8 507 if ( bVisibleMergeResultWindow && (!m_sd1.m_bIsText || !m_sd2.m_bIsText || !m_sd3.m_bIsText) )
joachim99@8 508 {
joachim99@8 509 KMessageBox::information( this, i18n(
joachim99@8 510 "Some inputfiles don't seem to be pure textfiles.\n"
joachim99@8 511 "Note that the KDiff3-merge was not meant for binary data.\n"
joachim99@8 512 "Continue at your own risk.") );
joachim99@8 513 /* QDialog d(this);
joachim99@8 514 QVBoxLayout* l = new QVBoxLayout(&d);
joachim99@8 515 QVButtonGroup* bg = new QVButtonGroup(i18n("Some file(s) don't seem to be text files:"),&d);
joachim99@8 516 l->addWidget(bg);
joachim99@8 517 new QRadioButton("A: " + m_sd1.getAliasName(), bg);
joachim99@8 518 new QRadioButton("B: " + m_sd2.getAliasName(), bg);
joachim99@8 519 if (!m_sd3.isEmpty()) new QRadioButton("C: " + m_sd3.getAliasName(), bg);
joachim99@8 520 bg->setButton(0);
joachim99@8 521 QHBoxLayout* hbl = new QHBoxLayout(l);
joachim99@8 522 QPushButton* pSaveButton = new QPushButton( i18n("Save Selection"), &d );
joachim99@8 523 connect( pSaveButton, SIGNAL(clicked()), &d, SLOT(accept()));
joachim99@8 524 hbl->addWidget( pSaveButton );
joachim99@8 525 QPushButton* pProceedButton = new QPushButton( i18n("Proceed with text-merge"), &d );
joachim99@8 526 connect( pProceedButton, SIGNAL(clicked()), &d, SLOT(reject()));
joachim99@8 527 hbl->addWidget( pProceedButton );
joachim99@8 528
joachim99@8 529 int result = d.exec();
joachim99@8 530 if( result == QDialog::Accepted )
joachim99@8 531 {
joachim99@8 532 if ( bg->find(0)->isOn() ) saveBuffer( m_sd1.m_pBuf, m_sd1.m_size, m_outputFilename );
joachim99@8 533 else if ( bg->find(1)->isOn() ) saveBuffer( m_sd2.m_pBuf, m_sd2.m_size, m_outputFilename );
joachim99@8 534 else saveBuffer( m_sd3.m_pBuf, m_sd3.m_size, m_outputFilename );
joachim99@8 535 }*/
joachim99@8 536 }
joachim99@8 537
joachim99@8 538 QTimer::singleShot( 10, this, SLOT(slotAfterFirstPaint()) );
joachim99@8 539 }
joachim99@8 540
joachim99@8 541
joachim99@8 542 void KDiff3App::resizeDiffTextWindow(int newWidth, int newHeight)
joachim99@8 543 {
joachim99@8 544 m_DTWHeight = newHeight;
joachim99@8 545 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
joachim99@8 546 m_pDiffVScrollBar->setPageStep( newHeight );
joachim99@8 547 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
joachim99@8 548
joachim99@8 549 // The second window has a somewhat inverse width
joachim99@8 550
joachim99@8 551 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
joachim99@8 552 m_pHScrollBar->setPageStep( newWidth );
joachim99@8 553 }
joachim99@8 554
joachim99@8 555 void KDiff3App::resizeMergeResultWindow()
joachim99@8 556 {
joachim99@8 557 MergeResultWindow* p = m_pMergeResultWindow;
joachim99@8 558 m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) );
joachim99@8 559 m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() );
joachim99@8 560
joachim99@8 561 // The second window has a somewhat inverse width
joachim99@8 562 // m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
joachim99@8 563 // m_pHScrollBar->setPageStep( newWidth );
joachim99@8 564 }
joachim99@8 565
joachim99@8 566 void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY )
joachim99@8 567 {
joachim99@8 568 if ( deltaY!= 0 )
joachim99@8 569 {
joachim99@8 570 m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->value() + deltaY );
joachim99@8 571 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
joachim99@8 572 }
joachim99@8 573 if ( deltaX!= 0)
joachim99@8 574 m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX );
joachim99@8 575 }
joachim99@8 576
joachim99@8 577 void KDiff3App::scrollMergeResultWindow( int deltaX, int deltaY )
joachim99@8 578 {
joachim99@8 579 if ( deltaY!= 0 )
joachim99@8 580 m_pMergeVScrollBar->setValue( m_pMergeVScrollBar->value() + deltaY );
joachim99@8 581 if ( deltaX!= 0)
joachim99@8 582 m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX );
joachim99@8 583 }
joachim99@8 584
joachim99@8 585 void KDiff3App::setDiff3Line( int line )
joachim99@8 586 {
joachim99@8 587 m_pDiffVScrollBar->setValue( line );
joachim99@8 588 }
joachim99@8 589
joachim99@8 590 void KDiff3App::sourceMask( int srcMask, int enabledMask )
joachim99@8 591 {
joachim99@8 592 chooseA->setChecked( (srcMask & 1) != 0 );
joachim99@8 593 chooseB->setChecked( (srcMask & 2) != 0 );
joachim99@8 594 chooseC->setChecked( (srcMask & 4) != 0 );
joachim99@8 595 chooseA->setEnabled( (enabledMask & 1) != 0 );
joachim99@8 596 chooseB->setEnabled( (enabledMask & 2) != 0 );
joachim99@8 597 chooseC->setEnabled( (enabledMask & 4) != 0 );
joachim99@8 598 }
joachim99@8 599
joachim99@8 600
joachim99@8 601
joachim99@8 602 // Function uses setMinSize( sizeHint ) before adding the widget.
joachim99@8 603 // void addWidget(QBoxLayout* layout, QWidget* widget);
joachim99@8 604 template <class W, class L>
joachim99@8 605 void addWidget( L* layout, W* widget)
joachim99@8 606 {
joachim99@8 607 QSize s = widget->sizeHint();
joachim99@8 608 widget->setMinimumSize( QSize(max2(s.width(),0),max2(s.height(),0) ) );
joachim99@8 609 layout->addWidget( widget );
joachim99@8 610 }
joachim99@8 611
joachim99@8 612 void KDiff3App::initView()
joachim99@8 613 {
joachim99@8 614 // set the main widget here
joachim99@8 615 QValueList<int> oldHeights;
joachim99@8 616 if ( m_pDirectoryMergeSplitter->isVisible() )
joachim99@8 617 {
joachim99@8 618 oldHeights = m_pMainSplitter->sizes();
joachim99@8 619 }
joachim99@8 620
joachim99@8 621 if ( m_pMainWidget != 0 )
joachim99@8 622 {
joachim99@8 623 return;
joachim99@8 624 //delete m_pMainWidget;
joachim99@8 625 }
joachim99@8 626 m_pMainWidget = new QFrame(m_pMainSplitter);
joachim99@8 627 m_pMainWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken );
joachim99@8 628 m_pMainWidget->setLineWidth(1);
joachim99@8 629
joachim99@8 630
joachim99@8 631 QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget);
joachim99@8 632
joachim99@8 633 QSplitter* pVSplitter = new QSplitter( m_pMainWidget );
joachim99@8 634 pVSplitter->setOrientation( Vertical );
joachim99@8 635 pVLayout->addWidget( pVSplitter );
joachim99@8 636
joachim99@8 637 QWidget* pDiffWindowFrame = new QFrame( pVSplitter );
joachim99@8 638 QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame );
joachim99@8 639
joachim99@8 640 m_pDiffWindowSplitter = new QSplitter( pDiffWindowFrame );
joachim99@8 641 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Horizontal : Vertical );
joachim99@8 642 pDiffHLayout->addWidget( m_pDiffWindowSplitter );
joachim99@8 643
joachim99@8 644 m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog );
joachim99@8 645 pDiffHLayout->addWidget(m_pOverview);
joachim99@8 646 connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) );
joachim99@8 647 //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint()));
joachim99@8 648
joachim99@8 649 m_pDiffVScrollBar = new QScrollBar( Vertical, pDiffWindowFrame );
joachim99@8 650 pDiffHLayout->addWidget( m_pDiffVScrollBar );
joachim99@8 651
joachim99@8 652 m_pDiffTextWindow1 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog );
joachim99@8 653 m_pDiffTextWindow2 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog );
joachim99@8 654 m_pDiffTextWindow3 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog );
joachim99@8 655
joachim99@8 656 // Merge window
joachim99@8 657 m_pMergeWindowFrame = new QFrame( pVSplitter );
joachim99@8 658 QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame );
joachim99@8 659
joachim99@8 660 m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog );
joachim99@8 661 pMergeHLayout->addWidget( m_pMergeResultWindow );
joachim99@8 662
joachim99@8 663 m_pMergeVScrollBar = new QScrollBar( Vertical, m_pMergeWindowFrame );
joachim99@8 664 pMergeHLayout->addWidget( m_pMergeVScrollBar );
joachim99@8 665
joachim99@8 666 autoAdvance->setEnabled(true);
joachim99@8 667
joachim99@8 668 QValueList<int> sizes = pVSplitter->sizes();
joachim99@8 669 int total = sizes[0] + sizes[1];
joachim99@8 670 sizes[0]=total/2; sizes[1]=total/2;
joachim99@8 671 pVSplitter->setSizes( sizes );
joachim99@8 672
joachim99@8 673 m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts
joachim99@8 674
joachim99@8 675 QHBoxLayout* pHScrollBarLayout = new QHBoxLayout( pVLayout );
joachim99@8 676 m_pHScrollBar = new QScrollBar( Horizontal, m_pMainWidget );
joachim99@8 677 pHScrollBarLayout->addWidget( m_pHScrollBar );
joachim99@8 678 m_pCornerWidget = new QWidget( m_pMainWidget );
joachim99@8 679 pHScrollBarLayout->addWidget( m_pCornerWidget );
joachim99@8 680
joachim99@8 681
joachim99@8 682 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pOverview, SLOT(setFirstLine(int)));
joachim99@8 683 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int)));
joachim99@8 684 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstColumn(int)));
joachim99@8 685 connect( m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
joachim99@8 686 connect( m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
joachim99@8 687 connect( m_pDiffTextWindow1, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
joachim99@8 688 m_pDiffTextWindow1->installEventFilter( this );
joachim99@8 689
joachim99@8 690 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int)));
joachim99@8 691 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstColumn(int)));
joachim99@8 692 connect( m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
joachim99@8 693 connect( m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
joachim99@8 694 connect( m_pDiffTextWindow2, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
joachim99@8 695 m_pDiffTextWindow2->installEventFilter( this );
joachim99@8 696
joachim99@8 697 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int)));
joachim99@8 698 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstColumn(int)));
joachim99@8 699 connect( m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
joachim99@8 700 connect( m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
joachim99@8 701 connect( m_pDiffTextWindow3, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
joachim99@8 702 m_pDiffTextWindow3->installEventFilter( this );
joachim99@8 703
joachim99@8 704 MergeResultWindow* p = m_pMergeResultWindow;
joachim99@8 705 connect( m_pMergeVScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstLine(int)));
joachim99@8 706
joachim99@8 707 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstColumn(int)));
joachim99@8 708 connect( p, SIGNAL(scroll(int,int)), this, SLOT(scrollMergeResultWindow(int,int)));
joachim99@8 709 connect( p, SIGNAL(sourceMask(int,int)), this, SLOT(sourceMask(int,int)));
joachim99@8 710 connect( p, SIGNAL( resizeSignal() ),this, SLOT(resizeMergeResultWindow()));
joachim99@8 711 connect( p, SIGNAL( selectionEnd() ), this, SLOT( slotSelectionEnd() ) );
joachim99@8 712 connect( p, SIGNAL( newSelection() ), this, SLOT( slotSelectionStart() ) );
joachim99@8 713 connect( p, SIGNAL( modified() ), this, SLOT( slotOutputModified() ) );
joachim99@8 714 connect( p, SIGNAL( updateAvailabilities() ), this, SLOT( slotUpdateAvailabilities() ) );
joachim99@8 715 connect( p, SIGNAL( showPopupMenu(const QPoint&) ), this, SLOT(showPopupMenu(const QPoint&)));
joachim99@8 716 sourceMask(0,0);
joachim99@8 717
joachim99@8 718
joachim99@8 719 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, SLOT(setFastSelectorRange(int,int)));
joachim99@8 720 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, SLOT(setFastSelectorRange(int,int)));
joachim99@8 721 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, SLOT(setFastSelectorRange(int,int)));
joachim99@8 722 connect(m_pDiffTextWindow1, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
joachim99@8 723 connect(m_pDiffTextWindow2, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
joachim99@8 724 connect(m_pDiffTextWindow3, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
joachim99@8 725
joachim99@8 726 connect( m_pDiffTextWindow1, SIGNAL( resizeSignal(int,int) ),this, SLOT(resizeDiffTextWindow(int,int)));
joachim99@8 727
joachim99@8 728 m_pDiffTextWindow1->setFocus();
joachim99@8 729 m_pMainWidget->setMinimumSize(50,50);
joachim99@8 730 if ( m_pDirectoryMergeSplitter->isVisible() )
joachim99@8 731 {
joachim99@8 732 if (oldHeights.count() < 2)
joachim99@8 733 oldHeights.append(0);
joachim99@8 734 if (oldHeights[1]==0) // Distribute the available space evenly between the two widgets.
joachim99@8 735 {
joachim99@8 736 oldHeights[1] = oldHeights[0]/2;
joachim99@8 737 oldHeights[0] -= oldHeights[1];
joachim99@8 738 }
joachim99@8 739 m_pMainSplitter->setSizes( oldHeights );
joachim99@8 740 }
joachim99@8 741 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
joachim99@8 742 //show();
joachim99@8 743 m_pMainWidget->show();
joachim99@8 744 showWindowA->setChecked( true );
joachim99@8 745 showWindowB->setChecked( true );
joachim99@8 746 showWindowC->setChecked( true );
joachim99@8 747 }
joachim99@8 748
joachim99@8 749 void KDiff3App::slotAfterFirstPaint()
joachim99@8 750 {
joachim99@8 751 int newHeight = m_pDiffTextWindow1->getNofVisibleLines();
joachim99@8 752 int newWidth = m_pDiffTextWindow1->getNofVisibleColumns();
joachim99@8 753 m_DTWHeight = newHeight;
joachim99@8 754 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
joachim99@8 755 m_pDiffVScrollBar->setPageStep( newHeight );
joachim99@8 756 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
joachim99@8 757
joachim99@8 758 // The second window has a somewhat inverse width
joachim99@8 759 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
joachim99@8 760 m_pHScrollBar->setPageStep( newWidth );
joachim99@8 761
joachim99@8 762 m_pMergeResultWindow->slotGoTop();
joachim99@8 763
joachim99@8 764 if (m_pCornerWidget)
joachim99@8 765 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
joachim99@8 766
joachim99@8 767 slotUpdateAvailabilities();
joachim99@8 768 }
joachim99@8 769
joachim99@8 770 void KDiff3App::resizeEvent(QResizeEvent* e)
joachim99@8 771 {
joachim99@8 772 QSplitter::resizeEvent(e);
joachim99@8 773 if (m_pCornerWidget)
joachim99@8 774 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
joachim99@8 775 }
joachim99@8 776
joachim99@8 777
joachim99@8 778 bool KDiff3App::eventFilter( QObject* o, QEvent* e )
joachim99@8 779 {
joachim99@8 780 if( o == m_pMergeResultWindow )
joachim99@8 781 {
joachim99@8 782 if ( e->type() == QEvent::KeyPress )
joachim99@8 783 { // key press
joachim99@8 784 QKeyEvent *k = (QKeyEvent*)e;
joachim99@8 785 if (k->key()==Qt::Key_Insert && (k->state() & Qt::ControlButton)!=0 )
joachim99@8 786 {
joachim99@8 787 slotEditCopy();
joachim99@8 788 return true;
joachim99@8 789 }
joachim99@8 790 if (k->key()==Qt::Key_Insert && (k->state() & Qt::ShiftButton)!=0 )
joachim99@8 791 {
joachim99@8 792 slotEditPaste();
joachim99@8 793 return true;
joachim99@8 794 }
joachim99@8 795 if (k->key()==Qt::Key_Delete && (k->state() & Qt::ShiftButton)!=0 )
joachim99@8 796 {
joachim99@8 797 slotEditCut();
joachim99@8 798 return true;
joachim99@8 799 }
joachim99@8 800 }
joachim99@8 801 return QSplitter::eventFilter( o, e ); // standard event processing
joachim99@8 802 }
joachim99@8 803
joachim99@8 804 if ( e->type() == QEvent::KeyPress ) // key press
joachim99@8 805 {
joachim99@8 806 QKeyEvent *k = (QKeyEvent*)e;
joachim99@8 807
joachim99@8 808 bool bCtrl = (k->state() & Qt::ControlButton) != 0;
joachim99@8 809 if (k->key()==Qt::Key_Insert && bCtrl )
joachim99@8 810 {
joachim99@8 811 slotEditCopy();
joachim99@8 812 return true;
joachim99@8 813 }
joachim99@8 814 if (k->key()==Qt::Key_Insert && (k->state() & Qt::ShiftButton)!=0 )
joachim99@8 815 {
joachim99@8 816 slotEditPaste();
joachim99@8 817 return true;
joachim99@8 818 }
joachim99@8 819 int deltaX=0;
joachim99@8 820 int deltaY=0;
joachim99@8 821 int pageSize = m_DTWHeight;
joachim99@8 822 switch( k->key() )
joachim99@8 823 {
joachim99@8 824 case Key_Down: ++deltaY; break;
joachim99@8 825 case Key_Up: --deltaY; break;
joachim99@8 826 case Key_PageDown: if (!bCtrl) deltaY+=pageSize; break;
joachim99@8 827 case Key_PageUp: if (!bCtrl) deltaY-=pageSize; break;
joachim99@8 828 case Key_Left: --deltaX; break;
joachim99@8 829 case Key_Right: ++deltaX; break;
joachim99@8 830 case Key_Home: if ( bCtrl ) m_pDiffVScrollBar->setValue( 0 );
joachim99@8 831 else m_pHScrollBar->setValue( 0 );
joachim99@8 832 break;
joachim99@8 833 case Key_End: if ( bCtrl ) m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->maxValue() );
joachim99@8 834 else m_pHScrollBar->setValue( m_pHScrollBar->maxValue() );
joachim99@8 835 break;
joachim99@8 836 default: break;
joachim99@8 837 }
joachim99@8 838
joachim99@8 839 scrollDiffTextWindow( deltaX, deltaY );
joachim99@8 840
joachim99@8 841 return true; // eat event
joachim99@8 842 }
joachim99@8 843 else if (e->type() == QEvent::Wheel ) { // wheel event
joachim99@8 844 QWheelEvent *w = (QWheelEvent*)e;
joachim99@8 845 w->accept();
joachim99@8 846
joachim99@8 847 int deltaX=0;
joachim99@8 848
joachim99@8 849 int d=w->delta();
joachim99@8 850 int deltaY = -d/120 * QApplication::wheelScrollLines();
joachim99@8 851
joachim99@8 852 scrollDiffTextWindow( deltaX, deltaY );
joachim99@8 853 return true;
joachim99@8 854 }
joachim99@8 855 else if (e->type() == QEvent::Drop )
joachim99@8 856 {
joachim99@8 857 QDropEvent* pDropEvent = static_cast<QDropEvent*>(e);
joachim99@8 858 pDropEvent->accept();
joachim99@8 859
joachim99@8 860 if ( QUriDrag::canDecode(pDropEvent) )
joachim99@8 861 {
joachim99@8 862 #ifdef KREPLACEMENTS_H
joachim99@8 863 QStringList stringList;
joachim99@8 864 QUriDrag::decodeLocalFiles( pDropEvent, stringList );
joachim99@8 865 if ( canContinue() && !stringList.isEmpty() )
joachim99@8 866 {
joachim99@8 867 raise();
joachim99@8 868 QString filename = stringList.first();
joachim99@8 869 if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename );
joachim99@8 870 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename );
joachim99@8 871 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename );
joachim99@8 872 init();
joachim99@8 873 }
joachim99@8 874 #else
joachim99@8 875 KURL::List urlList;
joachim99@8 876 KURLDrag::decode( pDropEvent, urlList );
joachim99@8 877 if ( canContinue() && !urlList.isEmpty() )
joachim99@8 878 {
joachim99@8 879 raise();
joachim99@8 880 FileAccess fa( urlList.first().url() );
joachim99@8 881 if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa );
joachim99@8 882 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa );
joachim99@8 883 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa );
joachim99@8 884 init();
joachim99@8 885 }
joachim99@8 886 #endif
joachim99@8 887 }
joachim99@8 888 else if ( QTextDrag::canDecode(pDropEvent) )
joachim99@8 889 {
joachim99@8 890 QString text;
joachim99@8 891 bool bDecodeSuccess = QTextDrag::decode( pDropEvent, text );
joachim99@8 892 if ( bDecodeSuccess && canContinue() )
joachim99@8 893 {
joachim99@8 894 raise();
joachim99@8 895 bool bUpCase = m_pOptionDialog->m_bUpCase;
joachim99@8 896 if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text, bUpCase);
joachim99@8 897 else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text, bUpCase);
joachim99@8 898 else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text, bUpCase);
joachim99@8 899 init();
joachim99@8 900 }
joachim99@8 901 }
joachim99@8 902
joachim99@8 903 return true;
joachim99@8 904 }
joachim99@8 905 return QSplitter::eventFilter( o, e ); // standard event processing
joachim99@8 906 }
joachim99@8 907
joachim99@8 908
joachim99@8 909
joachim99@8 910 OpenDialog::OpenDialog(
joachim99@8 911 QWidget* pParent, const QString& n1, const QString& n2, const QString& n3,
joachim99@8 912 bool bMerge, const QString& outputName, const char* slotConfigure, OptionDialog* pOptions )
joachim99@8 913 : QDialog( pParent, "OpenDialog", true /*modal*/ )
joachim99@8 914 {
joachim99@8 915 m_pOptions = pOptions;
joachim99@8 916
joachim99@8 917 QVBoxLayout* v = new QVBoxLayout( this, 5 );
joachim99@8 918 QGridLayout* h = new QGridLayout( v, 5, 4, 5 );
joachim99@8 919 h->setColStretch( 1, 10 );
joachim99@8 920
joachim99@8 921 QLabel* label = new QLabel( "A (Base):", this );
joachim99@8 922
joachim99@8 923 m_lineA = new QComboBox( true, this );
joachim99@8 924 m_lineA->insertStringList( m_pOptions->m_recentAFiles );
joachim99@8 925 m_lineA->setEditText( KURL(n1).prettyURL() );
joachim99@8 926 m_lineA->setMinimumSize( 200, m_lineA->size().height() );
joachim99@8 927 QPushButton * button = new QPushButton( "File...", this );
joachim99@8 928 connect( button, SIGNAL(clicked()), this, SLOT( selectFileA() ) );
joachim99@8 929 QPushButton * button2 = new QPushButton( "Dir...", this );
joachim99@8 930 connect( button2, SIGNAL(clicked()), this, SLOT( selectDirA() ) );
joachim99@8 931
joachim99@8 932 h->addWidget( label, 0, 0 );
joachim99@8 933 h->addWidget( m_lineA, 0, 1 );
joachim99@8 934 h->addWidget( button, 0, 2 );
joachim99@8 935 h->addWidget( button2, 0, 3 );
joachim99@8 936
joachim99@8 937 label = new QLabel( "B:", this );
joachim99@8 938 m_lineB = new QComboBox( true, this );
joachim99@8 939 m_lineB->insertStringList( m_pOptions->m_recentBFiles );
joachim99@8 940 m_lineB->setEditText( KURL(n2).prettyURL() );
joachim99@8 941 m_lineB->setMinimumSize( 200, m_lineB->size().height() );
joachim99@8 942 button = new QPushButton( "File...", this );
joachim99@8 943 connect( button, SIGNAL(clicked()), this, SLOT( selectFileB() ) );
joachim99@8 944 button2 = new QPushButton( "Dir...", this );
joachim99@8 945 connect( button2, SIGNAL(clicked()), this, SLOT( selectDirB() ) );
joachim99@8 946
joachim99@8 947 h->addWidget( label, 1, 0 );
joachim99@8 948 h->addWidget( m_lineB, 1, 1 );
joachim99@8 949 h->addWidget( button, 1, 2 );
joachim99@8 950 h->addWidget( button2, 1, 3 );
joachim99@8 951
joachim99@8 952 label = new QLabel( "C (Optional):", this );
joachim99@8 953 m_lineC= new QComboBox( true, this );
joachim99@8 954 m_lineC->insertStringList( m_pOptions->m_recentCFiles );
joachim99@8 955 m_lineC->setEditText( KURL(n3).prettyURL() );
joachim99@8 956 m_lineC->setMinimumSize( 200, m_lineC->size().height() );
joachim99@8 957 button = new QPushButton( "File...", this );
joachim99@8 958 connect( button, SIGNAL(clicked()), this, SLOT( selectFileC() ) );
joachim99@8 959 button2 = new QPushButton( "Dir...", this );
joachim99@8 960 connect( button2, SIGNAL(clicked()), this, SLOT( selectDirC() ) );
joachim99@8 961
joachim99@8 962 h->addWidget( label, 2, 0 );
joachim99@8 963 h->addWidget( m_lineC, 2, 1 );
joachim99@8 964 h->addWidget( button, 2, 2 );
joachim99@8 965 h->addWidget( button2, 2, 3 );
joachim99@8 966
joachim99@8 967 m_pMerge = new QCheckBox( "Merge", this );
joachim99@8 968 h->addWidget( m_pMerge, 3, 0 );
joachim99@8 969
joachim99@8 970 label = new QLabel( "Output (Optional):", this );
joachim99@8 971 m_lineOut = new QComboBox( true, this );
joachim99@8 972 m_lineOut->insertStringList( m_pOptions->m_recentOutputFiles );
joachim99@8 973 m_lineOut->setEditText( KURL(outputName).prettyURL() );
joachim99@8 974 m_lineOut->setMinimumSize( 200, m_lineOut->size().height() );
joachim99@8 975 button = new QPushButton( "File...", this );
joachim99@8 976 connect( button, SIGNAL(clicked()), this, SLOT( selectOutputName() ) );
joachim99@8 977 button2 = new QPushButton( "Dir...", this );
joachim99@8 978 connect( button2, SIGNAL(clicked()), this, SLOT( selectOutputDir() ) );
joachim99@8 979 connect( m_pMerge, SIGNAL(stateChanged(int)), this, SLOT(internalSlot(int)) );
joachim99@8 980 connect( this, SIGNAL(internalSignal(bool)), m_lineOut, SLOT(setEnabled(bool)) );
joachim99@8 981 connect( this, SIGNAL(internalSignal(bool)), button, SLOT(setEnabled(bool)) );
joachim99@8 982 connect( this, SIGNAL(internalSignal(bool)), button2, SLOT(setEnabled(bool)) );
joachim99@8 983
joachim99@8 984 m_pMerge->setChecked( !bMerge );
joachim99@8 985 m_pMerge->setChecked( bMerge );
joachim99@8 986 // m_lineOutput->setEnabled( bMerge );
joachim99@8 987
joachim99@8 988 // button->setEnabled( bMerge );
joachim99@8 989
joachim99@8 990 h->addWidget( label, 4, 0 );
joachim99@8 991 h->addWidget( m_lineOut, 4, 1 );
joachim99@8 992 h->addWidget( button, 4, 2 );
joachim99@8 993 h->addWidget( button2, 4, 3 );
joachim99@8 994
joachim99@8 995 h->addColSpacing( 1, 200 );
joachim99@8 996
joachim99@8 997 QHBoxLayout* l = new QHBoxLayout( v, 5 );
joachim99@8 998 button = new QPushButton( "Ok", this );
joachim99@8 999 button->setDefault( true );
joachim99@8 1000 connect( button, SIGNAL(clicked()), this, SLOT( accept() ) );
joachim99@8 1001 l->addWidget( button );
joachim99@8 1002
joachim99@8 1003 button = new QPushButton( "Cancel", this );
joachim99@8 1004 connect( button, SIGNAL(clicked()), this, SLOT( reject() ) );
joachim99@8 1005 l->addWidget( button );
joachim99@8 1006
joachim99@8 1007 button = new QPushButton( "Configure...", this );
joachim99@8 1008 connect( button, SIGNAL(clicked()), pParent, slotConfigure );
joachim99@8 1009 l->addWidget( button );
joachim99@8 1010
joachim99@8 1011 QSize sh = sizeHint();
joachim99@8 1012 setFixedHeight( sh.height() );
joachim99@8 1013 }
joachim99@8 1014
joachim99@8 1015 void OpenDialog::selectURL( QComboBox* pLine, bool bDir, int i, bool bSave )
joachim99@8 1016 {
joachim99@8 1017 QString current = pLine->currentText();
joachim99@8 1018 if (current.isEmpty() && i>3 ){ current = m_lineC->currentText(); }
joachim99@8 1019 if (current.isEmpty() ){ current = m_lineB->currentText(); }
joachim99@8 1020 if (current.isEmpty() ){ current = m_lineA->currentText(); }
joachim99@8 1021 KURL newURL = bDir ? KFileDialog::getExistingURL( current, this)
joachim99@8 1022 : bSave ? KFileDialog::getSaveURL( current, 0, this)
joachim99@8 1023 : KFileDialog::getOpenURL( current, 0, this);
joachim99@8 1024 if ( !newURL.isEmpty() )
joachim99@8 1025 {
joachim99@8 1026 pLine->setEditText( newURL.url() );
joachim99@8 1027 }
joachim99@8 1028 // newURL won't be modified if nothing was selected.
joachim99@8 1029 }
joachim99@8 1030
joachim99@8 1031 void OpenDialog::selectFileA() { selectURL( m_lineA, false, 1, false ); }
joachim99@8 1032 void OpenDialog::selectFileB() { selectURL( m_lineB, false, 2, false ); }
joachim99@8 1033 void OpenDialog::selectFileC() { selectURL( m_lineC, false, 3, false ); }
joachim99@8 1034 void OpenDialog::selectOutputName(){ selectURL( m_lineOut, false, 4, true ); }
joachim99@8 1035 void OpenDialog::selectDirA() { selectURL( m_lineA, true, 1, false ); }
joachim99@8 1036 void OpenDialog::selectDirB() { selectURL( m_lineB, true, 2, false ); }
joachim99@8 1037 void OpenDialog::selectDirC() { selectURL( m_lineC, true, 3, false ); }
joachim99@8 1038 void OpenDialog::selectOutputDir() { selectURL( m_lineOut, true, 4, true ); }
joachim99@8 1039
joachim99@8 1040 void OpenDialog::internalSlot(int i)
joachim99@8 1041 {
joachim99@8 1042 emit internalSignal(i!=0);
joachim99@8 1043 }
joachim99@8 1044
joachim99@8 1045 void OpenDialog::accept()
joachim99@8 1046 {
joachim99@8 1047 unsigned int maxNofRecentFiles = 10;
joachim99@8 1048
joachim99@8 1049 QString s = m_lineA->currentText();
joachim99@8 1050 s = KURL::fromPathOrURL(s).prettyURL();
joachim99@8 1051 QStringList* sl = &m_pOptions->m_recentAFiles;
joachim99@8 1052 // If an item exist, remove it from the list and reinsert it at the beginning.
joachim99@8 1053 sl->remove(s);
joachim99@8 1054 if ( !s.isEmpty() ) sl->prepend( s );
joachim99@8 1055 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
joachim99@8 1056
joachim99@8 1057 s = m_lineB->currentText();
joachim99@8 1058 s = KURL::fromPathOrURL(s).prettyURL();
joachim99@8 1059 sl = &m_pOptions->m_recentBFiles;
joachim99@8 1060 sl->remove(s);
joachim99@8 1061 if ( !s.isEmpty() ) sl->prepend( s );
joachim99@8 1062 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
joachim99@8 1063
joachim99@8 1064 s = m_lineC->currentText();
joachim99@8 1065 s = KURL::fromPathOrURL(s).prettyURL();
joachim99@8 1066 sl = &m_pOptions->m_recentCFiles;
joachim99@8 1067 sl->remove(s);
joachim99@8 1068 if ( !s.isEmpty() ) sl->prepend( s );
joachim99@8 1069 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
joachim99@8 1070
joachim99@8 1071 s = m_lineOut->currentText();
joachim99@8 1072 s = KURL::fromPathOrURL(s).prettyURL();
joachim99@8 1073 sl = &m_pOptions->m_recentOutputFiles;
joachim99@8 1074 sl->remove(s);
joachim99@8 1075 if ( !s.isEmpty() ) sl->prepend( s );
joachim99@8 1076 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
joachim99@8 1077
joachim99@8 1078 QDialog::accept();
joachim99@8 1079 }
joachim99@8 1080
joachim99@8 1081 void KDiff3App::slotFileOpen()
joachim99@8 1082 {
joachim99@8 1083 if ( !canContinue() ) return;
joachim99@8 1084
joachim99@8 1085 if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() )
joachim99@8 1086 {
joachim99@8 1087 int result = KMessageBox::warningYesNo(this,
joachim99@8 1088 i18n("You are currently doing a directory merge. Are you sure, you want to abort?"),
joachim99@8 1089 i18n("Warning"), i18n("Yes - Abort"), i18n("No - Continue merging") );
joachim99@8 1090 if ( result!=KMessageBox::Yes )
joachim99@8 1091 return;
joachim99@8 1092 }
joachim99@8 1093
joachim99@8 1094
joachim99@8 1095 slotStatusMsg(i18n("Opening files..."));
joachim99@8 1096
joachim99@8 1097 for(;;)
joachim99@8 1098 {
joachim99@8 1099 OpenDialog d(this,
joachim99@8 1100 m_sd1.m_bPreserve ? QString("") : m_sd1.getAliasName(),
joachim99@8 1101 m_sd2.m_bPreserve ? QString("") : m_sd2.getAliasName(),
joachim99@8 1102 m_sd3.m_bPreserve ? QString("") : m_sd3.getAliasName(),
joachim99@8 1103 !m_outputFilename.isEmpty(),
joachim99@8 1104 m_bDefaultFilename ? QString("") : m_outputFilename,
joachim99@8 1105 SLOT(slotConfigure()), m_pOptionDialog );
joachim99@8 1106 int status = d.exec();
joachim99@8 1107 if ( status == QDialog::Accepted )
joachim99@8 1108 {
joachim99@8 1109 m_sd1.setFilename( d.m_lineA->currentText() );
joachim99@8 1110 m_sd2.setFilename( d.m_lineB->currentText() );
joachim99@8 1111 m_sd3.setFilename( d.m_lineC->currentText() );
joachim99@8 1112
joachim99@8 1113 if( d.m_pMerge->isChecked() )
joachim99@8 1114 {
joachim99@8 1115 if ( d.m_lineOut->currentText().isEmpty() )
joachim99@8 1116 {
joachim99@8 1117 m_outputFilename = "unnamed.txt";
joachim99@8 1118 m_bDefaultFilename = true;
joachim99@8 1119 }
joachim99@8 1120 else
joachim99@8 1121 {
joachim99@8 1122 m_outputFilename = d.m_lineOut->currentText();
joachim99@8 1123 m_bDefaultFilename = false;
joachim99@8 1124 }
joachim99@8 1125 }
joachim99@8 1126 else
joachim99@8 1127 m_outputFilename = "";
joachim99@8 1128
joachim99@8 1129 m_bDirCompare = improveFilenames();
joachim99@8 1130 if ( m_bDirCompare )
joachim99@8 1131 {
joachim99@8 1132 m_pDirectoryMergeSplitter->show();
joachim99@8 1133 if ( m_pMainWidget!=0 )
joachim99@8 1134 {
joachim99@8 1135 m_pMainWidget->hide();
joachim99@8 1136 }
joachim99@8 1137 break;
joachim99@8 1138 }
joachim99@8 1139 else
joachim99@8 1140 {
joachim99@8 1141 m_pDirectoryMergeSplitter->hide();
joachim99@8 1142 init();
joachim99@8 1143
joachim99@8 1144 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 ||
joachim99@8 1145 ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 ||
joachim99@8 1146 ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
joachim99@8 1147 {
joachim99@8 1148 QString text( i18n("Opening of these files failed:") );
joachim99@8 1149 text += "\n\n";
joachim99@8 1150 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 )
joachim99@8 1151 text += " - " + m_sd1.getAliasName() + "\n";
joachim99@8 1152 if ( ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 )
joachim99@8 1153 text += " - " + m_sd2.getAliasName() + "\n";
joachim99@8 1154 if ( ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
joachim99@8 1155 text += " - " + m_sd3.getAliasName() + "\n";
joachim99@8 1156
joachim99@8 1157 KMessageBox::sorry( this, text, i18n("File open error") );
joachim99@8 1158 continue;
joachim99@8 1159 }
joachim99@8 1160 }
joachim99@8 1161 }
joachim99@8 1162 break;
joachim99@8 1163 }
joachim99@8 1164
joachim99@8 1165 slotUpdateAvailabilities();
joachim99@8 1166 slotStatusMsg(i18n("Ready."));
joachim99@8 1167 }
joachim99@8 1168
joachim99@8 1169 void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
joachim99@8 1170 QString an1, QString an2, QString an3 )
joachim99@8 1171 {
joachim99@8 1172 if ( !canContinue() ) return;
joachim99@8 1173
joachim99@8 1174 slotStatusMsg(i18n("Opening files..."));
joachim99@8 1175
joachim99@8 1176 m_sd1.setFilename( fn1 );
joachim99@8 1177 m_sd2.setFilename( fn2 );
joachim99@8 1178 m_sd3.setFilename( fn3 );
joachim99@8 1179
joachim99@8 1180 m_sd1.setAliasName( an1 );
joachim99@8 1181 m_sd2.setAliasName( an2 );
joachim99@8 1182 m_sd3.setAliasName( an3 );
joachim99@8 1183
joachim99@8 1184 if ( ! ofn.isEmpty() )
joachim99@8 1185 {
joachim99@8 1186 m_outputFilename = ofn;
joachim99@8 1187 m_bDefaultFilename = false;
joachim99@8 1188 }
joachim99@8 1189 else
joachim99@8 1190 {
joachim99@8 1191 m_outputFilename = "";
joachim99@8 1192 m_bDefaultFilename = true;
joachim99@8 1193 }
joachim99@8 1194
joachim99@8 1195 bool bDirCompare = improveFilenames(); // Using local bDirCompare is intended, because
joachim99@8 1196 // this method is called from the directory-merge-window.
joachim99@8 1197
joachim99@8 1198 if( bDirCompare )
joachim99@8 1199 {
joachim99@8 1200 }
joachim99@8 1201 else
joachim99@8 1202 {
joachim99@8 1203 init();
joachim99@8 1204
joachim99@8 1205 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 ||
joachim99@8 1206 ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 ||
joachim99@8 1207 ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
joachim99@8 1208 {
joachim99@8 1209 QString text( i18n("Opening of these files failed:") );
joachim99@8 1210 text += "\n\n";
joachim99@8 1211 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 )
joachim99@8 1212 text += " - " + m_sd1.getAliasName() + "\n";
joachim99@8 1213 if ( ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 )
joachim99@8 1214 text += " - " + m_sd2.getAliasName() + "\n";
joachim99@8 1215 if ( ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
joachim99@8 1216 text += " - " + m_sd3.getAliasName() + "\n";
joachim99@8 1217
joachim99@8 1218 KMessageBox::sorry( this, text, i18n("File open error") );
joachim99@8 1219 }
joachim99@8 1220 else
joachim99@8 1221 {
joachim99@8 1222 if ( m_pDirectoryMergeWindow!=0 && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
joachim99@8 1223 {
joachim99@8 1224 slotDirViewToggle();
joachim99@8 1225 }
joachim99@8 1226 }
joachim99@8 1227 }
joachim99@8 1228 slotStatusMsg(i18n("Ready."));
joachim99@8 1229 }
joachim99@8 1230
joachim99@8 1231 void KDiff3App::slotEditCut()
joachim99@8 1232 {
joachim99@8 1233 slotStatusMsg(i18n("Cutting selection..."));
joachim99@8 1234
joachim99@8 1235 QString s;
joachim99@8 1236 if ( m_pMergeResultWindow!=0 )
joachim99@8 1237 {
joachim99@8 1238 s = m_pMergeResultWindow->getSelection();
joachim99@8 1239 m_pMergeResultWindow->deleteSelection();
joachim99@8 1240
joachim99@8 1241 m_pMergeResultWindow->update();
joachim99@8 1242 }
joachim99@8 1243
joachim99@8 1244 if ( !s.isNull() )
joachim99@8 1245 {
joachim99@8 1246 QApplication::clipboard()->setText( s );
joachim99@8 1247 }
joachim99@8 1248
joachim99@8 1249 slotStatusMsg(i18n("Ready."));
joachim99@8 1250 }
joachim99@8 1251
joachim99@8 1252 void KDiff3App::slotEditCopy()
joachim99@8 1253 {
joachim99@8 1254 slotStatusMsg(i18n("Copying selection to clipboard..."));
joachim99@8 1255 QString s;
joachim99@8 1256 if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection();
joachim99@8 1257 if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection();
joachim99@8 1258 if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection();
joachim99@8 1259 if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
joachim99@8 1260 if ( !s.isNull() )
joachim99@8 1261 {
joachim99@8 1262 QApplication::clipboard()->setText( s );
joachim99@8 1263 }
joachim99@8 1264
joachim99@8 1265 slotStatusMsg(i18n("Ready."));
joachim99@8 1266 }
joachim99@8 1267
joachim99@8 1268 void KDiff3App::slotEditPaste()
joachim99@8 1269 {
joachim99@8 1270 slotStatusMsg(i18n("Inserting clipboard contents..."));
joachim99@8 1271
joachim99@8 1272 if ( m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() )
joachim99@8 1273 {
joachim99@8 1274 m_pMergeResultWindow->pasteClipboard();
joachim99@8 1275 }
joachim99@8 1276 else if ( canContinue() )
joachim99@8 1277 {
joachim99@8 1278 bool bUpCase = m_pOptionDialog->m_bUpCase;
joachim99@8 1279 if ( m_pDiffTextWindow1->hasFocus() )
joachim99@8 1280 {
joachim99@8 1281 m_sd1.setData( QApplication::clipboard()->text(), bUpCase );
joachim99@8 1282 init();
joachim99@8 1283 }
joachim99@8 1284 else if ( m_pDiffTextWindow2->hasFocus() )
joachim99@8 1285 {
joachim99@8 1286 m_sd2.setData( QApplication::clipboard()->text(), bUpCase );
joachim99@8 1287 init();
joachim99@8 1288 }
joachim99@8 1289 else if ( m_pDiffTextWindow3->hasFocus() )
joachim99@8 1290 {
joachim99@8 1291 m_sd3.setData( QApplication::clipboard()->text(), bUpCase );
joachim99@8 1292 init();
joachim99@8 1293 }
joachim99@8 1294 }
joachim99@8 1295
joachim99@8 1296 slotStatusMsg(i18n("Ready."));
joachim99@8 1297 }
joachim99@8 1298
joachim99@8 1299
joachim99@8 1300 void KDiff3App::slotGoCurrent()
joachim99@8 1301 {
joachim99@8 1302 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoCurrent();
joachim99@8 1303 }
joachim99@8 1304 void KDiff3App::slotGoTop()
joachim99@8 1305 {
joachim99@8 1306 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoTop();
joachim99@8 1307 }
joachim99@8 1308 void KDiff3App::slotGoBottom()
joachim99@8 1309 {
joachim99@8 1310 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoBottom();
joachim99@8 1311 }
joachim99@8 1312 void KDiff3App::slotGoPrevUnsolvedConflict()
joachim99@8 1313 {
joachim99@8 1314 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevUnsolvedConflict();
joachim99@8 1315 }
joachim99@8 1316 void KDiff3App::slotGoNextUnsolvedConflict()
joachim99@8 1317 {
joachim99@8 1318 m_bTimerBlock = false;
joachim99@8 1319 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextUnsolvedConflict();
joachim99@8 1320 }
joachim99@8 1321 void KDiff3App::slotGoPrevConflict()
joachim99@8 1322 {
joachim99@8 1323 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevConflict();
joachim99@8 1324 }
joachim99@8 1325 void KDiff3App::slotGoNextConflict()
joachim99@8 1326 {
joachim99@8 1327 m_bTimerBlock = false;
joachim99@8 1328 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextConflict();
joachim99@8 1329 }
joachim99@8 1330 void KDiff3App::slotGoPrevDelta()
joachim99@8 1331 {
joachim99@8 1332 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevDelta();
joachim99@8 1333 }
joachim99@8 1334 void KDiff3App::slotGoNextDelta()
joachim99@8 1335 {
joachim99@8 1336 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextDelta();
joachim99@8 1337 }
joachim99@8 1338 void KDiff3App::slotChooseA()
joachim99@8 1339 {
joachim99@8 1340 if (m_pMergeResultWindow && ! m_bTimerBlock )
joachim99@8 1341 {
joachim99@8 1342 m_pMergeResultWindow->slotChooseA();
joachim99@8 1343 if ( autoAdvance->isChecked() )
joachim99@8 1344 {
joachim99@8 1345 m_bTimerBlock = true;
joachim99@8 1346 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
joachim99@8 1347 }
joachim99@8 1348 }
joachim99@8 1349 }
joachim99@8 1350 void KDiff3App::slotChooseB()
joachim99@8 1351 {
joachim99@8 1352 if ( m_pMergeResultWindow && ! m_bTimerBlock )
joachim99@8 1353 {
joachim99@8 1354 m_pMergeResultWindow->slotChooseB();
joachim99@8 1355 if ( autoAdvance->isChecked() )
joachim99@8 1356 {
joachim99@8 1357 m_bTimerBlock = true;
joachim99@8 1358 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
joachim99@8 1359 }
joachim99@8 1360 }
joachim99@8 1361 }
joachim99@8 1362 void KDiff3App::slotChooseC()
joachim99@8 1363 {
joachim99@8 1364 if ( m_pMergeResultWindow && ! m_bTimerBlock )
joachim99@8 1365 {
joachim99@8 1366 m_pMergeResultWindow->slotChooseC();
joachim99@8 1367 if ( autoAdvance->isChecked() )
joachim99@8 1368 {
joachim99@8 1369 m_bTimerBlock = true;
joachim99@8 1370 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
joachim99@8 1371 }
joachim99@8 1372 }
joachim99@8 1373 }
joachim99@8 1374 void KDiff3App::slotChooseAEverywhere()
joachim99@8 1375 {
joachim99@8 1376 if (m_pMergeResultWindow )
joachim99@8 1377 {
joachim99@8 1378 slotGoTop();
joachim99@8 1379 m_pMergeResultWindow->slotChooseAEverywhere();
joachim99@8 1380 }
joachim99@8 1381 }
joachim99@8 1382 void KDiff3App::slotChooseBEverywhere()
joachim99@8 1383 {
joachim99@8 1384 if (m_pMergeResultWindow )
joachim99@8 1385 {
joachim99@8 1386 slotGoTop();
joachim99@8 1387 m_pMergeResultWindow->slotChooseBEverywhere();
joachim99@8 1388 }
joachim99@8 1389 }
joachim99@8 1390
joachim99@8 1391 void KDiff3App::slotChooseCEverywhere()
joachim99@8 1392 {
joachim99@8 1393 if (m_pMergeResultWindow )
joachim99@8 1394 {
joachim99@8 1395 slotGoTop();
joachim99@8 1396 m_pMergeResultWindow->slotChooseCEverywhere();
joachim99@8 1397 }
joachim99@8 1398 }
joachim99@8 1399
joachim99@8 1400 void KDiff3App::slotAutoSolve()
joachim99@8 1401 {
joachim99@8 1402 if (m_pMergeResultWindow )
joachim99@8 1403 {
joachim99@8 1404 slotGoTop();
joachim99@8 1405 m_pMergeResultWindow->slotAutoSolve();
joachim99@8 1406 // m_pMergeWindowFrame->show(); incompatible with bPreserveCarriageReturn
joachim99@8 1407 m_pMergeResultWindow->showNrOfConflicts();
joachim99@8 1408 slotUpdateAvailabilities();
joachim99@8 1409 }
joachim99@8 1410 }
joachim99@8 1411
joachim99@8 1412 void KDiff3App::slotUnsolve()
joachim99@8 1413 {
joachim99@8 1414 if (m_pMergeResultWindow )
joachim99@8 1415 {
joachim99@8 1416 slotGoTop();
joachim99@8 1417 m_pMergeResultWindow->slotUnsolve();
joachim99@8 1418 }
joachim99@8 1419 }
joachim99@8 1420
joachim99@8 1421
joachim99@8 1422 void KDiff3App::slotConfigure()
joachim99@8 1423 {
joachim99@8 1424 m_pOptionDialog->setState();
joachim99@8 1425 m_pOptionDialog->incInitialSize ( QSize(0,40) );
joachim99@8 1426 m_pOptionDialog->exec();
joachim99@8 1427 slotRefresh();
joachim99@8 1428 }
joachim99@8 1429
joachim99@8 1430 void KDiff3App::slotConfigureKeys()
joachim99@8 1431 {
joachim99@8 1432 KKeyDialog::configure(actionCollection(), this);
joachim99@8 1433 }
joachim99@8 1434
joachim99@8 1435 void KDiff3App::slotRefresh()
joachim99@8 1436 {
joachim99@8 1437 g_tabSize = m_pOptionDialog->m_tabSize;
joachim99@8 1438 if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->update();
joachim99@8 1439 if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->update();
joachim99@8 1440 if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->update();
joachim99@8 1441 if (m_pMergeResultWindow!=0) m_pMergeResultWindow->update();
joachim99@8 1442
joachim99@8 1443 autoAdvance->setChecked( m_pOptionDialog->m_bAutoAdvance );
joachim99@8 1444 showWhiteSpace->setChecked( m_pOptionDialog->m_bShowWhiteSpace );
joachim99@8 1445 showLineNumbers->setChecked( m_pOptionDialog->m_bShowLineNumbers );
joachim99@8 1446
joachim99@8 1447 if ( m_pDiffWindowSplitter!=0 )
joachim99@8 1448 {
joachim99@8 1449 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Horizontal : Vertical );
joachim99@8 1450 }
joachim99@8 1451 }
joachim99@8 1452
joachim99@8 1453 void KDiff3App::slotSelectionStart()
joachim99@8 1454 {
joachim99@8 1455 //editCopy->setEnabled( false );
joachim99@8 1456 //editCut->setEnabled( false );
joachim99@8 1457
joachim99@8 1458 const QObject* s = sender();
joachim99@8 1459 if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection();
joachim99@8 1460 if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection();
joachim99@8 1461 if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection();
joachim99@8 1462 if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection();
joachim99@8 1463 }
joachim99@8 1464
joachim99@8 1465 void KDiff3App::slotSelectionEnd()
joachim99@8 1466 {
joachim99@8 1467 //const QObject* s = sender();
joachim99@8 1468 //editCopy->setEnabled(true);
joachim99@8 1469 //editCut->setEnabled( s==m_pMergeResultWindow );
joachim99@8 1470 if ( m_pOptionDialog->m_bAutoCopySelection )
joachim99@8 1471 {
joachim99@8 1472 slotEditCopy();
joachim99@8 1473 }
joachim99@8 1474 }
joachim99@8 1475
joachim99@8 1476 void KDiff3App::slotClipboardChanged()
joachim99@8 1477 {
joachim99@8 1478 QString s = QApplication::clipboard()->text();
joachim99@8 1479 //editPaste->setEnabled(!s.isEmpty());
joachim99@8 1480 }
joachim99@8 1481
joachim99@8 1482 void KDiff3App::slotOutputModified()
joachim99@8 1483 {
joachim99@8 1484 if ( !m_bOutputModified )
joachim99@8 1485 {
joachim99@8 1486 m_bOutputModified=true;
joachim99@8 1487 slotUpdateAvailabilities();
joachim99@8 1488 }
joachim99@8 1489 }
joachim99@8 1490
joachim99@8 1491 void KDiff3App::slotAutoAdvanceToggled()
joachim99@8 1492 {
joachim99@8 1493 m_pOptionDialog->m_bAutoAdvance = autoAdvance->isChecked();
joachim99@8 1494 }
joachim99@8 1495
joachim99@8 1496 void KDiff3App::slotShowWhiteSpaceToggled()
joachim99@8 1497 {
joachim99@8 1498 m_pOptionDialog->m_bShowWhiteSpace = showWhiteSpace->isChecked();
joachim99@8 1499 if ( m_pDiffTextWindow1!=0 )
joachim99@8 1500 m_pDiffTextWindow1->update();
joachim99@8 1501 if ( m_pDiffTextWindow2!=0 )
joachim99@8 1502 m_pDiffTextWindow2->update();
joachim99@8 1503 if ( m_pDiffTextWindow3!=0 )
joachim99@8 1504 m_pDiffTextWindow3->update();
joachim99@8 1505 }
joachim99@8 1506
joachim99@8 1507 void KDiff3App::slotShowLineNumbersToggled()
joachim99@8 1508 {
joachim99@8 1509 m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked();
joachim99@8 1510 if ( m_pDiffTextWindow1!=0 )
joachim99@8 1511 m_pDiffTextWindow1->update();
joachim99@8 1512 if ( m_pDiffTextWindow2!=0 )
joachim99@8 1513 m_pDiffTextWindow2->update();
joachim99@8 1514 if ( m_pDiffTextWindow3!=0 )
joachim99@8 1515 m_pDiffTextWindow3->update();
joachim99@8 1516 }
joachim99@8 1517
joachim99@8 1518 /// Return true for directory compare, else false
joachim99@8 1519 bool KDiff3App::improveFilenames()
joachim99@8 1520 {
joachim99@8 1521 FileAccess f1(m_sd1.getFilename());
joachim99@8 1522 FileAccess f2(m_sd2.getFilename());
joachim99@8 1523 FileAccess f3(m_sd3.getFilename());
joachim99@8 1524 FileAccess f4(m_outputFilename);
joachim99@8 1525
joachim99@8 1526 if ( f1.isFile() && f1.exists() )
joachim99@8 1527 {
joachim99@8 1528 if ( f2.isDir() )
joachim99@8 1529 {
joachim99@8 1530 f2.addPath( f1.fileName() );
joachim99@8 1531 if ( f2.isFile() && f2.exists() )
joachim99@8 1532 m_sd2.setFileAccess( f2 );
joachim99@8 1533 }
joachim99@8 1534 if ( f3.isDir() )
joachim99@8 1535 {
joachim99@8 1536 f3.addPath( f1.fileName() );
joachim99@8 1537 if ( f3.isFile() && f3.exists() )
joachim99@8 1538 m_sd3.setFileAccess( f3 );
joachim99@8 1539 }
joachim99@8 1540 if ( f4.isDir() )
joachim99@8 1541 {
joachim99@8 1542 f4.addPath( f1.fileName() );
joachim99@8 1543 if ( f4.isFile() && f4.exists() )
joachim99@8 1544 m_outputFilename = f4.absFilePath();
joachim99@8 1545 }
joachim99@8 1546 }
joachim99@8 1547 else if ( f1.isDir() )
joachim99@8 1548 {
joachim99@8 1549 FileAccess destDir;
joachim99@8 1550 if (!m_bDefaultFilename) destDir = f4;
joachim99@8 1551 m_pDirectoryMergeSplitter->show();
joachim99@8 1552 m_pDirectoryMergeWindow->init(
joachim99@8 1553 f1, f2, f3,
joachim99@8 1554 destDir, // Destdirname
joachim99@8 1555 !m_outputFilename.isEmpty()
joachim99@8 1556 );
joachim99@8 1557
joachim99@8 1558 if (m_pMainWidget!=0) m_pMainWidget->hide();
joachim99@8 1559 m_sd1.reset();
joachim99@8 1560 if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,0,0,1,false);
joachim99@8 1561 m_sd2.reset();
joachim99@8 1562 if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,0,0,2,false);
joachim99@8 1563 m_sd3.reset();
joachim99@8 1564 if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,0,0,3,false);
joachim99@8 1565 slotUpdateAvailabilities();
joachim99@8 1566 return true;
joachim99@8 1567 }
joachim99@8 1568 return false;
joachim99@8 1569 }
joachim99@8 1570
joachim99@8 1571 void KDiff3App::slotReload()
joachim99@8 1572 {
joachim99@8 1573 if ( !canContinue() ) return;
joachim99@8 1574
joachim99@8 1575 init();
joachim99@8 1576 }
joachim99@8 1577
joachim99@8 1578 bool KDiff3App::canContinue()
joachim99@8 1579 {
joachim99@8 1580 // First test if anything must be saved.
joachim99@8 1581 if(m_bOutputModified)
joachim99@8 1582 {
joachim99@8 1583 int result = KMessageBox::warningYesNoCancel(this,
joachim99@8 1584 i18n("The merge result hasn't been saved."),
joachim99@8 1585 i18n("Warning"), i18n("Save and continue"), i18n("Continue without saving") );
joachim99@8 1586 if ( result==KMessageBox::Cancel )
joachim99@8 1587 return false;
joachim99@8 1588 else if ( result==KMessageBox::Yes )
joachim99@8 1589 {
joachim99@8 1590 slotFileSave();
joachim99@8 1591 if ( m_bOutputModified )
joachim99@8 1592 {
joachim99@8 1593 KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") );
joachim99@8 1594 return false;
joachim99@8 1595 }
joachim99@8 1596 }
joachim99@8 1597 }
joachim99@8 1598
joachim99@8 1599 m_bOutputModified = false;
joachim99@8 1600 return true;
joachim99@8 1601 }
joachim99@8 1602
joachim99@8 1603 void KDiff3App::slotCheckIfCanContinue( bool* pbContinue )
joachim99@8 1604 {
joachim99@8 1605 if (pbContinue!=0) *pbContinue = canContinue();
joachim99@8 1606 }
joachim99@8 1607
joachim99@8 1608
joachim99@8 1609 void KDiff3App::slotDirShowBoth()
joachim99@8 1610 {
joachim99@8 1611 if( dirShowBoth->isChecked() )
joachim99@8 1612 {
joachim99@8 1613 if ( m_bDirCompare )
joachim99@8 1614 m_pDirectoryMergeSplitter->show();
joachim99@8 1615 else
joachim99@8 1616 m_pDirectoryMergeSplitter->hide();
joachim99@8 1617
joachim99@8 1618 if ( m_pMainWidget!=0 )
joachim99@8 1619 m_pMainWidget->show();
joachim99@8 1620 }
joachim99@8 1621 else
joachim99@8 1622 {
joachim99@8 1623 if ( m_pMainWidget!=0 )
joachim99@8 1624 {
joachim99@8 1625 m_pMainWidget->show();
joachim99@8 1626 m_pDirectoryMergeSplitter->hide();
joachim99@8 1627 }
joachim99@8 1628 else if ( m_bDirCompare )
joachim99@8 1629 {
joachim99@8 1630 m_pDirectoryMergeSplitter->show();
joachim99@8 1631 }
joachim99@8 1632 }
joachim99@8 1633
joachim99@8 1634 slotUpdateAvailabilities();
joachim99@8 1635 }
joachim99@8 1636
joachim99@8 1637
joachim99@8 1638 void KDiff3App::slotDirViewToggle()
joachim99@8 1639 {
joachim99@8 1640 if ( m_bDirCompare )
joachim99@8 1641 {
joachim99@8 1642 if( ! m_pDirectoryMergeSplitter->isVisible() )
joachim99@8 1643 {
joachim99@8 1644 m_pDirectoryMergeSplitter->show();
joachim99@8 1645 if (m_pMainWidget!=0)
joachim99@8 1646 m_pMainWidget->hide();
joachim99@8 1647 }
joachim99@8 1648 else
joachim99@8 1649 {
joachim99@8 1650 if (m_pMainWidget!=0)
joachim99@8 1651 {
joachim99@8 1652 m_pDirectoryMergeSplitter->hide();
joachim99@8 1653 m_pMainWidget->show();
joachim99@8 1654 }
joachim99@8 1655 }
joachim99@8 1656 }
joachim99@8 1657 slotUpdateAvailabilities();
joachim99@8 1658 }
joachim99@8 1659
joachim99@8 1660 void KDiff3App::slotShowWindowAToggled()
joachim99@8 1661 {
joachim99@8 1662 if ( m_pDiffTextWindow1!=0 )
joachim99@8 1663 {
joachim99@8 1664 if ( showWindowA->isChecked() ) m_pDiffTextWindow1->show();
joachim99@8 1665 else m_pDiffTextWindow1->hide();
joachim99@8 1666 slotUpdateAvailabilities();
joachim99@8 1667 }
joachim99@8 1668 }
joachim99@8 1669
joachim99@8 1670 void KDiff3App::slotShowWindowBToggled()
joachim99@8 1671 {
joachim99@8 1672 if ( m_pDiffTextWindow2!=0 )
joachim99@8 1673 {
joachim99@8 1674 if ( showWindowB->isChecked() ) m_pDiffTextWindow2->show();
joachim99@8 1675 else m_pDiffTextWindow2->hide();
joachim99@8 1676 slotUpdateAvailabilities();
joachim99@8 1677 }
joachim99@8 1678 }
joachim99@8 1679
joachim99@8 1680 void KDiff3App::slotShowWindowCToggled()
joachim99@8 1681 {
joachim99@8 1682 if ( m_pDiffTextWindow3!=0 )
joachim99@8 1683 {
joachim99@8 1684 if ( showWindowC->isChecked() ) m_pDiffTextWindow3->show();
joachim99@8 1685 else m_pDiffTextWindow3->hide();
joachim99@8 1686 slotUpdateAvailabilities();
joachim99@8 1687 }
joachim99@8 1688 }
joachim99@8 1689
joachim99@8 1690 void KDiff3App::slotEditFind()
joachim99@8 1691 {
joachim99@8 1692 m_pFindDialog->currentLine = 0;
joachim99@8 1693 m_pFindDialog->currentPos = 0;
joachim99@8 1694 m_pFindDialog->currentWindow = 1;
joachim99@8 1695
joachim99@8 1696 if ( QDialog::Accepted == m_pFindDialog->exec() )
joachim99@8 1697 {
joachim99@8 1698 slotEditFindNext();
joachim99@8 1699 }
joachim99@8 1700 }
joachim99@8 1701
joachim99@8 1702 void KDiff3App::slotEditFindNext()
joachim99@8 1703 {
joachim99@8 1704 QCString s = m_pFindDialog->m_pSearchString->text().utf8();
joachim99@8 1705 if ( s.isEmpty() )
joachim99@8 1706 {
joachim99@8 1707 slotEditFind();
joachim99@8 1708 return;
joachim99@8 1709 }
joachim99@8 1710
joachim99@8 1711 bool bDirDown = true;
joachim99@8 1712 bool bCaseSensitive = m_pFindDialog->m_pCaseSensitive->isChecked();
joachim99@8 1713
joachim99@8 1714 int d3vLine = m_pFindDialog->currentLine;
joachim99@8 1715 int posInLine = m_pFindDialog->currentPos;
joachim99@8 1716 if ( m_pFindDialog->currentWindow == 1 )
joachim99@8 1717 {
joachim99@8 1718 if ( m_pFindDialog->m_pSearchInA->isChecked() && m_pDiffTextWindow1!=0 &&
joachim99@8 1719 m_pDiffTextWindow1->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1720 {
joachim99@8 1721 m_pDiffTextWindow1->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
joachim99@8 1722 m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2);
joachim99@8 1723 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1724 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1725 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1726 return;
joachim99@8 1727 }
joachim99@8 1728 m_pFindDialog->currentWindow = 2;
joachim99@8 1729 m_pFindDialog->currentLine = 0;
joachim99@8 1730 m_pFindDialog->currentPos = 0;
joachim99@8 1731 }
joachim99@8 1732
joachim99@8 1733 d3vLine = m_pFindDialog->currentLine;
joachim99@8 1734 posInLine = m_pFindDialog->currentPos;
joachim99@8 1735 if ( m_pFindDialog->currentWindow == 2 )
joachim99@8 1736 {
joachim99@8 1737 if ( m_pFindDialog->m_pSearchInB->isChecked() && m_pDiffTextWindow2!=0 &&
joachim99@8 1738 m_pDiffTextWindow2->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1739 {
joachim99@8 1740 m_pDiffTextWindow2->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
joachim99@8 1741 m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2);
joachim99@8 1742 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1743 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1744 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1745 return;
joachim99@8 1746 }
joachim99@8 1747 m_pFindDialog->currentWindow = 3;
joachim99@8 1748 m_pFindDialog->currentLine = 0;
joachim99@8 1749 m_pFindDialog->currentPos = 0;
joachim99@8 1750 }
joachim99@8 1751
joachim99@8 1752 d3vLine = m_pFindDialog->currentLine;
joachim99@8 1753 posInLine = m_pFindDialog->currentPos;
joachim99@8 1754 if ( m_pFindDialog->currentWindow == 3 )
joachim99@8 1755 {
joachim99@8 1756 if ( m_pFindDialog->m_pSearchInC->isChecked() && m_pDiffTextWindow3!=0 &&
joachim99@8 1757 m_pDiffTextWindow3->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1758 {
joachim99@8 1759 m_pDiffTextWindow3->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
joachim99@8 1760 m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2);
joachim99@8 1761 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1762 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1763 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1764 return;
joachim99@8 1765 }
joachim99@8 1766 m_pFindDialog->currentWindow = 4;
joachim99@8 1767 m_pFindDialog->currentLine = 0;
joachim99@8 1768 m_pFindDialog->currentPos = 0;
joachim99@8 1769 }
joachim99@8 1770
joachim99@8 1771 d3vLine = m_pFindDialog->currentLine;
joachim99@8 1772 posInLine = m_pFindDialog->currentPos;
joachim99@8 1773 if ( m_pFindDialog->currentWindow == 4 )
joachim99@8 1774 {
joachim99@8 1775 if ( m_pFindDialog->m_pSearchInOutput->isChecked() && m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() &&
joachim99@8 1776 m_pMergeResultWindow->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
joachim99@8 1777 {
joachim99@8 1778 m_pMergeResultWindow->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
joachim99@8 1779 m_pMergeVScrollBar->setValue(d3vLine - m_pMergeVScrollBar->pageStep()/2);
joachim99@8 1780 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
joachim99@8 1781 m_pFindDialog->currentLine = d3vLine;
joachim99@8 1782 m_pFindDialog->currentPos = posInLine + 1;
joachim99@8 1783 return;
joachim99@8 1784 }
joachim99@8 1785 m_pFindDialog->currentWindow = 5;
joachim99@8 1786 m_pFindDialog->currentLine = 0;
joachim99@8 1787 m_pFindDialog->currentPos = 0;
joachim99@8 1788 }
joachim99@8 1789
joachim99@8 1790 KMessageBox::information(this,i18n("Search Complete."),i18n("KDiff3: Search Complete."));
joachim99@8 1791 m_pFindDialog->currentWindow = 1;
joachim99@8 1792 m_pFindDialog->currentLine = 0;
joachim99@8 1793 m_pFindDialog->currentPos = 0;
joachim99@8 1794 }
joachim99@8 1795
joachim99@8 1796 void KDiff3App::slotMergeCurrentFile()
joachim99@8 1797 {
joachim99@8 1798 if ( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() )
joachim99@8 1799 {
joachim99@8 1800 m_pDirectoryMergeWindow->mergeCurrentFile();
joachim99@8 1801 }
joachim99@8 1802 else if ( m_pMainWidget != 0 && m_pMainWidget->isVisible() )
joachim99@8 1803 {
joachim99@8 1804 if ( !canContinue() ) return;
joachim99@8 1805 if ( m_outputFilename.isEmpty() )
joachim99@8 1806 {
joachim99@8 1807 if ( !m_sd3.isEmpty() && !m_sd3.m_bPreserve )
joachim99@8 1808 {
joachim99@8 1809 m_outputFilename = m_sd3.getFilename();
joachim99@8 1810 }
joachim99@8 1811 else if ( !m_sd2.isEmpty() && !m_sd2.m_bPreserve )
joachim99@8 1812 {
joachim99@8 1813 m_outputFilename = m_sd2.getFilename();
joachim99@8 1814 }
joachim99@8 1815 else if ( !m_sd1.isEmpty() && !m_sd1.m_bPreserve )
joachim99@8 1816 {
joachim99@8 1817 m_outputFilename = m_sd1.getFilename();
joachim99@8 1818 }
joachim99@8 1819 else
joachim99@8 1820 {
joachim99@8 1821 m_outputFilename = "unnamed.txt";
joachim99@8 1822 m_bDefaultFilename = true;
joachim99@8 1823 }
joachim99@8 1824 }
joachim99@8 1825 init();
joachim99@8 1826 }
joachim99@8 1827 }
joachim99@8 1828
joachim99@8 1829 void KDiff3App::slotWinFocusNext()
joachim99@8 1830 {
joachim99@8 1831 QWidget* focus = qApp->focusWidget();
joachim99@8 1832 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
joachim99@8 1833 {
joachim99@8 1834 slotDirViewToggle();
joachim99@8 1835 }
joachim99@8 1836
joachim99@8 1837 std::list<QWidget*> visibleWidgetList;
joachim99@8 1838 if ( m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
joachim99@8 1839 if ( m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
joachim99@8 1840 if ( m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
joachim99@8 1841 if ( m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
joachim99@8 1842 if ( m_bDirCompare /*m_pDirectoryMergeWindow->isVisible()*/ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
joachim99@8 1843 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
joachim99@8 1844
joachim99@8 1845 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
joachim99@8 1846 ++i;
joachim99@8 1847 if ( i==visibleWidgetList.end() ) ++i; // if at end goto begin of list
joachim99@8 1848 if ( i!=visibleWidgetList.end() )
joachim99@8 1849 {
joachim99@8 1850 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
joachim99@8 1851 {
joachim99@8 1852 slotDirViewToggle();
joachim99@8 1853 }
joachim99@8 1854 (*i)->setFocus();
joachim99@8 1855 }
joachim99@8 1856 }
joachim99@8 1857
joachim99@8 1858 void KDiff3App::slotWinFocusPrev()
joachim99@8 1859 {
joachim99@8 1860 QWidget* focus = qApp->focusWidget();
joachim99@8 1861 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
joachim99@8 1862 {
joachim99@8 1863 slotDirViewToggle();
joachim99@8 1864 }
joachim99@8 1865
joachim99@8 1866 std::list<QWidget*> visibleWidgetList;
joachim99@8 1867 if ( m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
joachim99@8 1868 if ( m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
joachim99@8 1869 if ( m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
joachim99@8 1870 if ( m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
joachim99@8 1871 if (m_bDirCompare /* m_pDirectoryMergeWindow->isVisible() */ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
joachim99@8 1872 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
joachim99@8 1873
joachim99@8 1874 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
joachim99@8 1875 --i;
joachim99@8 1876 if ( i==visibleWidgetList.end() ) --i;
joachim99@8 1877 if ( i!=visibleWidgetList.end() )
joachim99@8 1878 {
joachim99@8 1879 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
joachim99@8 1880 {
joachim99@8 1881 slotDirViewToggle();
joachim99@8 1882 }
joachim99@8 1883 (*i)->setFocus();
joachim99@8 1884 }
joachim99@8 1885 }
joachim99@8 1886
joachim99@8 1887 void KDiff3App::slotWinToggleSplitterOrientation()
joachim99@8 1888 {
joachim99@8 1889 if ( m_pDiffWindowSplitter!=0 )
joachim99@8 1890 {
joachim99@8 1891 m_pDiffWindowSplitter->setOrientation(
joachim99@8 1892 m_pDiffWindowSplitter->orientation()==Vertical ? Horizontal : Vertical
joachim99@8 1893 );
joachim99@8 1894 }
joachim99@8 1895 }
joachim99@8 1896
joachim99@8 1897 void KDiff3App::slotUpdateAvailabilities()
joachim99@8 1898 {
joachim99@8 1899 bool bTextDataAvailable = (m_sd1.m_pBuf != 0 || m_sd2.m_pBuf != 0 || m_sd3.m_pBuf != 0 );
joachim99@8 1900 if( dirShowBoth->isChecked() )
joachim99@8 1901 {
joachim99@8 1902 if ( m_bDirCompare )
joachim99@8 1903 m_pDirectoryMergeSplitter->show();
joachim99@8 1904 else
joachim99@8 1905 m_pDirectoryMergeSplitter->hide();
joachim99@8 1906
joachim99@8 1907 if ( m_pMainWidget!=0 && !m_pMainWidget->isVisible() &&
joachim99@8 1908 bTextDataAvailable
joachim99@8 1909 )
joachim99@8 1910 m_pMainWidget->show();
joachim99@8 1911 }
joachim99@8 1912
joachim99@8 1913 bool bDiffWindowVisible = m_pMainWidget != 0 && m_pMainWidget->isVisible();
joachim99@8 1914 bool bMergeEditorVisible = m_pMergeWindowFrame !=0 && m_pMergeWindowFrame->isVisible();
joachim99@8 1915
joachim99@8 1916 dirStartOperation->setEnabled( m_bDirCompare );
joachim99@8 1917 dirFoldAll->setEnabled( m_bDirCompare );
joachim99@8 1918 dirUnfoldAll->setEnabled( m_bDirCompare );
joachim99@8 1919
joachim99@8 1920 dirCompareCurrent->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() );
joachim99@8 1921
joachim99@8 1922 dirMergeCurrent->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected()
joachim99@8 1923 || bDiffWindowVisible );
joachim99@8 1924
joachim99@8 1925 dirShowBoth->setEnabled( m_bDirCompare );
joachim99@8 1926
joachim99@8 1927 dirRescan->setEnabled( m_bDirCompare );
joachim99@8 1928
joachim99@8 1929 dirViewToggle->setEnabled(
joachim99@8 1930 m_bDirCompare &&
joachim99@8 1931 (!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && m_pMainWidget->isVisible() ||
joachim99@8 1932 m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && !m_pMainWidget->isVisible() && bTextDataAvailable )
joachim99@8 1933 );
joachim99@8 1934
joachim99@8 1935 dirAutoChoiceEverywhere->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() );
joachim99@8 1936 dirDoNothingEverywhere->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() );
joachim99@8 1937 dirChooseAEverywhere->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() );
joachim99@8 1938 dirChooseBEverywhere->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() );
joachim99@8 1939 dirChooseCEverywhere->setEnabled( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() );
joachim99@8 1940
joachim99@8 1941 showWhiteSpace->setEnabled( bDiffWindowVisible );
joachim99@8 1942 autoAdvance->setEnabled( bMergeEditorVisible );
joachim99@8 1943 autoSolve->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@8 1944 unsolve->setEnabled( bMergeEditorVisible );
joachim99@8 1945 chooseA->setEnabled( bMergeEditorVisible );
joachim99@8 1946 chooseB->setEnabled( bMergeEditorVisible );
joachim99@8 1947 chooseC->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@8 1948 chooseAEverywhere->setEnabled( bMergeEditorVisible );
joachim99@8 1949 chooseBEverywhere->setEnabled( bMergeEditorVisible );
joachim99@8 1950 chooseCEverywhere->setEnabled( bMergeEditorVisible && m_bTripleDiff );
joachim99@8 1951 showWindowA->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow2->isVisible() || m_pDiffTextWindow3->isVisible() ) );
joachim99@8 1952 showWindowB->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow3->isVisible() ));
joachim99@8 1953 showWindowC->setEnabled( bDiffWindowVisible && m_bTripleDiff && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow2->isVisible() ) );
joachim99@8 1954 editFind->setEnabled( bDiffWindowVisible );
joachim99@8 1955 editFindNext->setEnabled( bDiffWindowVisible );
joachim99@8 1956 m_pFindDialog->m_pSearchInC->setEnabled( m_bTripleDiff );
joachim99@8 1957 m_pFindDialog->m_pSearchInOutput->setEnabled( bMergeEditorVisible );
joachim99@8 1958
joachim99@8 1959 bool bSavable = bMergeEditorVisible && m_pMergeResultWindow->getNrOfUnsolvedConflicts()==0;
joachim99@8 1960 fileSave->setEnabled( m_bOutputModified && bSavable );
joachim99@8 1961 fileSaveAs->setEnabled( bSavable );
joachim99@8 1962
joachim99@8 1963 goTop->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
joachim99@8 1964 goBottom->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
joachim99@8 1965 goCurrent->setEnabled( bDiffWindowVisible );
joachim99@8 1966 goPrevUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictAboveCurrent() );
joachim99@8 1967 goNextUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictBelowCurrent() );
joachim99@8 1968 goPrevConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictAboveCurrent() );
joachim99@8 1969 goNextConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictBelowCurrent() );
joachim99@8 1970 goPrevDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
joachim99@8 1971 goNextDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
joachim99@8 1972
joachim99@8 1973 winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=0 );
joachim99@8 1974 }