annotate kdiff3/src-QT4/mergeresultwindow.cpp @ 91:fa1a49fc1ec1

Fix crash on start if word wrap is on, and fix for storing utf-8 without BOM.
author joachim99
date Tue, 06 Jan 2009 22:31:57 +0000
parents fcd146072e0c
children 4e6ebbbae925
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@8 2 mergeresultwindow.cpp - description
joachim99@8 3 -------------------
joachim99@8 4 begin : Sun Apr 14 2002
joachim99@77 5 copyright : (C) 2002-2007 by Joachim Eibl
joachim99@69 6 email : joachim.eibl at gmx.de
joachim99@8 7 ***************************************************************************/
joachim99@8 8
joachim99@8 9 /***************************************************************************
joachim99@8 10 * *
joachim99@8 11 * This program is free software; you can redistribute it and/or modify *
joachim99@8 12 * it under the terms of the GNU General Public License as published by *
joachim99@8 13 * the Free Software Foundation; either version 2 of the License, or *
joachim99@8 14 * (at your option) any later version. *
joachim99@8 15 * *
joachim99@8 16 ***************************************************************************/
joachim99@8 17
joachim99@69 18 #include "mergeresultwindow.h"
joachim99@69 19 #include "optiondialog.h"
joachim99@69 20
joachim99@75 21 #include <QPainter>
joachim99@75 22 #include <QApplication>
joachim99@75 23 #include <QClipboard>
joachim99@75 24 #include <QDir>
joachim99@75 25 #include <QFile>
joachim99@75 26 #include <QCursor>
joachim99@75 27 #include <QStatusBar>
joachim99@75 28 #include <QRegExp>
joachim99@70 29 #include <QTextStream>
joachim99@70 30 #include <QKeyEvent>
joachim99@70 31 #include <QMouseEvent>
joachim99@69 32
joachim99@75 33 #include <QLineEdit>
joachim99@75 34 #include <QTextCodec>
joachim99@75 35 #include <QComboBox>
joachim99@75 36 #include <QHBoxLayout>
joachim99@75 37 #include <QLabel>
joachim99@75 38 #include <QUrl>
joachim99@80 39 //Added by qt3to4:
joachim99@80 40 #include <QTimerEvent>
joachim99@80 41 #include <QResizeEvent>
joachim99@80 42 #include <QWheelEvent>
joachim99@80 43 #include <QPixmap>
joachim99@80 44 #include <QFocusEvent>
joachim99@80 45 #include <QEvent>
joachim99@80 46 #include <QInputEvent>
joachim99@80 47 #include <QDropEvent>
joachim99@80 48 #include <QPaintEvent>
joachim99@80 49 #include <QTextStream>
joachim99@75 50
joachim99@8 51 #include <klocale.h>
joachim99@8 52 #include <kmessagebox.h>
joachim99@58 53 #include <iostream>
joachim99@8 54
joachim99@8 55 int g_bAutoSolve = true;
joachim99@8 56
joachim99@53 57 #undef leftInfoWidth
joachim99@8 58 #define leftInfoWidth 3
joachim99@8 59
joachim99@8 60 MergeResultWindow::MergeResultWindow(
joachim99@8 61 QWidget* pParent,
joachim99@66 62 OptionDialog* pOptionDialog,
joachim99@66 63 QStatusBar* pStatusBar
joachim99@8 64 )
joachim99@75 65 : QWidget( pParent )
joachim99@8 66 {
joachim99@75 67 setObjectName( "MergeResultWindow" );
joachim99@70 68 setFocusPolicy( Qt::ClickFocus );
joachim99@8 69
joachim99@8 70 m_firstLine = 0;
joachim99@8 71 m_firstColumn = 0;
joachim99@8 72 m_nofColumns = 0;
joachim99@8 73 m_nofLines = 0;
joachim99@58 74 m_totalSize = 0;
joachim99@8 75 m_bMyUpdate = false;
joachim99@8 76 m_bInsertMode = true;
joachim99@8 77 m_scrollDeltaX = 0;
joachim99@8 78 m_scrollDeltaY = 0;
joachim99@8 79 m_bModified = false;
joachim99@69 80 m_eOverviewMode=Overview::eOMNormal;
joachim99@8 81
joachim99@8 82 m_pldA = 0;
joachim99@8 83 m_pldB = 0;
joachim99@8 84 m_pldC = 0;
joachim99@69 85 m_sizeA = 0;
joachim99@69 86 m_sizeB = 0;
joachim99@69 87 m_sizeC = 0;
joachim99@8 88
joachim99@8 89 m_pDiff3LineList = 0;
joachim99@8 90 m_pTotalDiffStatus = 0;
joachim99@66 91 m_pStatusBar = pStatusBar;
joachim99@58 92
joachim99@8 93 m_pOptionDialog = pOptionDialog;
joachim99@58 94 m_bPaintingAllowed = false;
joachim99@69 95 m_delayedDrawTimer = 0;
joachim99@8 96
joachim99@8 97 m_cursorXPos=0;
joachim99@8 98 m_cursorOldXPos=0;
joachim99@8 99 m_cursorYPos=0;
joachim99@8 100 m_bCursorOn = true;
joachim99@69 101 m_bCursorUpdate = false;
joachim99@8 102 connect( &m_cursorTimer, SIGNAL(timeout()), this, SLOT( slotCursorUpdate() ) );
joachim99@75 103 m_cursorTimer.setSingleShot(true);
joachim99@75 104 m_cursorTimer.start( 500 /*ms*/ );
joachim99@8 105 m_selection.reset();
joachim99@8 106
joachim99@8 107 setMinimumSize( QSize(20,20) );
joachim99@27 108 setFont( m_pOptionDialog->m_font );
joachim99@8 109 }
joachim99@8 110
joachim99@8 111 void MergeResultWindow::init(
joachim99@69 112 const LineData* pLineDataA, int sizeA,
joachim99@69 113 const LineData* pLineDataB, int sizeB,
joachim99@69 114 const LineData* pLineDataC, int sizeC,
joachim99@8 115 const Diff3LineList* pDiff3LineList,
joachim99@75 116 TotalDiffStatus* pTotalDiffStatus
joachim99@8 117 )
joachim99@8 118 {
joachim99@8 119 m_firstLine = 0;
joachim99@8 120 m_firstColumn = 0;
joachim99@8 121 m_nofColumns = 0;
joachim99@8 122 m_nofLines = 0;
joachim99@8 123 m_bMyUpdate = false;
joachim99@8 124 m_bInsertMode = true;
joachim99@8 125 m_scrollDeltaX = 0;
joachim99@8 126 m_scrollDeltaY = 0;
joachim99@75 127 setModified( false );
joachim99@8 128
joachim99@8 129 m_pldA = pLineDataA;
joachim99@8 130 m_pldB = pLineDataB;
joachim99@8 131 m_pldC = pLineDataC;
joachim99@69 132 m_sizeA = sizeA;
joachim99@69 133 m_sizeB = sizeB;
joachim99@69 134 m_sizeC = sizeC;
joachim99@8 135
joachim99@8 136 m_pDiff3LineList = pDiff3LineList;
joachim99@8 137 m_pTotalDiffStatus = pTotalDiffStatus;
joachim99@8 138
joachim99@8 139 m_selection.reset();
joachim99@8 140 m_cursorXPos=0;
joachim99@8 141 m_cursorOldXPos=0;
joachim99@8 142 m_cursorYPos=0;
joachim99@8 143
joachim99@8 144 merge( g_bAutoSolve, -1 );
joachim99@8 145 g_bAutoSolve = true;
joachim99@8 146 update();
joachim99@66 147 updateSourceMask();
joachim99@68 148
joachim99@68 149 int wsc;
joachim99@69 150 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
joachim99@73 151 if (m_pStatusBar)
joachim99@80 152 m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
joachim99@80 153 ,nofUnsolved,wsc) );
joachim99@8 154 }
joachim99@8 155
joachim99@69 156 void MergeResultWindow::reset()
joachim99@69 157 {
joachim99@69 158 m_pDiff3LineList = 0;
joachim99@69 159 m_pTotalDiffStatus = 0;
joachim99@69 160 m_pldA = 0;
joachim99@69 161 m_pldB = 0;
joachim99@69 162 m_pldC = 0;
joachim99@69 163 }
joachim99@8 164
joachim99@8 165 // Calculate the merge information for the given Diff3Line.
joachim99@8 166 // Results will be stored in mergeDetails, bConflict, bLineRemoved and src.
joachim99@8 167 void mergeOneLine(
joachim99@8 168 const Diff3Line& d, e_MergeDetails& mergeDetails, bool& bConflict,
joachim99@8 169 bool& bLineRemoved, int& src, bool bTwoInputs
joachim99@8 170 )
joachim99@8 171 {
joachim99@8 172 mergeDetails = eDefault;
joachim99@8 173 bConflict = false;
joachim99@8 174 bLineRemoved = false;
joachim99@8 175 src = 0;
joachim99@8 176
joachim99@8 177 if ( bTwoInputs ) // Only two input files
joachim99@8 178 {
joachim99@8 179 if ( d.lineA!=-1 && d.lineB!=-1 )
joachim99@8 180 {
joachim99@8 181 if ( d.pFineAB == 0 )
joachim99@8 182 {
joachim99@8 183 mergeDetails = eNoChange; src = A;
joachim99@8 184 }
joachim99@8 185 else
joachim99@8 186 {
joachim99@8 187 mergeDetails = eBChanged; bConflict = true;
joachim99@8 188 }
joachim99@8 189 }
joachim99@8 190 else
joachim99@8 191 {
joachim99@8 192 if ( d.lineA!=-1 && d.lineB==-1 )
joachim99@8 193 {
joachim99@8 194 mergeDetails = eBDeleted; bConflict = true;
joachim99@8 195 }
joachim99@8 196 else if ( d.lineA==-1 && d.lineB!=-1 )
joachim99@8 197 {
joachim99@8 198 mergeDetails = eBDeleted; bConflict = true;
joachim99@8 199 }
joachim99@8 200 }
joachim99@8 201 return;
joachim99@8 202 }
joachim99@8 203
joachim99@8 204 // A is base.
joachim99@8 205 if ( d.lineA!=-1 && d.lineB!=-1 && d.lineC!=-1 )
joachim99@8 206 {
joachim99@8 207 if ( d.pFineAB == 0 && d.pFineBC == 0 && d.pFineCA == 0)
joachim99@8 208 {
joachim99@8 209 mergeDetails = eNoChange; src = A;
joachim99@8 210 }
joachim99@8 211 else if( d.pFineAB == 0 && d.pFineBC != 0 && d.pFineCA != 0 )
joachim99@8 212 {
joachim99@8 213 mergeDetails = eCChanged; src = C;
joachim99@8 214 }
joachim99@8 215 else if( d.pFineAB != 0 && d.pFineBC != 0 && d.pFineCA == 0 )
joachim99@8 216 {
joachim99@8 217 mergeDetails = eBChanged; src = B;
joachim99@8 218 }
joachim99@8 219 else if( d.pFineAB != 0 && d.pFineBC == 0 && d.pFineCA != 0 )
joachim99@8 220 {
joachim99@8 221 mergeDetails = eBCChangedAndEqual; src = C;
joachim99@8 222 }
joachim99@8 223 else if( d.pFineAB != 0 && d.pFineBC != 0 && d.pFineCA != 0 )
joachim99@8 224 {
joachim99@8 225 mergeDetails = eBCChanged; bConflict = true;
joachim99@8 226 }
joachim99@8 227 else
joachim99@8 228 assert(false);
joachim99@8 229 }
joachim99@8 230 else if ( d.lineA!=-1 && d.lineB!=-1 && d.lineC==-1 )
joachim99@8 231 {
joachim99@8 232 if( d.pFineAB != 0 )
joachim99@8 233 {
joachim99@8 234 mergeDetails = eBChanged_CDeleted; bConflict = true;
joachim99@8 235 }
joachim99@8 236 else
joachim99@8 237 {
joachim99@8 238 mergeDetails = eCDeleted; bLineRemoved = true; src = C;
joachim99@8 239 }
joachim99@8 240 }
joachim99@8 241 else if ( d.lineA!=-1 && d.lineB==-1 && d.lineC!=-1 )
joachim99@8 242 {
joachim99@8 243 if( d.pFineCA != 0 )
joachim99@8 244 {
joachim99@8 245 mergeDetails = eCChanged_BDeleted; bConflict = true;
joachim99@8 246 }
joachim99@8 247 else
joachim99@8 248 {
joachim99@8 249 mergeDetails = eBDeleted; bLineRemoved = true; src = B;
joachim99@8 250 }
joachim99@8 251 }
joachim99@8 252 else if ( d.lineA==-1 && d.lineB!=-1 && d.lineC!=-1 )
joachim99@8 253 {
joachim99@8 254 if( d.pFineBC != 0 )
joachim99@8 255 {
joachim99@8 256 mergeDetails = eBCAdded; bConflict = true;
joachim99@8 257 }
joachim99@8 258 else // B==C
joachim99@8 259 {
joachim99@8 260 mergeDetails = eBCAddedAndEqual; src = C;
joachim99@8 261 }
joachim99@8 262 }
joachim99@8 263 else if ( d.lineA==-1 && d.lineB==-1 && d.lineC!= -1 )
joachim99@8 264 {
joachim99@8 265 mergeDetails = eCAdded; src = C;
joachim99@8 266 }
joachim99@8 267 else if ( d.lineA==-1 && d.lineB!=-1 && d.lineC== -1 )
joachim99@8 268 {
joachim99@8 269 mergeDetails = eBAdded; src = B;
joachim99@8 270 }
joachim99@8 271 else if ( d.lineA!=-1 && d.lineB==-1 && d.lineC==-1 )
joachim99@8 272 {
joachim99@8 273 mergeDetails = eBCDeleted; bLineRemoved = true; src = C;
joachim99@8 274 }
joachim99@8 275 else
joachim99@8 276 assert(false);
joachim99@8 277 }
joachim99@8 278
joachim99@8 279 bool MergeResultWindow::sameKindCheck( const MergeLine& ml1, const MergeLine& ml2 )
joachim99@8 280 {
joachim99@8 281 if ( ml1.bConflict && ml2.bConflict )
joachim99@8 282 {
joachim99@51 283 // Both lines have conflicts: If one is only a white space conflict and
joachim99@51 284 // the other one is a real conflict, then this line returns false.
joachim99@8 285 return ml1.id3l->bAEqC == ml2.id3l->bAEqC && ml1.id3l->bAEqB == ml2.id3l->bAEqB;
joachim99@8 286 }
joachim99@8 287 else
joachim99@8 288 return (
joachim99@8 289 !ml1.bConflict && !ml2.bConflict && ml1.bDelta && ml2.bDelta && ml1.srcSelect == ml2.srcSelect ||
joachim99@8 290 !ml1.bDelta && !ml2.bDelta
joachim99@8 291 );
joachim99@8 292 }
joachim99@8 293
joachim99@51 294 void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConflictsOnly, bool bWhiteSpaceOnly )
joachim99@51 295 {
joachim99@51 296 if ( !bConflictsOnly )
joachim99@8 297 {
joachim99@51 298 if(m_bModified)
joachim99@8 299 {
joachim99@51 300 int result = KMessageBox::warningYesNo(this,
joachim99@51 301 i18n("The output has been modified.\n"
joachim99@51 302 "If you continue your changes will be lost."),
joachim99@80 303 i18n("Warning"),
joachim99@80 304 KStandardGuiItem::cont(),
joachim99@80 305 KStandardGuiItem::cancel());
joachim99@51 306 if ( result==KMessageBox::No )
joachim99@51 307 return;
joachim99@8 308 }
joachim99@8 309
joachim99@51 310 m_mergeLineList.clear();
joachim99@58 311 m_totalSize = 0;
joachim99@51 312 int lineIdx = 0;
joachim99@51 313 Diff3LineList::const_iterator it;
joachim99@51 314 for( it=m_pDiff3LineList->begin(); it!=m_pDiff3LineList->end(); ++it, ++lineIdx )
joachim99@8 315 {
joachim99@51 316 const Diff3Line& d = *it;
joachim99@51 317
joachim99@51 318 MergeLine ml;
joachim99@51 319 bool bLineRemoved;
joachim99@51 320 mergeOneLine( d, ml.mergeDetails, ml.bConflict, bLineRemoved, ml.srcSelect, m_pldC==0 );
joachim99@51 321
joachim99@51 322 // Automatic solving for only whitespace changes.
joachim99@51 323 if ( ml.bConflict &&
joachim99@51 324 ( m_pldC==0 && (d.bAEqB || d.bWhiteLineA && d.bWhiteLineB) ||
joachim99@51 325 m_pldC!=0 && (d.bAEqB && d.bAEqC || d.bWhiteLineA && d.bWhiteLineB && d.bWhiteLineC ) ) )
joachim99@51 326 {
joachim99@51 327 ml.bWhiteSpaceConflict = true;
joachim99@51 328 }
joachim99@51 329
joachim99@51 330 ml.d3lLineIdx = lineIdx;
joachim99@51 331 ml.bDelta = ml.srcSelect != A;
joachim99@51 332 ml.id3l = it;
joachim99@51 333 ml.srcRangeLength = 1;
joachim99@51 334
joachim99@51 335 MergeLine* back = m_mergeLineList.empty() ? 0 : &m_mergeLineList.back();
joachim99@51 336
joachim99@51 337 bool bSame = back!=0 && sameKindCheck( ml, *back );
joachim99@51 338 if( bSame )
joachim99@51 339 {
joachim99@51 340 ++back->srcRangeLength;
joachim99@51 341 if ( back->bWhiteSpaceConflict && !ml.bWhiteSpaceConflict )
joachim99@51 342 back->bWhiteSpaceConflict = false;
joachim99@51 343 }
joachim99@51 344 else
joachim99@51 345 {
joachim99@51 346 if (back!=0 && back->bWhiteSpaceConflict )
joachim99@51 347 {
joachim99@51 348 if ( m_pldC==0 && m_pOptionDialog->m_whiteSpace2FileMergeDefault != 0 ) // Only two inputs
joachim99@51 349 {
joachim99@51 350 back->srcSelect = m_pOptionDialog->m_whiteSpace2FileMergeDefault;
joachim99@51 351 back->bConflict = false;
joachim99@51 352 }
joachim99@51 353 else if ( m_pldC!=0 && m_pOptionDialog->m_whiteSpace3FileMergeDefault != 0 )
joachim99@51 354 {
joachim99@51 355 back->srcSelect = m_pOptionDialog->m_whiteSpace3FileMergeDefault;
joachim99@51 356 back->bConflict = false;
joachim99@51 357 }
joachim99@51 358 }
joachim99@58 359 ml.mergeEditLineList.setTotalSizePtr(&m_totalSize);
joachim99@51 360 m_mergeLineList.push_back( ml );
joachim99@51 361 }
joachim99@51 362
joachim99@51 363 if ( ! ml.bConflict )
joachim99@51 364 {
joachim99@51 365 MergeLine& tmpBack = m_mergeLineList.back();
joachim99@69 366 MergeEditLine mel(ml.id3l);
joachim99@69 367 mel.setSource( ml.srcSelect, bLineRemoved );
joachim99@51 368 tmpBack.mergeEditLineList.push_back(mel);
joachim99@51 369 }
joachim99@51 370 else if ( back==0 || ! back->bConflict || !bSame )
joachim99@51 371 {
joachim99@51 372 MergeLine& tmpBack = m_mergeLineList.back();
joachim99@69 373 MergeEditLine mel(ml.id3l);
joachim99@51 374 mel.setConflict();
joachim99@51 375 tmpBack.mergeEditLineList.push_back(mel);
joachim99@51 376 }
joachim99@8 377 }
joachim99@8 378 }
joachim99@8 379
joachim99@8 380 if ( !bAutoSolve )
joachim99@8 381 {
joachim99@8 382 // Change all auto selections
joachim99@8 383 MergeLineList::iterator mlIt;
joachim99@8 384 for( mlIt=m_mergeLineList.begin(); mlIt!=m_mergeLineList.end(); ++mlIt )
joachim99@8 385 {
joachim99@8 386 MergeLine& ml = *mlIt;
joachim99@51 387 bool bConflict = ml.mergeEditLineList.empty() || ml.mergeEditLineList.begin()->isConflict();
joachim99@51 388 if ( ml.bDelta && ( !bConflictsOnly || bConflict ) && (!bWhiteSpaceOnly || ml.bWhiteSpaceConflict ))
joachim99@8 389 {
joachim99@8 390 ml.mergeEditLineList.clear();
joachim99@8 391 if ( defaultSelector==-1 && ml.bDelta )
joachim99@8 392 {
joachim99@69 393 MergeEditLine mel(ml.id3l);;
joachim99@8 394 mel.setConflict();
joachim99@8 395 ml.bConflict = true;
joachim99@8 396 ml.mergeEditLineList.push_back(mel);
joachim99@8 397 }
joachim99@8 398 else
joachim99@8 399 {
joachim99@8 400 Diff3LineList::const_iterator d3llit=ml.id3l;
joachim99@8 401 int j;
joachim99@8 402
joachim99@8 403 for( j=0; j<ml.srcRangeLength; ++j )
joachim99@8 404 {
joachim99@69 405 MergeEditLine mel(d3llit);
joachim99@69 406 mel.setSource( defaultSelector, false );
joachim99@51 407
joachim99@8 408 int srcLine = defaultSelector==1 ? d3llit->lineA :
joachim99@8 409 defaultSelector==2 ? d3llit->lineB :
joachim99@8 410 defaultSelector==3 ? d3llit->lineC : -1;
joachim99@51 411
joachim99@8 412 if ( srcLine != -1 )
joachim99@8 413 {
joachim99@8 414 ml.mergeEditLineList.push_back(mel);
joachim99@8 415 }
joachim99@8 416
joachim99@8 417 ++d3llit;
joachim99@8 418 }
joachim99@8 419
joachim99@8 420 if ( ml.mergeEditLineList.empty() ) // Make a line nevertheless
joachim99@8 421 {
joachim99@69 422 MergeEditLine mel(ml.id3l);
joachim99@8 423 mel.setRemoved( defaultSelector );
joachim99@8 424 ml.mergeEditLineList.push_back(mel);
joachim99@8 425 }
joachim99@8 426 }
joachim99@8 427 }
joachim99@8 428 }
joachim99@8 429 }
joachim99@8 430
joachim99@8 431 MergeLineList::iterator mlIt;
joachim99@8 432 for( mlIt=m_mergeLineList.begin(); mlIt!=m_mergeLineList.end(); ++mlIt )
joachim99@8 433 {
joachim99@8 434 MergeLine& ml = *mlIt;
joachim99@8 435 // Remove all lines that are empty, because no src lines are there.
joachim99@8 436
joachim99@8 437 int oldSrcLine = -1;
joachim99@8 438 int oldSrc = -1;
joachim99@8 439 MergeEditLineList::iterator melIt;
joachim99@8 440 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); )
joachim99@8 441 {
joachim99@8 442 MergeEditLine& mel = *melIt;
joachim99@8 443 int melsrc = mel.src();
joachim99@8 444
joachim99@69 445 int srcLine = mel.isRemoved() ? -1 :
joachim99@69 446 melsrc==1 ? mel.id3l()->lineA :
joachim99@8 447 melsrc==2 ? mel.id3l()->lineB :
joachim99@8 448 melsrc==3 ? mel.id3l()->lineC : -1;
joachim99@8 449
joachim99@69 450 // At least one line remains because oldSrc != melsrc for first line in list
joachim99@69 451 // Other empty lines will be removed
joachim99@8 452 if ( srcLine == -1 && oldSrcLine==-1 && oldSrc == melsrc )
joachim99@8 453 melIt = ml.mergeEditLineList.erase( melIt );
joachim99@8 454 else
joachim99@8 455 ++melIt;
joachim99@8 456
joachim99@8 457 oldSrcLine = srcLine;
joachim99@8 458 oldSrc = melsrc;
joachim99@8 459 }
joachim99@8 460 }
joachim99@8 461
joachim99@69 462 if ( bAutoSolve && !bConflictsOnly )
joachim99@69 463 {
joachim99@69 464 if ( m_pOptionDialog->m_bRunHistoryAutoMergeOnMergeStart )
joachim99@69 465 slotMergeHistory();
joachim99@69 466 if ( m_pOptionDialog->m_bRunRegExpAutoMergeOnMergeStart )
joachim99@69 467 slotRegExpAutoMerge();
joachim99@69 468 if ( m_pldC != 0 && ! doRelevantChangesExist() )
joachim99@69 469 emit noRelevantChangesDetected();
joachim99@69 470 }
joachim99@69 471
joachim99@66 472 int nrOfSolvedConflicts = 0;
joachim99@66 473 int nrOfUnsolvedConflicts = 0;
joachim99@66 474 int nrOfWhiteSpaceConflicts = 0;
joachim99@66 475
joachim99@66 476 MergeLineList::iterator i;
joachim99@66 477 for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@66 478 {
joachim99@66 479 if ( i->bConflict )
joachim99@66 480 ++nrOfUnsolvedConflicts;
joachim99@66 481 else if ( i->bDelta )
joachim99@66 482 ++nrOfSolvedConflicts;
joachim99@68 483
joachim99@66 484 if ( i->bWhiteSpaceConflict )
joachim99@66 485 ++nrOfWhiteSpaceConflicts;
joachim99@66 486 }
joachim99@68 487
joachim99@66 488 m_pTotalDiffStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts;
joachim99@66 489 m_pTotalDiffStatus->nofSolvedConflicts = nrOfSolvedConflicts;
joachim99@66 490 m_pTotalDiffStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts;
joachim99@66 491
joachim99@66 492
joachim99@8 493 m_cursorXPos=0;
joachim99@8 494 m_cursorOldXPos=0;
joachim99@8 495 m_cursorYPos=0;
joachim99@66 496 //m_firstLine = 0; // Must not set line/column without scrolling there
joachim99@66 497 //m_firstColumn = 0;
joachim99@51 498
joachim99@75 499 setModified(false);
joachim99@66 500
joachim99@66 501 m_currentMergeLineIt = m_mergeLineList.begin();
joachim99@66 502 slotGoTop();
joachim99@66 503
joachim99@8 504 updateAvailabilities();
joachim99@8 505 update();
joachim99@8 506 }
joachim99@8 507
joachim99@8 508 void MergeResultWindow::setFirstLine(int firstLine)
joachim99@8 509 {
joachim99@8 510 m_firstLine = max2(0,firstLine);
joachim99@8 511 update();
joachim99@8 512 }
joachim99@8 513
joachim99@8 514 void MergeResultWindow::setFirstColumn(int firstCol)
joachim99@8 515 {
joachim99@8 516 m_firstColumn = max2(0,firstCol);
joachim99@8 517 update();
joachim99@8 518 }
joachim99@8 519
joachim99@8 520 int MergeResultWindow::getNofColumns()
joachim99@8 521 {
joachim99@8 522 return m_nofColumns;
joachim99@8 523 }
joachim99@8 524
joachim99@8 525 int MergeResultWindow::getNofLines()
joachim99@8 526 {
joachim99@58 527 return m_totalSize;
joachim99@8 528 }
joachim99@8 529
joachim99@8 530 int MergeResultWindow::getNofVisibleColumns()
joachim99@8 531 {
joachim99@8 532 QFontMetrics fm = fontMetrics();
joachim99@8 533 return width()/fm.width('W')-4;
joachim99@8 534 }
joachim99@8 535
joachim99@8 536 int MergeResultWindow::getNofVisibleLines()
joachim99@8 537 {
joachim99@8 538 QFontMetrics fm = fontMetrics();
joachim99@8 539 return (height()-3)/fm.height()-2;
joachim99@8 540 }
joachim99@8 541
joachim99@8 542 void MergeResultWindow::resizeEvent( QResizeEvent* e )
joachim99@8 543 {
joachim99@8 544 QWidget::resizeEvent(e);
joachim99@8 545 emit resizeSignal();
joachim99@8 546 }
joachim99@8 547
joachim99@69 548 Overview::e_OverviewMode MergeResultWindow::getOverviewMode()
joachim99@69 549 {
joachim99@69 550 return m_eOverviewMode;
joachim99@69 551 }
joachim99@69 552
joachim99@69 553 void MergeResultWindow::setOverviewMode( Overview::e_OverviewMode eOverviewMode )
joachim99@69 554 {
joachim99@69 555 m_eOverviewMode = eOverviewMode;
joachim99@69 556 }
joachim99@69 557
joachim99@69 558 // Check whether we should ignore current delta when moving to next/previous delta
joachim99@69 559 bool MergeResultWindow::checkOverviewIgnore(MergeLineList::iterator &i)
joachim99@69 560 {
joachim99@69 561 if (m_eOverviewMode == Overview::eOMNormal) return false;
joachim99@69 562 if (m_eOverviewMode == Overview::eOMAvsB)
joachim99@69 563 return i->mergeDetails == eCAdded || i->mergeDetails == eCDeleted || i->mergeDetails == eCChanged;
joachim99@69 564 if (m_eOverviewMode == Overview::eOMAvsC)
joachim99@69 565 return i->mergeDetails == eBAdded || i->mergeDetails == eBDeleted || i->mergeDetails == eBChanged;
joachim99@69 566 if (m_eOverviewMode == Overview::eOMBvsC)
joachim99@69 567 return i->mergeDetails == eBCAddedAndEqual || i->mergeDetails == eBCDeleted || i->mergeDetails == eBCChangedAndEqual;
joachim99@69 568 return false;
joachim99@69 569 }
joachim99@69 570
joachim99@8 571 // Go to prev/next delta/conflict or first/last delta.
joachim99@8 572 void MergeResultWindow::go( e_Direction eDir, e_EndPoint eEndPoint )
joachim99@8 573 {
joachim99@8 574 assert( eDir==eUp || eDir==eDown );
joachim99@8 575 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@51 576 bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace;
joachim99@8 577 if( eEndPoint==eEnd )
joachim99@8 578 {
joachim99@8 579 if (eDir==eUp) i = m_mergeLineList.begin(); // first mergeline
joachim99@8 580 else i = --m_mergeLineList.end(); // last mergeline
joachim99@8 581
joachim99@77 582 while ( isItAtEnd(eDir==eUp, i) && ! i->bDelta )
joachim99@8 583 {
joachim99@8 584 if ( eDir==eUp ) ++i; // search downwards
joachim99@8 585 else --i; // search upwards
joachim99@8 586 }
joachim99@8 587 }
joachim99@77 588 else if ( eEndPoint == eDelta && isItAtEnd(eDir!=eUp, i) )
joachim99@8 589 {
joachim99@8 590 do
joachim99@8 591 {
joachim99@8 592 if ( eDir==eUp ) --i;
joachim99@8 593 else ++i;
joachim99@8 594 }
joachim99@77 595 while ( isItAtEnd(eDir!=eUp, i) && ( i->bDelta == false || checkOverviewIgnore(i) || bSkipWhiteConflicts && i->bWhiteSpaceConflict ) );
joachim99@8 596 }
joachim99@77 597 else if ( eEndPoint == eConflict && isItAtEnd(eDir!=eUp, i) )
joachim99@8 598 {
joachim99@8 599 do
joachim99@8 600 {
joachim99@8 601 if ( eDir==eUp ) --i;
joachim99@8 602 else ++i;
joachim99@8 603 }
joachim99@77 604 while ( isItAtEnd(eDir!=eUp, i) && (i->bConflict == false || bSkipWhiteConflicts && i->bWhiteSpaceConflict ) );
joachim99@8 605 }
joachim99@77 606 else if ( isItAtEnd(eDir!=eUp, i) && eEndPoint == eUnsolvedConflict )
joachim99@8 607 {
joachim99@8 608 do
joachim99@8 609 {
joachim99@8 610 if ( eDir==eUp ) --i;
joachim99@8 611 else ++i;
joachim99@8 612 }
joachim99@77 613 while ( isItAtEnd(eDir!=eUp, i) && ! i->mergeEditLineList.begin()->isConflict() );
joachim99@8 614 }
joachim99@8 615
joachim99@53 616 if ( isVisible() )
joachim99@53 617 setFocus();
joachim99@68 618
joachim99@66 619 setFastSelector( i );
joachim99@8 620 }
joachim99@8 621
joachim99@8 622 bool MergeResultWindow::isDeltaAboveCurrent()
joachim99@8 623 {
joachim99@51 624 bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace;
joachim99@66 625 if (m_mergeLineList.empty()) return false;
joachim99@8 626 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@66 627 if (i == m_mergeLineList.begin()) return false;
joachim99@66 628 do
joachim99@8 629 {
joachim99@66 630 --i;
joachim99@77 631 if ( i->bDelta && !checkOverviewIgnore(i) && !( bSkipWhiteConflicts && i->bWhiteSpaceConflict ) ) return true;
joachim99@68 632 }
joachim99@66 633 while (i!=m_mergeLineList.begin());
joachim99@68 634
joachim99@8 635 return false;
joachim99@8 636 }
joachim99@8 637
joachim99@8 638 bool MergeResultWindow::isDeltaBelowCurrent()
joachim99@8 639 {
joachim99@51 640 bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace;
joachim99@66 641 if (m_mergeLineList.empty()) return false;
joachim99@68 642
joachim99@8 643 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@66 644 if (i!=m_mergeLineList.end())
joachim99@8 645 {
joachim99@66 646 ++i;
joachim99@66 647 for( ; i!=m_mergeLineList.end(); ++i )
joachim99@66 648 {
joachim99@77 649 if ( i->bDelta && !checkOverviewIgnore(i) && !( bSkipWhiteConflicts && i->bWhiteSpaceConflict ) ) return true;
joachim99@66 650 }
joachim99@8 651 }
joachim99@8 652 return false;
joachim99@8 653 }
joachim99@8 654
joachim99@8 655 bool MergeResultWindow::isConflictAboveCurrent()
joachim99@8 656 {
joachim99@66 657 if (m_mergeLineList.empty()) return false;
joachim99@8 658 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@66 659 if (i == m_mergeLineList.begin()) return false;
joachim99@68 660
joachim99@77 661 bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace;
joachim99@77 662
joachim99@66 663 do
joachim99@8 664 {
joachim99@66 665 --i;
joachim99@77 666 if ( i->bConflict && !(bSkipWhiteConflicts && i->bWhiteSpaceConflict) ) return true;
joachim99@66 667 }
joachim99@66 668 while (i!=m_mergeLineList.begin());
joachim99@66 669
joachim99@8 670 return false;
joachim99@8 671 }
joachim99@8 672
joachim99@8 673 bool MergeResultWindow::isConflictBelowCurrent()
joachim99@8 674 {
joachim99@8 675 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@66 676 if (m_mergeLineList.empty()) return false;
joachim99@77 677
joachim99@77 678 bool bSkipWhiteConflicts = ! m_pOptionDialog->m_bShowWhiteSpace;
joachim99@77 679
joachim99@66 680 if (i!=m_mergeLineList.end())
joachim99@8 681 {
joachim99@66 682 ++i;
joachim99@66 683 for( ; i!=m_mergeLineList.end(); ++i )
joachim99@66 684 {
joachim99@77 685 if ( i->bConflict && !(bSkipWhiteConflicts && i->bWhiteSpaceConflict) ) return true;
joachim99@66 686 }
joachim99@8 687 }
joachim99@69 688 return false;
joachim99@8 689 }
joachim99@8 690
joachim99@77 691 bool MergeResultWindow::isUnsolvedConflictAtCurrent()
joachim99@77 692 {
joachim99@77 693 if (m_mergeLineList.empty()) return false;
joachim99@77 694 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@77 695 return i->mergeEditLineList.begin()->isConflict();
joachim99@77 696 }
joachim99@77 697
joachim99@8 698 bool MergeResultWindow::isUnsolvedConflictAboveCurrent()
joachim99@8 699 {
joachim99@66 700 if (m_mergeLineList.empty()) return false;
joachim99@8 701 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@66 702 if (i == m_mergeLineList.begin()) return false;
joachim99@66 703
joachim99@66 704 do
joachim99@8 705 {
joachim99@66 706 --i;
joachim99@8 707 if ( i->mergeEditLineList.begin()->isConflict() ) return true;
joachim99@66 708 }
joachim99@66 709 while (i!=m_mergeLineList.begin());
joachim99@66 710
joachim99@8 711 return false;
joachim99@8 712 }
joachim99@8 713
joachim99@8 714 bool MergeResultWindow::isUnsolvedConflictBelowCurrent()
joachim99@8 715 {
joachim99@8 716 MergeLineList::iterator i = m_currentMergeLineIt;
joachim99@66 717 if (m_mergeLineList.empty()) return false;
joachim99@66 718
joachim99@66 719 if (i!=m_mergeLineList.end())
joachim99@8 720 {
joachim99@66 721 ++i;
joachim99@66 722 for( ; i!=m_mergeLineList.end(); ++i )
joachim99@66 723 {
joachim99@66 724 if ( i->mergeEditLineList.begin()->isConflict() ) return true;
joachim99@66 725 }
joachim99@8 726 }
joachim99@8 727 return false;
joachim99@8 728 }
joachim99@8 729
joachim99@8 730 void MergeResultWindow::slotGoTop()
joachim99@8 731 {
joachim99@8 732 go( eUp, eEnd );
joachim99@8 733 }
joachim99@8 734
joachim99@8 735 void MergeResultWindow::slotGoCurrent()
joachim99@8 736 {
joachim99@8 737 setFastSelector( m_currentMergeLineIt );
joachim99@8 738 }
joachim99@8 739
joachim99@8 740 void MergeResultWindow::slotGoBottom()
joachim99@8 741 {
joachim99@8 742 go( eDown, eEnd );
joachim99@8 743 }
joachim99@8 744
joachim99@8 745 void MergeResultWindow::slotGoPrevDelta()
joachim99@8 746 {
joachim99@8 747 go( eUp, eDelta );
joachim99@8 748 }
joachim99@8 749
joachim99@8 750 void MergeResultWindow::slotGoNextDelta()
joachim99@8 751 {
joachim99@8 752 go( eDown, eDelta );
joachim99@8 753 }
joachim99@8 754
joachim99@8 755 void MergeResultWindow::slotGoPrevConflict()
joachim99@8 756 {
joachim99@8 757 go( eUp, eConflict );
joachim99@8 758 }
joachim99@8 759
joachim99@8 760 void MergeResultWindow::slotGoNextConflict()
joachim99@8 761 {
joachim99@8 762 go( eDown, eConflict );
joachim99@8 763 }
joachim99@8 764
joachim99@8 765 void MergeResultWindow::slotGoPrevUnsolvedConflict()
joachim99@8 766 {
joachim99@8 767 go( eUp, eUnsolvedConflict );
joachim99@8 768 }
joachim99@8 769
joachim99@8 770 void MergeResultWindow::slotGoNextUnsolvedConflict()
joachim99@8 771 {
joachim99@8 772 go( eDown, eUnsolvedConflict );
joachim99@8 773 }
joachim99@8 774
joachim99@8 775 /** The line is given as a index in the Diff3LineList.
joachim99@8 776 The function calculates the corresponding iterator. */
joachim99@8 777 void MergeResultWindow::slotSetFastSelectorLine( int line )
joachim99@8 778 {
joachim99@8 779 MergeLineList::iterator i;
joachim99@8 780 for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@8 781 {
joachim99@8 782 if ( line>=i->d3lLineIdx && line < i->d3lLineIdx + i->srcRangeLength )
joachim99@8 783 {
joachim99@68 784 //if ( i->bDelta )
joachim99@8 785 {
joachim99@8 786 setFastSelector( i );
joachim99@8 787 }
joachim99@8 788 break;
joachim99@8 789 }
joachim99@8 790 }
joachim99@8 791 }
joachim99@8 792
joachim99@68 793 int MergeResultWindow::getNrOfUnsolvedConflicts( int* pNrOfWhiteSpaceConflicts )
joachim99@8 794 {
joachim99@8 795 int nrOfUnsolvedConflicts = 0;
joachim99@68 796 if (pNrOfWhiteSpaceConflicts!=0)
joachim99@68 797 *pNrOfWhiteSpaceConflicts = 0;
joachim99@8 798
joachim99@8 799 MergeLineList::iterator mlIt = m_mergeLineList.begin();
joachim99@8 800 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 801 {
joachim99@8 802 MergeLine& ml = *mlIt;
joachim99@8 803 MergeEditLineList::iterator melIt = ml.mergeEditLineList.begin();
joachim99@8 804 if ( melIt->isConflict() )
joachim99@68 805 {
joachim99@8 806 ++nrOfUnsolvedConflicts;
joachim99@68 807 if ( ml.bWhiteSpaceConflict && pNrOfWhiteSpaceConflicts!=0 )
joachim99@68 808 ++ *pNrOfWhiteSpaceConflicts;
joachim99@68 809 }
joachim99@8 810 }
joachim99@8 811
joachim99@8 812 return nrOfUnsolvedConflicts;
joachim99@8 813 }
joachim99@8 814
joachim99@8 815 void MergeResultWindow::showNrOfConflicts()
joachim99@8 816 {
joachim99@80 817 if (!m_pOptionDialog->m_bShowInfoDialogs)
joachim99@80 818 return;
joachim99@69 819 int nrOfConflicts = 0;
joachim99@8 820 MergeLineList::iterator i;
joachim99@8 821 for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@8 822 {
joachim99@69 823 if ( i->bConflict || i->bDelta )
joachim99@69 824 ++nrOfConflicts;
joachim99@8 825 }
joachim99@8 826 QString totalInfo;
joachim99@8 827 if ( m_pTotalDiffStatus->bBinaryAEqB && m_pTotalDiffStatus->bBinaryAEqC )
joachim99@8 828 totalInfo += i18n("All input files are binary equal.");
joachim99@8 829 else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC )
joachim99@8 830 totalInfo += i18n("All input files contain the same text.");
joachim99@8 831 else {
joachim99@80 832 if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("B"));
joachim99@80 833 else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n",QString("A"),QString("B"));
joachim99@80 834 if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("A"),QString("C"));
joachim99@80 835 else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n",QString("A"),QString("C"));
joachim99@80 836 if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n",QString("B"),QString("C"));
joachim99@80 837 else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n",QString("B"),QString("C"));
joachim99@8 838 }
joachim99@69 839
joachim99@69 840 int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts();
joachim99@69 841
joachim99@8 842 KMessageBox::information( this,
joachim99@69 843 i18n("Total number of conflicts: ") + QString::number(nrOfConflicts) +
joachim99@69 844 i18n("\nNr of automatically solved conflicts: ") + QString::number(nrOfConflicts-nrOfUnsolvedConflicts) +
joachim99@8 845 i18n("\nNr of unsolved conflicts: ") + QString::number(nrOfUnsolvedConflicts) +
joachim99@8 846 "\n"+totalInfo,
joachim99@8 847 i18n("Conflicts")
joachim99@8 848 );
joachim99@8 849 }
joachim99@8 850
joachim99@8 851 void MergeResultWindow::setFastSelector(MergeLineList::iterator i)
joachim99@8 852 {
joachim99@8 853 if ( i==m_mergeLineList.end() )
joachim99@8 854 return;
joachim99@8 855 m_currentMergeLineIt = i;
joachim99@8 856 emit setFastSelectorRange( i->d3lLineIdx, i->srcRangeLength );
joachim99@8 857
joachim99@8 858 int line1 = 0;
joachim99@8 859
joachim99@8 860 MergeLineList::iterator mlIt = m_mergeLineList.begin();
joachim99@8 861 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 862 {
joachim99@8 863 if(mlIt==m_currentMergeLineIt)
joachim99@8 864 break;
joachim99@8 865 line1 += mlIt->mergeEditLineList.size();
joachim99@8 866 }
joachim99@8 867
joachim99@8 868 int nofLines = m_currentMergeLineIt->mergeEditLineList.size();
joachim99@8 869 int newFirstLine = getBestFirstLine( line1, nofLines, m_firstLine, getNofVisibleLines() );
joachim99@8 870 if ( newFirstLine != m_firstLine )
joachim99@8 871 {
joachim99@8 872 scroll( 0, newFirstLine - m_firstLine );
joachim99@8 873 }
joachim99@8 874
joachim99@8 875 if ( m_selection.isEmpty() )
joachim99@8 876 {
joachim99@8 877 m_cursorXPos = 0;
joachim99@8 878 m_cursorOldXPos = 0;
joachim99@8 879 m_cursorYPos = line1;
joachim99@8 880 }
joachim99@8 881
joachim99@8 882 update();
joachim99@66 883 updateSourceMask();
joachim99@8 884 emit updateAvailabilities();
joachim99@8 885 }
joachim99@8 886
joachim99@8 887 void MergeResultWindow::choose( int selector )
joachim99@8 888 {
joachim99@66 889 if ( m_currentMergeLineIt==m_mergeLineList.end() )
joachim99@66 890 return;
joachim99@68 891
joachim99@8 892 setModified();
joachim99@8 893
joachim99@8 894 // First find range for which this change works.
joachim99@8 895 MergeLine& ml = *m_currentMergeLineIt;
joachim99@8 896
joachim99@8 897 MergeEditLineList::iterator melIt;
joachim99@8 898
joachim99@8 899 // Now check if selector is active for this range already.
joachim99@8 900 bool bActive = false;
joachim99@8 901
joachim99@8 902 // Remove unneeded lines in the range.
joachim99@8 903 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); )
joachim99@8 904 {
joachim99@8 905 MergeEditLine& mel = *melIt;
joachim99@8 906 if ( mel.src()==selector )
joachim99@8 907 bActive = true;
joachim99@8 908
joachim99@8 909 if ( mel.src()==selector || !mel.isEditableText() || mel.isModified() )
joachim99@8 910 melIt = ml.mergeEditLineList.erase( melIt );
joachim99@8 911 else
joachim99@8 912 ++melIt;
joachim99@8 913 }
joachim99@8 914
joachim99@8 915 if ( !bActive ) // Selected source wasn't active.
joachim99@8 916 { // Append the lines from selected source here at rangeEnd.
joachim99@8 917 Diff3LineList::const_iterator d3llit=ml.id3l;
joachim99@8 918 int j;
joachim99@8 919
joachim99@8 920 for( j=0; j<ml.srcRangeLength; ++j )
joachim99@8 921 {
joachim99@69 922 MergeEditLine mel(d3llit);
joachim99@69 923 mel.setSource( selector, false );
joachim99@8 924 ml.mergeEditLineList.push_back(mel);
joachim99@8 925
joachim99@8 926 ++d3llit;
joachim99@8 927 }
joachim99@8 928 }
joachim99@8 929
joachim99@8 930 if ( ! ml.mergeEditLineList.empty() )
joachim99@8 931 {
joachim99@8 932 // Remove all lines that are empty, because no src lines are there.
joachim99@8 933 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); )
joachim99@8 934 {
joachim99@8 935 MergeEditLine& mel = *melIt;
joachim99@8 936
joachim99@8 937 int srcLine = mel.src()==1 ? mel.id3l()->lineA :
joachim99@8 938 mel.src()==2 ? mel.id3l()->lineB :
joachim99@8 939 mel.src()==3 ? mel.id3l()->lineC : -1;
joachim99@8 940
joachim99@8 941 if ( srcLine == -1 )
joachim99@8 942 melIt = ml.mergeEditLineList.erase( melIt );
joachim99@8 943 else
joachim99@8 944 ++melIt;
joachim99@8 945 }
joachim99@8 946 }
joachim99@8 947
joachim99@8 948 if ( ml.mergeEditLineList.empty() )
joachim99@8 949 {
joachim99@8 950 // Insert a dummy line:
joachim99@69 951 MergeEditLine mel(ml.id3l);
joachim99@8 952
joachim99@8 953 if ( bActive ) mel.setConflict(); // All src entries deleted => conflict
joachim99@8 954 else mel.setRemoved(selector); // No lines in corresponding src found.
joachim99@8 955
joachim99@8 956 ml.mergeEditLineList.push_back(mel);
joachim99@8 957 }
joachim99@68 958
joachim99@58 959 if ( m_cursorYPos >= m_totalSize )
joachim99@58 960 {
joachim99@58 961 m_cursorYPos = m_totalSize-1;
joachim99@58 962 m_cursorXPos = 0;
joachim99@58 963 }
joachim99@8 964
joachim99@8 965 update();
joachim99@66 966 updateSourceMask();
joachim99@8 967 emit updateAvailabilities();
joachim99@68 968 int wsc;
joachim99@69 969 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
joachim99@80 970 m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
joachim99@80 971 ,nofUnsolved,wsc) );
joachim99@8 972 }
joachim99@8 973
joachim99@51 974 // bConflictsOnly: automatically choose for conflicts only (true) or for everywhere (false)
joachim99@51 975 void MergeResultWindow::chooseGlobal(int selector, bool bConflictsOnly, bool bWhiteSpaceOnly )
joachim99@8 976 {
joachim99@8 977 resetSelection();
joachim99@8 978
joachim99@51 979 merge( false, selector, bConflictsOnly, bWhiteSpaceOnly );
joachim99@75 980 setModified( true );
joachim99@8 981 update();
joachim99@68 982 int wsc;
joachim99@69 983 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
joachim99@80 984 m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
joachim99@80 985 ,nofUnsolved,wsc) );
joachim99@8 986 }
joachim99@8 987
joachim99@8 988 void MergeResultWindow::slotAutoSolve()
joachim99@8 989 {
joachim99@8 990 resetSelection();
joachim99@8 991 merge( true, -1 );
joachim99@75 992 setModified( true );
joachim99@8 993 update();
joachim99@68 994 int wsc;
joachim99@69 995 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
joachim99@80 996 m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
joachim99@80 997 ,nofUnsolved,wsc) );
joachim99@8 998 }
joachim99@8 999
joachim99@8 1000 void MergeResultWindow::slotUnsolve()
joachim99@8 1001 {
joachim99@8 1002 resetSelection();
joachim99@8 1003 merge( false, -1 );
joachim99@75 1004 setModified( true );
joachim99@8 1005 update();
joachim99@68 1006 int wsc;
joachim99@69 1007 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
joachim99@80 1008 m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
joachim99@80 1009 ,nofUnsolved,wsc) );
joachim99@69 1010 }
joachim99@69 1011
joachim99@77 1012 static QString calcHistoryLead(const QString& s )
joachim99@77 1013 {
joachim99@77 1014 // Return the start of the line until the first white char after the first non white char.
joachim99@77 1015 int i;
joachim99@77 1016 for( i=0; i<s.length(); ++i )
joachim99@77 1017 {
joachim99@77 1018 if (s[i]!=' ' && s[i]!='\t')
joachim99@77 1019 {
joachim99@77 1020 for( ; i<s.length(); ++i )
joachim99@77 1021 {
joachim99@77 1022 if (s[i]==' ' || s[i]=='\t')
joachim99@77 1023 {
joachim99@77 1024 return s.left(i);
joachim99@77 1025 }
joachim99@77 1026 }
joachim99@77 1027 return s; // Very unlikely
joachim99@77 1028 }
joachim99@77 1029 }
joachim99@77 1030 return ""; // Must be an empty string, not a null string.
joachim99@77 1031 }
joachim99@77 1032
joachim99@77 1033 static void findHistoryRange( const QRegExp& historyStart, bool bThreeFiles, const Diff3LineList* pD3LList,
joachim99@69 1034 Diff3LineList::const_iterator& iBegin, Diff3LineList::const_iterator& iEnd, int& idxBegin, int& idxEnd )
joachim99@69 1035 {
joachim99@69 1036 QString historyLead;
joachim99@69 1037 // Search for start of history
joachim99@69 1038 for( iBegin = pD3LList->begin(), idxBegin=0; iBegin!=pD3LList->end(); ++iBegin, ++idxBegin )
joachim99@69 1039 {
joachim99@69 1040 if ( historyStart.exactMatch( iBegin->getString(A) ) &&
joachim99@69 1041 historyStart.exactMatch( iBegin->getString(B) ) &&
joachim99@69 1042 ( !bThreeFiles || historyStart.exactMatch( iBegin->getString(C) ) ) )
joachim99@69 1043 {
joachim99@77 1044 historyLead = calcHistoryLead( iBegin->getString(A) );
joachim99@69 1045 break;
joachim99@69 1046 }
joachim99@69 1047 }
joachim99@69 1048 // Search for end of history
joachim99@69 1049 for( iEnd = iBegin, idxEnd = idxBegin; iEnd!=pD3LList->end(); ++iEnd, ++idxEnd )
joachim99@69 1050 {
joachim99@69 1051 QString sA = iEnd->getString(A);
joachim99@69 1052 QString sB = iEnd->getString(B);
joachim99@69 1053 QString sC = iEnd->getString(C);
joachim99@77 1054 if ( ! ((sA.isNull() || historyLead == calcHistoryLead(sA) ) &&
joachim99@77 1055 (sB.isNull() || historyLead == calcHistoryLead(sB) ) &&
joachim99@77 1056 (!bThreeFiles || sC.isNull() || historyLead == calcHistoryLead(sC) )
joachim99@69 1057 ))
joachim99@69 1058 {
joachim99@69 1059 break; // End of the history
joachim99@69 1060 }
joachim99@69 1061 }
joachim99@69 1062 }
joachim99@69 1063
joachim99@69 1064 bool findParenthesesGroups( const QString& s, QStringList& sl )
joachim99@69 1065 {
joachim99@69 1066 sl.clear();
joachim99@69 1067 int i=0;
joachim99@69 1068 std::list<int> startPosStack;
joachim99@69 1069 int length = s.length();
joachim99@69 1070 for( i=0; i<length; ++i )
joachim99@69 1071 {
joachim99@69 1072 if ( s[i]=='\\' && i+1<length && ( s[i+1]=='\\' || s[i+1]=='(' || s[i+1]==')' ) )
joachim99@69 1073 {
joachim99@69 1074 ++i;
joachim99@69 1075 continue;
joachim99@69 1076 }
joachim99@69 1077 if ( s[i]=='(' )
joachim99@69 1078 {
joachim99@69 1079 startPosStack.push_back(i);
joachim99@69 1080 }
joachim99@69 1081 else if ( s[i]==')' )
joachim99@69 1082 {
joachim99@69 1083 if (startPosStack.empty())
joachim99@69 1084 return false; // Parentheses don't match
joachim99@69 1085 int startPos = startPosStack.back();
joachim99@69 1086 startPosStack.pop_back();
joachim99@69 1087 sl.push_back( s.mid( startPos+1, i-startPos-1 ) );
joachim99@69 1088 }
joachim99@69 1089 }
joachim99@69 1090 return startPosStack.empty(); // false if parentheses don't match
joachim99@69 1091 }
joachim99@69 1092
joachim99@69 1093 QString calcHistorySortKey( const QString& keyOrder, QRegExp& matchedRegExpr, const QStringList& parenthesesGroupList )
joachim99@69 1094 {
joachim99@75 1095 QStringList keyOrderList = keyOrder.split(',');
joachim99@69 1096 QString key;
joachim99@69 1097 for ( QStringList::iterator keyIt = keyOrderList.begin(); keyIt!=keyOrderList.end(); ++keyIt )
joachim99@69 1098 {
joachim99@69 1099 if ( (*keyIt).isEmpty() )
joachim99@69 1100 continue;
joachim99@69 1101 bool bOk=false;
joachim99@69 1102 int groupIdx = (*keyIt).toInt(&bOk);
joachim99@69 1103 if (!bOk || groupIdx<0 || groupIdx >(int)parenthesesGroupList.size() )
joachim99@69 1104 continue;
joachim99@69 1105 QString s = matchedRegExpr.cap( groupIdx );
joachim99@69 1106 if ( groupIdx == 0 )
joachim99@69 1107 {
joachim99@69 1108 key += s + " ";
joachim99@69 1109 continue;
joachim99@69 1110 }
joachim99@69 1111
joachim99@69 1112 QString groupRegExp = parenthesesGroupList[groupIdx-1];
joachim99@75 1113 if( groupRegExp.indexOf('|')<0 || groupRegExp.indexOf('(')>=0 )
joachim99@69 1114 {
joachim99@69 1115 bool bOk = false;
joachim99@69 1116 int i = s.toInt( &bOk );
joachim99@69 1117 if ( bOk && i>=0 && i<10000 )
joachim99@69 1118 s.sprintf("%04d", i); // This should help for correct sorting of numbers.
joachim99@69 1119 key += s + " ";
joachim99@69 1120 }
joachim99@69 1121 else
joachim99@69 1122 {
joachim99@69 1123 // Assume that the groupRegExp consists of something like "Jan|Feb|Mar|Apr"
joachim99@69 1124 // s is the string that managed to match.
joachim99@69 1125 // Now we want to know at which position it occurred. e.g. Jan=0, Feb=1, Mar=2, etc.
joachim99@75 1126 QStringList sl = groupRegExp.split( '|' );
joachim99@75 1127 int idx = sl.indexOf( s );
joachim99@69 1128 if (idx<0)
joachim99@69 1129 {
joachim99@69 1130 // Didn't match
joachim99@69 1131 }
joachim99@69 1132 else
joachim99@69 1133 {
joachim99@69 1134 QString sIdx;
joachim99@69 1135 sIdx.sprintf("%02d", idx+1 ); // Up to 99 words in the groupRegExp (more than 12 aren't expected)
joachim99@69 1136 key += sIdx + " ";
joachim99@69 1137 }
joachim99@69 1138 }
joachim99@69 1139 }
joachim99@69 1140 return key;
joachim99@69 1141 }
joachim99@69 1142
joachim99@69 1143 void MergeResultWindow::collectHistoryInformation(
joachim99@69 1144 int src, Diff3LineList::const_iterator iHistoryBegin, Diff3LineList::const_iterator iHistoryEnd,
joachim99@69 1145 HistoryMap& historyMap,
joachim99@69 1146 std::list< HistoryMap::iterator >& hitList // list of iterators
joachim99@69 1147 )
joachim99@69 1148 {
joachim99@69 1149 std::list< HistoryMap::iterator >::iterator itHitListFront = hitList.begin();
joachim99@69 1150 Diff3LineList::const_iterator id3l = iHistoryBegin;
joachim99@69 1151 QString historyLead;
joachim99@69 1152 {
joachim99@69 1153 const LineData* pld = id3l->getLineData(src);
joachim99@69 1154 QString s( pld->pLine, pld->size );
joachim99@77 1155 historyLead = calcHistoryLead(s);
joachim99@69 1156 }
joachim99@70 1157 QRegExp historyStart( m_pOptionDialog->m_historyStartRegExp );
joachim99@80 1158 if ( id3l == iHistoryEnd )
joachim99@80 1159 return;
joachim99@69 1160 ++id3l; // Skip line with "$Log ... $"
joachim99@70 1161 QRegExp newHistoryEntry( m_pOptionDialog->m_historyEntryStartRegExp );
joachim99@69 1162 QStringList parenthesesGroups;
joachim99@69 1163 findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, parenthesesGroups );
joachim99@69 1164 QString key;
joachim99@69 1165 MergeEditLineList melList;
joachim99@69 1166 bool bPrevLineIsEmpty = true;
joachim99@69 1167 bool bUseRegExp = !m_pOptionDialog->m_historyEntryStartRegExp.isEmpty();
joachim99@69 1168 for(; id3l != iHistoryEnd; ++id3l )
joachim99@69 1169 {
joachim99@69 1170 const LineData* pld = id3l->getLineData(src);
joachim99@69 1171 if ( !pld ) continue;
joachim99@69 1172 QString s( pld->pLine, pld->size );
joachim99@77 1173 if (historyLead.isNull()) historyLead = calcHistoryLead(s);
joachim99@69 1174 QString sLine = s.mid(historyLead.length());
joachim99@75 1175 if ( ( !bUseRegExp && !sLine.trimmed().isEmpty() && bPrevLineIsEmpty )
joachim99@69 1176 || bUseRegExp && newHistoryEntry.exactMatch( sLine )
joachim99@69 1177 )
joachim99@69 1178 {
joachim99@69 1179 if ( !key.isEmpty() && !melList.empty() )
joachim99@69 1180 {
joachim99@69 1181 // Only insert new HistoryMapEntry if key not found; in either case p.first is a valid iterator to element key.
joachim99@69 1182 std::pair<HistoryMap::iterator, bool> p = historyMap.insert(HistoryMap::value_type(key,HistoryMapEntry()));
joachim99@69 1183 HistoryMapEntry& hme = p.first->second;
joachim99@69 1184 if ( src==A ) hme.mellA = melList;
joachim99@69 1185 if ( src==B ) hme.mellB = melList;
joachim99@69 1186 if ( src==C ) hme.mellC = melList;
joachim99@69 1187 if ( p.second ) // Not in list yet?
joachim99@69 1188 {
joachim99@69 1189 hitList.insert( itHitListFront, p.first );
joachim99@69 1190 }
joachim99@69 1191 }
joachim99@69 1192
joachim99@69 1193 if ( ! bUseRegExp )
joachim99@69 1194 key = sLine;
joachim99@69 1195 else
joachim99@69 1196 key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,parenthesesGroups);
joachim99@69 1197
joachim99@69 1198 melList.clear();
joachim99@69 1199 melList.push_back( MergeEditLine(id3l,src) );
joachim99@69 1200 }
joachim99@69 1201 else if ( ! historyStart.exactMatch( s ) )
joachim99@69 1202 {
joachim99@69 1203 melList.push_back( MergeEditLine(id3l,src) );
joachim99@69 1204 }
joachim99@69 1205
joachim99@75 1206 bPrevLineIsEmpty = sLine.trimmed().isEmpty();
joachim99@69 1207 }
joachim99@69 1208 if ( !key.isEmpty() )
joachim99@69 1209 {
joachim99@69 1210 // Only insert new HistoryMapEntry if key not found; in either case p.first is a valid iterator to element key.
joachim99@69 1211 std::pair<HistoryMap::iterator, bool> p = historyMap.insert(HistoryMap::value_type(key,HistoryMapEntry()));
joachim99@69 1212 HistoryMapEntry& hme = p.first->second;
joachim99@69 1213 if ( src==A ) hme.mellA = melList;
joachim99@69 1214 if ( src==B ) hme.mellB = melList;
joachim99@69 1215 if ( src==C ) hme.mellC = melList;
joachim99@69 1216 if ( p.second ) // Not in list yet?
joachim99@69 1217 {
joachim99@69 1218 hitList.insert( itHitListFront, p.first );
joachim99@69 1219 }
joachim99@69 1220 }
joachim99@69 1221 // End of the history
joachim99@69 1222 }
joachim99@69 1223
joachim99@69 1224 MergeResultWindow::MergeEditLineList& MergeResultWindow::HistoryMapEntry::choice( bool bThreeInputs )
joachim99@69 1225 {
joachim99@69 1226 if ( !bThreeInputs )
joachim99@69 1227 return mellA.empty() ? mellB : mellA;
joachim99@69 1228 else
joachim99@69 1229 {
joachim99@69 1230 if ( mellA.empty() )
joachim99@69 1231 return mellC.empty() ? mellB : mellC; // A doesn't exist, return one that exists
joachim99@69 1232 else if ( ! mellB.empty() && ! mellC.empty() )
joachim99@69 1233 { // A, B and C exist
joachim99@69 1234 return mellA;
joachim99@69 1235 }
joachim99@69 1236 else
joachim99@69 1237 return mellB.empty() ? mellB : mellC; // A exists, return the one that doesn't exist
joachim99@69 1238 }
joachim99@69 1239 }
joachim99@69 1240
joachim99@69 1241 bool MergeResultWindow::HistoryMapEntry::staysInPlace( bool bThreeInputs, Diff3LineList::const_iterator& iHistoryEnd )
joachim99@69 1242 {
joachim99@69 1243 // The entry should stay in place if the decision made by the automerger is correct.
joachim99@69 1244 Diff3LineList::const_iterator& iHistoryLast = iHistoryEnd;
joachim99@69 1245 --iHistoryLast;
joachim99@69 1246 if ( !bThreeInputs )
joachim99@69 1247 {
joachim99@69 1248 if ( !mellA.empty() && !mellB.empty() && mellA.begin()->id3l()==mellB.begin()->id3l() &&
joachim99@69 1249 mellA.back().id3l() == iHistoryLast && mellB.back().id3l() == iHistoryLast )
joachim99@69 1250 {
joachim99@69 1251 iHistoryEnd = mellA.begin()->id3l();
joachim99@69 1252 return true;
joachim99@69 1253 }
joachim99@69 1254 else
joachim99@69 1255 {
joachim99@69 1256 return false;
joachim99@69 1257 }
joachim99@69 1258 }
joachim99@69 1259 else
joachim99@69 1260 {
joachim99@69 1261 if ( !mellA.empty() && !mellB.empty() && !mellC.empty()
joachim99@69 1262 && mellA.begin()->id3l()==mellB.begin()->id3l() && mellA.begin()->id3l()==mellC.begin()->id3l()
joachim99@69 1263 && mellA.back().id3l() == iHistoryLast && mellB.back().id3l() == iHistoryLast && mellC.back().id3l() == iHistoryLast )
joachim99@69 1264 {
joachim99@69 1265 iHistoryEnd = mellA.begin()->id3l();
joachim99@69 1266 return true;
joachim99@69 1267 }
joachim99@69 1268 else
joachim99@69 1269 {
joachim99@69 1270 return false;
joachim99@69 1271 }
joachim99@69 1272 }
joachim99@69 1273 }
joachim99@69 1274
joachim99@69 1275 void MergeResultWindow::slotMergeHistory()
joachim99@69 1276 {
joachim99@69 1277 Diff3LineList::const_iterator iD3LHistoryBegin;
joachim99@69 1278 Diff3LineList::const_iterator iD3LHistoryEnd;
joachim99@69 1279 int d3lHistoryBeginLineIdx = -1;
joachim99@69 1280 int d3lHistoryEndLineIdx = -1;
joachim99@69 1281
joachim99@69 1282 // Search for history start, history end in the diff3LineList
joachim99@77 1283 findHistoryRange( QRegExp(m_pOptionDialog->m_historyStartRegExp), m_pldC!=0, m_pDiff3LineList, iD3LHistoryBegin, iD3LHistoryEnd, d3lHistoryBeginLineIdx, d3lHistoryEndLineIdx );
joachim99@69 1284
joachim99@69 1285 if ( iD3LHistoryBegin != m_pDiff3LineList->end() )
joachim99@69 1286 {
joachim99@69 1287 // Now collect the historyMap information
joachim99@69 1288 HistoryMap historyMap;
joachim99@69 1289 std::list< HistoryMap::iterator > hitList;
joachim99@69 1290 if (m_pldC==0)
joachim99@69 1291 {
joachim99@69 1292 collectHistoryInformation( A, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList );
joachim99@69 1293 collectHistoryInformation( B, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList );
joachim99@69 1294 }
joachim99@69 1295 else
joachim99@69 1296 {
joachim99@69 1297 collectHistoryInformation( A, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList );
joachim99@69 1298 collectHistoryInformation( B, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList );
joachim99@69 1299 collectHistoryInformation( C, iD3LHistoryBegin, iD3LHistoryEnd, historyMap, hitList );
joachim99@69 1300 }
joachim99@69 1301
joachim99@69 1302 Diff3LineList::const_iterator iD3LHistoryOrigEnd = iD3LHistoryEnd;
joachim99@69 1303
joachim99@69 1304 bool bHistoryMergeSorting = m_pOptionDialog->m_bHistoryMergeSorting && ! m_pOptionDialog->m_historyEntryStartSortKeyOrder.isEmpty() &&
joachim99@69 1305 ! m_pOptionDialog->m_historyEntryStartRegExp.isEmpty();
joachim99@69 1306
joachim99@77 1307 if ( m_pOptionDialog->m_maxNofHistoryEntries==-1 )
joachim99@69 1308 {
joachim99@77 1309 // Remove parts from the historyMap and hitList that stay in place
joachim99@77 1310 if ( bHistoryMergeSorting )
joachim99@69 1311 {
joachim99@77 1312 while ( ! historyMap.empty() )
joachim99@77 1313 {
joachim99@77 1314 HistoryMap::iterator hMapIt = historyMap.begin();
joachim99@77 1315 if( hMapIt->second.staysInPlace( m_pldC!=0, iD3LHistoryEnd ) )
joachim99@77 1316 historyMap.erase(hMapIt);
joachim99@77 1317 else
joachim99@77 1318 break;
joachim99@77 1319 }
joachim99@69 1320 }
joachim99@77 1321 else
joachim99@69 1322 {
joachim99@77 1323 while ( ! hitList.empty() )
joachim99@77 1324 {
joachim99@77 1325 HistoryMap::iterator hMapIt = hitList.back();
joachim99@77 1326 if( hMapIt->second.staysInPlace( m_pldC!=0, iD3LHistoryEnd ) )
joachim99@77 1327 hitList.pop_back();
joachim99@77 1328 else
joachim99@77 1329 break;
joachim99@77 1330 }
joachim99@69 1331 }
joachim99@77 1332 while (iD3LHistoryOrigEnd != iD3LHistoryEnd)
joachim99@77 1333 {
joachim99@77 1334 --iD3LHistoryOrigEnd;
joachim99@77 1335 --d3lHistoryEndLineIdx;
joachim99@77 1336 }
joachim99@69 1337 }
joachim99@69 1338
joachim99@69 1339 MergeLineList::iterator iMLLStart = splitAtDiff3LineIdx(d3lHistoryBeginLineIdx);
joachim99@69 1340 MergeLineList::iterator iMLLEnd = splitAtDiff3LineIdx(d3lHistoryEndLineIdx);
joachim99@69 1341 // Now join all MergeLines in the history
joachim99@69 1342 MergeLineList::iterator i = iMLLStart;
joachim99@69 1343 if ( i != iMLLEnd )
joachim99@69 1344 {
joachim99@69 1345 ++i;
joachim99@69 1346 while ( i!=iMLLEnd )
joachim99@69 1347 {
joachim99@69 1348 iMLLStart->join(*i);
joachim99@69 1349 i = m_mergeLineList.erase( i );
joachim99@69 1350 }
joachim99@69 1351 }
joachim99@69 1352 iMLLStart->mergeEditLineList.clear();
joachim99@69 1353 // Now insert the complete history into the first MergeLine of the history
joachim99@69 1354 iMLLStart->mergeEditLineList.push_back( MergeEditLine( iD3LHistoryBegin, m_pldC == 0 ? B : C ) );
joachim99@77 1355 QString lead = calcHistoryLead( iD3LHistoryBegin->getString(A) );
joachim99@69 1356 MergeEditLine mel( m_pDiff3LineList->end() );
joachim99@69 1357 mel.setString( lead );
joachim99@69 1358 iMLLStart->mergeEditLineList.push_back(mel);
joachim99@69 1359
joachim99@77 1360 int historyCount = 0;
joachim99@69 1361 if ( bHistoryMergeSorting )
joachim99@69 1362 {
joachim99@69 1363 // Create a sorted history
joachim99@69 1364 HistoryMap::reverse_iterator hmit;
joachim99@69 1365 for ( hmit = historyMap.rbegin(); hmit != historyMap.rend(); ++hmit )
joachim99@69 1366 {
joachim99@77 1367 if ( historyCount==m_pOptionDialog->m_maxNofHistoryEntries )
joachim99@77 1368 break;
joachim99@77 1369 ++historyCount;
joachim99@69 1370 HistoryMapEntry& hme = hmit->second;
joachim99@69 1371 MergeEditLineList& mell = hme.choice(m_pldC!=0);
joachim99@69 1372 if (!mell.empty())
joachim99@69 1373 iMLLStart->mergeEditLineList.splice( iMLLStart->mergeEditLineList.end(), mell, mell.begin(), mell.end() );
joachim99@69 1374 }
joachim99@69 1375 }
joachim99@69 1376 else
joachim99@69 1377 {
joachim99@69 1378 // Create history in order of appearance
joachim99@69 1379 std::list< HistoryMap::iterator >::iterator hlit;
joachim99@69 1380 for ( hlit = hitList.begin(); hlit != hitList.end(); ++hlit )
joachim99@69 1381 {
joachim99@77 1382 if ( historyCount==m_pOptionDialog->m_maxNofHistoryEntries )
joachim99@77 1383 break;
joachim99@77 1384 ++historyCount;
joachim99@69 1385 HistoryMapEntry& hme = (*hlit)->second;
joachim99@69 1386 MergeEditLineList& mell = hme.choice(m_pldC!=0);
joachim99@69 1387 if (!mell.empty())
joachim99@69 1388 iMLLStart->mergeEditLineList.splice( iMLLStart->mergeEditLineList.end(), mell, mell.begin(), mell.end() );
joachim99@69 1389 }
joachim99@69 1390 }
joachim99@69 1391 setFastSelector( iMLLStart );
joachim99@69 1392 update();
joachim99@69 1393 }
joachim99@69 1394 }
joachim99@69 1395
joachim99@69 1396 void MergeResultWindow::slotRegExpAutoMerge()
joachim99@69 1397 {
joachim99@69 1398 if ( m_pOptionDialog->m_autoMergeRegExp.isEmpty() )
joachim99@69 1399 return;
joachim99@69 1400
joachim99@70 1401 QRegExp vcsKeywords( m_pOptionDialog->m_autoMergeRegExp );
joachim99@69 1402 MergeLineList::iterator i;
joachim99@69 1403 for ( i=m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@69 1404 {
joachim99@69 1405 if (i->bConflict )
joachim99@69 1406 {
joachim99@69 1407 Diff3LineList::const_iterator id3l = i->id3l;
joachim99@69 1408 if ( vcsKeywords.exactMatch( id3l->getString(A) ) &&
joachim99@69 1409 vcsKeywords.exactMatch( id3l->getString(B) ) &&
joachim99@69 1410 (m_pldC==0 || vcsKeywords.exactMatch( id3l->getString(C) )))
joachim99@69 1411 {
joachim99@69 1412 MergeEditLine& mel = *i->mergeEditLineList.begin();
joachim99@69 1413 mel.setSource( m_pldC==0 ? B : C, false );
joachim99@69 1414 splitAtDiff3LineIdx( i->d3lLineIdx+1 );
joachim99@69 1415 }
joachim99@69 1416 }
joachim99@69 1417 }
joachim99@69 1418 update();
joachim99@69 1419 }
joachim99@69 1420
joachim99@69 1421 // This doesn't detect user modifications and should only be called after automatic merge
joachim99@69 1422 // This will only do something for three file merge.
joachim99@69 1423 // Irrelevant changes are those where all contributions from B are already contained in C.
joachim99@69 1424 // Also irrelevant are conflicts automatically solved (automerge regexp and history automerge)
joachim99@69 1425 // Precondition: The VCS-keyword would also be C.
joachim99@69 1426 bool MergeResultWindow::doRelevantChangesExist()
joachim99@69 1427 {
joachim99@69 1428 if ( m_pldC==0 || m_mergeLineList.size() <= 1 )
joachim99@69 1429 return true;
joachim99@69 1430
joachim99@69 1431 MergeLineList::iterator i;
joachim99@69 1432 for ( i=m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@69 1433 {
joachim99@69 1434 if ( ( i->bConflict && i->mergeEditLineList.begin()->src()!=C )
joachim99@69 1435 || i->srcSelect == B )
joachim99@69 1436 {
joachim99@69 1437 return true;
joachim99@69 1438 }
joachim99@69 1439 }
joachim99@69 1440
joachim99@69 1441 return false;
joachim99@69 1442 }
joachim99@69 1443
joachim99@69 1444 // Returns the iterator to the MergeLine after the split
joachim99@69 1445 MergeResultWindow::MergeLineList::iterator MergeResultWindow::splitAtDiff3LineIdx( int d3lLineIdx )
joachim99@69 1446 {
joachim99@69 1447 MergeLineList::iterator i;
joachim99@69 1448 for ( i = m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@69 1449 {
joachim99@69 1450 if ( i->d3lLineIdx==d3lLineIdx )
joachim99@69 1451 {
joachim99@69 1452 // No split needed, this is the beginning of a MergeLine
joachim99@69 1453 return i;
joachim99@69 1454 }
joachim99@69 1455 else if ( i->d3lLineIdx > d3lLineIdx )
joachim99@69 1456 {
joachim99@69 1457 // The split must be in the previous MergeLine
joachim99@69 1458 --i;
joachim99@69 1459 MergeLine& ml = *i;
joachim99@69 1460 MergeLine newML;
joachim99@69 1461 ml.split(newML,d3lLineIdx);
joachim99@69 1462 ++i;
joachim99@69 1463 return m_mergeLineList.insert( i, newML );
joachim99@69 1464 }
joachim99@69 1465 }
joachim99@69 1466 // The split must be in the previous MergeLine
joachim99@69 1467 --i;
joachim99@69 1468 MergeLine& ml = *i;
joachim99@69 1469 MergeLine newML;
joachim99@69 1470 ml.split(newML,d3lLineIdx);
joachim99@69 1471 ++i;
joachim99@69 1472 return m_mergeLineList.insert( i, newML );
joachim99@69 1473 }
joachim99@69 1474
joachim99@69 1475 void MergeResultWindow::slotSplitDiff( int firstD3lLineIdx, int lastD3lLineIdx )
joachim99@69 1476 {
joachim99@69 1477 if (lastD3lLineIdx>=0)
joachim99@69 1478 splitAtDiff3LineIdx( lastD3lLineIdx + 1 );
joachim99@69 1479 setFastSelector( splitAtDiff3LineIdx(firstD3lLineIdx) );
joachim99@69 1480 }
joachim99@69 1481
joachim99@69 1482 void MergeResultWindow::slotJoinDiffs( int firstD3lLineIdx, int lastD3lLineIdx )
joachim99@69 1483 {
joachim99@69 1484 MergeLineList::iterator i;
joachim99@69 1485 MergeLineList::iterator iMLLStart = m_mergeLineList.end();
joachim99@69 1486 MergeLineList::iterator iMLLEnd = m_mergeLineList.end();
joachim99@69 1487 for ( i=m_mergeLineList.begin(); i!=m_mergeLineList.end(); ++i )
joachim99@69 1488 {
joachim99@69 1489 MergeLine& ml = *i;
joachim99@69 1490 if ( firstD3lLineIdx >= ml.d3lLineIdx && firstD3lLineIdx < ml.d3lLineIdx + ml.srcRangeLength )
joachim99@69 1491 {
joachim99@69 1492 iMLLStart = i;
joachim99@69 1493 }
joachim99@69 1494 if ( lastD3lLineIdx >= ml.d3lLineIdx && lastD3lLineIdx < ml.d3lLineIdx + ml.srcRangeLength )
joachim99@69 1495 {
joachim99@69 1496 iMLLEnd = i;
joachim99@69 1497 ++iMLLEnd;
joachim99@69 1498 break;
joachim99@69 1499 }
joachim99@69 1500 }
joachim99@69 1501
joachim99@69 1502 bool bJoined = false;
joachim99@69 1503 for( i=iMLLStart; i!=iMLLEnd && i!=m_mergeLineList.end(); )
joachim99@69 1504 {
joachim99@69 1505 if ( i==iMLLStart )
joachim99@69 1506 {
joachim99@69 1507 ++i;
joachim99@69 1508 }
joachim99@69 1509 else
joachim99@69 1510 {
joachim99@69 1511 iMLLStart->join(*i);
joachim99@69 1512 i = m_mergeLineList.erase( i );
joachim99@69 1513 bJoined = true;
joachim99@69 1514 }
joachim99@69 1515 }
joachim99@69 1516 if (bJoined)
joachim99@69 1517 {
joachim99@69 1518 iMLLStart->mergeEditLineList.clear();
joachim99@69 1519 // Insert a conflict line as placeholder
joachim99@69 1520 iMLLStart->mergeEditLineList.push_back( MergeEditLine( iMLLStart->id3l ) );
joachim99@69 1521 }
joachim99@69 1522 setFastSelector( iMLLStart );
joachim99@8 1523 }
joachim99@8 1524
joachim99@8 1525 void MergeResultWindow::myUpdate(int afterMilliSecs)
joachim99@8 1526 {
joachim99@75 1527 if ( m_delayedDrawTimer )
joachim99@75 1528 killTimer(m_delayedDrawTimer);
joachim99@8 1529 m_bMyUpdate = true;
joachim99@69 1530 m_delayedDrawTimer = startTimer( afterMilliSecs );
joachim99@8 1531 }
joachim99@8 1532
joachim99@8 1533 void MergeResultWindow::timerEvent(QTimerEvent*)
joachim99@8 1534 {
joachim99@69 1535 killTimer(m_delayedDrawTimer);
joachim99@69 1536 m_delayedDrawTimer = 0;
joachim99@8 1537
joachim99@8 1538 if ( m_bMyUpdate )
joachim99@8 1539 {
joachim99@69 1540 update();
joachim99@8 1541 m_bMyUpdate = false;
joachim99@8 1542 }
joachim99@8 1543
joachim99@8 1544 if ( m_scrollDeltaX != 0 || m_scrollDeltaY != 0 )
joachim99@8 1545 {
joachim99@8 1546 m_selection.end( m_selection.lastLine + m_scrollDeltaY, m_selection.lastPos + m_scrollDeltaX );
joachim99@8 1547 emit scroll( m_scrollDeltaX, m_scrollDeltaY );
joachim99@69 1548 killTimer(m_delayedDrawTimer);
joachim99@69 1549 m_delayedDrawTimer = startTimer(50);
joachim99@8 1550 }
joachim99@8 1551 }
joachim99@8 1552
joachim99@68 1553 QString MergeResultWindow::MergeEditLine::getString( const MergeResultWindow* mrw )
joachim99@8 1554 {
joachim99@68 1555 if ( isRemoved() ) { return QString(); }
joachim99@8 1556
joachim99@8 1557 if ( ! isModified() )
joachim99@8 1558 {
joachim99@8 1559 int src = m_src;
joachim99@77 1560 if ( src == 0 ) { return QString(); }
joachim99@8 1561 const Diff3Line& d3l = *m_id3l;
joachim99@8 1562 const LineData* pld = 0;
joachim99@8 1563 assert( src == A || src == B || src == C );
joachim99@8 1564 if ( src == A && d3l.lineA!=-1 ) pld = &mrw->m_pldA[ d3l.lineA ];
joachim99@8 1565 else if ( src == B && d3l.lineB!=-1 ) pld = &mrw->m_pldB[ d3l.lineB ];
joachim99@8 1566 else if ( src == C && d3l.lineC!=-1 ) pld = &mrw->m_pldC[ d3l.lineC ];
joachim99@8 1567
joachim99@8 1568 if ( pld == 0 )
joachim99@8 1569 {
joachim99@8 1570 // assert(false); This is no error.
joachim99@68 1571 return QString();
joachim99@8 1572 }
joachim99@8 1573
joachim99@68 1574 return QString( pld->pLine, pld->size );
joachim99@8 1575 }
joachim99@8 1576 else
joachim99@8 1577 {
joachim99@8 1578 return m_str;
joachim99@8 1579 }
joachim99@8 1580 return 0;
joachim99@8 1581 }
joachim99@8 1582
joachim99@8 1583 /// Converts the cursor-posOnScreen into a text index, considering tabulators.
joachim99@69 1584 int convertToPosInText( const QString& s, int posOnScreen, int tabSize )
joachim99@8 1585 {
joachim99@8 1586 int localPosOnScreen = 0;
joachim99@68 1587 int size=s.length();
joachim99@8 1588 for ( int i=0; i<size; ++i )
joachim99@8 1589 {
joachim99@8 1590 if ( localPosOnScreen>=posOnScreen )
joachim99@8 1591 return i;
joachim99@8 1592
joachim99@8 1593 // All letters except tabulator have width one.
joachim99@69 1594 int letterWidth = s[i]!='\t' ? 1 : tabber( localPosOnScreen, tabSize );
joachim99@8 1595
joachim99@8 1596 localPosOnScreen += letterWidth;
joachim99@8 1597
joachim99@8 1598 if ( localPosOnScreen>posOnScreen )
joachim99@8 1599 return i;
joachim99@8 1600 }
joachim99@8 1601 return size;
joachim99@8 1602 }
joachim99@8 1603
joachim99@8 1604
joachim99@8 1605 /// Converts the index into the text to a cursor-posOnScreen considering tabulators.
joachim99@69 1606 int convertToPosOnScreen( const QString& p, int posInText, int tabSize )
joachim99@8 1607 {
joachim99@8 1608 int posOnScreen = 0;
joachim99@8 1609 for ( int i=0; i<posInText; ++i )
joachim99@8 1610 {
joachim99@8 1611 // All letters except tabulator have width one.
joachim99@69 1612 int letterWidth = p[i]!='\t' ? 1 : tabber( posOnScreen, tabSize );
joachim99@8 1613
joachim99@8 1614 posOnScreen += letterWidth;
joachim99@8 1615 }
joachim99@8 1616 return posOnScreen;
joachim99@8 1617 }
joachim99@8 1618
joachim99@8 1619 void MergeResultWindow::writeLine(
joachim99@68 1620 MyPainter& p, int line, const QString& str,
joachim99@68 1621 int srcSelect, e_MergeDetails mergeDetails, int rangeMark, bool bUserModified, bool bLineRemoved, bool bWhiteSpaceConflict
joachim99@8 1622 )
joachim99@8 1623 {
joachim99@8 1624 const QFontMetrics& fm = fontMetrics();
joachim99@8 1625 int fontHeight = fm.height();
joachim99@8 1626 int fontWidth = fm.width("W");
joachim99@8 1627 int fontAscent = fm.ascent();
joachim99@8 1628
joachim99@75 1629 int topLineYOffset = 0;
joachim99@8 1630 int xOffset = fontWidth * leftInfoWidth;
joachim99@8 1631
joachim99@8 1632 int yOffset = ( line-m_firstLine ) * fontHeight;
joachim99@8 1633 if ( yOffset < 0 || yOffset > height() )
joachim99@8 1634 return;
joachim99@8 1635
joachim99@8 1636 yOffset += topLineYOffset;
joachim99@8 1637
joachim99@8 1638 QString srcName = " ";
joachim99@8 1639 if ( bUserModified ) srcName = "m";
joachim99@8 1640 else if ( srcSelect == A && mergeDetails != eNoChange ) srcName = "A";
joachim99@8 1641 else if ( srcSelect == B ) srcName = "B";
joachim99@8 1642 else if ( srcSelect == C ) srcName = "C";
joachim99@8 1643
joachim99@8 1644 if ( rangeMark & 4 )
joachim99@8 1645 {
joachim99@8 1646 p.fillRect( xOffset, yOffset, width(), fontHeight, m_pOptionDialog->m_currentRangeBgColor );
joachim99@8 1647 }
joachim99@68 1648
joachim99@8 1649 if( (srcSelect > 0 || bUserModified ) && !bLineRemoved )
joachim99@8 1650 {
joachim99@8 1651 int outPos = 0;
joachim99@68 1652 QString s;
joachim99@68 1653 int size = str.length();
joachim99@8 1654 for ( int i=0; i<size; ++i )
joachim99@8 1655 {
joachim99@8 1656 int spaces = 1;
joachim99@68 1657 if ( str[i]=='\t' )
joachim99@8 1658 {
joachim99@69 1659 spaces = tabber( outPos, m_pOptionDialog->m_tabSize );
joachim99@8 1660 for( int j=0; j<spaces; ++j )
joachim99@8 1661 s+=' ';
joachim99@8 1662 }
joachim99@8 1663 else
joachim99@8 1664 {
joachim99@68 1665 s+=str[i];
joachim99@8 1666 }
joachim99@8 1667 outPos += spaces;
joachim99@8 1668 }
joachim99@8 1669
joachim99@8 1670 if ( m_selection.lineWithin( line ) )
joachim99@8 1671 {
joachim99@69 1672 int firstPosInLine = convertToPosOnScreen( str, convertToPosInText( str, m_selection.firstPosInLine(line), m_pOptionDialog->m_tabSize ),m_pOptionDialog->m_tabSize );
joachim99@69 1673 int lastPosInLine = convertToPosOnScreen( str, convertToPosInText( str, m_selection.lastPosInLine(line), m_pOptionDialog->m_tabSize ), m_pOptionDialog->m_tabSize );
joachim99@8 1674 int lengthInLine = max2(0,lastPosInLine - firstPosInLine);
joachim99@8 1675 if (lengthInLine>0) m_selection.bSelectionContainsData = true;
joachim99@8 1676
joachim99@8 1677 if ( lengthInLine < int(s.length()) )
joachim99@8 1678 { // Draw a normal line first
joachim99@8 1679 p.setPen( m_pOptionDialog->m_fgColor );
joachim99@68 1680 p.drawText( xOffset, yOffset+fontAscent, s.mid(m_firstColumn), true );
joachim99@8 1681 }
joachim99@8 1682 int firstPosInLine2 = max2( firstPosInLine, m_firstColumn );
joachim99@8 1683 int lengthInLine2 = max2(0,lastPosInLine - firstPosInLine2);
joachim99@8 1684
joachim99@8 1685 if( m_selection.lineWithin( line+1 ) )
joachim99@8 1686 p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset,
joachim99@75 1687 width(), fontHeight, palette().highlight() );
joachim99@69 1688 else if ( lengthInLine2>0 )
joachim99@8 1689 p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset,
joachim99@75 1690 fontWidth*lengthInLine2, fontHeight, palette().highlight() );
joachim99@75 1691
joachim99@75 1692 p.setPen( palette().highlightedText().color() );
joachim99@8 1693 p.drawText( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset+fontAscent,
joachim99@68 1694 s.mid(firstPosInLine2,lengthInLine2), true );
joachim99@8 1695 }
joachim99@8 1696 else
joachim99@8 1697 {
joachim99@8 1698 p.setPen( m_pOptionDialog->m_fgColor );
joachim99@68 1699 p.drawText( xOffset, yOffset+fontAscent, s.mid(m_firstColumn), true );
joachim99@8 1700 }
joachim99@8 1701
joachim99@8 1702 p.setPen( m_pOptionDialog->m_fgColor );
joachim99@8 1703 if ( m_cursorYPos==line )
joachim99@8 1704 {
joachim99@8 1705 m_cursorXPos = minMaxLimiter( m_cursorXPos, 0, outPos );
joachim99@69 1706 m_cursorXPos = convertToPosOnScreen( str, convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize ),m_pOptionDialog->m_tabSize );
joachim99@8 1707 }
joachim99@8 1708
joachim99@68 1709 p.drawText( 1, yOffset+fontAscent, srcName, true );
joachim99@8 1710 }
joachim99@8 1711 else if ( bLineRemoved )
joachim99@8 1712 {
joachim99@8 1713 p.setPen( m_pOptionDialog->m_colorForConflict );
joachim99@8 1714 p.drawText( xOffset, yOffset+fontAscent, i18n("<No src line>") );
joachim99@8 1715 p.drawText( 1, yOffset+fontAscent, srcName );
joachim99@8 1716 if ( m_cursorYPos==line ) m_cursorXPos = 0;
joachim99@8 1717 }
joachim99@8 1718 else if ( srcSelect == 0 )
joachim99@8 1719 {
joachim99@8 1720 p.setPen( m_pOptionDialog->m_colorForConflict );
joachim99@68 1721 if ( bWhiteSpaceConflict )
joachim99@68 1722 p.drawText( xOffset, yOffset+fontAscent, i18n("<Merge Conflict (Whitespace only)>") );
joachim99@68 1723 else
joachim99@68 1724 p.drawText( xOffset, yOffset+fontAscent, i18n("<Merge Conflict>") );
joachim99@8 1725 p.drawText( 1, yOffset+fontAscent, "?" );
joachim99@8 1726 if ( m_cursorYPos==line ) m_cursorXPos = 0;
joachim99@8 1727 }
joachim99@8 1728 else assert(false);
joachim99@8 1729
joachim99@8 1730 xOffset -= fontWidth;
joachim99@8 1731 p.setPen( m_pOptionDialog->m_fgColor );
joachim99@8 1732 if ( rangeMark & 1 ) // begin mark
joachim99@8 1733 {
joachim99@8 1734 p.drawLine( xOffset, yOffset+1, xOffset, yOffset+fontHeight/2 );
joachim99@8 1735 p.drawLine( xOffset, yOffset+1, xOffset-2, yOffset+1 );
joachim99@8 1736 }
joachim99@8 1737 else
joachim99@8 1738 {
joachim99@8 1739 p.drawLine( xOffset, yOffset, xOffset, yOffset+fontHeight/2 );
joachim99@8 1740 }
joachim99@8 1741
joachim99@8 1742 if ( rangeMark & 2 ) // end mark
joachim99@8 1743 {
joachim99@8 1744 p.drawLine( xOffset, yOffset+fontHeight/2, xOffset, yOffset+fontHeight-1 );
joachim99@8 1745 p.drawLine( xOffset, yOffset+fontHeight-1, xOffset-2, yOffset+fontHeight-1 );
joachim99@8 1746 }
joachim99@8 1747 else
joachim99@8 1748 {
joachim99@8 1749 p.drawLine( xOffset, yOffset+fontHeight/2, xOffset, yOffset+fontHeight );
joachim99@8 1750 }
joachim99@8 1751
joachim99@8 1752 if ( rangeMark & 4 )
joachim99@8 1753 {
joachim99@8 1754 p.fillRect( xOffset + 3, yOffset, 3, fontHeight, m_pOptionDialog->m_fgColor );
joachim99@8 1755 /* p.setPen( blue );
joachim99@8 1756 p.drawLine( xOffset+2, yOffset, xOffset+2, yOffset+fontHeight-1 );
joachim99@8 1757 p.drawLine( xOffset+3, yOffset, xOffset+3, yOffset+fontHeight-1 );*/
joachim99@8 1758 }
joachim99@8 1759 }
joachim99@8 1760
joachim99@58 1761 void MergeResultWindow::setPaintingAllowed(bool bPaintingAllowed)
joachim99@58 1762 {
joachim99@58 1763 m_bPaintingAllowed = bPaintingAllowed;
joachim99@66 1764 if ( !m_bPaintingAllowed )
joachim99@69 1765 {
joachim99@66 1766 m_currentMergeLineIt = m_mergeLineList.end();
joachim99@69 1767 reset();
joachim99@69 1768 }
joachim99@80 1769 update();
joachim99@58 1770 }
joachim99@58 1771
joachim99@80 1772 void MergeResultWindow::paintEvent( QPaintEvent* )
joachim99@8 1773 {
joachim99@80 1774 if (m_pDiff3LineList==0 || !m_bPaintingAllowed)
joachim99@80 1775 return;
joachim99@8 1776
joachim99@8 1777 bool bOldSelectionContainsData = m_selection.bSelectionContainsData;
joachim99@8 1778 const QFontMetrics& fm = fontMetrics();
joachim99@8 1779 int fontHeight = fm.height();
joachim99@8 1780 int fontWidth = fm.width("W");
joachim99@8 1781 int fontAscent = fm.ascent();
joachim99@8 1782
joachim99@69 1783 if ( !m_bCursorUpdate ) // Don't redraw everything for blinking cursor?
joachim99@8 1784 {
joachim99@8 1785 m_selection.bSelectionContainsData = false;
joachim99@8 1786 if ( size() != m_pixmap.size() )
joachim99@75 1787 m_pixmap = QPixmap(size());
joachim99@8 1788
joachim99@68 1789 MyPainter p(&m_pixmap, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
joachim99@8 1790 p.setFont( font() );
joachim99@68 1791 p.QPainter::fillRect( rect(), m_pOptionDialog->m_bgColor );
joachim99@8 1792
joachim99@8 1793 //int visibleLines = height() / fontHeight;
joachim99@8 1794
joachim99@8 1795 int lastVisibleLine = m_firstLine + getNofVisibleLines() + 5;
joachim99@8 1796 int nofColumns = 0;
joachim99@8 1797 int line = 0;
joachim99@8 1798 MergeLineList::iterator mlIt = m_mergeLineList.begin();
joachim99@8 1799 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 1800 {
joachim99@8 1801 MergeLine& ml = *mlIt;
joachim99@8 1802 if ( line > lastVisibleLine || line + ml.mergeEditLineList.size() < m_firstLine)
joachim99@8 1803 {
joachim99@8 1804 line += ml.mergeEditLineList.size();
joachim99@8 1805 }
joachim99@8 1806 else
joachim99@8 1807 {
joachim99@8 1808 MergeEditLineList::iterator melIt;
joachim99@8 1809 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt )
joachim99@8 1810 {
joachim99@8 1811 if (line>=m_firstLine && line<=lastVisibleLine)
joachim99@8 1812 {
joachim99@8 1813 MergeEditLine& mel = *melIt;
joachim99@8 1814 MergeEditLineList::iterator melIt1 = melIt;
joachim99@8 1815 ++melIt1;
joachim99@8 1816
joachim99@8 1817 int rangeMark = 0;
joachim99@8 1818 if ( melIt==ml.mergeEditLineList.begin() ) rangeMark |= 1; // Begin range mark
joachim99@8 1819 if ( melIt1==ml.mergeEditLineList.end() ) rangeMark |= 2; // End range mark
joachim99@8 1820
joachim99@8 1821 if ( mlIt == m_currentMergeLineIt ) rangeMark |= 4; // Mark of the current line
joachim99@8 1822
joachim99@68 1823 QString s;
joachim99@68 1824 s = mel.getString( this );
joachim99@69 1825 if ( convertToPosOnScreen(s,s.length(),m_pOptionDialog->m_tabSize) >nofColumns)
joachim99@68 1826 nofColumns = s.length();
joachim99@8 1827
joachim99@68 1828 writeLine( p, line, s, mel.src(), ml.mergeDetails, rangeMark,
joachim99@68 1829 mel.isModified(), mel.isRemoved(), ml.bWhiteSpaceConflict );
joachim99@8 1830 }
joachim99@8 1831 ++line;
joachim99@8 1832 }
joachim99@8 1833 }
joachim99@8 1834 }
joachim99@8 1835
joachim99@8 1836 if ( line != m_nofLines || nofColumns != m_nofColumns )
joachim99@8 1837 {
joachim99@8 1838 m_nofLines = line;
joachim99@58 1839 assert( m_nofLines == m_totalSize );
joachim99@8 1840
joachim99@8 1841 m_nofColumns = nofColumns;
joachim99@8 1842 emit resizeSignal();
joachim99@8 1843 }
joachim99@8 1844
joachim99@8 1845 p.end();
joachim99@8 1846 }
joachim99@8 1847
joachim99@8 1848 QPainter painter(this);
joachim99@8 1849
joachim99@75 1850 int topLineYOffset = 0;
joachim99@8 1851 int xOffset = fontWidth * leftInfoWidth;
joachim99@8 1852 int yOffset = ( m_cursorYPos - m_firstLine ) * fontHeight + topLineYOffset;
joachim99@8 1853 int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
joachim99@8 1854
joachim99@69 1855 if ( !m_bCursorUpdate )
joachim99@8 1856 painter.drawPixmap(0,0, m_pixmap);
joachim99@8 1857 else
joachim99@68 1858 {
joachim99@80 1859 painter.drawPixmap(0,0, m_pixmap ); // Draw everything. (Internally cursor rect is clipped anyway.)
joachim99@80 1860 //if (!m_pOptionDialog->m_bRightToLeftLanguage)
joachim99@80 1861 // painter.drawPixmap(xCursor-2, yOffset, m_pixmap,
joachim99@80 1862 // xCursor-2, yOffset, 5, fontAscent+2 );
joachim99@80 1863 //else
joachim99@80 1864 // painter.drawPixmap(width()-1-4-(xCursor-2), yOffset, m_pixmap,
joachim99@80 1865 // width()-1-4-(xCursor-2), yOffset, 5, fontAscent+2 );
joachim99@69 1866 m_bCursorUpdate = false;
joachim99@68 1867 }
joachim99@69 1868 painter.end();
joachim99@8 1869
joachim99@8 1870 if ( m_bCursorOn && hasFocus() && m_cursorYPos>=m_firstLine )
joachim99@8 1871 {
joachim99@68 1872 MyPainter painter(this, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
joachim99@75 1873 int topLineYOffset = 0;
joachim99@8 1874 int xOffset = fontWidth * leftInfoWidth;
joachim99@8 1875
joachim99@8 1876 int yOffset = ( m_cursorYPos-m_firstLine ) * fontHeight + topLineYOffset;
joachim99@8 1877
joachim99@8 1878 int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
joachim99@66 1879
joachim99@66 1880 painter.setPen( m_pOptionDialog->m_fgColor );
joachim99@66 1881
joachim99@8 1882 painter.drawLine( xCursor, yOffset, xCursor, yOffset+fontAscent );
joachim99@8 1883 painter.drawLine( xCursor-2, yOffset, xCursor+2, yOffset );
joachim99@8 1884 painter.drawLine( xCursor-2, yOffset+fontAscent+1, xCursor+2, yOffset+fontAscent+1 );
joachim99@8 1885 }
joachim99@8 1886
joachim99@8 1887 if( !bOldSelectionContainsData && m_selection.bSelectionContainsData )
joachim99@8 1888 emit newSelection();
joachim99@8 1889 }
joachim99@8 1890
joachim99@66 1891 void MergeResultWindow::updateSourceMask()
joachim99@66 1892 {
joachim99@66 1893 int srcMask=0;
joachim99@66 1894 int enabledMask = 0;
joachim99@66 1895 if( !hasFocus() || m_pDiff3LineList==0 || !m_bPaintingAllowed || m_currentMergeLineIt == m_mergeLineList.end() )
joachim99@66 1896 {
joachim99@66 1897 srcMask = 0;
joachim99@66 1898 enabledMask = 0;
joachim99@66 1899 }
joachim99@66 1900 else
joachim99@66 1901 {
joachim99@66 1902 enabledMask = m_pldC==0 ? 3 : 7;
joachim99@66 1903 MergeLine& ml = *m_currentMergeLineIt;
joachim99@66 1904
joachim99@66 1905 srcMask = 0;
joachim99@66 1906 bool bModified = false;
joachim99@66 1907 MergeEditLineList::iterator melIt;
joachim99@66 1908 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt )
joachim99@66 1909 {
joachim99@66 1910 MergeEditLine& mel = *melIt;
joachim99@66 1911 if ( mel.src()==1 ) srcMask |= 1;
joachim99@66 1912 if ( mel.src()==2 ) srcMask |= 2;
joachim99@66 1913 if ( mel.src()==3 ) srcMask |= 4;
joachim99@66 1914 if ( mel.isModified() || !mel.isEditableText() ) bModified = true;
joachim99@66 1915 }
joachim99@68 1916
joachim99@66 1917 if ( ml.mergeDetails == eNoChange )
joachim99@69 1918 {
joachim99@66 1919 srcMask = 0;
joachim99@66 1920 enabledMask = bModified ? 1 : 0;
joachim99@66 1921 }
joachim99@66 1922 }
joachim99@68 1923
joachim99@66 1924 emit sourceMask( srcMask, enabledMask );
joachim99@66 1925 }
joachim99@66 1926
joachim99@66 1927 void MergeResultWindow::focusInEvent( QFocusEvent* e )
joachim99@66 1928 {
joachim99@66 1929 updateSourceMask();
joachim99@66 1930 QWidget::focusInEvent(e);
joachim99@66 1931 }
joachim99@66 1932
joachim99@8 1933 void MergeResultWindow::convertToLinePos( int x, int y, int& line, int& pos )
joachim99@8 1934 {
joachim99@8 1935 const QFontMetrics& fm = fontMetrics();
joachim99@8 1936 int fontHeight = fm.height();
joachim99@8 1937 int fontWidth = fm.width('W');
joachim99@8 1938 int xOffset = (leftInfoWidth-m_firstColumn)*fontWidth;
joachim99@75 1939 int topLineYOffset = 0;
joachim99@8 1940
joachim99@8 1941 int yOffset = topLineYOffset - m_firstLine * fontHeight;
joachim99@8 1942
joachim99@58 1943 line = min2( ( y - yOffset ) / fontHeight, m_totalSize-1 );
joachim99@68 1944 if ( ! m_pOptionDialog->m_bRightToLeftLanguage )
joachim99@68 1945 pos = ( x - xOffset ) / fontWidth;
joachim99@68 1946 else
joachim99@68 1947 pos = ( (width() - 1 - x) - xOffset ) / fontWidth;
joachim99@8 1948 }
joachim99@8 1949
joachim99@8 1950 void MergeResultWindow::mousePressEvent ( QMouseEvent* e )
joachim99@8 1951 {
joachim99@8 1952 m_bCursorOn = true;
joachim99@8 1953
joachim99@8 1954 int line;
joachim99@8 1955 int pos;
joachim99@8 1956 convertToLinePos( e->x(), e->y(), line, pos );
joachim99@8 1957
joachim99@69 1958 bool bLMB = e->button() == Qt::LeftButton;
joachim99@69 1959 bool bMMB = e->button() == Qt::MidButton;
joachim99@69 1960 bool bRMB = e->button() == Qt::RightButton;
joachim99@8 1961
joachim99@8 1962 if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection
joachim99@8 1963 {
joachim99@8 1964 m_cursorXPos = 0;
joachim99@8 1965 m_cursorOldXPos = 0;
joachim99@8 1966 m_cursorYPos = max2(line,0);
joachim99@8 1967 int l = 0;
joachim99@8 1968 MergeLineList::iterator i = m_mergeLineList.begin();
joachim99@8 1969 for(i = m_mergeLineList.begin();i!=m_mergeLineList.end(); ++i)
joachim99@8 1970 {
joachim99@8 1971 if (l==line)
joachim99@8 1972 break;
joachim99@8 1973
joachim99@8 1974 l += i->mergeEditLineList.size();
joachim99@8 1975 if (l>line)
joachim99@8 1976 break;
joachim99@8 1977 }
joachim99@8 1978 m_selection.reset(); // Disable current selection
joachim99@8 1979
joachim99@8 1980 m_bCursorOn = true;
joachim99@8 1981 setFastSelector( i );
joachim99@8 1982
joachim99@8 1983 if (bRMB)
joachim99@8 1984 {
joachim99@8 1985 showPopupMenu( QCursor::pos() );
joachim99@8 1986 }
joachim99@8 1987 }
joachim99@8 1988 else if ( bLMB ) // Normal cursor placement
joachim99@8 1989 {
joachim99@8 1990 pos = max2(pos,0);
joachim99@8 1991 line = max2(line,0);
joachim99@75 1992 if ( e->QInputEvent::modifiers() & Qt::ShiftModifier )
joachim99@8 1993 {
joachim99@8 1994 if (m_selection.firstLine==-1)
joachim99@8 1995 m_selection.start( line, pos );
joachim99@8 1996 m_selection.end( line, pos );
joachim99@8 1997 }
joachim99@8 1998 else
joachim99@8 1999 {
joachim99@8 2000 // Selection
joachim99@8 2001 m_selection.reset();
joachim99@8 2002 m_selection.start( line, pos );
joachim99@8 2003 m_selection.end( line, pos );
joachim99@8 2004 }
joachim99@8 2005 m_cursorXPos = pos;
joachim99@8 2006 m_cursorOldXPos = pos;
joachim99@8 2007 m_cursorYPos = line;
joachim99@8 2008
joachim99@8 2009 update();
joachim99@8 2010 //showStatusLine( line, m_winIdx, m_pFilename, m_pDiff3LineList, m_pStatusBar );
joachim99@8 2011 }
joachim99@8 2012 else if ( bMMB ) // Paste clipboard
joachim99@8 2013 {
joachim99@8 2014 pos = max2(pos,0);
joachim99@8 2015 line = max2(line,0);
joachim99@8 2016
joachim99@8 2017 m_selection.reset();
joachim99@8 2018 m_cursorXPos = pos;
joachim99@8 2019 m_cursorOldXPos = pos;
joachim99@8 2020 m_cursorYPos = line;
joachim99@8 2021
joachim99@66 2022 pasteClipboard( true );
joachim99@8 2023 }
joachim99@8 2024 }
joachim99@8 2025
joachim99@8 2026 void MergeResultWindow::mouseDoubleClickEvent( QMouseEvent* e )
joachim99@8 2027 {
joachim99@69 2028 if ( e->button() == Qt::LeftButton )
joachim99@8 2029 {
joachim99@8 2030 int line;
joachim99@8 2031 int pos;
joachim99@8 2032 convertToLinePos( e->x(), e->y(), line, pos );
joachim99@8 2033 m_cursorXPos = pos;
joachim99@8 2034 m_cursorOldXPos = pos;
joachim99@8 2035 m_cursorYPos = line;
joachim99@8 2036
joachim99@8 2037 // Get the string data of the current line
joachim99@8 2038
joachim99@8 2039 MergeLineList::iterator mlIt;
joachim99@8 2040 MergeEditLineList::iterator melIt;
joachim99@8 2041 calcIteratorFromLineNr( line, mlIt, melIt );
joachim99@68 2042 QString s = melIt->getString( this );
joachim99@8 2043
joachim99@68 2044 if ( !s.isEmpty() )
joachim99@8 2045 {
joachim99@8 2046 int pos1, pos2;
joachim99@8 2047
joachim99@69 2048 calcTokenPos( s, pos, pos1, pos2, m_pOptionDialog->m_tabSize );
joachim99@8 2049
joachim99@8 2050 resetSelection();
joachim99@69 2051 m_selection.start( line, convertToPosOnScreen( s, pos1, m_pOptionDialog->m_tabSize ) );
joachim99@69 2052 m_selection.end( line, convertToPosOnScreen( s, pos2, m_pOptionDialog->m_tabSize ) );
joachim99@8 2053
joachim99@8 2054 update();
joachim99@8 2055 // emit selectionEnd() happens in the mouseReleaseEvent.
joachim99@8 2056 }
joachim99@8 2057 }
joachim99@8 2058 }
joachim99@8 2059
joachim99@8 2060 void MergeResultWindow::mouseReleaseEvent ( QMouseEvent * e )
joachim99@8 2061 {
joachim99@69 2062 if ( e->button() == Qt::LeftButton )
joachim99@8 2063 {
joachim99@75 2064 if (m_delayedDrawTimer)
joachim99@75 2065 {
joachim99@75 2066 killTimer(m_delayedDrawTimer);
joachim99@75 2067 m_delayedDrawTimer = 0;
joachim99@75 2068 }
joachim99@8 2069
joachim99@8 2070 if (m_selection.firstLine != -1 )
joachim99@8 2071 {
joachim99@8 2072 emit selectionEnd();
joachim99@8 2073 }
joachim99@8 2074 }
joachim99@8 2075 }
joachim99@8 2076
joachim99@8 2077 void MergeResultWindow::mouseMoveEvent ( QMouseEvent * e )
joachim99@8 2078 {
joachim99@8 2079 int line;
joachim99@8 2080 int pos;
joachim99@8 2081 convertToLinePos( e->x(), e->y(), line, pos );
joachim99@8 2082 m_cursorXPos = pos;
joachim99@8 2083 m_cursorOldXPos = pos;
joachim99@8 2084 m_cursorYPos = line;
joachim99@8 2085 if (m_selection.firstLine != -1 )
joachim99@8 2086 {
joachim99@8 2087 m_selection.end( line, pos );
joachim99@8 2088 myUpdate(0);
joachim99@8 2089
joachim99@8 2090 //showStatusLine( line, m_winIdx, m_pFilename, m_pDiff3LineList, m_pStatusBar );
joachim99@8 2091
joachim99@8 2092 // Scroll because mouse moved out of the window
joachim99@8 2093 const QFontMetrics& fm = fontMetrics();
joachim99@8 2094 int fontWidth = fm.width('W');
joachim99@75 2095 int topLineYOffset = 0;
joachim99@8 2096 int deltaX=0;
joachim99@8 2097 int deltaY=0;
joachim99@68 2098 if ( ! m_pOptionDialog->m_bRightToLeftLanguage )
joachim99@68 2099 {
joachim99@68 2100 if ( e->x() < leftInfoWidth*fontWidth ) deltaX=-1;
joachim99@68 2101 if ( e->x() > width() ) deltaX=+1;
joachim99@68 2102 }
joachim99@68 2103 else
joachim99@68 2104 {
joachim99@68 2105 if ( e->x() > width()-1-leftInfoWidth*fontWidth ) deltaX=-1;
joachim99@68 2106 if ( e->x() < fontWidth ) deltaX=+1;
joachim99@68 2107 }
joachim99@8 2108 if ( e->y() < topLineYOffset ) deltaY=-1;
joachim99@8 2109 if ( e->y() > height() ) deltaY=+1;
joachim99@8 2110 m_scrollDeltaX = deltaX;
joachim99@8 2111 m_scrollDeltaY = deltaY;
joachim99@8 2112 if ( deltaX != 0 || deltaY!= 0)
joachim99@8 2113 {
joachim99@8 2114 emit scroll( deltaX, deltaY );
joachim99@8 2115 }
joachim99@8 2116 }
joachim99@8 2117 }
joachim99@8 2118
joachim99@8 2119
joachim99@8 2120 void MergeResultWindow::slotCursorUpdate()
joachim99@8 2121 {
joachim99@8 2122 m_cursorTimer.stop();
joachim99@8 2123 m_bCursorOn = !m_bCursorOn;
joachim99@8 2124
joachim99@8 2125 if ( isVisible() )
joachim99@69 2126 {
joachim99@69 2127 m_bCursorUpdate = true;
joachim99@69 2128
joachim99@69 2129 const QFontMetrics& fm = fontMetrics();
joachim99@69 2130 int fontWidth = fm.width("W");
joachim99@75 2131 int topLineYOffset = 0;
joachim99@69 2132 int xOffset = fontWidth * leftInfoWidth;
joachim99@69 2133 int yOffset = ( m_cursorYPos - m_firstLine ) * fm.height() + topLineYOffset;
joachim99@69 2134 int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
joachim99@69 2135
joachim99@69 2136 if (!m_pOptionDialog->m_bRightToLeftLanguage)
joachim99@69 2137 repaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
joachim99@69 2138 else
joachim99@69 2139 repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
joachim99@69 2140
joachim99@69 2141 m_bCursorUpdate=false;
joachim99@69 2142 }
joachim99@8 2143
joachim99@75 2144 m_cursorTimer.start(500);
joachim99@8 2145 }
joachim99@8 2146
joachim99@8 2147
joachim99@8 2148 void MergeResultWindow::wheelEvent( QWheelEvent* e )
joachim99@8 2149 {
joachim99@8 2150 int d = -e->delta()*QApplication::wheelScrollLines()/120;
joachim99@8 2151 e->accept();
joachim99@8 2152 scroll( 0, min2(d, getNofVisibleLines()) );
joachim99@8 2153 }
joachim99@8 2154
joachim99@51 2155
joachim99@8 2156 void MergeResultWindow::keyPressEvent( QKeyEvent* e )
joachim99@8 2157 {
joachim99@8 2158 int y = m_cursorYPos;
joachim99@8 2159 MergeLineList::iterator mlIt;
joachim99@8 2160 MergeEditLineList::iterator melIt;
joachim99@8 2161 calcIteratorFromLineNr( y, mlIt, melIt );
joachim99@8 2162
joachim99@68 2163 QString str = melIt->getString( this );
joachim99@69 2164 int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize );
joachim99@69 2165
joachim99@75 2166 bool bCtrl = ( e->QInputEvent::modifiers() & Qt::ControlModifier ) != 0 ;
joachim99@75 2167 bool bShift = ( e->QInputEvent::modifiers() & Qt::ShiftModifier ) != 0 ;
joachim99@8 2168 #ifdef _WIN32
joachim99@75 2169 bool bAlt = ( e->QInputEvent::modifiers() & Qt::AltModifier ) != 0 ;
joachim99@8 2170 if ( bCtrl && bAlt ){ bCtrl=false; bAlt=false; } // AltGr-Key pressed.
joachim99@8 2171 #endif
joachim99@8 2172
joachim99@8 2173 bool bYMoveKey = false;
joachim99@8 2174 // Special keys
joachim99@8 2175 switch ( e->key() )
joachim99@8 2176 {
joachim99@69 2177 case Qt::Key_Escape: break;
joachim99@8 2178 //case Key_Tab: break;
joachim99@69 2179 case Qt::Key_Backtab: break;
joachim99@69 2180 case Qt::Key_Delete:
joachim99@8 2181 {
joachim99@68 2182 if ( deleteSelection2( str, x, y, mlIt, melIt )) break;
joachim99@8 2183 if( !melIt->isEditableText() ) break;
joachim99@68 2184 if (x>=(int)str.length())
joachim99@8 2185 {
joachim99@58 2186 if ( y<m_totalSize-1 )
joachim99@8 2187 {
joachim99@8 2188 setModified();
joachim99@8 2189 MergeLineList::iterator mlIt1;
joachim99@8 2190 MergeEditLineList::iterator melIt1;
joachim99@8 2191 calcIteratorFromLineNr( y+1, mlIt1, melIt1 );
joachim99@8 2192 if ( melIt1->isEditableText() )
joachim99@8 2193 {
joachim99@68 2194 QString s2 = melIt1->getString( this );
joachim99@68 2195 melIt->setString( str + s2 );
joachim99@8 2196
joachim99@8 2197 // Remove the line
joachim99@8 2198 if ( mlIt1->mergeEditLineList.size()>1 )
joachim99@8 2199 mlIt1->mergeEditLineList.erase( melIt1 );
joachim99@8 2200 else
joachim99@8 2201 melIt1->setRemoved();
joachim99@8 2202 }
joachim99@8 2203 }
joachim99@8 2204 }
joachim99@8 2205 else
joachim99@8 2206 {
joachim99@68 2207 QString s = str.left(x);
joachim99@68 2208 s += str.mid( x+1 );
joachim99@8 2209 melIt->setString( s );
joachim99@8 2210 setModified();
joachim99@8 2211 }
joachim99@8 2212 break;
joachim99@8 2213 }
joachim99@69 2214 case Qt::Key_Backspace:
joachim99@8 2215 {
joachim99@68 2216 if ( deleteSelection2( str, x, y, mlIt, melIt )) break;
joachim99@8 2217 if( !melIt->isEditableText() ) break;
joachim99@8 2218 if (x==0)
joachim99@8 2219 {
joachim99@8 2220 if ( y>0 )
joachim99@8 2221 {
joachim99@8 2222 setModified();
joachim99@8 2223 MergeLineList::iterator mlIt1;
joachim99@8 2224 MergeEditLineList::iterator melIt1;
joachim99@8 2225 calcIteratorFromLineNr( y-1, mlIt1, melIt1 );
joachim99@8 2226 if ( melIt1->isEditableText() )
joachim99@8 2227 {
joachim99@68 2228 QString s1 = melIt1->getString( this );
joachim99@68 2229 melIt1->setString( s1 + str );
joachim99@8 2230
joachim99@8 2231 // Remove the previous line
joachim99@8 2232 if ( mlIt->mergeEditLineList.size()>1 )
joachim99@8 2233 mlIt->mergeEditLineList.erase( melIt );
joachim99@8 2234 else
joachim99@8 2235 melIt->setRemoved();
joachim99@8 2236
joachim99@8 2237 --y;
joachim99@68 2238 x=str.length();
joachim99@8 2239 }
joachim99@8 2240 }
joachim99@8 2241 }
joachim99@8 2242 else
joachim99@8 2243 {
joachim99@68 2244 QString s = str.left( x-1 );
joachim99@68 2245 s += str.mid( x );
joachim99@8 2246 --x;
joachim99@8 2247 melIt->setString( s );
joachim99@8 2248 setModified();
joachim99@8 2249 }
joachim99@8 2250 break;
joachim99@8 2251 }
joachim99@69 2252 case Qt::Key_Return:
joachim99@69 2253 case Qt::Key_Enter:
joachim99@8 2254 {
joachim99@8 2255 if( !melIt->isEditableText() ) break;
joachim99@68 2256 deleteSelection2( str, x, y, mlIt, melIt );
joachim99@8 2257 setModified();
joachim99@68 2258 QString indentation;
joachim99@8 2259 if ( m_pOptionDialog->m_bAutoIndentation )
joachim99@8 2260 { // calc last indentation
joachim99@8 2261 MergeLineList::iterator mlIt1 = mlIt;
joachim99@8 2262 MergeEditLineList::iterator melIt1 = melIt;
joachim99@8 2263 for(;;) {
joachim99@68 2264 const QString s = melIt1->getString(this);
joachim99@68 2265 if ( !s.isEmpty() ) {
joachim99@70 2266 int i;
joachim99@68 2267 for( i=0; i<s.length(); ++i ){ if(s[i]!=' ' && s[i]!='\t') break; }
joachim99@68 2268 if (i<s.length()) {
joachim99@68 2269 indentation = s.left(i);
joachim99@8 2270 break;
joachim99@8 2271 }
joachim99@8 2272 }
joachim99@77 2273 // Go back one line
joachim99@77 2274 if ( melIt1 != mlIt1->mergeEditLineList.begin() )
joachim99@77 2275 --melIt1;
joachim99@77 2276 else
joachim99@77 2277 {
joachim99@77 2278 if ( mlIt1 == m_mergeLineList.begin() ) break;
joachim99@8 2279 --mlIt1;
joachim99@8 2280 melIt1 = mlIt1->mergeEditLineList.end();
joachim99@8 2281 --melIt1;
joachim99@8 2282 }
joachim99@8 2283 }
joachim99@8 2284 }
joachim99@69 2285 MergeEditLine mel(mlIt->id3l); // Associate every mel with an id3l, even if not really valid.
joachim99@68 2286 mel.setString( indentation + str.mid(x) );
joachim99@8 2287
joachim99@68 2288 if ( x<(int)str.length() ) // Cut off the old line.
joachim99@8 2289 {
joachim99@8 2290 // Since ps possibly points into melIt->str, first copy it into a temporary.
joachim99@68 2291 QString temp = str.left(x);
joachim99@8 2292 melIt->setString( temp );
joachim99@8 2293 }
joachim99@8 2294
joachim99@8 2295 ++melIt;
joachim99@8 2296 mlIt->mergeEditLineList.insert( melIt, mel );
joachim99@68 2297 x = indentation.length();
joachim99@8 2298 ++y;
joachim99@8 2299 break;
joachim99@8 2300 }
joachim99@69 2301 case Qt::Key_Insert: m_bInsertMode = !m_bInsertMode; break;
joachim99@69 2302 case Qt::Key_Pause: break;
joachim99@69 2303 case Qt::Key_Print: break;
joachim99@69 2304 case Qt::Key_SysReq: break;
joachim99@69 2305 case Qt::Key_Home: x=0; if(bCtrl){y=0; } break; // cursor movement
joachim99@69 2306 case Qt::Key_End: x=INT_MAX; if(bCtrl){y=INT_MAX;} break;
joachim99@69 2307
joachim99@69 2308 case Qt::Key_Left:
joachim99@69 2309 case Qt::Key_Right:
joachim99@69 2310 if ( (e->key()==Qt::Key_Left) ^ m_pOptionDialog->m_bRightToLeftLanguage ) // operator^: XOR
joachim99@8 2311 {
joachim99@68 2312 if ( !bCtrl )
joachim99@68 2313 {
joachim99@68 2314 --x;
joachim99@68 2315 if(x<0 && y>0){--y; x=INT_MAX;}
joachim99@68 2316 }
joachim99@68 2317 else
joachim99@68 2318 {
joachim99@68 2319 while( x>0 && (str[x-1]==' ' || str[x-1]=='\t') ) --x;
joachim99@68 2320 while( x>0 && (str[x-1]!=' ' && str[x-1]!='\t') ) --x;
joachim99@68 2321 }
joachim99@8 2322 }
joachim99@8 2323 else
joachim99@8 2324 {
joachim99@68 2325 if ( !bCtrl )
joachim99@68 2326 {
joachim99@68 2327 ++x; if(x>(int)str.length() && y<m_totalSize-1){ ++y; x=0; }
joachim99@68 2328 }
joachim99@8 2329
joachim99@68 2330 else
joachim99@68 2331 {
joachim99@68 2332 while( x<(int)str.length() && (str[x]==' ' || str[x]=='\t') ) ++x;
joachim99@68 2333 while( x<(int)str.length() && (str[x]!=' ' && str[x]!='\t') ) ++x;
joachim99@68 2334 }
joachim99@8 2335 }
joachim99@8 2336 break;
joachim99@8 2337
joachim99@75 2338 case Qt::Key_Up: if (!bCtrl){ --y; bYMoveKey=true; } break;
joachim99@75 2339 case Qt::Key_Down: if (!bCtrl){ ++y; bYMoveKey=true; } break;
joachim99@75 2340 case Qt::Key_PageUp: if (!bCtrl){ y-=getNofVisibleLines(); bYMoveKey=true; } break;
joachim99@75 2341 case Qt::Key_PageDown: if (!bCtrl){ y+=getNofVisibleLines(); bYMoveKey=true; } break;
joachim99@8 2342 default:
joachim99@8 2343 {
joachim99@8 2344 QString t = e->text();
joachim99@8 2345 if( t.isEmpty() || bCtrl )
joachim99@8 2346 { e->ignore(); return; }
joachim99@8 2347 else
joachim99@8 2348 {
joachim99@8 2349 if( bCtrl )
joachim99@8 2350 {
joachim99@8 2351 e->ignore(); return;
joachim99@8 2352 }
joachim99@8 2353 else
joachim99@8 2354 {
joachim99@8 2355 if( !melIt->isEditableText() ) break;
joachim99@68 2356 deleteSelection2( str, x, y, mlIt, melIt );
joachim99@8 2357
joachim99@8 2358 setModified();
joachim99@8 2359 // Characters to insert
joachim99@68 2360 QString s=str;
joachim99@8 2361 if ( t[0]=='\t' && m_pOptionDialog->m_bReplaceTabs )
joachim99@8 2362 {
joachim99@69 2363 int spaces = (m_cursorXPos / m_pOptionDialog->m_tabSize + 1)*m_pOptionDialog->m_tabSize - m_cursorXPos;
joachim99@8 2364 t.fill( ' ', spaces );
joachim99@8 2365 }
joachim99@8 2366 if ( m_bInsertMode )
joachim99@68 2367 s.insert( x, t );
joachim99@8 2368 else
joachim99@68 2369 s.replace( x, t.length(), t );
joachim99@8 2370
joachim99@8 2371 melIt->setString( s );
joachim99@8 2372 x += t.length();
joachim99@8 2373 bShift = false;
joachim99@8 2374 }
joachim99@8 2375 }
joachim99@8 2376 }
joachim99@8 2377 }
joachim99@8 2378
joachim99@58 2379 y = minMaxLimiter( y, 0, m_totalSize-1 );
joachim99@8 2380
joachim99@8 2381 calcIteratorFromLineNr( y, mlIt, melIt );
joachim99@68 2382 str = melIt->getString( this );
joachim99@8 2383
joachim99@68 2384 x = minMaxLimiter( x, 0, (int)str.length() );
joachim99@8 2385
joachim99@8 2386 int newFirstLine = m_firstLine;
joachim99@8 2387 int newFirstColumn = m_firstColumn;
joachim99@8 2388
joachim99@8 2389 if ( y<m_firstLine )
joachim99@8 2390 newFirstLine = y;
joachim99@8 2391 else if ( y > m_firstLine + getNofVisibleLines() )
joachim99@8 2392 newFirstLine = y - getNofVisibleLines();
joachim99@8 2393
joachim99@8 2394 if (bYMoveKey)
joachim99@69 2395 x=convertToPosInText( str, m_cursorOldXPos, m_pOptionDialog->m_tabSize );
joachim99@69 2396
joachim99@69 2397 int xOnScreen = convertToPosOnScreen( str, x, m_pOptionDialog->m_tabSize );
joachim99@8 2398 if ( xOnScreen<m_firstColumn )
joachim99@8 2399 newFirstColumn = xOnScreen;
joachim99@8 2400 else if ( xOnScreen > m_firstColumn + getNofVisibleColumns() )
joachim99@8 2401 newFirstColumn = xOnScreen - getNofVisibleColumns();
joachim99@8 2402
joachim99@8 2403 if ( bShift )
joachim99@8 2404 {
joachim99@8 2405 if (m_selection.firstLine==-1)
joachim99@8 2406 m_selection.start( m_cursorYPos, m_cursorXPos );
joachim99@8 2407
joachim99@8 2408 m_selection.end( y, xOnScreen );
joachim99@8 2409 }
joachim99@8 2410 else
joachim99@8 2411 m_selection.reset();
joachim99@8 2412
joachim99@8 2413 m_cursorYPos = y;
joachim99@8 2414 m_cursorXPos = xOnScreen;
joachim99@8 2415 if ( ! bYMoveKey )
joachim99@8 2416 m_cursorOldXPos = m_cursorXPos;
joachim99@8 2417
joachim99@8 2418 m_bCursorOn = false;
joachim99@8 2419
joachim99@8 2420 if ( newFirstLine!=m_firstLine || newFirstColumn!=m_firstColumn )
joachim99@8 2421 {
joachim99@8 2422 m_bCursorOn = true;
joachim99@8 2423 scroll( newFirstColumn-m_firstColumn, newFirstLine-m_firstLine );
joachim99@8 2424 return;
joachim99@8 2425 }
joachim99@8 2426
joachim99@8 2427 m_bCursorOn = true;
joachim99@8 2428 update();
joachim99@8 2429 }
joachim99@8 2430
joachim99@8 2431 void MergeResultWindow::calcIteratorFromLineNr(
joachim99@8 2432 int line,
joachim99@8 2433 MergeResultWindow::MergeLineList::iterator& mlIt,
joachim99@8 2434 MergeResultWindow::MergeEditLineList::iterator& melIt
joachim99@8 2435 )
joachim99@8 2436 {
joachim99@8 2437 for( mlIt = m_mergeLineList.begin(); mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 2438 {
joachim99@8 2439 MergeLine& ml = *mlIt;
joachim99@8 2440 if ( line > ml.mergeEditLineList.size() )
joachim99@8 2441 {
joachim99@8 2442 line -= ml.mergeEditLineList.size();
joachim99@8 2443 }
joachim99@8 2444 else
joachim99@8 2445 {
joachim99@8 2446 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt )
joachim99@8 2447 {
joachim99@8 2448 --line;
joachim99@8 2449 if (line<0) return;
joachim99@8 2450 }
joachim99@8 2451 }
joachim99@8 2452 }
joachim99@8 2453 assert(false);
joachim99@8 2454 }
joachim99@8 2455
joachim99@8 2456
joachim99@8 2457 QString MergeResultWindow::getSelection()
joachim99@8 2458 {
joachim99@8 2459 QString selectionString;
joachim99@8 2460
joachim99@8 2461 int line = 0;
joachim99@8 2462 MergeLineList::iterator mlIt = m_mergeLineList.begin();
joachim99@8 2463 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 2464 {
joachim99@8 2465 MergeLine& ml = *mlIt;
joachim99@8 2466 MergeEditLineList::iterator melIt;
joachim99@8 2467 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt )
joachim99@8 2468 {
joachim99@8 2469 MergeEditLine& mel = *melIt;
joachim99@8 2470
joachim99@8 2471 if ( m_selection.lineWithin(line) )
joachim99@8 2472 {
joachim99@8 2473 int outPos = 0;
joachim99@8 2474 if (mel.isEditableText())
joachim99@8 2475 {
joachim99@68 2476 const QString str = mel.getString( this );
joachim99@8 2477
joachim99@8 2478 // Consider tabs
joachim99@8 2479
joachim99@70 2480 for( int i=0; i<str.length(); ++i )
joachim99@8 2481 {
joachim99@8 2482 int spaces = 1;
joachim99@68 2483 if ( str[i]=='\t' )
joachim99@8 2484 {
joachim99@69 2485 spaces = tabber( outPos, m_pOptionDialog->m_tabSize );
joachim99@8 2486 }
joachim99@8 2487
joachim99@8 2488 if( m_selection.within( line, outPos ) )
joachim99@8 2489 {
joachim99@68 2490 selectionString += str[i];
joachim99@8 2491 }
joachim99@8 2492
joachim99@8 2493 outPos += spaces;
joachim99@8 2494 }
joachim99@8 2495 }
joachim99@8 2496 else if ( mel.isConflict() )
joachim99@8 2497 {
joachim99@58 2498 selectionString += i18n("<Merge Conflict>");
joachim99@8 2499 }
joachim99@68 2500
joachim99@8 2501 if( m_selection.within( line, outPos ) )
joachim99@8 2502 {
joachim99@8 2503 #ifdef _WIN32
joachim99@8 2504 selectionString += '\r';
joachim99@8 2505 #endif
joachim99@8 2506 selectionString += '\n';
joachim99@8 2507 }
joachim99@8 2508 }
joachim99@8 2509
joachim99@8 2510 ++line;
joachim99@8 2511 }
joachim99@8 2512 }
joachim99@8 2513
joachim99@8 2514 return selectionString;
joachim99@8 2515 }
joachim99@8 2516
joachim99@68 2517 bool MergeResultWindow::deleteSelection2( QString& s, int& x, int& y,
joachim99@8 2518 MergeLineList::iterator& mlIt, MergeEditLineList::iterator& melIt )
joachim99@8 2519 {
joachim99@8 2520 if (m_selection.firstLine!=-1 && m_selection.bSelectionContainsData )
joachim99@8 2521 {
joachim99@8 2522 deleteSelection();
joachim99@8 2523 y = m_cursorYPos;
joachim99@8 2524 calcIteratorFromLineNr( y, mlIt, melIt );
joachim99@68 2525 s = melIt->getString( this );
joachim99@69 2526 x = convertToPosInText( s, m_cursorXPos, m_pOptionDialog->m_tabSize );
joachim99@8 2527 return true;
joachim99@8 2528 }
joachim99@8 2529 return false;
joachim99@8 2530 }
joachim99@8 2531
joachim99@8 2532 void MergeResultWindow::deleteSelection()
joachim99@8 2533 {
joachim99@8 2534 if ( m_selection.firstLine==-1 || !m_selection.bSelectionContainsData )
joachim99@8 2535 {
joachim99@8 2536 return;
joachim99@8 2537 }
joachim99@8 2538 setModified();
joachim99@8 2539
joachim99@8 2540 int line = 0;
joachim99@8 2541 MergeLineList::iterator mlItFirst;
joachim99@8 2542 MergeEditLineList::iterator melItFirst;
joachim99@68 2543 QString firstLineString;
joachim99@8 2544
joachim99@8 2545 int firstLine = -1;
joachim99@8 2546 int lastLine = -1;
joachim99@8 2547
joachim99@8 2548 MergeLineList::iterator mlIt;
joachim99@8 2549 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 2550 {
joachim99@8 2551 MergeLine& ml = *mlIt;
joachim99@8 2552 MergeEditLineList::iterator melIt;
joachim99@8 2553 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt )
joachim99@8 2554 {
joachim99@8 2555 MergeEditLine& mel = *melIt;
joachim99@8 2556
joachim99@8 2557 if ( mel.isEditableText() && m_selection.lineWithin(line) )
joachim99@8 2558 {
joachim99@8 2559 if ( firstLine==-1 )
joachim99@8 2560 firstLine = line;
joachim99@8 2561 lastLine = line;
joachim99@8 2562 }
joachim99@8 2563
joachim99@8 2564 ++line;
joachim99@8 2565 }
joachim99@8 2566 }
joachim99@8 2567
joachim99@8 2568 if ( firstLine == -1 )
joachim99@8 2569 {
joachim99@8 2570 return; // Nothing to delete.
joachim99@8 2571 }
joachim99@8 2572
joachim99@8 2573 line = 0;
joachim99@8 2574 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 2575 {
joachim99@8 2576 MergeLine& ml = *mlIt;
joachim99@8 2577 MergeEditLineList::iterator melIt, melIt1;
joachim99@8 2578 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); )
joachim99@8 2579 {
joachim99@8 2580 MergeEditLine& mel = *melIt;
joachim99@8 2581 melIt1 = melIt;
joachim99@8 2582 ++melIt1;
joachim99@8 2583
joachim99@8 2584 if ( mel.isEditableText() && m_selection.lineWithin(line) )
joachim99@8 2585 {
joachim99@68 2586 QString lineString = mel.getString( this );
joachim99@8 2587
joachim99@8 2588 int firstPosInLine = m_selection.firstPosInLine(line);
joachim99@8 2589 int lastPosInLine = m_selection.lastPosInLine(line);
joachim99@8 2590
joachim99@8 2591 if ( line==firstLine )
joachim99@8 2592 {
joachim99@8 2593 mlItFirst = mlIt;
joachim99@8 2594 melItFirst = melIt;
joachim99@69 2595 int pos = convertToPosInText( lineString, firstPosInLine, m_pOptionDialog->m_tabSize );
joachim99@68 2596 firstLineString = lineString.left( pos );
joachim99@8 2597 }
joachim99@8 2598
joachim99@8 2599 if ( line==lastLine )
joachim99@8 2600 {
joachim99@8 2601 // This is the last line in the selection
joachim99@69 2602 int pos = convertToPosInText( lineString, lastPosInLine, m_pOptionDialog->m_tabSize );
joachim99@68 2603 firstLineString += lineString.mid( pos ); // rest of line
joachim99@8 2604 melItFirst->setString( firstLineString );
joachim99@8 2605 }
joachim99@8 2606
joachim99@8 2607 if ( line!=firstLine )
joachim99@8 2608 {
joachim99@8 2609 // Remove the line
joachim99@8 2610 if ( mlIt->mergeEditLineList.size()>1 )
joachim99@58 2611 mlIt->mergeEditLineList.erase( melIt );
joachim99@8 2612 else
joachim99@58 2613 melIt->setRemoved();
joachim99@8 2614 }
joachim99@8 2615 }
joachim99@8 2616
joachim99@8 2617 ++line;
joachim99@8 2618 melIt = melIt1;
joachim99@8 2619 }
joachim99@8 2620 }
joachim99@8 2621
joachim99@8 2622 m_cursorYPos = m_selection.beginLine();
joachim99@8 2623 m_cursorXPos = m_selection.beginPos();
joachim99@8 2624 m_cursorOldXPos = m_cursorXPos;
joachim99@8 2625
joachim99@8 2626 m_selection.reset();
joachim99@8 2627 }
joachim99@8 2628
joachim99@66 2629 void MergeResultWindow::pasteClipboard( bool bFromSelection )
joachim99@8 2630 {
joachim99@8 2631 if (m_selection.firstLine != -1 )
joachim99@8 2632 deleteSelection();
joachim99@8 2633
joachim99@8 2634 setModified();
joachim99@8 2635
joachim99@8 2636 int y = m_cursorYPos;
joachim99@8 2637 MergeLineList::iterator mlIt;
joachim99@8 2638 MergeEditLineList::iterator melIt, melItAfter;
joachim99@8 2639 calcIteratorFromLineNr( y, mlIt, melIt );
joachim99@8 2640 melItAfter = melIt;
joachim99@8 2641 ++melItAfter;
joachim99@68 2642 QString str = melIt->getString( this );
joachim99@69 2643 int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize );
joachim99@8 2644
joachim99@66 2645 if ( !QApplication::clipboard()->supportsSelection() )
joachim99@66 2646 bFromSelection = false;
joachim99@8 2647
joachim99@68 2648 QString clipBoard = QApplication::clipboard()->text( bFromSelection ? QClipboard::Selection : QClipboard::Clipboard );
joachim99@68 2649
joachim99@68 2650 QString currentLine = str.left(x);
joachim99@68 2651 QString endOfLine = str.mid(x);
joachim99@8 2652 int i;
joachim99@68 2653 int len = clipBoard.length();
joachim99@68 2654 for( i=0; i<len; ++i )
joachim99@8 2655 {
joachim99@68 2656 QChar c = clipBoard[i];
joachim99@8 2657 if ( c == '\r' ) continue;
joachim99@8 2658 if ( c == '\n' )
joachim99@8 2659 {
joachim99@8 2660 melIt->setString( currentLine );
joachim99@69 2661 MergeEditLine mel(mlIt->id3l); // Associate every mel with an id3l, even if not really valid.
joachim99@69 2662 melIt = mlIt->mergeEditLineList.insert( melItAfter, mel );
joachim99@8 2663 currentLine = "";
joachim99@8 2664 x=0;
joachim99@8 2665 ++y;
joachim99@8 2666 }
joachim99@8 2667 else
joachim99@8 2668 {
joachim99@8 2669 currentLine += c;
joachim99@8 2670 ++x;
joachim99@8 2671 }
joachim99@8 2672 }
joachim99@8 2673
joachim99@8 2674 currentLine += endOfLine;
joachim99@8 2675 melIt->setString( currentLine );
joachim99@8 2676
joachim99@8 2677 m_cursorYPos = y;
joachim99@69 2678 m_cursorXPos = convertToPosOnScreen( currentLine, x, m_pOptionDialog->m_tabSize );
joachim99@8 2679 m_cursorOldXPos = m_cursorXPos;
joachim99@8 2680
joachim99@8 2681 update();
joachim99@8 2682 }
joachim99@8 2683
joachim99@8 2684 void MergeResultWindow::resetSelection()
joachim99@8 2685 {
joachim99@8 2686 m_selection.reset();
joachim99@8 2687 update();
joachim99@8 2688 }
joachim99@8 2689
joachim99@75 2690 void MergeResultWindow::setModified(bool bModified)
joachim99@8 2691 {
joachim99@75 2692 if (bModified != m_bModified)
joachim99@8 2693 {
joachim99@75 2694 m_bModified = bModified;
joachim99@75 2695 emit modifiedChanged(m_bModified);
joachim99@8 2696 }
joachim99@8 2697 }
joachim99@8 2698
joachim99@8 2699 /// Saves and returns true when successful.
joachim99@80 2700 bool MergeResultWindow::saveDocument( const QString& fileName, QTextCodec* pEncoding, e_LineEndStyle eLineEndStyle )
joachim99@8 2701 {
joachim99@8 2702 // Are still conflicts somewhere?
joachim99@8 2703 if ( getNrOfUnsolvedConflicts()>0 )
joachim99@8 2704 {
joachim99@8 2705 KMessageBox::error( this,
joachim99@8 2706 i18n("Not all conflicts are solved yet.\n"
joachim99@8 2707 "File not saved.\n"),
joachim99@51 2708 i18n("Conflicts Left"));
joachim99@8 2709 return false;
joachim99@8 2710 }
joachim99@8 2711
joachim99@80 2712 if ( eLineEndStyle==eLineEndStyleConflict || eLineEndStyle==eLineEndStyleUndefined )
joachim99@80 2713 {
joachim99@80 2714 KMessageBox::error( this,
joachim99@80 2715 i18n("There is a line end style conflict. Please choose the line end style manually.\n"
joachim99@80 2716 "File not saved.\n"),
joachim99@80 2717 i18n("Conflicts Left"));
joachim99@80 2718 return false;
joachim99@80 2719 }
joachim99@80 2720
joachim99@8 2721 update();
joachim99@8 2722
joachim99@8 2723 FileAccess file( fileName, true /*bWantToWrite*/ );
joachim99@8 2724 if ( m_pOptionDialog->m_bDmCreateBakFiles && file.exists() )
joachim99@8 2725 {
joachim99@8 2726 bool bSuccess = file.createBackup(".orig");
joachim99@8 2727 if ( !bSuccess )
joachim99@8 2728 {
joachim99@68 2729 KMessageBox::error( this, file.getStatusText() + i18n("\n\nCreating backup failed. File not saved."), i18n("File Save Error") );
joachim99@8 2730 return false;
joachim99@8 2731 }
joachim99@8 2732 }
joachim99@8 2733
joachim99@8 2734 QByteArray dataArray;
joachim99@75 2735 QTextStream textOutStream(&dataArray, QIODevice::WriteOnly);
joachim99@91 2736 if ( pEncoding->name()=="UTF-8" )
joachim99@91 2737 textOutStream.setGenerateByteOrderMark( false ); // Shouldn't be necessary. Bug in Qt or docs
joachim99@91 2738 else
joachim99@91 2739 textOutStream.setGenerateByteOrderMark( true ); // Only for UTF-16
joachim99@75 2740 textOutStream.setCodec( pEncoding );
joachim99@68 2741
joachim99@68 2742 int line = 0;
joachim99@68 2743 MergeLineList::iterator mlIt = m_mergeLineList.begin();
joachim99@68 2744 for(mlIt = m_mergeLineList.begin();mlIt!=m_mergeLineList.end(); ++mlIt)
joachim99@8 2745 {
joachim99@68 2746 MergeLine& ml = *mlIt;
joachim99@68 2747 MergeEditLineList::iterator melIt;
joachim99@68 2748 for( melIt = ml.mergeEditLineList.begin(); melIt != ml.mergeEditLineList.end(); ++melIt )
joachim99@8 2749 {
joachim99@68 2750 MergeEditLine& mel = *melIt;
joachim99@68 2751
joachim99@68 2752 if ( mel.isEditableText() )
joachim99@8 2753 {
joachim99@68 2754 QString str = mel.getString( this );
joachim99@8 2755
joachim99@68 2756 if (line>0) // Prepend line feed, but not for first line
joachim99@8 2757 {
joachim99@80 2758 if ( eLineEndStyle == eLineEndStyleDos )
joachim99@68 2759 { str.prepend("\r\n"); }
joachim99@8 2760 else
joachim99@68 2761 { str.prepend("\n"); }
joachim99@8 2762 }
joachim99@8 2763
joachim99@68 2764 textOutStream << str;
joachim99@77 2765 ++line;
joachim99@8 2766 }
joachim99@8 2767 }
joachim99@8 2768 }
joachim99@75 2769 textOutStream.flush();
joachim99@68 2770 bool bSuccess = file.writeFile( dataArray.data(), dataArray.size() );
joachim99@8 2771 if ( ! bSuccess )
joachim99@8 2772 {
joachim99@51 2773 KMessageBox::error( this, i18n("Error while writing."), i18n("File Save Error") );
joachim99@8 2774 return false;
joachim99@8 2775 }
joachim99@8 2776
joachim99@75 2777 setModified( false );
joachim99@8 2778 update();
joachim99@8 2779
joachim99@8 2780 return true;
joachim99@8 2781 }
joachim99@8 2782
joachim99@68 2783 QString MergeResultWindow::getString( int lineIdx )
joachim99@8 2784 {
joachim99@8 2785 MergeResultWindow::MergeLineList::iterator mlIt;
joachim99@8 2786 MergeResultWindow::MergeEditLineList::iterator melIt;
joachim99@8 2787 calcIteratorFromLineNr( lineIdx, mlIt, melIt );
joachim99@68 2788 QString s = melIt->getString( this );
joachim99@68 2789 return s;
joachim99@8 2790 }
joachim99@8 2791
joachim99@68 2792 bool MergeResultWindow::findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive )
joachim99@8 2793 {
joachim99@8 2794 int it = d3vLine;
joachim99@8 2795 int endIt = bDirDown ? getNofLines() : -1;
joachim99@8 2796 int step = bDirDown ? 1 : -1;
joachim99@8 2797 int startPos = posInLine;
joachim99@8 2798
joachim99@8 2799 for( ; it!=endIt; it+=step )
joachim99@8 2800 {
joachim99@68 2801 QString line = getString( it );
joachim99@8 2802 if ( !line.isEmpty() )
joachim99@8 2803 {
joachim99@75 2804 int pos = line.indexOf( s, startPos, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive );
joachim99@8 2805 if ( pos != -1 )
joachim99@8 2806 {
joachim99@8 2807 d3vLine = it;
joachim99@8 2808 posInLine = pos;
joachim99@8 2809 return true;
joachim99@8 2810 }
joachim99@8 2811
joachim99@8 2812 startPos = 0;
joachim99@8 2813 }
joachim99@8 2814 }
joachim99@8 2815 return false;
joachim99@8 2816 }
joachim99@8 2817
joachim99@8 2818 void MergeResultWindow::setSelection( int firstLine, int startPos, int lastLine, int endPos )
joachim99@8 2819 {
joachim99@69 2820 if ( lastLine >= getNofLines() )
joachim99@69 2821 {
joachim99@69 2822 lastLine = getNofLines()-1;
joachim99@69 2823 QString s = getString( lastLine );
joachim99@69 2824 endPos = s.length();
joachim99@69 2825 }
joachim99@8 2826 m_selection.reset();
joachim99@69 2827 m_selection.start( firstLine, convertToPosOnScreen( getString(firstLine), startPos, m_pOptionDialog->m_tabSize ) );
joachim99@69 2828 m_selection.end( lastLine, convertToPosOnScreen( getString(lastLine), endPos, m_pOptionDialog->m_tabSize ) );
joachim99@8 2829 update();
joachim99@8 2830 }
joachim99@8 2831
joachim99@75 2832 Overview::Overview( OptionDialog* pOptions )
joachim99@75 2833 //: QWidget( pParent, 0, Qt::WNoAutoErase )
joachim99@8 2834 {
joachim99@8 2835 m_pDiff3LineList = 0;
joachim99@8 2836 m_pOptions = pOptions;
joachim99@8 2837 m_bTripleDiff = false;
joachim99@66 2838 m_eOverviewMode = eOMNormal;
joachim99@66 2839 m_nofLines = 1;
joachim99@69 2840 m_bPaintingAllowed = false;
joachim99@8 2841 setFixedWidth(20);
joachim99@8 2842 }
joachim99@8 2843
joachim99@8 2844 void Overview::init( Diff3LineList* pDiff3LineList, bool bTripleDiff )
joachim99@8 2845 {
joachim99@8 2846 m_pDiff3LineList = pDiff3LineList;
joachim99@8 2847 m_bTripleDiff = bTripleDiff;
joachim99@75 2848 m_pixmap = QPixmap( QSize(0,0) ); // make sure that a redraw happens
joachim99@8 2849 update();
joachim99@8 2850 }
joachim99@8 2851
joachim99@69 2852 void Overview::reset()
joachim99@69 2853 {
joachim99@69 2854 m_pDiff3LineList = 0;
joachim99@69 2855 }
joachim99@69 2856
joachim99@51 2857 void Overview::slotRedraw()
joachim99@51 2858 {
joachim99@75 2859 m_pixmap = QPixmap( QSize(0,0) ); // make sure that a redraw happens
joachim99@51 2860 update();
joachim99@51 2861 }
joachim99@51 2862
joachim99@8 2863 void Overview::setRange( int firstLine, int pageHeight )
joachim99@8 2864 {
joachim99@8 2865 m_firstLine = firstLine;
joachim99@8 2866 m_pageHeight = pageHeight;
joachim99@8 2867 update();
joachim99@8 2868 }
joachim99@8 2869 void Overview::setFirstLine( int firstLine )
joachim99@8 2870 {
joachim99@8 2871 m_firstLine = firstLine;
joachim99@8 2872 update();
joachim99@8 2873 }
joachim99@8 2874
joachim99@66 2875 void Overview::setOverviewMode( e_OverviewMode eOverviewMode )
joachim99@66 2876 {
joachim99@66 2877 m_eOverviewMode = eOverviewMode;
joachim99@69 2878 slotRedraw();
joachim99@66 2879 }
joachim99@66 2880
joachim99@66 2881 Overview::e_OverviewMode Overview::getOverviewMode()
joachim99@66 2882 {
joachim99@66 2883 return m_eOverviewMode;
joachim99@66 2884 }
joachim99@66 2885
joachim99@8 2886 void Overview::mousePressEvent( QMouseEvent* e )
joachim99@8 2887 {
joachim99@8 2888 int h = height()-1;
joachim99@66 2889 int h1 = h * m_pageHeight / max2(1,m_nofLines)+3;
joachim99@8 2890 if ( h>0 )
joachim99@66 2891 emit setLine( ( e->y() - h1/2 )*m_nofLines/h );
joachim99@8 2892 }
joachim99@8 2893
joachim99@8 2894 void Overview::mouseMoveEvent( QMouseEvent* e )
joachim99@8 2895 {
joachim99@8 2896 mousePressEvent(e);
joachim99@8 2897 }
joachim99@8 2898
joachim99@8 2899 void Overview::setPaintingAllowed( bool bAllowPainting )
joachim99@8 2900 {
joachim99@8 2901 if (m_bPaintingAllowed != bAllowPainting)
joachim99@8 2902 {
joachim99@8 2903 m_bPaintingAllowed = bAllowPainting;
joachim99@8 2904 if ( m_bPaintingAllowed ) update();
joachim99@69 2905 else reset();
joachim99@8 2906 }
joachim99@8 2907 }
joachim99@8 2908
joachim99@66 2909 void Overview::drawColumn( QPainter& p, e_OverviewMode eOverviewMode, int x, int w, int h, int nofLines )
joachim99@66 2910 {
joachim99@69 2911 p.setPen(Qt::black);
joachim99@66 2912 p.drawLine( x, 0, x, h );
joachim99@66 2913
joachim99@66 2914 if (nofLines==0) return;
joachim99@66 2915
joachim99@66 2916 int line = 0;
joachim99@66 2917 int oldY = 0;
joachim99@66 2918 int oldConflictY = -1;
joachim99@66 2919 int wrapLineIdx=0;
joachim99@66 2920 Diff3LineList::const_iterator i;
joachim99@66 2921 for( i = m_pDiff3LineList->begin(); i!= m_pDiff3LineList->end(); )
joachim99@66 2922 {
joachim99@66 2923 const Diff3Line& d3l = *i;
joachim99@66 2924 int y = h * (line+1) / nofLines;
joachim99@66 2925 e_MergeDetails md;
joachim99@66 2926 bool bConflict;
joachim99@66 2927 bool bLineRemoved;
joachim99@66 2928 int src;
joachim99@66 2929 mergeOneLine( d3l, md, bConflict, bLineRemoved, src, !m_bTripleDiff );
joachim99@66 2930
joachim99@66 2931 QColor c = m_pOptions->m_bgColor;
joachim99@66 2932 bool bWhiteSpaceChange = false;
joachim99@66 2933 //if( bConflict ) c=m_pOptions->m_colorForConflict;
joachim99@66 2934 //else
joachim99@66 2935 if ( eOverviewMode==eOMNormal )
joachim99@66 2936 {
joachim99@66 2937 switch( md )
joachim99@66 2938 {
joachim99@66 2939 case eDefault:
joachim99@66 2940 case eNoChange:
joachim99@66 2941 c = m_pOptions->m_bgColor;
joachim99@66 2942 break;
joachim99@66 2943
joachim99@66 2944 case eBAdded:
joachim99@66 2945 case eBDeleted:
joachim99@66 2946 case eBChanged:
joachim99@66 2947 c = bConflict ? m_pOptions->m_colorForConflict : m_pOptions->m_colorB;
joachim99@66 2948 bWhiteSpaceChange = d3l.bAEqB || d3l.bWhiteLineA && d3l.bWhiteLineB;
joachim99@66 2949 break;
joachim99@66 2950
joachim99@66 2951 case eCAdded:
joachim99@66 2952 case eCDeleted:
joachim99@66 2953 case eCChanged:
joachim99@66 2954 bWhiteSpaceChange = d3l.bAEqC || d3l.bWhiteLineA && d3l.bWhiteLineC;
joachim99@66 2955 c = bConflict ? m_pOptions->m_colorForConflict : m_pOptions->m_colorC;
joachim99@66 2956 break;
joachim99@66 2957
joachim99@66 2958 case eBCChanged: // conflict
joachim99@66 2959 case eBCChangedAndEqual: // possible conflict
joachim99@66 2960 case eBCDeleted: // possible conflict
joachim99@66 2961 case eBChanged_CDeleted: // conflict
joachim99@66 2962 case eCChanged_BDeleted: // conflict
joachim99@66 2963 case eBCAdded: // conflict
joachim99@66 2964 case eBCAddedAndEqual: // possible conflict
joachim99@66 2965 c=m_pOptions->m_colorForConflict;
joachim99@66 2966 break;
joachim99@66 2967 default: assert(false); break;
joachim99@66 2968 }
joachim99@66 2969 }
joachim99@66 2970 else if ( eOverviewMode==eOMAvsB )
joachim99@66 2971 {
joachim99@66 2972 switch( md )
joachim99@66 2973 {
joachim99@66 2974 case eDefault:
joachim99@66 2975 case eNoChange:
joachim99@66 2976 case eCAdded:
joachim99@66 2977 case eCDeleted:
joachim99@66 2978 case eCChanged: break;
joachim99@66 2979 default: c = m_pOptions->m_colorForConflict;
joachim99@66 2980 bWhiteSpaceChange = d3l.bAEqB || d3l.bWhiteLineA && d3l.bWhiteLineB;
joachim99@66 2981 break;
joachim99@66 2982 }
joachim99@66 2983 }
joachim99@66 2984 else if ( eOverviewMode==eOMAvsC )
joachim99@66 2985 {
joachim99@66 2986 switch( md )
joachim99@66 2987 {
joachim99@66 2988 case eDefault:
joachim99@66 2989 case eNoChange:
joachim99@66 2990 case eBAdded:
joachim99@66 2991 case eBDeleted:
joachim99@66 2992 case eBChanged: break;
joachim99@66 2993 default: c = m_pOptions->m_colorForConflict;
joachim99@66 2994 bWhiteSpaceChange = d3l.bAEqC || d3l.bWhiteLineA && d3l.bWhiteLineC;
joachim99@69 2995 break;
joachim99@66 2996 }
joachim99@66 2997 }
joachim99@66 2998 else if ( eOverviewMode==eOMBvsC )
joachim99@66 2999 {
joachim99@66 3000 switch( md )
joachim99@66 3001 {
joachim99@66 3002 case eDefault:
joachim99@66 3003 case eNoChange:
joachim99@66 3004 case eBCChangedAndEqual:
joachim99@66 3005 case eBCDeleted:
joachim99@66 3006 case eBCAddedAndEqual: break;
joachim99@66 3007 default: c=m_pOptions->m_colorForConflict;
joachim99@66 3008 bWhiteSpaceChange = d3l.bBEqC || d3l.bWhiteLineB && d3l.bWhiteLineC;
joachim99@66 3009 break;
joachim99@66 3010 }
joachim99@66 3011 }
joachim99@66 3012
joachim99@66 3013 if (!bWhiteSpaceChange || m_pOptions->m_bShowWhiteSpace )
joachim99@66 3014 {
joachim99@66 3015 // Make sure that lines with conflict are not overwritten.
joachim99@66 3016 if ( c == m_pOptions->m_colorForConflict )
joachim99@66 3017 {
joachim99@69 3018 p.fillRect(x+1, oldY, w, max2(1,y-oldY), bWhiteSpaceChange ? QBrush(c,Qt::Dense4Pattern) : QBrush(c) );
joachim99@66 3019 oldConflictY = oldY;
joachim99@66 3020 }
joachim99@66 3021 else if ( c!=m_pOptions->m_bgColor && oldY>oldConflictY )
joachim99@66 3022 {
joachim99@69 3023 p.fillRect(x+1, oldY, w, max2(1,y-oldY), bWhiteSpaceChange ? QBrush(c,Qt::Dense4Pattern) : QBrush(c) );
joachim99@66 3024 }
joachim99@66 3025 }
joachim99@66 3026
joachim99@66 3027 oldY = y;
joachim99@66 3028
joachim99@66 3029 ++line;
joachim99@66 3030 if ( m_pOptions->m_bWordWrap )
joachim99@66 3031 {
joachim99@66 3032 ++wrapLineIdx;
joachim99@66 3033 if(wrapLineIdx>=d3l.linesNeededForDisplay)
joachim99@66 3034 {
joachim99@66 3035 wrapLineIdx=0;
joachim99@66 3036 ++i;
joachim99@66 3037 }
joachim99@66 3038 }
joachim99@66 3039 else
joachim99@66 3040 {
joachim99@66 3041 ++i;
joachim99@66 3042 }
joachim99@66 3043 }
joachim99@66 3044 }
joachim99@66 3045
joachim99@8 3046 void Overview::paintEvent( QPaintEvent* )
joachim99@8 3047 {
joachim99@8 3048 if (m_pDiff3LineList==0 || !m_bPaintingAllowed ) return;
joachim99@8 3049 int h = height()-1;
joachim99@8 3050 int w = width();
joachim99@66 3051
joachim99@8 3052
joachim99@8 3053 if ( m_pixmap.size() != size() )
joachim99@8 3054 {
joachim99@66 3055 if ( m_pOptions->m_bWordWrap )
joachim99@66 3056 {
joachim99@66 3057 m_nofLines = 0;
joachim99@66 3058 Diff3LineList::const_iterator i;
joachim99@66 3059 for( i = m_pDiff3LineList->begin(); i!= m_pDiff3LineList->end(); ++i )
joachim99@66 3060 {
joachim99@66 3061 m_nofLines += i->linesNeededForDisplay;
joachim99@69 3062 }
joachim99@66 3063 }
joachim99@66 3064 else
joachim99@66 3065 {
joachim99@66 3066 m_nofLines = m_pDiff3LineList->size();
joachim99@66 3067 }
joachim99@66 3068
joachim99@75 3069 m_pixmap = QPixmap( size() );
joachim99@8 3070
joachim99@8 3071 QPainter p(&m_pixmap);
joachim99@66 3072 p.fillRect( rect(), m_pOptions->m_bgColor );
joachim99@8 3073
joachim99@66 3074 if ( !m_bTripleDiff || m_eOverviewMode == eOMNormal )
joachim99@8 3075 {
joachim99@66 3076 drawColumn( p, eOMNormal, 0, w, h, m_nofLines );
joachim99@8 3077 }
joachim99@66 3078 else
joachim99@66 3079 {
joachim99@66 3080 drawColumn( p, eOMNormal, 0, w/2, h, m_nofLines );
joachim99@66 3081 drawColumn( p, m_eOverviewMode, w/2, w/2, h, m_nofLines );
joachim99@69 3082 }
joachim99@8 3083 }
joachim99@8 3084
joachim99@8 3085 QPainter painter( this );
joachim99@8 3086 painter.drawPixmap( 0,0, m_pixmap );
joachim99@8 3087
joachim99@66 3088 int y1 = h * m_firstLine / m_nofLines-1;
joachim99@66 3089 int h1 = h * m_pageHeight / m_nofLines+3;
joachim99@69 3090 painter.setPen(Qt::black);
joachim99@8 3091 painter.drawRect( 1, y1, w-1, h1 );
joachim99@8 3092 }
joachim99@8 3093
joachim99@75 3094 WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog)
joachim99@75 3095 {
joachim99@75 3096 m_pOptionDialog = pOptionDialog;
joachim99@75 3097 setAutoFillBackground(true);
joachim99@75 3098
joachim99@75 3099 QHBoxLayout* pHLayout = new QHBoxLayout(this);
joachim99@75 3100 pHLayout->setMargin(2);
joachim99@75 3101 pHLayout->setSpacing(2);
joachim99@75 3102
joachim99@75 3103 m_pLabel = new QLabel(i18n("Output")+":");
joachim99@75 3104 pHLayout->addWidget( m_pLabel );
joachim99@75 3105
joachim99@75 3106 m_pFileNameLineEdit = new QLineEdit();
joachim99@75 3107 pHLayout->addWidget( m_pFileNameLineEdit, 6 );
joachim99@75 3108 m_pFileNameLineEdit->installEventFilter( this );
joachim99@75 3109 m_pFileNameLineEdit->setReadOnly( true );
joachim99@75 3110
joachim99@75 3111 //m_pBrowseButton = new QPushButton("...");
joachim99@75 3112 //pHLayout->addWidget( m_pBrowseButton, 0 );
joachim99@75 3113 //connect( m_pBrowseButton, SIGNAL(clicked()), this, SLOT(slotBrowseButtonClicked()));
joachim99@75 3114
joachim99@75 3115 m_pModifiedLabel = new QLabel(i18n("[Modified]"));
joachim99@75 3116 pHLayout->addWidget( m_pModifiedLabel );
joachim99@75 3117 m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->sizeHint() );
joachim99@75 3118 m_pModifiedLabel->setText("");
joachim99@75 3119
joachim99@75 3120 pHLayout->addStretch(1);
joachim99@75 3121
joachim99@75 3122 m_pEncodingLabel = new QLabel(i18n("Encoding for saving")+":");
joachim99@75 3123 pHLayout->addWidget( m_pEncodingLabel );
joachim99@75 3124
joachim99@75 3125 m_pEncodingSelector = new QComboBox();
joachim99@80 3126 m_pEncodingSelector->setSizeAdjustPolicy( QComboBox::AdjustToContents );
joachim99@75 3127 pHLayout->addWidget( m_pEncodingSelector, 2 );
joachim99@75 3128 setEncodings(0,0,0);
joachim99@80 3129
joachim99@80 3130 m_pLineEndStyleLabel = new QLabel( i18n("Line end style:") );
joachim99@80 3131 pHLayout->addWidget( m_pLineEndStyleLabel );
joachim99@80 3132 m_pLineEndStyleSelector = new QComboBox();
joachim99@80 3133 m_pLineEndStyleSelector->setSizeAdjustPolicy( QComboBox::AdjustToContents );
joachim99@80 3134 pHLayout->addWidget( m_pLineEndStyleSelector );
joachim99@80 3135 setLineEndStyles(eLineEndStyleUndefined,eLineEndStyleUndefined,eLineEndStyleUndefined);
joachim99@75 3136 }
joachim99@75 3137
joachim99@75 3138 void WindowTitleWidget::setFileName( const QString& fileName )
joachim99@75 3139 {
joachim99@75 3140 m_pFileNameLineEdit->setText( QDir::toNativeSeparators(fileName) );
joachim99@75 3141 }
joachim99@75 3142
joachim99@75 3143 QString WindowTitleWidget::getFileName()
joachim99@75 3144 {
joachim99@75 3145 return m_pFileNameLineEdit->text();
joachim99@75 3146 }
joachim99@75 3147
joachim99@80 3148 static QString getLineEndStyleName( e_LineEndStyle eLineEndStyle )
joachim99@80 3149 {
joachim99@80 3150 if ( eLineEndStyle == eLineEndStyleDos )
joachim99@80 3151 return "DOS";
joachim99@80 3152 else if ( eLineEndStyle == eLineEndStyleUnix )
joachim99@80 3153 return "Unix";
joachim99@80 3154 return QString();
joachim99@80 3155 }
joachim99@80 3156
joachim99@80 3157 void WindowTitleWidget::setLineEndStyles( e_LineEndStyle eLineEndStyleA, e_LineEndStyle eLineEndStyleB, e_LineEndStyle eLineEndStyleC)
joachim99@80 3158 {
joachim99@80 3159 m_pLineEndStyleSelector->clear();
joachim99@80 3160 QString dosUsers;
joachim99@80 3161 if ( eLineEndStyleA == eLineEndStyleDos )
joachim99@80 3162 dosUsers += "A";
joachim99@80 3163 if ( eLineEndStyleB == eLineEndStyleDos )
joachim99@80 3164 dosUsers += (dosUsers.isEmpty() ? "" : ", ") + QString("B");
joachim99@80 3165 if ( eLineEndStyleC == eLineEndStyleDos )
joachim99@80 3166 dosUsers += (dosUsers.isEmpty() ? "" : ", ") + QString("C");
joachim99@80 3167 QString unxUsers;
joachim99@80 3168 if ( eLineEndStyleA == eLineEndStyleUnix )
joachim99@80 3169 unxUsers += "A";
joachim99@80 3170 if ( eLineEndStyleB == eLineEndStyleUnix )
joachim99@80 3171 unxUsers += (unxUsers.isEmpty() ? "" : ", ") + QString("B");
joachim99@80 3172 if ( eLineEndStyleC == eLineEndStyleUnix )
joachim99@80 3173 unxUsers += (unxUsers.isEmpty() ? "" : ", ") + QString("C");
joachim99@80 3174
joachim99@80 3175 m_pLineEndStyleSelector->addItem( i18n("Unix") + (unxUsers.isEmpty() ? "" : " (" + unxUsers + ")" ) );
joachim99@80 3176 m_pLineEndStyleSelector->addItem( i18n("DOS") + (dosUsers.isEmpty() ? "" : " (" + dosUsers + ")" ) );
joachim99@80 3177
joachim99@80 3178 e_LineEndStyle autoChoice = (e_LineEndStyle)m_pOptionDialog->m_lineEndStyle;
joachim99@80 3179
joachim99@80 3180 if ( m_pOptionDialog->m_lineEndStyle == eLineEndStyleAutoDetect )
joachim99@80 3181 {
joachim99@80 3182 if ( eLineEndStyleA != eLineEndStyleUndefined && eLineEndStyleB != eLineEndStyleUndefined && eLineEndStyleC != eLineEndStyleUndefined )
joachim99@80 3183 {
joachim99@80 3184 if ( eLineEndStyleA == eLineEndStyleB )
joachim99@80 3185 autoChoice = eLineEndStyleC;
joachim99@80 3186 else if ( eLineEndStyleA == eLineEndStyleC )
joachim99@80 3187 autoChoice = eLineEndStyleB;
joachim99@80 3188 else
joachim99@80 3189 autoChoice = eLineEndStyleConflict; //conflict (not likely while only two values exist)
joachim99@80 3190 }
joachim99@80 3191 else
joachim99@80 3192 {
joachim99@80 3193 e_LineEndStyle c1, c2;
joachim99@80 3194 if ( eLineEndStyleA == eLineEndStyleUndefined ) { c1 = eLineEndStyleB; c2 = eLineEndStyleC; }
joachim99@80 3195 else if( eLineEndStyleB == eLineEndStyleUndefined ) { c1 = eLineEndStyleA; c2 = eLineEndStyleC; }
joachim99@80 3196 else /*if( eLineEndStyleC == eLineEndStyleUndefined )*/ { c1 = eLineEndStyleA; c2 = eLineEndStyleB; }
joachim99@80 3197 if ( c1 == c2 && c1!=eLineEndStyleUndefined )
joachim99@80 3198 autoChoice = c1;
joachim99@80 3199 else
joachim99@80 3200 autoChoice = eLineEndStyleConflict;
joachim99@80 3201 }
joachim99@80 3202 }
joachim99@80 3203
joachim99@80 3204 if ( autoChoice == eLineEndStyleUnix )
joachim99@80 3205 m_pLineEndStyleSelector->setCurrentIndex(0);
joachim99@80 3206 else if ( autoChoice == eLineEndStyleDos )
joachim99@80 3207 m_pLineEndStyleSelector->setCurrentIndex(1);
joachim99@80 3208 else if ( autoChoice == eLineEndStyleConflict )
joachim99@80 3209 {
joachim99@80 3210 m_pLineEndStyleSelector->addItem( i18n("Conflict") );
joachim99@80 3211 m_pLineEndStyleSelector->setCurrentIndex(2);
joachim99@80 3212 }
joachim99@80 3213 }
joachim99@80 3214
joachim99@80 3215 e_LineEndStyle WindowTitleWidget::getLineEndStyle( )
joachim99@80 3216 {
joachim99@80 3217
joachim99@80 3218 int current = m_pLineEndStyleSelector->currentIndex();
joachim99@80 3219 if (current == 0)
joachim99@80 3220 return eLineEndStyleUnix;
joachim99@80 3221 else if (current == 1)
joachim99@80 3222 return eLineEndStyleDos;
joachim99@80 3223 else
joachim99@80 3224 return eLineEndStyleConflict;
joachim99@80 3225 }
joachim99@80 3226
joachim99@75 3227 void WindowTitleWidget::setEncodings( QTextCodec* pCodecForA, QTextCodec* pCodecForB, QTextCodec* pCodecForC )
joachim99@75 3228 {
joachim99@75 3229 m_pEncodingSelector->clear();
joachim99@75 3230
joachim99@75 3231 // First sort codec names:
joachim99@75 3232 std::map<QString, QTextCodec*> names;
joachim99@75 3233 QList<int> mibs = QTextCodec::availableMibs();
joachim99@75 3234 foreach(int i, mibs)
joachim99@75 3235 {
joachim99@75 3236 QTextCodec* c = QTextCodec::codecForMib(i);
joachim99@75 3237 if ( c!=0 )
joachim99@75 3238 names[QString(c->name())]=c;
joachim99@75 3239 }
joachim99@75 3240
joachim99@75 3241 if ( pCodecForA )
joachim99@75 3242 m_pEncodingSelector->addItem( i18n("Codec from") + " A: " + pCodecForA->name(), QVariant::fromValue((void*)pCodecForA) );
joachim99@75 3243 if ( pCodecForB )
joachim99@75 3244 m_pEncodingSelector->addItem( i18n("Codec from") + " B: " + pCodecForB->name(), QVariant::fromValue((void*)pCodecForB) );
joachim99@75 3245 if ( pCodecForC )
joachim99@75 3246 m_pEncodingSelector->addItem( i18n("Codec from") + " C: " + pCodecForC->name(), QVariant::fromValue((void*)pCodecForC) );
joachim99@75 3247
joachim99@75 3248 std::map<QString, QTextCodec*>::iterator it;
joachim99@75 3249 for(it=names.begin();it!=names.end();++it)
joachim99@75 3250 {
joachim99@75 3251 m_pEncodingSelector->addItem( it->first, QVariant::fromValue((void*)it->second) );
joachim99@75 3252 }
joachim99@75 3253 m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->sizeHint() );
joachim99@75 3254
joachim99@75 3255 if ( pCodecForC && pCodecForB && pCodecForA )
joachim99@75 3256 {
joachim99@75 3257 if ( pCodecForA == pCodecForB )
joachim99@75 3258 m_pEncodingSelector->setCurrentIndex( 2 ); // C
joachim99@75 3259 else if ( pCodecForA == pCodecForC )
joachim99@75 3260 m_pEncodingSelector->setCurrentIndex( 1 ); // B
joachim99@75 3261 else
joachim99@75 3262 m_pEncodingSelector->setCurrentIndex( 2 ); // C
joachim99@75 3263 }
joachim99@75 3264 else if ( pCodecForA && pCodecForB )
joachim99@75 3265 m_pEncodingSelector->setCurrentIndex( 1 ); // B
joachim99@75 3266 else
joachim99@75 3267 m_pEncodingSelector->setCurrentIndex( 0 );
joachim99@75 3268 }
joachim99@75 3269
joachim99@75 3270 QTextCodec* WindowTitleWidget::getEncoding()
joachim99@75 3271 {
joachim99@75 3272 return (QTextCodec*)m_pEncodingSelector->itemData( m_pEncodingSelector->currentIndex() ).value<void*>();
joachim99@75 3273 }
joachim99@75 3274
joachim99@75 3275 void WindowTitleWidget::setEncoding(QTextCodec* pEncoding)
joachim99@75 3276 {
joachim99@75 3277 int idx = m_pEncodingSelector->findText( pEncoding->name() );
joachim99@75 3278 if (idx>=0)
joachim99@75 3279 m_pEncodingSelector->setCurrentIndex( idx );
joachim99@75 3280 }
joachim99@75 3281
joachim99@75 3282 //void WindowTitleWidget::slotBrowseButtonClicked()
joachim99@75 3283 //{
joachim99@75 3284 // QString current = m_pFileNameLineEdit->text();
joachim99@75 3285 //
joachim99@80 3286 // KUrl newURL = KFileDialog::getSaveUrl( current, 0, this, i18n("Select file (not saving yet)"));
joachim99@75 3287 // if ( !newURL.isEmpty() )
joachim99@75 3288 // {
joachim99@75 3289 // m_pFileNameLineEdit->setText( newURL.url() );
joachim99@75 3290 // }
joachim99@75 3291 //}
joachim99@75 3292
joachim99@75 3293 void WindowTitleWidget::slotSetModified( bool bModified )
joachim99@75 3294 {
joachim99@75 3295 m_pModifiedLabel->setText( bModified ? i18n("[Modified]") : "" );
joachim99@75 3296 }
joachim99@75 3297
joachim99@75 3298 bool WindowTitleWidget::eventFilter( QObject* o, QEvent* e )
joachim99@75 3299 {
joachim99@75 3300 if ( e->type()==QEvent::FocusIn || e->type()==QEvent::FocusOut )
joachim99@75 3301 {
joachim99@75 3302 QPalette p = m_pLabel->palette();
joachim99@75 3303
joachim99@75 3304 QColor c1 = m_pOptionDialog->m_fgColor;
joachim99@75 3305 QColor c2 = Qt::lightGray;
joachim99@75 3306 if ( e->type()==QEvent::FocusOut )
joachim99@75 3307 c2 = m_pOptionDialog->m_bgColor;
joachim99@75 3308
joachim99@75 3309 p.setColor(QPalette::Window, c2);
joachim99@75 3310 setPalette( p );
joachim99@75 3311
joachim99@75 3312 p.setColor(QPalette::WindowText, c1);
joachim99@75 3313 m_pLabel->setPalette( p );
joachim99@75 3314 m_pEncodingLabel->setPalette( p );
joachim99@75 3315 m_pEncodingSelector->setPalette( p );
joachim99@75 3316 }
joachim99@75 3317 if (o == m_pFileNameLineEdit && e->type()==QEvent::Drop)
joachim99@75 3318 {
joachim99@75 3319 QDropEvent* d = static_cast<QDropEvent*>(e);
joachim99@75 3320
joachim99@75 3321 if ( d->mimeData()->hasUrls() )
joachim99@75 3322 {
joachim99@75 3323 QList<QUrl> lst = d->mimeData()->urls();
joachim99@75 3324
joachim99@75 3325 if ( lst.count() > 0 )
joachim99@75 3326 {
joachim99@75 3327 static_cast<QLineEdit*>(o)->setText( lst[0].toString() );
joachim99@75 3328 static_cast<QLineEdit*>(o)->setFocus();
joachim99@75 3329 return true;
joachim99@75 3330 }
joachim99@75 3331 }
joachim99@75 3332 }
joachim99@75 3333 return false;
joachim99@75 3334 }
joachim99@8 3335
joachim99@70 3336 //#include "mergeresultwindow.moc"