annotate kdiff3/src-QT4/directorymergewindow.cpp @ 75:08ea9b86c12c

KDiff3-0.9.91
author joachim99
date Sat, 04 Nov 2006 00:05:00 +0000
parents kdiff3/src/directorymergewindow.cpp@f7dad0aa6146
children 1184fc843210
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@8 2 directorymergewindow.cpp
joachim99@58 3 -----------------
joachim99@8 4 begin : Sat Oct 19 2002
joachim99@69 5 copyright : (C) 2002-2005 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@8 18 #include "directorymergewindow.h"
joachim99@8 19 #include "optiondialog.h"
joachim99@8 20 #include <vector>
joachim99@8 21 #include <map>
joachim99@8 22
joachim99@75 23 #include <QDir>
joachim99@75 24 #include <QApplication>
joachim99@75 25 #include <QPixmap>
joachim99@75 26 #include <QImage>
joachim99@70 27 #include <QTextStream>
joachim99@70 28 #include <QKeyEvent>
joachim99@75 29 #include <QMenu>
joachim99@75 30 #include <QRegExp>
joachim99@75 31 #include <QMessageBox>
joachim99@75 32 #include <QLayout>
joachim99@75 33 #include <QLabel>
joachim99@75 34 #include <QSplitter>
joachim99@75 35 #include <QTextEdit>
joachim99@75 36 #include <QItemDelegate>
joachim99@75 37
joachim99@75 38
joachim99@8 39 #include <kpopupmenu.h>
joachim99@51 40 #include <kaction.h>
joachim99@8 41 #include <kmessagebox.h>
joachim99@69 42 #include <kfiledialog.h>
joachim99@8 43 #include <kiconloader.h>
joachim99@8 44 #include <klocale.h>
joachim99@75 45
joachim99@8 46 #include <iostream>
joachim99@8 47 #include <assert.h>
joachim99@73 48 //#include <konq_popupmenu.h>
joachim99@8 49
joachim99@51 50 static bool conflictingFileTypes(MergeFileInfos& mfi);
joachim99@69 51 /*
joachim99@8 52 class StatusInfo : public QListView
joachim99@8 53 {
joachim99@8 54 public:
joachim99@69 55 StatusInfo(QWidget* pParent) : QListView( pParent, "StatusInfo", Qt::WShowModal )
joachim99@8 56 {
joachim99@8 57 addColumn("");
joachim99@8 58 setSorting(-1); //disable sorting
joachim99@8 59 }
joachim99@8 60
joachim99@8 61 QListViewItem* m_pLast;
joachim99@8 62 QListViewItem* last()
joachim99@8 63 {
joachim99@8 64 if (firstChild()==0) return 0;
joachim99@8 65 else return m_pLast;
joachim99@8 66 }
joachim99@68 67
joachim99@8 68 void addText(const QString& s )
joachim99@8 69 {
joachim99@8 70 if (firstChild()==0) m_pLast = new QListViewItem( this, s );
joachim99@8 71 else m_pLast = new QListViewItem( this, last(), s );
joachim99@8 72 }
joachim99@8 73 };
joachim99@69 74 */
joachim99@75 75 class StatusInfo : public QTextEdit
joachim99@69 76 {
joachim99@69 77 public:
joachim99@75 78 StatusInfo(QWidget* pParent) : QTextEdit( pParent )
joachim99@69 79 {
joachim99@75 80 setObjectName("StatusInfo");
joachim99@70 81 setWindowFlags(Qt::Dialog);
joachim99@75 82 setWordWrapMode(QTextOption::NoWrap);
joachim99@69 83 setReadOnly(true);
joachim99@69 84 showMaximized();
joachim99@69 85 }
joachim99@69 86
joachim99@75 87 bool isEmpty(){
joachim99@75 88 return toPlainText().isEmpty(); }
joachim99@69 89
joachim99@69 90 void addText(const QString& s )
joachim99@69 91 {
joachim99@69 92 append(s);
joachim99@69 93 }
joachim99@69 94
joachim99@69 95 void show()
joachim99@69 96 {
joachim99@75 97 moveCursor ( QTextCursor::End );
joachim99@75 98 ensureCursorVisible();
joachim99@75 99
joachim99@75 100 QTextEdit::show();
joachim99@69 101 }
joachim99@69 102 };
joachim99@8 103
joachim99@8 104
joachim99@8 105 class TempRemover
joachim99@8 106 {
joachim99@8 107 public:
joachim99@8 108 TempRemover( const QString& origName, FileAccess& fa );
joachim99@8 109 ~TempRemover();
joachim99@8 110 QString name() { return m_name; }
joachim99@8 111 bool success() { return m_bSuccess; }
joachim99@8 112 private:
joachim99@8 113 QString m_name;
joachim99@8 114 bool m_bTemp;
joachim99@8 115 bool m_bSuccess;
joachim99@8 116 };
joachim99@8 117 TempRemover::TempRemover(const QString& origName, FileAccess& fa)
joachim99@8 118 {
joachim99@8 119 if ( fa.isLocal() )
joachim99@8 120 {
joachim99@8 121 m_name = origName;
joachim99@8 122 m_bTemp = false;
joachim99@8 123 m_bSuccess = true;
joachim99@8 124 }
joachim99@8 125 else
joachim99@8 126 {
joachim99@8 127 m_name = FileAccess::tempFileName();
joachim99@8 128 m_bSuccess = fa.copyFile( m_name );
joachim99@8 129 m_bTemp = m_bSuccess;
joachim99@8 130 }
joachim99@8 131 }
joachim99@8 132 TempRemover::~TempRemover()
joachim99@8 133 {
joachim99@8 134 if ( m_bTemp && ! m_name.isEmpty() )
joachim99@73 135 FileAccess::removeTempFile(m_name);
joachim99@8 136 }
joachim99@8 137
joachim99@8 138 void DirectoryMergeWindow::fastFileComparison(
joachim99@8 139 FileAccess& fi1, FileAccess& fi2,
joachim99@8 140 bool& bEqual, bool& bError, QString& status )
joachim99@8 141 {
joachim99@66 142 ProgressProxy pp;
joachim99@8 143 status = "";
joachim99@8 144 bEqual = false;
joachim99@8 145 bError = true;
joachim99@8 146
joachim99@8 147 if ( !m_bFollowFileLinks )
joachim99@8 148 {
joachim99@8 149 if ( fi1.isSymLink() != fi2.isSymLink() )
joachim99@8 150 {
joachim99@51 151 status = i18n("Mix of links and normal files.");
joachim99@8 152 return;
joachim99@8 153 }
joachim99@8 154 else if ( fi1.isSymLink() && fi2.isSymLink() )
joachim99@8 155 {
joachim99@8 156 bError = false;
joachim99@8 157 bEqual = fi1.readLink() == fi2.readLink();
joachim99@51 158 status = i18n("Link: ");
joachim99@8 159 return;
joachim99@8 160 }
joachim99@8 161 }
joachim99@8 162
joachim99@8 163 if ( fi1.size()!=fi2.size() )
joachim99@8 164 {
joachim99@8 165 bEqual = false;
joachim99@51 166 status = i18n("Size. ");
joachim99@51 167 return;
joachim99@51 168 }
joachim99@51 169 else if ( m_pOptions->m_bDmTrustSize )
joachim99@51 170 {
joachim99@51 171 bEqual = true;
joachim99@8 172 return;
joachim99@8 173 }
joachim99@8 174
joachim99@8 175 if ( m_pOptions->m_bDmTrustDate )
joachim99@8 176 {
joachim99@8 177 bEqual = ( fi1.lastModified() == fi2.lastModified() && fi1.size()==fi2.size() );
joachim99@8 178 bError = false;
joachim99@51 179 status = i18n("Date & Size: ");
joachim99@8 180 return;
joachim99@8 181 }
joachim99@8 182
joachim99@8 183 QString fileName1 = fi1.absFilePath();
joachim99@8 184 QString fileName2 = fi2.absFilePath();
joachim99@8 185 TempRemover tr1( fileName1, fi1 );
joachim99@8 186 if ( !tr1.success() )
joachim99@8 187 {
joachim99@51 188 status = i18n("Creating temp copy of %1 failed.").arg(fileName1);
joachim99@8 189 return;
joachim99@8 190 }
joachim99@8 191 TempRemover tr2( fileName2, fi2 );
joachim99@8 192 if ( !tr2.success() )
joachim99@8 193 {
joachim99@51 194 status = i18n("Creating temp copy of %1 failed.").arg(fileName2);
joachim99@8 195 return;
joachim99@8 196 }
joachim99@8 197
joachim99@8 198 std::vector<char> buf1(100000);
joachim99@8 199 std::vector<char> buf2(buf1.size());
joachim99@8 200
joachim99@8 201 QFile file1( tr1.name() );
joachim99@8 202
joachim99@70 203 if ( ! file1.open(QIODevice::ReadOnly) )
joachim99@8 204 {
joachim99@51 205 status = i18n("Opening %1 failed.").arg(fileName1);
joachim99@8 206 return;
joachim99@8 207 }
joachim99@8 208
joachim99@8 209 QFile file2( tr2.name() );
joachim99@8 210
joachim99@70 211 if ( ! file2.open(QIODevice::ReadOnly) )
joachim99@8 212 {
joachim99@51 213 status = i18n("Opening %1 failed.").arg(fileName2);
joachim99@8 214 return;
joachim99@8 215 }
joachim99@8 216
joachim99@68 217 pp.setInformation( i18n("Comparing file..."), 0, false );
joachim99@75 218 typedef qint64 t_FileSize;
joachim99@66 219 t_FileSize fullSize = file1.size();
joachim99@66 220 t_FileSize sizeLeft = fullSize;
joachim99@8 221
joachim99@66 222 while( sizeLeft>0 && ! pp.wasCancelled() )
joachim99@8 223 {
joachim99@66 224 int len = min2( sizeLeft, (t_FileSize)buf1.size() );
joachim99@75 225 if( len != file1.read( &buf1[0], len ) )
joachim99@8 226 {
joachim99@51 227 status = i18n("Error reading from %1").arg(fileName1);
joachim99@8 228 return;
joachim99@8 229 }
joachim99@8 230
joachim99@75 231 if( len != file2.read( &buf2[0], len ) )
joachim99@8 232 {
joachim99@51 233 status = i18n("Error reading from %1").arg(fileName2);
joachim99@8 234 return;
joachim99@8 235 }
joachim99@8 236
joachim99@8 237 if ( memcmp( &buf1[0], &buf2[0], len ) != 0 )
joachim99@8 238 {
joachim99@8 239 bError = false;
joachim99@8 240 return;
joachim99@8 241 }
joachim99@66 242 sizeLeft-=len;
joachim99@66 243 pp.setCurrent(double(fullSize-sizeLeft)/fullSize, false );
joachim99@8 244 }
joachim99@8 245
joachim99@8 246 // If the program really arrives here, then the files are really equal.
joachim99@8 247 bError = false;
joachim99@8 248 bEqual = true;
joachim99@8 249 }
joachim99@8 250
joachim99@75 251 static int s_NameCol = 0;
joachim99@8 252 static int s_ACol = 1;
joachim99@8 253 static int s_BCol = 2;
joachim99@8 254 static int s_CCol = 3;
joachim99@8 255 static int s_OpCol = 4;
joachim99@8 256 static int s_OpStatusCol = 5;
joachim99@66 257 static int s_UnsolvedCol = 6; // Nr of unsolved conflicts (for 3 input files)
joachim99@66 258 static int s_SolvedCol = 7; // Nr of auto-solvable conflicts (for 3 input files)
joachim99@66 259 static int s_NonWhiteCol = 8; // Nr of nonwhite deltas (for 2 input files)
joachim99@66 260 static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files)
joachim99@75 261
joachim99@75 262 // Previously Q3ListViewItem::paintCell(p,cg,column,width,align);
joachim99@75 263 class DirectoryMergeWindow::DirMergeItemDelegate : public QItemDelegate
joachim99@75 264 {
joachim99@75 265 DirectoryMergeWindow* m_pDMW;
joachim99@75 266 public:
joachim99@75 267 DirMergeItemDelegate(DirectoryMergeWindow* pParent)
joachim99@75 268 : QItemDelegate(pParent), m_pDMW(pParent)
joachim99@75 269 {
joachim99@75 270 }
joachim99@75 271 void paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
joachim99@75 272 {
joachim99@75 273 int column = index.column();
joachim99@75 274 if (column == s_ACol || column == s_BCol || column == s_CCol )
joachim99@75 275 {
joachim99@75 276 QVariant value = index.data( Qt::DecorationRole );
joachim99@75 277 QPixmap icon;
joachim99@75 278 if ( value.isValid() )
joachim99@75 279 {
joachim99@75 280 if (value.type() == QVariant::Icon)
joachim99@75 281 {
joachim99@75 282 icon = qvariant_cast<QIcon>(value).pixmap(16,16);
joachim99@75 283 //icon = qvariant_cast<QIcon>(value);
joachim99@75 284 //decorationRect = QRect(QPoint(0, 0), icon.actualSize(option.decorationSize, iconMode, iconState));
joachim99@75 285 }
joachim99@75 286 else
joachim99@75 287 {
joachim99@75 288 icon = qvariant_cast<QPixmap>(value);
joachim99@75 289 //decorationRect = QRect(QPoint(0, 0), option.decorationSize).intersected(pixmap.rect());
joachim99@75 290 }
joachim99@75 291 }
joachim99@75 292
joachim99@75 293 int x = option.rect.left();
joachim99@75 294 int y = option.rect.top();
joachim99@75 295 //QPixmap icon = value.value<QPixmap>(); //pixmap(column);
joachim99@75 296 if ( !icon.isNull() )
joachim99@75 297 {
joachim99@75 298 int yOffset = (sizeHint(option,index).height() - icon.height()) / 2;
joachim99@75 299 p->drawPixmap( x+2, y+yOffset, icon );
joachim99@75 300
joachim99@75 301 QTreeWidgetItem* pTWI = reinterpret_cast<QTreeWidgetItem*>( index.internalPointer() );
joachim99@75 302 DirMergeItem* pDMI = static_cast<DirMergeItem*>(pTWI);
joachim99@75 303 int i = pDMI==m_pDMW->m_pSelection1Item && column == m_pDMW->m_selection1Column ? 1 :
joachim99@75 304 pDMI==m_pDMW->m_pSelection2Item && column == m_pDMW->m_selection2Column ? 2 :
joachim99@75 305 pDMI==m_pDMW->m_pSelection3Item && column == m_pDMW->m_selection3Column ? 3 :
joachim99@75 306 0;
joachim99@75 307 if ( i!=0 )
joachim99@75 308 {
joachim99@75 309 OptionDialog* pOD = m_pDMW->m_pOptions;
joachim99@75 310 QColor c ( i==1 ? pOD->m_colorA : i==2 ? pOD->m_colorB : pOD->m_colorC );
joachim99@75 311 p->setPen( c );// highlight() );
joachim99@75 312 p->drawRect( x+2, y+yOffset, icon.width(), icon.height());
joachim99@75 313 p->setPen( QPen( c, 0, Qt::DotLine) );
joachim99@75 314 p->drawRect( x+1, y+yOffset-1, icon.width()+2, icon.height()+2);
joachim99@75 315 p->setPen( Qt::white );
joachim99@75 316 QString s( QChar('A'+i-1) );
joachim99@75 317 p->drawText( x+2 + (icon.width() - p->fontMetrics().width(s))/2,
joachim99@75 318 y+yOffset + (icon.height() + p->fontMetrics().ascent())/2-1,
joachim99@75 319 s );
joachim99@75 320 }
joachim99@75 321 else
joachim99@75 322 {
joachim99@75 323 p->setPen( m_pDMW->palette().background().color() );
joachim99@75 324 p->drawRect( x+1, y+yOffset-1, icon.width()+2, icon.height()+2);
joachim99@75 325 }
joachim99@75 326 return;
joachim99@75 327 }
joachim99@75 328 }
joachim99@75 329 QStyleOptionViewItem option2 = option;
joachim99@75 330 if ( column>=s_UnsolvedCol )
joachim99@75 331 {
joachim99@75 332 option2.displayAlignment = Qt::AlignRight;
joachim99@75 333 }
joachim99@75 334 QItemDelegate::paint( p, option2, index );
joachim99@75 335 }
joachim99@75 336 };
joachim99@75 337
joachim99@75 338
joachim99@8 339 DirectoryMergeWindow::DirectoryMergeWindow( QWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader )
joachim99@75 340 : QTreeWidget( pParent )
joachim99@8 341 {
joachim99@75 342 setItemDelegate( new DirMergeItemDelegate(this) );
joachim99@75 343 connect( this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(onDoubleClick(QTreeWidgetItem*)));
joachim99@75 344 connect( this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(onCurrentChanged(QTreeWidgetItem*)));
joachim99@75 345 connect( this, SIGNAL(expanded(const QModelIndex&)), this, SLOT(onExpanded()));
joachim99@8 346 m_pOptions = pOptions;
joachim99@8 347 m_pIconLoader = pIconLoader;
joachim99@8 348 m_pDirectoryMergeInfo = 0;
joachim99@8 349 m_bAllowResizeEvents = true;
joachim99@8 350 m_bSimulatedMergeStarted=false;
joachim99@8 351 m_bRealMergeStarted=false;
joachim99@8 352 m_bError = false;
joachim99@8 353 m_bSyncMode = false;
joachim99@8 354 m_pStatusInfo = new StatusInfo(0);
joachim99@8 355 m_pStatusInfo->hide();
joachim99@66 356 m_bScanning = false;
joachim99@69 357 m_pSelection1Item = 0;
joachim99@69 358 m_pSelection2Item = 0;
joachim99@69 359 m_pSelection3Item = 0;
joachim99@69 360 m_bCaseSensitive = true;
joachim99@68 361
joachim99@75 362 QStringList sl;
joachim99@75 363 sl << i18n("Name") << "A" << "B" << "C" << i18n("Operation") << i18n("Status")
joachim99@75 364 << i18n("Unsolved") << i18n("Solved") << i18n("Nonwhite") << i18n("White") << "";
joachim99@75 365 setHeaderLabels(sl);
joachim99@75 366
joachim99@75 367 //TODO setColumnAlignment( s_UnsolvedCol, Qt::AlignRight );
joachim99@75 368 //setColumnAlignment( s_SolvedCol, Qt::AlignRight );
joachim99@75 369 //setColumnAlignment( s_NonWhiteCol, Qt::AlignRight );
joachim99@75 370 //setColumnAlignment( s_WhiteCol, Qt::AlignRight );
joachim99@8 371 }
joachim99@8 372
joachim99@8 373 DirectoryMergeWindow::~DirectoryMergeWindow()
joachim99@8 374 {
joachim99@8 375 }
joachim99@8 376
joachim99@8 377
joachim99@8 378 int DirectoryMergeWindow::totalColumnWidth()
joachim99@8 379 {
joachim99@8 380 int w=0;
joachim99@8 381 for (int i=0; i<s_OpStatusCol; ++i)
joachim99@8 382 {
joachim99@8 383 w += columnWidth(i);
joachim99@8 384 }
joachim99@8 385 return w;
joachim99@8 386 }
joachim99@8 387
joachim99@8 388 void DirectoryMergeWindow::reload()
joachim99@8 389 {
joachim99@8 390 if ( isDirectoryMergeInProgress() )
joachim99@8 391 {
joachim99@8 392 int result = KMessageBox::warningYesNo(this,
joachim99@8 393 i18n("You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?"),
joachim99@51 394 i18n("Warning"), i18n("Rescan"), i18n("Continue Merging") );
joachim99@8 395 if ( result!=KMessageBox::Yes )
joachim99@8 396 return;
joachim99@8 397 }
joachim99@68 398
joachim99@8 399 init( m_dirA, m_dirB, m_dirC, m_dirDest, m_bDirectoryMerge );
joachim99@8 400 }
joachim99@8 401
joachim99@8 402 // Copy pm2 onto pm1, but preserve the alpha value from pm1 where pm2 is transparent.
joachim99@69 403 static QPixmap pixCombiner( const QPixmap* pm1, const QPixmap* pm2 )
joachim99@8 404 {
joachim99@75 405 QImage img1 = pm1->toImage().convertToFormat(QImage::Format_ARGB32);
joachim99@75 406 QImage img2 = pm2->toImage().convertToFormat(QImage::Format_ARGB32);
joachim99@8 407
joachim99@8 408 for (int y = 0; y < img1.height(); y++)
joachim99@8 409 {
joachim99@75 410 quint32 *line1 = reinterpret_cast<quint32 *>(img1.scanLine(y));
joachim99@75 411 quint32 *line2 = reinterpret_cast<quint32 *>(img2.scanLine(y));
joachim99@8 412 for (int x = 0; x < img1.width(); x++)
joachim99@8 413 {
joachim99@8 414 if ( qAlpha( line2[x] ) >0 )
joachim99@8 415 line1[x] = (line2[x] | 0xff000000);
joachim99@8 416 }
joachim99@8 417 }
joachim99@75 418 return QPixmap::fromImage(img1);
joachim99@8 419 }
joachim99@8 420
joachim99@8 421 // like pixCombiner but let the pm1 color shine through
joachim99@69 422 static QPixmap pixCombiner2( const QPixmap* pm1, const QPixmap* pm2 )
joachim99@8 423 {
joachim99@75 424 QPixmap pix=*pm1;
joachim99@75 425 QPainter p(&pix);
joachim99@75 426 p.setOpacity(0.5);
joachim99@75 427 p.drawPixmap( 0,0,*pm2 );
joachim99@75 428 p.end();
joachim99@75 429
joachim99@8 430 return pix;
joachim99@8 431 }
joachim99@8 432
joachim99@8 433 static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
joachim99@8 434 int& nofDirs, int& nofEqualFiles, int& nofManualMerges )
joachim99@8 435 {
joachim99@8 436 if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC )
joachim99@8 437 {
joachim99@8 438 ++nofDirs;
joachim99@8 439 }
joachim99@8 440 else
joachim99@8 441 {
joachim99@8 442 ++nofFiles;
joachim99@8 443 if ( i->m_pMFI->m_bEqualAB && (!bThreeDirs || i->m_pMFI->m_bEqualAC ))
joachim99@8 444 {
joachim99@8 445 ++nofEqualFiles;
joachim99@8 446 }
joachim99@8 447 else
joachim99@8 448 {
joachim99@8 449 if ( i->m_pMFI->m_eMergeOperation==eMergeABCToDest || i->m_pMFI->m_eMergeOperation==eMergeABToDest )
joachim99@8 450 ++nofManualMerges;
joachim99@8 451 }
joachim99@8 452 }
joachim99@75 453 for( int childIdx=0; childIdx<i->childCount(); ++childIdx )
joachim99@75 454 calcDirStatus( bThreeDirs, static_cast<DirMergeItem*>(i->child(childIdx)), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
joachim99@8 455 }
joachim99@8 456
joachim99@69 457 static QString sortString(const QString& s, bool bCaseSensitive)
joachim99@58 458 {
joachim99@69 459 if (bCaseSensitive)
joachim99@69 460 return s;
joachim99@69 461 else
joachim99@75 462 return s.toUpper();
joachim99@58 463 }
joachim99@58 464
joachim99@8 465 bool DirectoryMergeWindow::init
joachim99@8 466 (
joachim99@8 467 FileAccess& dirA,
joachim99@8 468 FileAccess& dirB,
joachim99@8 469 FileAccess& dirC,
joachim99@8 470 FileAccess& dirDest,
joachim99@8 471 bool bDirectoryMerge
joachim99@8 472 )
joachim99@8 473 {
joachim99@66 474 if ( m_pOptions->m_bDmFullAnalysis )
joachim99@66 475 {
joachim99@68 476 // A full analysis uses the same ressources that a normal text-diff/merge uses.
joachim99@66 477 // So make sure that the user saves his data first.
joachim99@66 478 bool bCanContinue=false;
joachim99@66 479 checkIfCanContinue( &bCanContinue );
joachim99@66 480 if ( !bCanContinue )
joachim99@66 481 return false;
joachim99@68 482 startDiffMerge("","","","","","","",0); // hide main window
joachim99@66 483 }
joachim99@68 484
joachim99@66 485 show();
joachim99@66 486
joachim99@66 487 ProgressProxy pp;
joachim99@8 488 m_bFollowDirLinks = m_pOptions->m_bDmFollowDirLinks;
joachim99@8 489 m_bFollowFileLinks = m_pOptions->m_bDmFollowFileLinks;
joachim99@8 490 m_bSimulatedMergeStarted=false;
joachim99@8 491 m_bRealMergeStarted=false;
joachim99@8 492 m_bError=false;
joachim99@8 493 m_bDirectoryMerge = bDirectoryMerge;
joachim99@69 494 m_pSelection1Item = 0;
joachim99@69 495 m_pSelection2Item = 0;
joachim99@69 496 m_pSelection3Item = 0;
joachim99@69 497 m_bCaseSensitive = m_pOptions->m_bDmCaseSensitiveFilenameComparison;
joachim99@8 498
joachim99@8 499 clear();
joachim99@8 500
joachim99@53 501 m_mergeItemList.clear();
joachim99@51 502 m_currentItemForOperation = m_mergeItemList.end();
joachim99@8 503
joachim99@8 504 m_dirA = dirA;
joachim99@8 505 m_dirB = dirB;
joachim99@8 506 m_dirC = dirC;
joachim99@8 507 m_dirDest = dirDest;
joachim99@8 508
joachim99@69 509 m_pDirShowIdenticalFiles->setChecked(true);
joachim99@69 510 m_pDirShowDifferentFiles->setChecked(true);
joachim99@69 511 m_pDirShowFilesOnlyInA->setChecked(true);
joachim99@69 512 m_pDirShowFilesOnlyInB->setChecked(true);
joachim99@69 513 m_pDirShowFilesOnlyInC->setChecked(true);
joachim99@69 514
joachim99@8 515 // Check if all input directories exist and are valid. The dest dir is not tested now.
joachim99@8 516 // The test will happen only when we are going to write to it.
joachim99@8 517 if ( !m_dirA.isDir() || !m_dirB.isDir() ||
joachim99@8 518 (m_dirC.isValid() && !m_dirC.isDir()) )
joachim99@8 519 {
joachim99@8 520 QString text( i18n("Opening of directories failed:") );
joachim99@8 521 text += "\n\n";
joachim99@8 522 if ( !dirA.isDir() )
joachim99@51 523 { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").arg(m_dirA.prettyAbsPath()); }
joachim99@8 524
joachim99@8 525 if ( !dirB.isDir() )
joachim99@51 526 { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").arg(m_dirB.prettyAbsPath()); }
joachim99@8 527
joachim99@8 528 if ( m_dirC.isValid() && !m_dirC.isDir() )
joachim99@51 529 { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").arg(m_dirC.prettyAbsPath()); }
joachim99@8 530
joachim99@51 531 KMessageBox::sorry( this, text, i18n("Directory Open Error") );
joachim99@8 532 return false;
joachim99@8 533 }
joachim99@8 534
joachim99@8 535 if ( m_dirC.isValid() &&
joachim99@8 536 (m_dirDest.prettyAbsPath() == m_dirA.prettyAbsPath() || m_dirDest.prettyAbsPath()==m_dirB.prettyAbsPath() ) )
joachim99@8 537 {
joachim99@8 538 KMessageBox::error(this,
joachim99@53 539 i18n( "The destination directory must not be the same as A or B when "
joachim99@8 540 "three directories are merged.\nCheck again before continuing."),
joachim99@51 541 i18n("Parameter Warning"));
joachim99@8 542 return false;
joachim99@8 543 }
joachim99@68 544
joachim99@66 545 m_bScanning = true;
joachim99@68 546 statusBarMessage(i18n("Scanning directories..."));
joachim99@8 547
joachim99@8 548 m_bSyncMode = m_pOptions->m_bDmSyncMode && !m_dirC.isValid() && !m_dirDest.isValid();
joachim99@8 549
joachim99@8 550 if ( m_dirDest.isValid() )
joachim99@8 551 m_dirDestInternal = m_dirDest;
joachim99@8 552 else
joachim99@8 553 m_dirDestInternal = m_dirC.isValid() ? m_dirC : m_dirB;
joachim99@8 554
joachim99@75 555 QString origCurrentDirectory = QDir::currentPath();
joachim99@8 556
joachim99@8 557 m_fileMergeMap.clear();
joachim99@8 558 t_DirectoryList::iterator i;
joachim99@8 559
joachim99@8 560 // calc how many directories will be read:
joachim99@8 561 double nofScans = ( m_dirA.isValid() ? 1 : 0 )+( m_dirB.isValid() ? 1 : 0 )+( m_dirC.isValid() ? 1 : 0 );
joachim99@8 562 int currentScan = 0;
joachim99@8 563
joachim99@75 564 //TODO setColumnWidthMode(s_UnsolvedCol, Q3ListView::Manual);
joachim99@75 565 // setColumnWidthMode(s_SolvedCol, Q3ListView::Manual);
joachim99@75 566 // setColumnWidthMode(s_WhiteCol, Q3ListView::Manual);
joachim99@75 567 // setColumnWidthMode(s_NonWhiteCol, Q3ListView::Manual);
joachim99@75 568 setColumnHidden( s_CCol, !m_dirC.isValid() );
joachim99@75 569 setColumnHidden( s_WhiteCol, !m_pOptions->m_bDmFullAnalysis );
joachim99@75 570 setColumnHidden( s_NonWhiteCol, !m_pOptions->m_bDmFullAnalysis );
joachim99@75 571 setColumnHidden( s_UnsolvedCol, !m_pOptions->m_bDmFullAnalysis );
joachim99@75 572 setColumnHidden( s_SolvedCol, !( m_pOptions->m_bDmFullAnalysis && m_dirC.isValid() ) );
joachim99@68 573
joachim99@8 574 bool bListDirSuccessA = true;
joachim99@8 575 bool bListDirSuccessB = true;
joachim99@8 576 bool bListDirSuccessC = true;
joachim99@8 577 if ( m_dirA.isValid() )
joachim99@8 578 {
joachim99@66 579 pp.setInformation(i18n("Reading Directory A"));
joachim99@66 580 pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans);
joachim99@8 581 ++currentScan;
joachim99@8 582
joachim99@8 583 t_DirectoryList dirListA;
joachim99@8 584 bListDirSuccessA = m_dirA.listDir( &dirListA,
joachim99@8 585 m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden,
joachim99@8 586 m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern,
joachim99@8 587 m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks,
joachim99@8 588 m_pOptions->m_bDmUseCvsIgnore);
joachim99@8 589
joachim99@8 590 for (i=dirListA.begin(); i!=dirListA.end();++i )
joachim99@8 591 {
joachim99@69 592 MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(), m_bCaseSensitive)];
joachim99@8 593 //std::cout <<i->filePath()<<std::endl;
joachim99@8 594 mfi.m_bExistsInA = true;
joachim99@8 595 mfi.m_fileInfoA = *i;
joachim99@8 596 }
joachim99@8 597 }
joachim99@8 598
joachim99@8 599 if ( m_dirB.isValid() )
joachim99@8 600 {
joachim99@66 601 pp.setInformation(i18n("Reading Directory B"));
joachim99@66 602 pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans);
joachim99@8 603 ++currentScan;
joachim99@8 604
joachim99@8 605 t_DirectoryList dirListB;
joachim99@8 606 bListDirSuccessB = m_dirB.listDir( &dirListB,
joachim99@8 607 m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden,
joachim99@8 608 m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern,
joachim99@8 609 m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks,
joachim99@8 610 m_pOptions->m_bDmUseCvsIgnore);
joachim99@8 611
joachim99@8 612 for (i=dirListB.begin(); i!=dirListB.end();++i )
joachim99@8 613 {
joachim99@69 614 MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(), m_bCaseSensitive)];
joachim99@8 615 mfi.m_bExistsInB = true;
joachim99@8 616 mfi.m_fileInfoB = *i;
joachim99@8 617 }
joachim99@8 618 }
joachim99@8 619
joachim99@8 620 e_MergeOperation eDefaultMergeOp;
joachim99@8 621 if ( m_dirC.isValid() )
joachim99@8 622 {
joachim99@66 623 pp.setInformation(i18n("Reading Directory C"));
joachim99@66 624 pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans);
joachim99@8 625 ++currentScan;
joachim99@8 626
joachim99@8 627 t_DirectoryList dirListC;
joachim99@8 628 bListDirSuccessC = m_dirC.listDir( &dirListC,
joachim99@8 629 m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden,
joachim99@8 630 m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern,
joachim99@8 631 m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks,
joachim99@8 632 m_pOptions->m_bDmUseCvsIgnore);
joachim99@8 633
joachim99@8 634 for (i=dirListC.begin(); i!=dirListC.end();++i )
joachim99@8 635 {
joachim99@69 636 MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(),m_bCaseSensitive)];
joachim99@8 637 mfi.m_bExistsInC = true;
joachim99@8 638 mfi.m_fileInfoC = *i;
joachim99@8 639 }
joachim99@8 640
joachim99@8 641 eDefaultMergeOp = eMergeABCToDest;
joachim99@8 642 }
joachim99@8 643 else
joachim99@8 644 eDefaultMergeOp = m_bSyncMode ? eMergeToAB : eMergeABToDest;
joachim99@8 645
joachim99@8 646 bool bContinue = true;
joachim99@8 647 if ( !bListDirSuccessA || !bListDirSuccessB || !bListDirSuccessC )
joachim99@8 648 {
joachim99@8 649 QString s = i18n("Some subdirectories were not readable in");
joachim99@8 650 if ( !bListDirSuccessA ) s += "\nA: " + m_dirA.prettyAbsPath();
joachim99@8 651 if ( !bListDirSuccessB ) s += "\nB: " + m_dirB.prettyAbsPath();
joachim99@8 652 if ( !bListDirSuccessC ) s += "\nC: " + m_dirC.prettyAbsPath();
joachim99@8 653 s+="\n";
joachim99@8 654 s+= i18n("Check the permissions of the subdirectories.");
joachim99@8 655 bContinue = KMessageBox::Continue == KMessageBox::warningContinueCancel( this, s );
joachim99@8 656 }
joachim99@8 657
joachim99@8 658 if ( bContinue )
joachim99@8 659 {
joachim99@66 660 prepareListView(pp);
joachim99@8 661
joachim99@75 662 for( int childIdx = 0; childIdx<topLevelItemCount(); ++childIdx )//Q3ListViewItem* p = firstChild(); p!=0; p = p->nextSibling() )
joachim99@8 663 {
joachim99@75 664 DirMergeItem* pDMI = static_cast<DirMergeItem*>( topLevelItem(childIdx) );
joachim99@8 665 calcSuggestedOperation( *pDMI->m_pMFI, eDefaultMergeOp );
joachim99@8 666 }
joachim99@8 667 }
joachim99@75 668 //else
joachim99@75 669 //{
joachim99@75 670 // setSelected( 0, true );
joachim99@75 671 //}
joachim99@75 672
joachim99@75 673 for (int i=0;i<columnCount();++i)
joachim99@75 674 resizeColumnToContents(i);
joachim99@8 675
joachim99@8 676 QDir::setCurrent(origCurrentDirectory);
joachim99@8 677
joachim99@8 678 // Try to improve the view a little bit.
joachim99@8 679 QWidget* pParent = parentWidget();
joachim99@8 680 QSplitter* pSplitter = static_cast<QSplitter*>(pParent);
joachim99@8 681 if (pSplitter!=0)
joachim99@8 682 {
joachim99@75 683 QList<int> sizes = pSplitter->sizes();
joachim99@8 684 int total = sizes[0] + sizes[1];
joachim99@8 685 sizes[0]=total*6/10;
joachim99@8 686 sizes[1]=total - sizes[0];
joachim99@8 687 pSplitter->setSizes( sizes );
joachim99@8 688 }
joachim99@68 689
joachim99@75 690 sortItems(0,Qt::AscendingOrder);
joachim99@75 691
joachim99@66 692 m_bScanning = false;
joachim99@66 693 statusBarMessage(i18n("Ready."));
joachim99@8 694
joachim99@8 695 if ( bContinue )
joachim99@8 696 {
joachim99@8 697 // Generate a status report
joachim99@8 698 int nofFiles=0;
joachim99@8 699 int nofDirs=0;
joachim99@8 700 int nofEqualFiles=0;
joachim99@8 701 int nofManualMerges=0;
joachim99@75 702 for( int childIdx = 0; childIdx<topLevelItemCount(); ++childIdx )
joachim99@75 703 calcDirStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(topLevelItem(childIdx)),
joachim99@8 704 nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
joachim99@8 705
joachim99@8 706 QString s;
joachim99@51 707 s = i18n("Directory Comparison Status") + "\n\n" +
joachim99@8 708 i18n("Number of subdirectories:") +" "+ QString::number(nofDirs) + "\n"+
joachim99@8 709 i18n("Number of equal files:") +" "+ QString::number(nofEqualFiles) + "\n"+
joachim99@8 710 i18n("Number of different files:") +" "+ QString::number(nofFiles-nofEqualFiles);
joachim99@8 711
joachim99@8 712 if ( m_dirC.isValid() )
joachim99@8 713 s += "\n" + i18n("Number of manual merges:") +" "+ QString::number(nofManualMerges);
joachim99@8 714 KMessageBox::information( this, s );
joachim99@75 715 if ( topLevelItemCount()>0 )
joachim99@75 716 topLevelItem(0)->setSelected(true);
joachim99@8 717 }
joachim99@68 718
joachim99@8 719 return true;
joachim99@8 720 }
joachim99@8 721
joachim99@75 722 void DirectoryMergeWindow::onExpanded()
joachim99@75 723 {
joachim99@75 724 resizeColumnToContents(s_NameCol);
joachim99@75 725 }
joachim99@8 726
joachim99@8 727
joachim99@8 728 void DirectoryMergeWindow::slotChooseAEverywhere(){ setAllMergeOperations( eCopyAToDest ); }
joachim99@8 729
joachim99@8 730 void DirectoryMergeWindow::slotChooseBEverywhere(){ setAllMergeOperations( eCopyBToDest ); }
joachim99@8 731
joachim99@8 732 void DirectoryMergeWindow::slotChooseCEverywhere(){ setAllMergeOperations( eCopyCToDest ); }
joachim99@8 733
joachim99@8 734 void DirectoryMergeWindow::slotAutoChooseEverywhere()
joachim99@8 735 {
joachim99@8 736 e_MergeOperation eDefaultMergeOp = m_dirC.isValid() ? eMergeABCToDest :
joachim99@8 737 m_bSyncMode ? eMergeToAB : eMergeABToDest;
joachim99@8 738 setAllMergeOperations(eDefaultMergeOp );
joachim99@8 739 }
joachim99@8 740
joachim99@8 741 void DirectoryMergeWindow::slotNoOpEverywhere(){ setAllMergeOperations(eNoOperation); }
joachim99@8 742
joachim99@75 743 static void setListViewItemOpen( QTreeWidgetItem* p, bool bOpen )
joachim99@8 744 {
joachim99@75 745 if ( p->childCount() > 0 )
joachim99@75 746 {
joachim99@75 747 for( int childIdx=0; childIdx<p->childCount(); ++childIdx )
joachim99@75 748 setListViewItemOpen( p->child(childIdx), bOpen );
joachim99@75 749
joachim99@75 750 p->setExpanded( bOpen );
joachim99@75 751 }
joachim99@8 752 }
joachim99@8 753
joachim99@8 754 void DirectoryMergeWindow::slotFoldAllSubdirs()
joachim99@8 755 {
joachim99@75 756 for( int i=0; i<topLevelItemCount(); ++i )
joachim99@75 757 setListViewItemOpen( topLevelItem(i), false );
joachim99@8 758 }
joachim99@8 759
joachim99@8 760 void DirectoryMergeWindow::slotUnfoldAllSubdirs()
joachim99@8 761 {
joachim99@75 762 for( int i=0; i<topLevelItemCount(); ++i )
joachim99@75 763 setListViewItemOpen( topLevelItem(i), true );
joachim99@8 764 }
joachim99@8 765
joachim99@75 766 static void setMergeOperation( QTreeWidgetItem* pLVI, e_MergeOperation eMergeOp )
joachim99@51 767 {
joachim99@51 768 if ( pLVI==0 ) return;
joachim99@51 769
joachim99@51 770 DirMergeItem* pDMI = static_cast<DirMergeItem*>(pLVI);
joachim99@51 771 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@51 772
joachim99@51 773 mfi.setMergeOperation(eMergeOp );
joachim99@51 774 }
joachim99@51 775
joachim99@51 776 // Merge current item (merge mode)
joachim99@51 777 void DirectoryMergeWindow::slotCurrentDoNothing() { setMergeOperation(currentItem(), eNoOperation ); }
joachim99@53 778 void DirectoryMergeWindow::slotCurrentChooseA() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyAToB : eCopyAToDest ); }
joachim99@53 779 void DirectoryMergeWindow::slotCurrentChooseB() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyBToA : eCopyBToDest ); }
joachim99@51 780 void DirectoryMergeWindow::slotCurrentChooseC() { setMergeOperation(currentItem(), eCopyCToDest ); }
joachim99@51 781 void DirectoryMergeWindow::slotCurrentMerge()
joachim99@51 782 {
joachim99@51 783 bool bThreeDirs = m_dirC.isValid();
joachim99@51 784 setMergeOperation(currentItem(), bThreeDirs ? eMergeABCToDest : eMergeABToDest );
joachim99@51 785 }
joachim99@51 786 void DirectoryMergeWindow::slotCurrentDelete() { setMergeOperation(currentItem(), eDeleteFromDest ); }
joachim99@51 787 // Sync current item
joachim99@51 788 void DirectoryMergeWindow::slotCurrentCopyAToB() { setMergeOperation(currentItem(), eCopyAToB ); }
joachim99@51 789 void DirectoryMergeWindow::slotCurrentCopyBToA() { setMergeOperation(currentItem(), eCopyBToA ); }
joachim99@51 790 void DirectoryMergeWindow::slotCurrentDeleteA() { setMergeOperation(currentItem(), eDeleteA ); }
joachim99@51 791 void DirectoryMergeWindow::slotCurrentDeleteB() { setMergeOperation(currentItem(), eDeleteB ); }
joachim99@51 792 void DirectoryMergeWindow::slotCurrentDeleteAAndB() { setMergeOperation(currentItem(), eDeleteAB ); }
joachim99@51 793 void DirectoryMergeWindow::slotCurrentMergeToA() { setMergeOperation(currentItem(), eMergeToA ); }
joachim99@51 794 void DirectoryMergeWindow::slotCurrentMergeToB() { setMergeOperation(currentItem(), eMergeToB ); }
joachim99@51 795 void DirectoryMergeWindow::slotCurrentMergeToAAndB() { setMergeOperation(currentItem(), eMergeToAB ); }
joachim99@51 796
joachim99@51 797
joachim99@51 798 void DirectoryMergeWindow::keyPressEvent( QKeyEvent* e )
joachim99@51 799 {
joachim99@75 800 if ( (e->QInputEvent::modifiers() & Qt::ControlModifier)!=0 )
joachim99@51 801 {
joachim99@51 802 bool bThreeDirs = m_dirC.isValid();
joachim99@51 803
joachim99@75 804 QTreeWidgetItem* lvi = currentItem();
joachim99@51 805 DirMergeItem* pDMI = lvi==0 ? 0 : static_cast<DirMergeItem*>(lvi);
joachim99@51 806 MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI;
joachim99@51 807
joachim99@51 808 if ( pMFI==0 ) return;
joachim99@51 809 bool bMergeMode = bThreeDirs || !m_bSyncMode;
joachim99@51 810 bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI);
joachim99@51 811
joachim99@51 812 if ( bMergeMode )
joachim99@51 813 {
joachim99@51 814 switch(e->key())
joachim99@51 815 {
joachim99@70 816 case Qt::Key_1: if(pMFI->m_bExistsInA){ slotCurrentChooseA(); } return;
joachim99@70 817 case Qt::Key_2: if(pMFI->m_bExistsInB){ slotCurrentChooseB(); } return;
joachim99@70 818 case Qt::Key_3: if(pMFI->m_bExistsInC){ slotCurrentChooseC(); } return;
joachim99@70 819 case Qt::Key_Space: slotCurrentDoNothing(); return;
joachim99@70 820 case Qt::Key_4: if ( !bFTConflict ) { slotCurrentMerge(); } return;
joachim99@70 821 case Qt::Key_Delete: slotCurrentDelete(); return;
joachim99@51 822 default: break;
joachim99@51 823 }
joachim99@51 824 }
joachim99@51 825 else
joachim99@51 826 {
joachim99@51 827 switch(e->key())
joachim99@51 828 {
joachim99@70 829 case Qt::Key_1: if(pMFI->m_bExistsInA){ slotCurrentCopyAToB(); } return;
joachim99@70 830 case Qt::Key_2: if(pMFI->m_bExistsInB){ slotCurrentCopyBToA(); } return;
joachim99@70 831 case Qt::Key_Space: slotCurrentDoNothing(); return;
joachim99@70 832 case Qt::Key_4: if ( !bFTConflict ) { slotCurrentMergeToAAndB(); } return;
joachim99@70 833 case Qt::Key_Delete: if( pMFI->m_bExistsInA && pMFI->m_bExistsInB ) slotCurrentDeleteAAndB();
joachim99@51 834 else if( pMFI->m_bExistsInA ) slotCurrentDeleteA();
joachim99@51 835 else if( pMFI->m_bExistsInB ) slotCurrentDeleteB();
joachim99@51 836 return;
joachim99@51 837 default: break;
joachim99@51 838 }
joachim99@51 839 }
joachim99@51 840 }
joachim99@75 841 else if ( e->key()==Qt::Key_Return || e->key()==Qt::Key_Enter )
joachim99@75 842 {
joachim99@75 843 onDoubleClick( currentItem() );
joachim99@75 844 return;
joachim99@75 845 }
joachim99@75 846
joachim99@75 847 QTreeWidget::keyPressEvent(e);
joachim99@51 848 }
joachim99@51 849
joachim99@53 850 void DirectoryMergeWindow::focusInEvent(QFocusEvent*)
joachim99@53 851 {
joachim99@53 852 updateAvailabilities();
joachim99@53 853 }
joachim99@53 854 void DirectoryMergeWindow::focusOutEvent(QFocusEvent*)
joachim99@53 855 {
joachim99@53 856 updateAvailabilities();
joachim99@53 857 }
joachim99@51 858
joachim99@8 859 void DirectoryMergeWindow::setAllMergeOperations( e_MergeOperation eDefaultOperation )
joachim99@8 860 {
joachim99@8 861 if ( KMessageBox::Yes == KMessageBox::warningYesNo(this,
joachim99@8 862 i18n("This affects all merge operations."),
joachim99@51 863 i18n("Changing All Merge Operations"),i18n("C&ontinue"), i18n("&Cancel") ) )
joachim99@8 864 {
joachim99@75 865 for( int i=0; i<topLevelItemCount(); ++i )
joachim99@8 866 {
joachim99@75 867 DirMergeItem* pDMI = static_cast<DirMergeItem*>( topLevelItem(i) );
joachim99@8 868 calcSuggestedOperation( *pDMI->m_pMFI, eDefaultOperation );
joachim99@8 869 }
joachim99@8 870 }
joachim99@8 871 }
joachim99@8 872
joachim99@8 873
joachim99@8 874 void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
joachim99@8 875 {
joachim99@8 876 std::map<QDateTime,int> dateMap;
joachim99@8 877
joachim99@8 878 if( mfi.m_bExistsInA )
joachim99@8 879 {
joachim99@8 880 mfi.m_bLinkA = mfi.m_fileInfoA.isSymLink();
joachim99@8 881 mfi.m_bDirA = mfi.m_fileInfoA.isDir();
joachim99@8 882 dateMap[ mfi.m_fileInfoA.lastModified() ] = 0;
joachim99@8 883 }
joachim99@8 884 if( mfi.m_bExistsInB )
joachim99@8 885 {
joachim99@8 886 mfi.m_bLinkB = mfi.m_fileInfoB.isSymLink();
joachim99@8 887 mfi.m_bDirB = mfi.m_fileInfoB.isDir();
joachim99@8 888 dateMap[ mfi.m_fileInfoB.lastModified() ] = 1;
joachim99@8 889 }
joachim99@8 890 if( mfi.m_bExistsInC )
joachim99@8 891 {
joachim99@8 892 mfi.m_bLinkC = mfi.m_fileInfoC.isSymLink();
joachim99@8 893 mfi.m_bDirC = mfi.m_fileInfoC.isDir();
joachim99@8 894 dateMap[ mfi.m_fileInfoC.lastModified() ] = 2;
joachim99@8 895 }
joachim99@8 896
joachim99@66 897 if ( m_pOptions->m_bDmFullAnalysis )
joachim99@8 898 {
joachim99@66 899 if( mfi.m_bExistsInA && mfi.m_bDirA || mfi.m_bExistsInB && mfi.m_bDirB || mfi.m_bExistsInC && mfi.m_bDirC )
joachim99@66 900 {
joachim99@66 901 // If any input is a directory, don't start any comparison.
joachim99@66 902 mfi.m_bEqualAB=mfi.m_bExistsInA && mfi.m_bExistsInB;
joachim99@66 903 mfi.m_bEqualAC=mfi.m_bExistsInA && mfi.m_bExistsInC;
joachim99@66 904 mfi.m_bEqualBC=mfi.m_bExistsInB && mfi.m_bExistsInC;
joachim99@66 905 }
joachim99@8 906 else
joachim99@8 907 {
joachim99@66 908 emit startDiffMerge(
joachim99@66 909 mfi.m_bExistsInA ? mfi.m_fileInfoA.absFilePath() : QString(""),
joachim99@66 910 mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : QString(""),
joachim99@66 911 mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : QString(""),
joachim99@66 912 "",
joachim99@66 913 "","","",&mfi.m_totalDiffStatus
joachim99@66 914 );
joachim99@68 915 int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts +
joachim99@68 916 mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts;
joachim99@68 917
joachim99@68 918 if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0)
joachim99@68 919 {
joachim99@68 920 mfi.m_bEqualAB = mfi.m_bEqualBC = mfi.m_bEqualAC = true;
joachim99@68 921 }
joachim99@68 922 else
joachim99@68 923 {
joachim99@68 924 mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB;
joachim99@68 925 mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC;
joachim99@68 926 mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC;
joachim99@68 927 }
joachim99@66 928 }
joachim99@66 929 }
joachim99@66 930 else
joachim99@68 931 {
joachim99@66 932 bool bError;
joachim99@66 933 QString eqStatus;
joachim99@66 934 if( mfi.m_bExistsInA && mfi.m_bExistsInB )
joachim99@66 935 {
joachim99@66 936 if( mfi.m_bDirA ) mfi.m_bEqualAB=true;
joachim99@66 937 else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus );
joachim99@66 938 }
joachim99@66 939 if( mfi.m_bExistsInA && mfi.m_bExistsInC )
joachim99@66 940 {
joachim99@66 941 if( mfi.m_bDirA ) mfi.m_bEqualAC=true;
joachim99@66 942 else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus );
joachim99@66 943 }
joachim99@66 944 if( mfi.m_bExistsInB && mfi.m_bExistsInC )
joachim99@66 945 {
joachim99@66 946 if (mfi.m_bEqualAB && mfi.m_bEqualAC)
joachim99@66 947 mfi.m_bEqualBC = true;
joachim99@66 948 else
joachim99@66 949 {
joachim99@66 950 if( mfi.m_bDirB ) mfi.m_bEqualBC=true;
joachim99@66 951 else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus );
joachim99@66 952 }
joachim99@8 953 }
joachim99@8 954 }
joachim99@8 955
joachim99@8 956 if (mfi.m_bLinkA!=mfi.m_bLinkB) mfi.m_bEqualAB=false;
joachim99@8 957 if (mfi.m_bLinkA!=mfi.m_bLinkC) mfi.m_bEqualAC=false;
joachim99@8 958 if (mfi.m_bLinkB!=mfi.m_bLinkC) mfi.m_bEqualBC=false;
joachim99@8 959
joachim99@8 960 if (mfi.m_bDirA!=mfi.m_bDirB) mfi.m_bEqualAB=false;
joachim99@8 961 if (mfi.m_bDirA!=mfi.m_bDirC) mfi.m_bEqualAC=false;
joachim99@8 962 if (mfi.m_bDirB!=mfi.m_bDirC) mfi.m_bEqualBC=false;
joachim99@8 963
joachim99@8 964 assert(eNew==0 && eMiddle==1 && eOld==2);
joachim99@8 965
joachim99@8 966 // The map automatically sorts the keys.
joachim99@8 967 int age = eNew;
joachim99@8 968 std::map<QDateTime,int>::reverse_iterator i;
joachim99@8 969 for( i=dateMap.rbegin(); i!=dateMap.rend(); ++i )
joachim99@8 970 {
joachim99@8 971 int n = i->second;
joachim99@8 972 if ( n==0 && mfi.m_ageA==eNotThere )
joachim99@8 973 {
joachim99@8 974 mfi.m_ageA = (e_Age)age; ++age;
joachim99@8 975 if ( mfi.m_bEqualAB ) { mfi.m_ageB = mfi.m_ageA; ++age; }
joachim99@8 976 if ( mfi.m_bEqualAC ) { mfi.m_ageC = mfi.m_ageA; ++age; }
joachim99@8 977 }
joachim99@8 978 else if ( n==1 && mfi.m_ageB==eNotThere )
joachim99@8 979 {
joachim99@8 980 mfi.m_ageB = (e_Age)age; ++age;
joachim99@8 981 if ( mfi.m_bEqualAB ) { mfi.m_ageA = mfi.m_ageB; ++age; }
joachim99@8 982 if ( mfi.m_bEqualBC ) { mfi.m_ageC = mfi.m_ageB; ++age; }
joachim99@8 983 }
joachim99@8 984 else if ( n==2 && mfi.m_ageC==eNotThere)
joachim99@8 985 {
joachim99@8 986 mfi.m_ageC = (e_Age)age; ++age;
joachim99@8 987 if ( mfi.m_bEqualAC ) { mfi.m_ageA = mfi.m_ageC; ++age; }
joachim99@8 988 if ( mfi.m_bEqualBC ) { mfi.m_ageB = mfi.m_ageC; ++age; }
joachim99@8 989 }
joachim99@8 990 }
joachim99@8 991
joachim99@8 992 // The checks below are necessary when the dates of the file are equal but the
joachim99@8 993 // files are not. One wouldn't expect this to happen, yet it happens sometimes.
joachim99@8 994 if ( mfi.m_bExistsInC && mfi.m_ageC==eNotThere )
joachim99@8 995 {
joachim99@8 996 mfi.m_ageC = (e_Age)age; ++age;
joachim99@8 997 mfi.m_bConflictingAges = true;
joachim99@8 998 }
joachim99@8 999 if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere )
joachim99@8 1000 {
joachim99@8 1001 mfi.m_ageB = (e_Age)age; ++age;
joachim99@8 1002 mfi.m_bConflictingAges = true;
joachim99@8 1003 }
joachim99@8 1004 if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere )
joachim99@8 1005 {
joachim99@8 1006 mfi.m_ageA = (e_Age)age; ++age;
joachim99@8 1007 mfi.m_bConflictingAges = true;
joachim99@8 1008 }
joachim99@8 1009
joachim99@8 1010 if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld )
joachim99@8 1011 {
joachim99@8 1012 if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld;
joachim99@8 1013 if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld;
joachim99@8 1014 if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld;
joachim99@8 1015 }
joachim99@8 1016 }
joachim99@8 1017
joachim99@8 1018 static QPixmap* s_pm_dir;
joachim99@8 1019 static QPixmap* s_pm_file;
joachim99@8 1020
joachim99@69 1021 static QPixmap* pmNotThere;
joachim99@69 1022 static QPixmap* pmNew;
joachim99@69 1023 static QPixmap* pmOld;
joachim99@69 1024 static QPixmap* pmMiddle;
joachim99@69 1025
joachim99@69 1026 static QPixmap* pmLink;
joachim99@69 1027
joachim99@69 1028 static QPixmap* pmDirLink;
joachim99@69 1029 static QPixmap* pmFileLink;
joachim99@69 1030
joachim99@69 1031 static QPixmap* pmNewLink;
joachim99@69 1032 static QPixmap* pmOldLink;
joachim99@69 1033 static QPixmap* pmMiddleLink;
joachim99@69 1034
joachim99@69 1035 static QPixmap* pmNewDir;
joachim99@69 1036 static QPixmap* pmMiddleDir;
joachim99@69 1037 static QPixmap* pmOldDir;
joachim99@69 1038
joachim99@69 1039 static QPixmap* pmNewDirLink;
joachim99@69 1040 static QPixmap* pmMiddleDirLink;
joachim99@69 1041 static QPixmap* pmOldDirLink;
joachim99@69 1042
joachim99@69 1043
joachim99@69 1044 static QPixmap colorToPixmap(QColor c)
joachim99@69 1045 {
joachim99@69 1046 QPixmap pm(16,16);
joachim99@69 1047 QPainter p(&pm);
joachim99@69 1048 p.setPen( Qt::black );
joachim99@69 1049 p.setBrush( c );
joachim99@69 1050 p.drawRect(0,0,pm.width(),pm.height());
joachim99@69 1051 return pm;
joachim99@69 1052 }
joachim99@69 1053
joachim99@69 1054 static void initPixmaps( QColor newest, QColor oldest, QColor middle, QColor notThere )
joachim99@69 1055 {
joachim99@69 1056 if (pmNew==0)
joachim99@69 1057 {
joachim99@69 1058 pmNotThere = new QPixmap;
joachim99@69 1059 pmNew = new QPixmap;
joachim99@69 1060 pmOld = new QPixmap;
joachim99@69 1061 pmMiddle = new QPixmap;
joachim99@69 1062
joachim99@69 1063 #include "xpm/link_arrow.xpm"
joachim99@69 1064 pmLink = new QPixmap(link_arrow);
joachim99@69 1065
joachim99@69 1066 pmDirLink = new QPixmap;
joachim99@69 1067 pmFileLink = new QPixmap;
joachim99@69 1068
joachim99@69 1069 pmNewLink = new QPixmap;
joachim99@69 1070 pmOldLink = new QPixmap;
joachim99@69 1071 pmMiddleLink = new QPixmap;
joachim99@69 1072
joachim99@69 1073 pmNewDir = new QPixmap;
joachim99@69 1074 pmMiddleDir = new QPixmap;
joachim99@69 1075 pmOldDir = new QPixmap;
joachim99@69 1076
joachim99@69 1077 pmNewDirLink = new QPixmap;
joachim99@69 1078 pmMiddleDirLink = new QPixmap;
joachim99@69 1079 pmOldDirLink = new QPixmap;
joachim99@69 1080 }
joachim99@69 1081
joachim99@69 1082
joachim99@69 1083 *pmNotThere = colorToPixmap(notThere);
joachim99@69 1084 *pmNew = colorToPixmap(newest);
joachim99@69 1085 *pmOld = colorToPixmap(oldest);
joachim99@69 1086 *pmMiddle = colorToPixmap(middle);
joachim99@69 1087
joachim99@69 1088 *pmDirLink = pixCombiner( s_pm_dir, pmLink);
joachim99@69 1089 *pmFileLink = pixCombiner( s_pm_file, pmLink );
joachim99@69 1090
joachim99@69 1091 *pmNewLink = pixCombiner( pmNew, pmLink);
joachim99@69 1092 *pmOldLink = pixCombiner( pmOld, pmLink);
joachim99@69 1093 *pmMiddleLink = pixCombiner( pmMiddle, pmLink);
joachim99@69 1094
joachim99@69 1095 *pmNewDir = pixCombiner2( pmNew, s_pm_dir);
joachim99@69 1096 *pmMiddleDir = pixCombiner2( pmMiddle, s_pm_dir);
joachim99@69 1097 *pmOldDir = pixCombiner2( pmOld, s_pm_dir);
joachim99@69 1098
joachim99@69 1099 *pmNewDirLink = pixCombiner( pmNewDir, pmLink);
joachim99@69 1100 *pmMiddleDirLink = pixCombiner( pmMiddleDir, pmLink);
joachim99@69 1101 *pmOldDirLink = pixCombiner( pmOldDir, pmLink);
joachim99@69 1102 }
joachim99@69 1103
joachim99@69 1104
joachim99@75 1105 static void setOnePixmap( QTreeWidgetItem* pLVI, int col, e_Age eAge, bool bLink, bool bDir )
joachim99@8 1106 {
joachim99@69 1107 static QPixmap* ageToPm[]= { pmNew, pmMiddle, pmOld, pmNotThere, s_pm_file };
joachim99@69 1108 static QPixmap* ageToPmLink[]= { pmNewLink, pmMiddleLink, pmOldLink, pmNotThere, pmFileLink };
joachim99@69 1109 static QPixmap* ageToPmDir[]= { pmNewDir, pmMiddleDir, pmOldDir, pmNotThere, s_pm_dir };
joachim99@69 1110 static QPixmap* ageToPmDirLink[]={ pmNewDirLink, pmMiddleDirLink, pmOldDirLink, pmNotThere, pmDirLink };
joachim99@8 1111
joachim99@8 1112 QPixmap** ppPm = bDir ? ( bLink ? ageToPmDirLink : ageToPmDir ):
joachim99@8 1113 ( bLink ? ageToPmLink : ageToPm );
joachim99@8 1114
joachim99@75 1115 pLVI->setIcon( col, *ppPm[eAge] );
joachim99@8 1116 }
joachim99@8 1117
joachim99@8 1118 static void setPixmaps( MergeFileInfos& mfi, bool bCheckC )
joachim99@8 1119 {
joachim99@75 1120 setOnePixmap( mfi.m_pDMI, s_NameCol, eAgeEnd,
joachim99@8 1121 mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC,
joachim99@8 1122 mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC
joachim99@8 1123 );
joachim99@8 1124
joachim99@8 1125 if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC )
joachim99@8 1126 {
joachim99@8 1127 mfi.m_ageA=eNotThere;
joachim99@8 1128 mfi.m_ageB=eNotThere;
joachim99@8 1129 mfi.m_ageC=eNotThere;
joachim99@8 1130 int age = eNew;
joachim99@8 1131 if ( mfi.m_bExistsInC )
joachim99@8 1132 {
joachim99@8 1133 mfi.m_ageC = (e_Age)age;
joachim99@8 1134 if (mfi.m_bEqualAC) mfi.m_ageA = (e_Age)age;
joachim99@8 1135 if (mfi.m_bEqualBC) mfi.m_ageB = (e_Age)age;
joachim99@8 1136 ++age;
joachim99@8 1137 }
joachim99@8 1138 if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere )
joachim99@8 1139 {
joachim99@8 1140 mfi.m_ageB = (e_Age)age;
joachim99@8 1141 if (mfi.m_bEqualAB) mfi.m_ageA = (e_Age)age;
joachim99@8 1142 ++age;
joachim99@8 1143 }
joachim99@8 1144 if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere )
joachim99@8 1145 {
joachim99@8 1146 mfi.m_ageA = (e_Age)age;
joachim99@8 1147 }
joachim99@8 1148 if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld )
joachim99@8 1149 {
joachim99@8 1150 if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld;
joachim99@8 1151 if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld;
joachim99@8 1152 if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld;
joachim99@8 1153 }
joachim99@8 1154 }
joachim99@8 1155
joachim99@8 1156 setOnePixmap( mfi.m_pDMI, s_ACol, mfi.m_ageA, mfi.m_bLinkA, mfi.m_bDirA );
joachim99@8 1157 setOnePixmap( mfi.m_pDMI, s_BCol, mfi.m_ageB, mfi.m_bLinkB, mfi.m_bDirB );
joachim99@8 1158 if ( bCheckC )
joachim99@8 1159 setOnePixmap( mfi.m_pDMI, s_CCol, mfi.m_ageC, mfi.m_bLinkC, mfi.m_bDirC );
joachim99@8 1160 }
joachim99@8 1161
joachim99@75 1162 static QTreeWidgetItem* nextSibling(const QTreeWidgetItem* p)
joachim99@75 1163 {
joachim99@75 1164 QTreeWidgetItem* pParent = p->parent();
joachim99@75 1165 if ( pParent )
joachim99@75 1166 {
joachim99@75 1167 int currentIdx = pParent->indexOfChild( const_cast<QTreeWidgetItem*>(p) );
joachim99@75 1168 if ( currentIdx+1 < pParent->childCount() )
joachim99@75 1169 return pParent->child(currentIdx+1);
joachim99@75 1170 }
joachim99@75 1171 else
joachim99@75 1172 {
joachim99@75 1173 QTreeWidget* pParentTreeWidget = p->treeWidget();
joachim99@75 1174 if ( pParentTreeWidget )
joachim99@75 1175 {
joachim99@75 1176 int currentIdx = pParentTreeWidget->indexOfTopLevelItem( const_cast<QTreeWidgetItem*>(p) );
joachim99@75 1177 if ( currentIdx+1 < pParentTreeWidget->topLevelItemCount() )
joachim99@75 1178 return pParentTreeWidget->topLevelItem(currentIdx+1);
joachim99@75 1179 }
joachim99@75 1180 }
joachim99@75 1181 return 0;
joachim99@75 1182 }
joachim99@75 1183
joachim99@8 1184 // Iterate through the complete tree. Start by specifying QListView::firstChild().
joachim99@75 1185 static QTreeWidgetItem* treeIterator( QTreeWidgetItem* p, bool bVisitChildren=true, bool bFindInvisible=false )
joachim99@8 1186 {
joachim99@8 1187 if( p!=0 )
joachim99@8 1188 {
joachim99@69 1189 do
joachim99@8 1190 {
joachim99@75 1191 if ( bVisitChildren && p->childCount() != 0 ) p = p->child(0);
joachim99@75 1192 else
joachim99@8 1193 {
joachim99@75 1194 QTreeWidgetItem* pNextSibling = nextSibling(p);
joachim99@75 1195 if ( pNextSibling )
joachim99@75 1196 p = pNextSibling;
joachim99@75 1197 else
joachim99@69 1198 {
joachim99@75 1199 p = p->parent();
joachim99@75 1200 while ( p!=0 )
joachim99@75 1201 {
joachim99@75 1202 QTreeWidgetItem* pNextSibling = nextSibling(p);
joachim99@75 1203 if( pNextSibling ) { p = pNextSibling; break; }
joachim99@75 1204 else { p = p->parent(); }
joachim99@75 1205 }
joachim99@69 1206 }
joachim99@8 1207 }
joachim99@8 1208 }
joachim99@75 1209 while( p && p->isHidden() && !bFindInvisible );
joachim99@8 1210 }
joachim99@8 1211 return p;
joachim99@8 1212 }
joachim99@8 1213
joachim99@66 1214 void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
joachim99@8 1215 {
joachim99@8 1216 static bool bFirstTime = true;
joachim99@8 1217 if (bFirstTime)
joachim99@8 1218 {
joachim99@8 1219 #include "xpm/file.xpm"
joachim99@8 1220 #include "xpm/folder.xpm"
joachim99@8 1221 s_pm_dir = new QPixmap( m_pIconLoader->loadIcon("folder", KIcon::Small ) );
joachim99@8 1222 if (s_pm_dir->size()!=QSize(16,16))
joachim99@8 1223 {
joachim99@8 1224 delete s_pm_dir;
joachim99@8 1225 s_pm_dir = new QPixmap( folder_pm );
joachim99@8 1226 }
joachim99@8 1227 s_pm_file= new QPixmap( file_pm );
joachim99@8 1228 bFirstTime=false;
joachim99@8 1229 }
joachim99@8 1230
joachim99@8 1231 clear();
joachim99@69 1232 initPixmaps( m_pOptions->m_newestFileColor, m_pOptions->m_oldestFileColor,
joachim99@69 1233 m_pOptions->m_midAgeFileColor, m_pOptions->m_missingFileColor );
joachim99@8 1234
joachim99@8 1235 setRootIsDecorated( true );
joachim99@8 1236
joachim99@8 1237 bool bCheckC = m_dirC.isValid();
joachim99@8 1238
joachim99@8 1239 std::map<QString, MergeFileInfos>::iterator j;
joachim99@8 1240 int nrOfFiles = m_fileMergeMap.size();
joachim99@8 1241 int currentIdx = 1;
joachim99@8 1242 QTime t;
joachim99@8 1243 t.start();
joachim99@8 1244 for( j=m_fileMergeMap.begin(); j!=m_fileMergeMap.end(); ++j )
joachim99@8 1245 {
joachim99@8 1246 MergeFileInfos& mfi = j->second;
joachim99@8 1247
joachim99@8 1248 mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() :
joachim99@8 1249 mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() :
joachim99@25 1250 mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() :
joachim99@25 1251 QString("");
joachim99@8 1252
joachim99@58 1253 // const QString& fileName = j->first;
joachim99@58 1254 const QString& fileName = mfi.m_subPath;
joachim99@58 1255
joachim99@66 1256 pp.setInformation(
joachim99@51 1257 i18n("Processing ") + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles)
joachim99@8 1258 +"\n" + fileName, double(currentIdx) / nrOfFiles, false );
joachim99@66 1259 if ( pp.wasCancelled() ) break;
joachim99@8 1260 ++currentIdx;
joachim99@8 1261
joachim99@8 1262
joachim99@8 1263 // The comparisons and calculations for each file take place here.
joachim99@8 1264 compareFilesAndCalcAges( mfi );
joachim99@8 1265
joachim99@8 1266 bool bEqual = bCheckC ? mfi.m_bEqualAB && mfi.m_bEqualAC : mfi.m_bEqualAB;
joachim99@69 1267 //bool bDir = mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC;
joachim99@69 1268
joachim99@69 1269 //if ( m_pOptions->m_bDmShowOnlyDeltas && !bDir && bEqual )
joachim99@69 1270 // continue;
joachim99@8 1271
joachim99@8 1272 // Get dirname from fileName: Search for "/" from end:
joachim99@75 1273 int pos = fileName.lastIndexOf('/');
joachim99@8 1274 QString dirPart;
joachim99@8 1275 QString filePart;
joachim99@8 1276 if (pos==-1)
joachim99@8 1277 {
joachim99@8 1278 // Top dir
joachim99@8 1279 filePart = fileName;
joachim99@8 1280 }
joachim99@8 1281 else
joachim99@8 1282 {
joachim99@8 1283 dirPart = fileName.left(pos);
joachim99@8 1284 filePart = fileName.mid(pos+1);
joachim99@8 1285 }
joachim99@8 1286
joachim99@8 1287 if ( dirPart.isEmpty() ) // Top level
joachim99@8 1288 {
joachim99@8 1289 new DirMergeItem( this, filePart, &mfi );
joachim99@8 1290 }
joachim99@8 1291 else
joachim99@8 1292 {
joachim99@69 1293 MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // parent
joachim99@8 1294 assert(dirMfi.m_pDMI!=0);
joachim99@8 1295 new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi );
joachim99@8 1296 mfi.m_pParent = &dirMfi;
joachim99@8 1297
joachim99@8 1298 if ( !bEqual ) // Set all parents to "not equal"
joachim99@8 1299 {
joachim99@8 1300 MergeFileInfos* p = mfi.m_pParent;
joachim99@8 1301 while(p!=0)
joachim99@8 1302 {
joachim99@8 1303 bool bChange = false;
joachim99@8 1304 if ( !mfi.m_bEqualAB && p->m_bEqualAB ){ p->m_bEqualAB = false; bChange=true; }
joachim99@8 1305 if ( !mfi.m_bEqualAC && p->m_bEqualAC ){ p->m_bEqualAC = false; bChange=true; }
joachim99@8 1306 if ( !mfi.m_bEqualBC && p->m_bEqualBC ){ p->m_bEqualBC = false; bChange=true; }
joachim99@8 1307
joachim99@8 1308 if ( bChange )
joachim99@8 1309 setPixmaps( *p, bCheckC );
joachim99@8 1310 else
joachim99@8 1311 break;
joachim99@8 1312
joachim99@8 1313 p = p->m_pParent;
joachim99@8 1314 }
joachim99@8 1315 }
joachim99@8 1316 }
joachim99@8 1317
joachim99@8 1318 setPixmaps( mfi, bCheckC );
joachim99@8 1319 }
joachim99@8 1320
joachim99@69 1321 /*if ( m_pOptions->m_bDmShowOnlyDeltas )
joachim99@8 1322 {
joachim99@8 1323 // Remove all equals. (Search tree depth first)
joachim99@8 1324 QListViewItem* p = firstChild();
joachim99@8 1325 while( p!=0 && firstChild() != 0 )
joachim99@8 1326 {
joachim99@8 1327 QListViewItem* pParent = p->parent();
joachim99@8 1328 QListViewItem* pNextSibling = p->nextSibling();
joachim99@8 1329
joachim99@8 1330 DirMergeItem* pDMI = static_cast<DirMergeItem*>(p);
joachim99@8 1331 bool bDirEqual = bCheckC ? pDMI->m_pMFI->m_bEqualAB && pDMI->m_pMFI->m_bEqualAC
joachim99@8 1332 : pDMI->m_pMFI->m_bEqualAB;
joachim99@8 1333 if ( pDMI!=0 && pDMI->m_pMFI->m_bDirA && bDirEqual )
joachim99@8 1334 {
joachim99@8 1335 delete p;
joachim99@8 1336 p=0;
joachim99@8 1337 }
joachim99@8 1338
joachim99@8 1339 if ( p!=0 && p->firstChild() != 0 ) p = p->firstChild();
joachim99@8 1340 else if ( pNextSibling!=0 ) p = pNextSibling;
joachim99@8 1341 else
joachim99@8 1342 {
joachim99@8 1343 p=pParent;
joachim99@8 1344 while ( p!=0 )
joachim99@8 1345 {
joachim99@8 1346 if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; }
joachim99@8 1347 else { p = p->parent(); }
joachim99@8 1348 }
joachim99@8 1349 }
joachim99@8 1350 }
joachim99@69 1351 }*/
joachim99@8 1352 }
joachim99@8 1353
joachim99@8 1354 static bool conflictingFileTypes(MergeFileInfos& mfi)
joachim99@8 1355 {
joachim99@8 1356 // Now check if file/dir-types fit.
joachim99@8 1357 if ( mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC )
joachim99@8 1358 {
joachim99@8 1359 if ( mfi.m_bExistsInA && ! mfi.m_bLinkA ||
joachim99@8 1360 mfi.m_bExistsInB && ! mfi.m_bLinkB ||
joachim99@8 1361 mfi.m_bExistsInC && ! mfi.m_bLinkC )
joachim99@8 1362 {
joachim99@8 1363 return true;
joachim99@8 1364 }
joachim99@8 1365 }
joachim99@8 1366
joachim99@8 1367 if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC )
joachim99@8 1368 {
joachim99@8 1369 if ( mfi.m_bExistsInA && ! mfi.m_bDirA ||
joachim99@8 1370 mfi.m_bExistsInB && ! mfi.m_bDirB ||
joachim99@8 1371 mfi.m_bExistsInC && ! mfi.m_bDirC )
joachim99@8 1372 {
joachim99@8 1373 return true;
joachim99@8 1374 }
joachim99@8 1375 }
joachim99@8 1376 return false;
joachim99@8 1377 }
joachim99@8 1378
joachim99@8 1379 void DirectoryMergeWindow::calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultMergeOp )
joachim99@8 1380 {
joachim99@8 1381 bool bCheckC = m_dirC.isValid();
joachim99@8 1382 bool bCopyNewer = m_pOptions->m_bDmCopyNewer;
joachim99@75 1383 bool bOtherDest = !( m_dirDestInternal.absFilePath() == m_dirA.absFilePath() ||
joachim99@75 1384 m_dirDestInternal.absFilePath() == m_dirB.absFilePath() ||
joachim99@75 1385 bCheckC && m_dirDestInternal.absFilePath() == m_dirC.absFilePath() );
joachim99@75 1386
joachim99@8 1387
joachim99@8 1388 if ( eDefaultMergeOp == eMergeABCToDest && !bCheckC ) { eDefaultMergeOp = eMergeABToDest; }
joachim99@8 1389 if ( eDefaultMergeOp == eMergeToAB && bCheckC ) { assert(false); }
joachim99@51 1390
joachim99@8 1391 if ( eDefaultMergeOp == eMergeToA || eDefaultMergeOp == eMergeToB ||
joachim99@8 1392 eDefaultMergeOp == eMergeABCToDest || eDefaultMergeOp == eMergeABToDest || eDefaultMergeOp == eMergeToAB )
joachim99@51 1393 {
joachim99@8 1394 if ( !bCheckC )
joachim99@8 1395 {
joachim99@8 1396 if ( mfi.m_bEqualAB )
joachim99@8 1397 {
joachim99@75 1398 mfi.setMergeOperation( bOtherDest ? eCopyBToDest : eNoOperation );
joachim99@8 1399 }
joachim99@8 1400 else if ( mfi.m_bExistsInA && mfi.m_bExistsInB )
joachim99@8 1401 {
joachim99@8 1402 if ( !bCopyNewer || mfi.m_bDirA )
joachim99@8 1403 mfi.setMergeOperation( eDefaultMergeOp );
joachim99@8 1404 else if ( bCopyNewer && mfi.m_bConflictingAges )
joachim99@8 1405 {
joachim99@8 1406 mfi.setMergeOperation( eConflictingAges );
joachim99@8 1407 }
joachim99@8 1408 else
joachim99@8 1409 {
joachim99@8 1410 if ( mfi.m_ageA == eNew )
joachim99@8 1411 mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyAToB : eCopyAToDest );
joachim99@8 1412 else
joachim99@8 1413 mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyBToA : eCopyBToDest );
joachim99@8 1414 }
joachim99@8 1415 }
joachim99@8 1416 else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB )
joachim99@8 1417 {
joachim99@8 1418 if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyBToDest );
joachim99@8 1419 else if ( eDefaultMergeOp==eMergeToB ) mfi.setMergeOperation( eNoOperation );
joachim99@8 1420 else mfi.setMergeOperation( eCopyBToA );
joachim99@8 1421 }
joachim99@8 1422 else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB )
joachim99@8 1423 {
joachim99@8 1424 if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyAToDest );
joachim99@8 1425 else if ( eDefaultMergeOp==eMergeToA ) mfi.setMergeOperation( eNoOperation );
joachim99@8 1426 else mfi.setMergeOperation( eCopyAToB );
joachim99@8 1427 }
joachim99@8 1428 else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB )
joachim99@8 1429 {
joachim99@8 1430 mfi.setMergeOperation( eNoOperation ); assert(false);
joachim99@8 1431 }
joachim99@8 1432 }
joachim99@8 1433 else
joachim99@8 1434 {
joachim99@8 1435 if ( mfi.m_bEqualAB && mfi.m_bEqualAC )
joachim99@8 1436 {
joachim99@75 1437 mfi.setMergeOperation( bOtherDest ? eCopyCToDest : eNoOperation );
joachim99@8 1438 }
joachim99@8 1439 else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC)
joachim99@8 1440 {
joachim99@8 1441 if ( mfi.m_bEqualAB )
joachim99@8 1442 mfi.setMergeOperation( eCopyCToDest );
joachim99@8 1443 else if ( mfi.m_bEqualAC )
joachim99@8 1444 mfi.setMergeOperation( eCopyBToDest );
joachim99@8 1445 else if ( mfi.m_bEqualBC )
joachim99@8 1446 mfi.setMergeOperation( eCopyCToDest );
joachim99@8 1447 else
joachim99@8 1448 mfi.setMergeOperation( eMergeABCToDest );
joachim99@8 1449 }
joachim99@8 1450 else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC )
joachim99@8 1451 {
joachim99@8 1452 if ( mfi.m_bEqualAB )
joachim99@8 1453 mfi.setMergeOperation( eDeleteFromDest );
joachim99@8 1454 else
joachim99@8 1455 mfi.setMergeOperation( eCopyBToDest );
joachim99@8 1456 }
joachim99@8 1457 else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC )
joachim99@8 1458 {
joachim99@8 1459 if ( mfi.m_bEqualAC )
joachim99@8 1460 mfi.setMergeOperation( eDeleteFromDest );
joachim99@8 1461 else
joachim99@8 1462 mfi.setMergeOperation( eCopyCToDest );
joachim99@8 1463 }
joachim99@8 1464 else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC )
joachim99@8 1465 {
joachim99@8 1466 if ( mfi.m_bEqualBC )
joachim99@8 1467 mfi.setMergeOperation( eCopyCToDest );
joachim99@8 1468 else
joachim99@8 1469 mfi.setMergeOperation( eMergeABCToDest );
joachim99@8 1470 }
joachim99@8 1471 else if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC )
joachim99@8 1472 {
joachim99@8 1473 mfi.setMergeOperation( eCopyCToDest );
joachim99@8 1474 }
joachim99@8 1475 else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC )
joachim99@8 1476 {
joachim99@8 1477 mfi.setMergeOperation( eCopyBToDest );
joachim99@8 1478 }
joachim99@8 1479 else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC)
joachim99@8 1480 {
joachim99@8 1481 mfi.setMergeOperation( eDeleteFromDest );
joachim99@8 1482 }
joachim99@8 1483 else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC )
joachim99@8 1484 {
joachim99@8 1485 mfi.setMergeOperation( eNoOperation ); assert(false);
joachim99@8 1486 }
joachim99@8 1487 }
joachim99@8 1488
joachim99@8 1489 // Now check if file/dir-types fit.
joachim99@8 1490 if ( conflictingFileTypes(mfi) )
joachim99@8 1491 {
joachim99@8 1492 mfi.setMergeOperation( eConflictingFileTypes );
joachim99@8 1493 }
joachim99@8 1494 }
joachim99@8 1495 else
joachim99@8 1496 {
joachim99@8 1497 e_MergeOperation eMO = eDefaultMergeOp;
joachim99@8 1498 switch ( eDefaultMergeOp )
joachim99@8 1499 {
joachim99@8 1500 case eConflictingFileTypes:
joachim99@8 1501 case eConflictingAges:
joachim99@8 1502 case eDeleteA:
joachim99@8 1503 case eDeleteB:
joachim99@8 1504 case eDeleteAB:
joachim99@8 1505 case eDeleteFromDest:
joachim99@8 1506 case eNoOperation: break;
joachim99@8 1507 case eCopyAToB: if ( !mfi.m_bExistsInA ) { eMO = eDeleteB; } break;
joachim99@8 1508 case eCopyBToA: if ( !mfi.m_bExistsInB ) { eMO = eDeleteA; } break;
joachim99@8 1509 case eCopyAToDest: if ( !mfi.m_bExistsInA ) { eMO = eDeleteFromDest; } break;
joachim99@8 1510 case eCopyBToDest: if ( !mfi.m_bExistsInB ) { eMO = eDeleteFromDest; } break;
joachim99@8 1511 case eCopyCToDest: if ( !mfi.m_bExistsInC ) { eMO = eDeleteFromDest; } break;
joachim99@8 1512
joachim99@8 1513 case eMergeToA:
joachim99@8 1514 case eMergeToB:
joachim99@8 1515 case eMergeToAB:
joachim99@8 1516 case eMergeABCToDest:
joachim99@8 1517 case eMergeABToDest:
joachim99@8 1518 default:
joachim99@8 1519 assert(false);
joachim99@8 1520 }
joachim99@8 1521 mfi.setMergeOperation( eMO );
joachim99@8 1522 }
joachim99@8 1523 }
joachim99@8 1524
joachim99@75 1525 void DirectoryMergeWindow::onDoubleClick( QTreeWidgetItem* lvi )
joachim99@8 1526 {
joachim99@8 1527 if (lvi==0) return;
joachim99@8 1528
joachim99@8 1529 if ( m_bDirectoryMerge )
joachim99@8 1530 mergeCurrentFile();
joachim99@8 1531 else
joachim99@8 1532 compareCurrentFile();
joachim99@8 1533 }
joachim99@8 1534
joachim99@75 1535 void DirectoryMergeWindow::onCurrentChanged(QTreeWidgetItem* lvi)
joachim99@8 1536 {
joachim99@8 1537 if ( lvi==0 ) return;
joachim99@8 1538
joachim99@8 1539 DirMergeItem* pDMI = static_cast<DirMergeItem*>(lvi);
joachim99@8 1540
joachim99@8 1541 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@8 1542 assert( mfi.m_pDMI==pDMI );
joachim99@8 1543
joachim99@8 1544 m_pDirectoryMergeInfo->setInfo( m_dirA, m_dirB, m_dirC, m_dirDestInternal, mfi );
joachim99@8 1545 }
joachim99@8 1546
joachim99@75 1547 void DirectoryMergeWindow::mousePressEvent( QMouseEvent* e )
joachim99@8 1548 {
joachim99@75 1549 QTreeWidget::mousePressEvent(e);
joachim99@75 1550 int c = columnAt( e->x() );
joachim99@75 1551 QTreeWidgetItem* lvi = itemAt( e->pos() );
joachim99@75 1552 QPoint p = e->globalPos();
joachim99@8 1553 if ( lvi==0 ) return;
joachim99@8 1554
joachim99@8 1555 DirMergeItem* pDMI = static_cast<DirMergeItem*>(lvi);
joachim99@8 1556
joachim99@8 1557 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@8 1558 assert( mfi.m_pDMI==pDMI );
joachim99@8 1559
joachim99@69 1560 if ( c==s_OpCol )
joachim99@8 1561 {
joachim99@69 1562 bool bThreeDirs = m_dirC.isValid();
joachim99@69 1563
joachim99@69 1564 KPopupMenu m(this);
joachim99@69 1565 if ( bThreeDirs )
joachim99@8 1566 {
joachim99@69 1567 m_pDirCurrentDoNothing->plug(&m);
joachim99@69 1568 int count=0;
joachim99@69 1569 if ( mfi.m_bExistsInA ) { m_pDirCurrentChooseA->plug(&m); ++count; }
joachim99@69 1570 if ( mfi.m_bExistsInB ) { m_pDirCurrentChooseB->plug(&m); ++count; }
joachim99@69 1571 if ( mfi.m_bExistsInC ) { m_pDirCurrentChooseC->plug(&m); ++count; }
joachim99@69 1572 if ( !conflictingFileTypes(mfi) && count>1 ) m_pDirCurrentMerge->plug(&m);
joachim99@69 1573 m_pDirCurrentDelete->plug(&m);
joachim99@69 1574 }
joachim99@69 1575 else if ( m_bSyncMode )
joachim99@69 1576 {
joachim99@69 1577 m_pDirCurrentSyncDoNothing->plug(&m);
joachim99@69 1578 if ( mfi.m_bExistsInA ) m_pDirCurrentSyncCopyAToB->plug(&m);
joachim99@69 1579 if ( mfi.m_bExistsInB ) m_pDirCurrentSyncCopyBToA->plug(&m);
joachim99@69 1580 if ( mfi.m_bExistsInA ) m_pDirCurrentSyncDeleteA->plug(&m);
joachim99@69 1581 if ( mfi.m_bExistsInB ) m_pDirCurrentSyncDeleteB->plug(&m);
joachim99@69 1582 if ( mfi.m_bExistsInA && mfi.m_bExistsInB )
joachim99@8 1583 {
joachim99@69 1584 m_pDirCurrentSyncDeleteAAndB->plug(&m);
joachim99@69 1585 if ( !conflictingFileTypes(mfi))
joachim99@69 1586 {
joachim99@69 1587 m_pDirCurrentSyncMergeToA->plug(&m);
joachim99@69 1588 m_pDirCurrentSyncMergeToB->plug(&m);
joachim99@69 1589 m_pDirCurrentSyncMergeToAAndB->plug(&m);
joachim99@69 1590 }
joachim99@8 1591 }
joachim99@8 1592 }
joachim99@69 1593 else
joachim99@69 1594 {
joachim99@69 1595 m_pDirCurrentDoNothing->plug(&m);
joachim99@69 1596 if ( mfi.m_bExistsInA ) { m_pDirCurrentChooseA->plug(&m); }
joachim99@69 1597 if ( mfi.m_bExistsInB ) { m_pDirCurrentChooseB->plug(&m); }
joachim99@69 1598 if ( !conflictingFileTypes(mfi) && mfi.m_bExistsInA && mfi.m_bExistsInB ) m_pDirCurrentMerge->plug(&m);
joachim99@69 1599 m_pDirCurrentDelete->plug(&m);
joachim99@69 1600 }
joachim99@69 1601
joachim99@69 1602 m.exec( p );
joachim99@8 1603 }
joachim99@69 1604 else if ( c == s_ACol || c==s_BCol || c==s_CCol )
joachim99@8 1605 {
joachim99@69 1606 QString itemPath;
joachim99@69 1607 if ( c == s_ACol && mfi.m_bExistsInA ){ itemPath = fullNameA(mfi); }
joachim99@69 1608 else if ( c == s_BCol && mfi.m_bExistsInB ){ itemPath = fullNameB(mfi); }
joachim99@69 1609 else if ( c == s_CCol && mfi.m_bExistsInC ){ itemPath = fullNameC(mfi); }
joachim99@69 1610
joachim99@69 1611 if (!itemPath.isEmpty())
joachim99@69 1612 {
joachim99@75 1613 selectItemAndColumn( pDMI, c, e->button()==Qt::RightButton );
joachim99@69 1614 }
joachim99@8 1615 }
joachim99@69 1616 }
joachim99@69 1617
joachim99@75 1618 void DirectoryMergeWindow::contextMenuEvent(QContextMenuEvent* e)
joachim99@69 1619 {
joachim99@75 1620 QTreeWidgetItem* lvi = itemAt( e->pos() );
joachim99@75 1621 int c = columnAt( e->x() );
joachim99@75 1622 QPoint p = e->globalPos();
joachim99@69 1623 if ( lvi==0 ) return;
joachim99@69 1624
joachim99@69 1625 DirMergeItem* pDMI = static_cast<DirMergeItem*>(lvi);
joachim99@69 1626
joachim99@69 1627 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@69 1628 assert( mfi.m_pDMI==pDMI );
joachim99@69 1629 if ( c == s_ACol || c==s_BCol || c==s_CCol )
joachim99@69 1630 {
joachim99@69 1631 QString itemPath;
joachim99@69 1632 if ( c == s_ACol && mfi.m_bExistsInA ){ itemPath = fullNameA(mfi); }
joachim99@69 1633 else if ( c == s_BCol && mfi.m_bExistsInB ){ itemPath = fullNameB(mfi); }
joachim99@69 1634 else if ( c == s_CCol && mfi.m_bExistsInC ){ itemPath = fullNameC(mfi); }
joachim99@69 1635
joachim99@69 1636 if (!itemPath.isEmpty())
joachim99@69 1637 {
joachim99@69 1638 selectItemAndColumn(pDMI, c, true);
joachim99@69 1639 KPopupMenu m(this);
joachim99@69 1640 m_pDirCompareExplicit->plug(&m);
joachim99@69 1641 m_pDirMergeExplicit->plug(&m);
joachim99@69 1642
joachim99@69 1643 #ifndef _WIN32
joachim99@69 1644 m.exec( p );
joachim99@69 1645 #else
joachim99@70 1646 void showShellContextMenu( const QString&, QPoint, QWidget*, QMenu* );
joachim99@69 1647 showShellContextMenu( itemPath, p, this, &m );
joachim99@69 1648 #endif
joachim99@69 1649 }
joachim99@69 1650 }
joachim99@69 1651 }
joachim99@69 1652
joachim99@69 1653 static QString getFileName( DirMergeItem* pDMI, int column )
joachim99@69 1654 {
joachim99@69 1655 if ( pDMI != 0 )
joachim99@69 1656 {
joachim99@69 1657 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@69 1658 return column == s_ACol ? mfi.m_fileInfoA.absFilePath() :
joachim99@69 1659 column == s_BCol ? mfi.m_fileInfoB.absFilePath() :
joachim99@69 1660 column == s_CCol ? mfi.m_fileInfoC.absFilePath() :
joachim99@69 1661 QString("");
joachim99@69 1662 }
joachim99@69 1663 return "";
joachim99@69 1664 }
joachim99@69 1665
joachim99@69 1666 static bool isDir( DirMergeItem* pDMI, int column )
joachim99@69 1667 {
joachim99@69 1668 if ( pDMI != 0 )
joachim99@69 1669 {
joachim99@69 1670 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@69 1671 return column == s_ACol ? mfi.m_bDirA :
joachim99@69 1672 column == s_BCol ? mfi.m_bDirB :
joachim99@69 1673 mfi.m_bDirC;
joachim99@69 1674 }
joachim99@69 1675 return false;
joachim99@69 1676 }
joachim99@69 1677
joachim99@69 1678
joachim99@69 1679 void DirectoryMergeWindow::selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu)
joachim99@69 1680 {
joachim99@69 1681 if ( bContextMenu && (
joachim99@69 1682 pDMI==m_pSelection1Item && c==m_selection1Column && m_pSelection2Item==0 ||
joachim99@69 1683 pDMI==m_pSelection2Item && c==m_selection2Column && m_pSelection3Item==0 ||
joachim99@69 1684 pDMI==m_pSelection3Item && c==m_selection3Column ) )
joachim99@69 1685 return;
joachim99@69 1686
joachim99@69 1687 DirMergeItem* pOld1=m_pSelection1Item;
joachim99@69 1688 DirMergeItem* pOld2=m_pSelection2Item;
joachim99@69 1689 DirMergeItem* pOld3=m_pSelection3Item;
joachim99@69 1690
joachim99@69 1691 bool bReset = false;
joachim99@69 1692
joachim99@69 1693 if ( m_pSelection1Item )
joachim99@69 1694 {
joachim99@69 1695 if (isDir( m_pSelection1Item, m_selection1Column )!=isDir( pDMI, c ))
joachim99@69 1696 bReset = true;
joachim99@69 1697 }
joachim99@69 1698
joachim99@69 1699 if ( bReset || m_pSelection3Item!=0 ||
joachim99@69 1700 pDMI==m_pSelection1Item && c==m_selection1Column ||
joachim99@69 1701 pDMI==m_pSelection2Item && c==m_selection2Column ||
joachim99@69 1702 pDMI==m_pSelection3Item && c==m_selection3Column)
joachim99@69 1703 {
joachim99@69 1704 m_pSelection1Item = 0;
joachim99@69 1705 m_pSelection2Item = 0;
joachim99@69 1706 m_pSelection3Item = 0;
joachim99@69 1707 }
joachim99@69 1708 else if ( m_pSelection1Item==0 )
joachim99@69 1709 {
joachim99@69 1710 m_pSelection1Item = pDMI;
joachim99@69 1711 m_selection1Column = c;
joachim99@69 1712 m_pSelection2Item = 0;
joachim99@69 1713 m_pSelection3Item = 0;
joachim99@69 1714 }
joachim99@69 1715 else if ( m_pSelection2Item==0 )
joachim99@69 1716 {
joachim99@69 1717 m_pSelection2Item = pDMI;
joachim99@69 1718 m_selection2Column = c;
joachim99@69 1719 m_pSelection3Item = 0;
joachim99@69 1720 }
joachim99@69 1721 else if ( m_pSelection3Item==0 )
joachim99@69 1722 {
joachim99@69 1723 m_pSelection3Item = pDMI;
joachim99@69 1724 m_selection3Column = c;
joachim99@69 1725 }
joachim99@75 1726 if (pOld1) dataChanged( indexFromItem( pOld1, s_ACol ), indexFromItem( pOld1, s_CCol ) );
joachim99@75 1727 if (pOld2) dataChanged( indexFromItem( pOld2, s_ACol ), indexFromItem( pOld2, s_CCol ) );
joachim99@75 1728 if (pOld3) dataChanged( indexFromItem( pOld3, s_ACol ), indexFromItem( pOld3, s_CCol ) );
joachim99@75 1729 if (m_pSelection1Item) dataChanged( indexFromItem( m_pSelection1Item, s_ACol ), indexFromItem( m_pSelection1Item, s_CCol ) );
joachim99@75 1730 if (m_pSelection2Item) dataChanged( indexFromItem( m_pSelection2Item, s_ACol ), indexFromItem( m_pSelection2Item, s_CCol ) );
joachim99@75 1731 if (m_pSelection3Item) dataChanged( indexFromItem( m_pSelection3Item, s_ACol ), indexFromItem( m_pSelection3Item, s_CCol ) );
joachim99@69 1732 emit updateAvailabilities();
joachim99@8 1733 }
joachim99@8 1734
joachim99@75 1735 DirMergeItem::DirMergeItem( QTreeWidget* pParent, const QString& fileName, MergeFileInfos* pMFI )
joachim99@75 1736 : QTreeWidgetItem( pParent, QStringList() << fileName << "" << "" << "" << i18n("To do.") << "" )
joachim99@66 1737 {
joachim99@66 1738 init(pMFI);
joachim99@66 1739 }
joachim99@66 1740
joachim99@66 1741 DirMergeItem::DirMergeItem( DirMergeItem* pParent, const QString& fileName, MergeFileInfos* pMFI )
joachim99@75 1742 : QTreeWidgetItem( pParent, QStringList() << fileName << "" << "" << "" << i18n("To do.") << "" )
joachim99@66 1743 {
joachim99@66 1744 init(pMFI);
joachim99@66 1745 }
joachim99@66 1746
joachim99@66 1747
joachim99@66 1748 void DirMergeItem::init(MergeFileInfos* pMFI)
joachim99@8 1749 {
joachim99@8 1750 pMFI->m_pDMI = this;
joachim99@8 1751 m_pMFI = pMFI;
joachim99@66 1752 TotalDiffStatus& tds = pMFI->m_totalDiffStatus;
joachim99@66 1753 if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC )
joachim99@66 1754 {
joachim99@66 1755 }
joachim99@66 1756 else
joachim99@66 1757 {
joachim99@66 1758 setText( s_UnsolvedCol, QString::number( tds.nofUnsolvedConflicts ) );
joachim99@66 1759 setText( s_SolvedCol, QString::number( tds.nofSolvedConflicts ) );
joachim99@66 1760 setText( s_NonWhiteCol, QString::number( tds.nofUnsolvedConflicts + tds.nofSolvedConflicts - tds.nofWhitespaceConflicts ) );
joachim99@66 1761 setText( s_WhiteCol, QString::number( tds.nofWhitespaceConflicts ) );
joachim99@66 1762 }
joachim99@8 1763 }
joachim99@8 1764
joachim99@75 1765 bool DirMergeItem::operator<(const QTreeWidgetItem& i) const
joachim99@8 1766 {
joachim99@75 1767 int col = treeWidget()->sortColumn();
joachim99@75 1768 const DirMergeItem* pDMI = static_cast<const DirMergeItem*>(&i);
joachim99@66 1769 bool bDir1 = m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC;
joachim99@66 1770 bool bDir2 = pDMI->m_pMFI->m_bDirA || pDMI->m_pMFI->m_bDirB || pDMI->m_pMFI->m_bDirC;
joachim99@66 1771 if ( m_pMFI==0 || pDMI->m_pMFI==0 || bDir1 == bDir2 )
joachim99@66 1772 {
joachim99@66 1773 if(col==s_UnsolvedCol || col==s_SolvedCol || col==s_NonWhiteCol || col==s_WhiteCol)
joachim99@75 1774 return text(col).toInt() > i.text(col).toInt();
joachim99@66 1775 else
joachim99@75 1776 return QTreeWidgetItem::operator<(i);
joachim99@66 1777 }
joachim99@66 1778 else
joachim99@75 1779 return bDir1;
joachim99@8 1780 }
joachim99@8 1781
joachim99@66 1782
joachim99@8 1783 DirMergeItem::~DirMergeItem()
joachim99@8 1784 {
joachim99@8 1785 m_pMFI->m_pDMI = 0;
joachim99@8 1786 }
joachim99@8 1787
joachim99@8 1788 void MergeFileInfos::setMergeOperation( e_MergeOperation eMOp )
joachim99@8 1789 {
joachim99@51 1790 if ( eMOp != m_eMergeOperation )
joachim99@51 1791 {
joachim99@51 1792 m_bOperationComplete = false;
joachim99@51 1793 m_pDMI->setText( s_OpStatusCol, "" );
joachim99@51 1794 }
joachim99@51 1795
joachim99@8 1796 m_eMergeOperation = eMOp;
joachim99@51 1797 QString s;
joachim99@8 1798 bool bDir = m_bDirA || m_bDirB || m_bDirC;
joachim99@8 1799 if( m_pDMI!=0 )
joachim99@8 1800 {
joachim99@8 1801 switch( m_eMergeOperation )
joachim99@8 1802 {
joachim99@8 1803 case eNoOperation: s=""; m_pDMI->setText(s_OpCol,""); break;
joachim99@51 1804 case eCopyAToB: s=i18n("Copy A to B"); break;
joachim99@51 1805 case eCopyBToA: s=i18n("Copy B to A"); break;
joachim99@51 1806 case eDeleteA: s=i18n("Delete A"); break;
joachim99@51 1807 case eDeleteB: s=i18n("Delete B"); break;
joachim99@51 1808 case eDeleteAB: s=i18n("Delete A & B"); break;
joachim99@51 1809 case eMergeToA: s=i18n("Merge to A"); break;
joachim99@51 1810 case eMergeToB: s=i18n("Merge to B"); break;
joachim99@51 1811 case eMergeToAB: s=i18n("Merge to A & B"); break;
joachim99@8 1812 case eCopyAToDest: s="A"; break;
joachim99@8 1813 case eCopyBToDest: s="B"; break;
joachim99@8 1814 case eCopyCToDest: s="C"; break;
joachim99@51 1815 case eDeleteFromDest: s=i18n("Delete (if exists)"); break;
joachim99@51 1816 case eMergeABCToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break;
joachim99@51 1817 case eMergeABToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break;
joachim99@51 1818 case eConflictingFileTypes: s=i18n("Error: Conflicting File Types"); break;
joachim99@51 1819 case eConflictingAges: s=i18n("Error: Dates are equal but files are not."); break;
joachim99@8 1820 default: assert(false); break;
joachim99@8 1821 }
joachim99@8 1822 m_pDMI->setText(s_OpCol,s);
joachim99@8 1823
joachim99@8 1824 e_MergeOperation eChildrenMergeOp = m_eMergeOperation;
joachim99@8 1825 if ( eChildrenMergeOp == eConflictingFileTypes ) eChildrenMergeOp = eMergeABCToDest;
joachim99@75 1826 for( int childIdx=0; childIdx<m_pDMI->childCount(); ++childIdx )
joachim99@8 1827 {
joachim99@75 1828 QTreeWidgetItem* p = m_pDMI->child(childIdx);
joachim99@8 1829 DirMergeItem* pDMI = static_cast<DirMergeItem*>( p );
joachim99@75 1830 DirectoryMergeWindow* pDMW = static_cast<DirectoryMergeWindow*>( p->treeWidget() );
joachim99@8 1831 pDMW->calcSuggestedOperation( *pDMI->m_pMFI, eChildrenMergeOp );
joachim99@8 1832 }
joachim99@8 1833 }
joachim99@8 1834 }
joachim99@8 1835
joachim99@8 1836 void DirectoryMergeWindow::compareCurrentFile()
joachim99@8 1837 {
joachim99@8 1838 if (!canContinue()) return;
joachim99@8 1839
joachim99@8 1840 if ( m_bRealMergeStarted )
joachim99@8 1841 {
joachim99@51 1842 KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible"));
joachim99@8 1843 return;
joachim99@8 1844 }
joachim99@8 1845
joachim99@75 1846 if ( currentItem() != 0 )
joachim99@8 1847 {
joachim99@75 1848 DirMergeItem* pDMI = static_cast<DirMergeItem*>( currentItem() );
joachim99@8 1849 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@8 1850 if ( !(mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC) )
joachim99@8 1851 {
joachim99@8 1852 emit startDiffMerge(
joachim99@8 1853 mfi.m_bExistsInA ? mfi.m_fileInfoA.absFilePath() : QString(""),
joachim99@8 1854 mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : QString(""),
joachim99@8 1855 mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : QString(""),
joachim99@8 1856 "",
joachim99@66 1857 "","","",0
joachim99@8 1858 );
joachim99@8 1859 }
joachim99@8 1860 }
joachim99@8 1861 emit updateAvailabilities();
joachim99@8 1862 }
joachim99@8 1863
joachim99@8 1864
joachim99@69 1865 void DirectoryMergeWindow::slotCompareExplicitlySelectedFiles()
joachim99@69 1866 {
joachim99@69 1867 if ( ! isDir(m_pSelection1Item,m_selection1Column) && !canContinue() ) return;
joachim99@69 1868
joachim99@69 1869 if ( m_bRealMergeStarted )
joachim99@69 1870 {
joachim99@69 1871 KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible"));
joachim99@69 1872 return;
joachim99@69 1873 }
joachim99@69 1874
joachim99@69 1875 emit startDiffMerge(
joachim99@69 1876 getFileName( m_pSelection1Item, m_selection1Column ),
joachim99@69 1877 getFileName( m_pSelection2Item, m_selection2Column ),
joachim99@69 1878 getFileName( m_pSelection3Item, m_selection3Column ),
joachim99@69 1879 "",
joachim99@69 1880 "","","",0
joachim99@69 1881 );
joachim99@69 1882 m_pSelection1Item=0;
joachim99@69 1883 m_pSelection2Item=0;
joachim99@69 1884 m_pSelection3Item=0;
joachim99@69 1885
joachim99@69 1886 emit updateAvailabilities();
joachim99@75 1887 update();
joachim99@69 1888 }
joachim99@69 1889
joachim99@69 1890 void DirectoryMergeWindow::slotMergeExplicitlySelectedFiles()
joachim99@69 1891 {
joachim99@69 1892 if ( ! isDir(m_pSelection1Item,m_selection1Column) && !canContinue() ) return;
joachim99@69 1893
joachim99@69 1894 if ( m_bRealMergeStarted )
joachim99@69 1895 {
joachim99@69 1896 KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible"));
joachim99@69 1897 return;
joachim99@69 1898 }
joachim99@69 1899
joachim99@69 1900 QString fn1 = getFileName( m_pSelection1Item, m_selection1Column );
joachim99@69 1901 QString fn2 = getFileName( m_pSelection2Item, m_selection2Column );
joachim99@69 1902 QString fn3 = getFileName( m_pSelection3Item, m_selection3Column );
joachim99@69 1903
joachim99@69 1904 emit startDiffMerge( fn1, fn2, fn3,
joachim99@69 1905 fn3.isEmpty() ? fn2 : fn3,
joachim99@69 1906 "","","",0
joachim99@69 1907 );
joachim99@69 1908 m_pSelection1Item=0;
joachim99@69 1909 m_pSelection2Item=0;
joachim99@69 1910 m_pSelection3Item=0;
joachim99@69 1911
joachim99@69 1912 emit updateAvailabilities();
joachim99@75 1913 update();
joachim99@69 1914 }
joachim99@8 1915
joachim99@8 1916 bool DirectoryMergeWindow::isFileSelected()
joachim99@8 1917 {
joachim99@75 1918 if ( currentItem() != 0 )
joachim99@8 1919 {
joachim99@75 1920 DirMergeItem* pDMI = static_cast<DirMergeItem*>( currentItem() );
joachim99@8 1921 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@8 1922 return ! (mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC || conflictingFileTypes(mfi) );
joachim99@8 1923 }
joachim99@8 1924 return false;
joachim99@8 1925 }
joachim99@8 1926
joachim99@8 1927 void DirectoryMergeWindow::mergeResultSaved(const QString& fileName)
joachim99@8 1928 {
joachim99@51 1929 DirMergeItem* pCurrentItemForOperation = (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() )
joachim99@51 1930 ? 0
joachim99@51 1931 : *m_currentItemForOperation;
joachim99@51 1932
joachim99@51 1933 if ( pCurrentItemForOperation!=0 && pCurrentItemForOperation->m_pMFI==0 )
joachim99@8 1934 {
joachim99@51 1935 KMessageBox::error( this, i18n("This should never happen: \n\nmergeResultSaved: m_pMFI=0\n\nIf you know how to reproduce this, please contact the program author."),i18n("Program Error") );
joachim99@8 1936 return;
joachim99@8 1937 }
joachim99@51 1938 if ( pCurrentItemForOperation!=0 && fileName == fullNameDest(*pCurrentItemForOperation->m_pMFI) )
joachim99@8 1939 {
joachim99@51 1940 if ( pCurrentItemForOperation->m_pMFI->m_eMergeOperation==eMergeToAB )
joachim99@8 1941 {
joachim99@51 1942 MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI;
joachim99@8 1943 bool bSuccess = copyFLD( fullNameB(mfi), fullNameA(mfi) );
joachim99@8 1944 if (!bSuccess)
joachim99@8 1945 {
joachim99@51 1946 KMessageBox::error(this, i18n("An error occurred while copying.\n"), i18n("Error") );
joachim99@75 1947 m_pStatusInfo->setWindowTitle(i18n("Merge Error"));
joachim99@8 1948 m_pStatusInfo->show();
joachim99@69 1949 //if ( m_pStatusInfo->firstChild()!=0 )
joachim99@69 1950 // m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() );
joachim99@8 1951 m_bError = true;
joachim99@51 1952 pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") );
joachim99@8 1953 mfi.m_eMergeOperation = eCopyBToA;
joachim99@8 1954 return;
joachim99@8 1955 }
joachim99@8 1956 }
joachim99@51 1957 pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Done.") );
joachim99@51 1958 pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true;
joachim99@51 1959 if ( m_mergeItemList.size()==1 )
joachim99@51 1960 {
joachim99@51 1961 m_mergeItemList.clear();
joachim99@51 1962 m_bRealMergeStarted=false;
joachim99@51 1963 }
joachim99@8 1964 }
joachim99@8 1965
joachim99@8 1966 emit updateAvailabilities();
joachim99@8 1967 }
joachim99@8 1968
joachim99@8 1969 bool DirectoryMergeWindow::canContinue()
joachim99@8 1970 {
joachim99@8 1971 bool bCanContinue=false;
joachim99@8 1972 checkIfCanContinue( &bCanContinue );
joachim99@8 1973 if ( bCanContinue && !m_bError )
joachim99@8 1974 {
joachim99@51 1975 DirMergeItem* pCurrentItemForOperation =
joachim99@51 1976 (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) ? 0 : *m_currentItemForOperation;
joachim99@51 1977
joachim99@51 1978 if ( pCurrentItemForOperation!=0 && ! pCurrentItemForOperation->m_pMFI->m_bOperationComplete )
joachim99@8 1979 {
joachim99@51 1980 pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Not saved.") );
joachim99@51 1981 pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true;
joachim99@51 1982 if ( m_mergeItemList.size()==1 )
joachim99@51 1983 {
joachim99@51 1984 m_mergeItemList.clear();
joachim99@51 1985 m_bRealMergeStarted=false;
joachim99@51 1986 }
joachim99@8 1987 }
joachim99@8 1988 }
joachim99@8 1989 return bCanContinue;
joachim99@8 1990 }
joachim99@8 1991
joachim99@51 1992 bool DirectoryMergeWindow::executeMergeOperation( MergeFileInfos& mfi, bool& bSingleFileMerge )
joachim99@8 1993 {
joachim99@51 1994 bool bCreateBackups = m_pOptions->m_bDmCreateBakFiles;
joachim99@51 1995 // First decide destname
joachim99@51 1996 QString destName;
joachim99@51 1997 switch( mfi.m_eMergeOperation )
joachim99@51 1998 {
joachim99@51 1999 case eNoOperation: break;
joachim99@51 2000 case eDeleteAB: break;
joachim99@51 2001 case eMergeToAB: // let the user save in B. In mergeResultSaved() the file will be copied to A.
joachim99@51 2002 case eMergeToB:
joachim99@51 2003 case eDeleteB:
joachim99@51 2004 case eCopyAToB: destName = fullNameB(mfi); break;
joachim99@51 2005 case eMergeToA:
joachim99@51 2006 case eDeleteA:
joachim99@51 2007 case eCopyBToA: destName = fullNameA(mfi); break;
joachim99@51 2008 case eMergeABToDest:
joachim99@51 2009 case eMergeABCToDest:
joachim99@51 2010 case eCopyAToDest:
joachim99@51 2011 case eCopyBToDest:
joachim99@51 2012 case eCopyCToDest:
joachim99@51 2013 case eDeleteFromDest: destName = fullNameDest(mfi); break;
joachim99@51 2014 default:
joachim99@51 2015 KMessageBox::error( this, i18n("Unknown merge operation. (This must never happen!)"), i18n("Error") );
joachim99@51 2016 assert(false);
joachim99@51 2017 }
joachim99@8 2018
joachim99@51 2019 bool bSuccess = false;
joachim99@51 2020 bSingleFileMerge = false;
joachim99@51 2021 switch( mfi.m_eMergeOperation )
joachim99@51 2022 {
joachim99@51 2023 case eNoOperation: bSuccess = true; break;
joachim99@51 2024 case eCopyAToDest:
joachim99@51 2025 case eCopyAToB: bSuccess = copyFLD( fullNameA(mfi), destName ); break;
joachim99@51 2026 case eCopyBToDest:
joachim99@51 2027 case eCopyBToA: bSuccess = copyFLD( fullNameB(mfi), destName ); break;
joachim99@51 2028 case eCopyCToDest: bSuccess = copyFLD( fullNameC(mfi), destName ); break;
joachim99@51 2029 case eDeleteFromDest:
joachim99@51 2030 case eDeleteA:
joachim99@51 2031 case eDeleteB: bSuccess = deleteFLD( destName, bCreateBackups ); break;
joachim99@51 2032 case eDeleteAB: bSuccess = deleteFLD( fullNameA(mfi), bCreateBackups ) &&
joachim99@51 2033 deleteFLD( fullNameB(mfi), bCreateBackups ); break;
joachim99@51 2034 case eMergeABToDest:
joachim99@51 2035 case eMergeToA:
joachim99@51 2036 case eMergeToAB:
joachim99@51 2037 case eMergeToB: bSuccess = mergeFLD( fullNameA(mfi), fullNameB(mfi), "",
joachim99@51 2038 destName, bSingleFileMerge );
joachim99@51 2039 break;
joachim99@51 2040 case eMergeABCToDest:bSuccess = mergeFLD(
joachim99@51 2041 mfi.m_bExistsInA ? fullNameA(mfi) : QString(""),
joachim99@51 2042 mfi.m_bExistsInB ? fullNameB(mfi) : QString(""),
joachim99@51 2043 mfi.m_bExistsInC ? fullNameC(mfi) : QString(""),
joachim99@51 2044 destName, bSingleFileMerge );
joachim99@51 2045 break;
joachim99@51 2046 default:
joachim99@51 2047 KMessageBox::error( this, i18n("Unknown merge operation."), i18n("Error") );
joachim99@51 2048 assert(false);
joachim99@51 2049 }
joachim99@8 2050
joachim99@51 2051 return bSuccess;
joachim99@51 2052 }
joachim99@8 2053
joachim99@51 2054
joachim99@51 2055 // Check if the merge can start, and prepare the m_mergeItemList which then contains all
joachim99@51 2056 // items that must be merged.
joachim99@75 2057 void DirectoryMergeWindow::prepareMergeStart( QTreeWidgetItem* pBegin, QTreeWidgetItem* pEnd, bool bVerbose )
joachim99@51 2058 {
joachim99@51 2059 if ( bVerbose )
joachim99@8 2060 {
joachim99@51 2061 int status = KMessageBox::warningYesNoCancel(this,
joachim99@51 2062 i18n("The merge is about to begin.\n\n"
joachim99@51 2063 "Choose \"Do it\" if you have read the instructions and know what you are doing.\n"
joachim99@51 2064 "Choosing \"Simulate it\" will tell you what would happen.\n\n"
joachim99@51 2065 "Be aware that this program still has beta status "
joachim99@51 2066 "and there is NO WARRANTY whatsoever! Make backups of your vital data!"),
joachim99@51 2067 i18n("Starting Merge"), i18n("Do It"), i18n("Simulate It") );
joachim99@51 2068 if (status==KMessageBox::Yes) m_bRealMergeStarted = true;
joachim99@51 2069 else if (status==KMessageBox::No ) m_bSimulatedMergeStarted = true;
joachim99@51 2070 else return;
joachim99@51 2071 }
joachim99@51 2072 else
joachim99@51 2073 {
joachim99@51 2074 m_bRealMergeStarted = true;
joachim99@51 2075 }
joachim99@51 2076
joachim99@51 2077 m_mergeItemList.clear();
joachim99@51 2078 if (pBegin == 0)
joachim99@51 2079 return;
joachim99@51 2080
joachim99@75 2081 for( QTreeWidgetItem* p = pBegin; p!= pEnd; p = treeIterator( p ) )
joachim99@51 2082 {
joachim99@51 2083 DirMergeItem* pDMI = static_cast<DirMergeItem*>(p);
joachim99@51 2084
joachim99@69 2085 if ( pDMI && ! pDMI->m_pMFI->m_bOperationComplete )
joachim99@8 2086 {
joachim99@51 2087 m_mergeItemList.push_back(pDMI);
joachim99@51 2088
joachim99@8 2089 if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingFileTypes )
joachim99@8 2090 {
joachim99@75 2091 scrollToItem( pDMI, QAbstractItemView::EnsureVisible );
joachim99@75 2092 pDMI->setSelected( true );
joachim99@51 2093 KMessageBox::error(this, i18n("The highlighted item has a different type in the different directories. Select what to do."), i18n("Error"));
joachim99@51 2094 m_mergeItemList.clear();
joachim99@51 2095 m_bRealMergeStarted=false;
joachim99@8 2096 return;
joachim99@8 2097 }
joachim99@8 2098 if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingAges )
joachim99@8 2099 {
joachim99@75 2100 scrollToItem ( pDMI, QAbstractItemView::EnsureVisible );
joachim99@75 2101 pDMI->setSelected( true );
joachim99@51 2102 KMessageBox::error(this, i18n("The modification dates of the file are equal but the files are not. Select what to do."), i18n("Error"));
joachim99@51 2103 m_mergeItemList.clear();
joachim99@51 2104 m_bRealMergeStarted=false;
joachim99@8 2105 return;
joachim99@8 2106 }
joachim99@8 2107 }
joachim99@8 2108 }
joachim99@8 2109
joachim99@51 2110 m_currentItemForOperation = m_mergeItemList.begin();
joachim99@51 2111 return;
joachim99@51 2112 }
joachim99@51 2113
joachim99@51 2114 void DirectoryMergeWindow::slotRunOperationForCurrentItem()
joachim99@51 2115 {
joachim99@51 2116 if ( ! canContinue() ) return;
joachim99@51 2117
joachim99@51 2118 bool bVerbose = false;
joachim99@51 2119 if ( m_mergeItemList.empty() )
joachim99@51 2120 {
joachim99@75 2121 QTreeWidgetItem* pBegin = currentItem();
joachim99@75 2122 QTreeWidgetItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no children)
joachim99@51 2123
joachim99@53 2124 prepareMergeStart( pBegin, pEnd, bVerbose );
joachim99@51 2125 mergeContinue(true, bVerbose);
joachim99@51 2126 }
joachim99@51 2127 else
joachim99@51 2128 mergeContinue(false, bVerbose);
joachim99@51 2129 }
joachim99@51 2130
joachim99@51 2131 void DirectoryMergeWindow::slotRunOperationForAllItems()
joachim99@51 2132 {
joachim99@51 2133 if ( ! canContinue() ) return;
joachim99@51 2134
joachim99@51 2135 bool bVerbose = true;
joachim99@51 2136 if ( m_mergeItemList.empty() )
joachim99@51 2137 {
joachim99@75 2138 QTreeWidgetItem* pBegin = topLevelItemCount()>0 ? topLevelItem(0) : 0;
joachim99@51 2139
joachim99@51 2140 prepareMergeStart( pBegin, 0, bVerbose );
joachim99@51 2141 mergeContinue(true, bVerbose);
joachim99@51 2142 }
joachim99@51 2143 else
joachim99@51 2144 mergeContinue(false, bVerbose);
joachim99@51 2145 }
joachim99@51 2146
joachim99@51 2147 void DirectoryMergeWindow::mergeCurrentFile()
joachim99@51 2148 {
joachim99@51 2149 if (!canContinue()) return;
joachim99@51 2150
joachim99@51 2151 if ( m_bRealMergeStarted )
joachim99@51 2152 {
joachim99@66 2153 KMessageBox::sorry(this,i18n("This operation is currently not possible because directory merge is currently running."),i18n("Operation Not Possible"));
joachim99@51 2154 return;
joachim99@51 2155 }
joachim99@51 2156
joachim99@51 2157 if ( isFileSelected() )
joachim99@51 2158 {
joachim99@75 2159 DirMergeItem* pDMI = static_cast<DirMergeItem*>( currentItem() );
joachim99@51 2160 if ( pDMI != 0 )
joachim99@51 2161 {
joachim99@51 2162 MergeFileInfos& mfi = *pDMI->m_pMFI;
joachim99@51 2163 m_mergeItemList.clear();
joachim99@51 2164 m_mergeItemList.push_back( pDMI );
joachim99@51 2165 m_currentItemForOperation=m_mergeItemList.begin();
joachim99@51 2166 bool bDummy=false;
joachim99@51 2167 mergeFLD(
joachim99@51 2168 mfi.m_bExistsInA ? mfi.m_fileInfoA.absFilePath() : QString(""),
joachim99@51 2169 mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : QString(""),
joachim99@51 2170 mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : QString(""),
joachim99@51 2171 fullNameDest(mfi),
joachim99@51 2172 bDummy
joachim99@51 2173 );
joachim99@51 2174 }
joachim99@51 2175 }
joachim99@51 2176 emit updateAvailabilities();
joachim99@51 2177 }
joachim99@51 2178
joachim99@51 2179
joachim99@51 2180 // When bStart is true then m_currentItemForOperation must still be processed.
joachim99@51 2181 // When bVerbose is true then a messagebox will tell when the merge is complete.
joachim99@51 2182 void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose)
joachim99@51 2183 {
joachim99@66 2184 ProgressProxy pp;
joachim99@51 2185 if ( m_mergeItemList.empty() )
joachim99@51 2186 return;
joachim99@51 2187
joachim99@51 2188 int nrOfItems = 0;
joachim99@51 2189 int nrOfCompletedItems = 0;
joachim99@51 2190 int nrOfCompletedSimItems = 0;
joachim99@51 2191
joachim99@51 2192 // Count the number of completed items (for the progress bar).
joachim99@51 2193 for( MergeItemList::iterator i = m_mergeItemList.begin(); i!=m_mergeItemList.end(); ++i )
joachim99@51 2194 {
joachim99@53 2195 DirMergeItem* pDMI = *i;
joachim99@51 2196 ++nrOfItems;
joachim99@51 2197 if ( pDMI->m_pMFI->m_bOperationComplete )
joachim99@51 2198 ++nrOfCompletedItems;
joachim99@51 2199 if ( pDMI->m_pMFI->m_bSimOpComplete )
joachim99@51 2200 ++nrOfCompletedSimItems;
joachim99@51 2201 }
joachim99@51 2202
joachim99@51 2203 m_pStatusInfo->hide();
joachim99@51 2204 m_pStatusInfo->clear();
joachim99@51 2205
joachim99@51 2206 DirMergeItem* pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation;
joachim99@51 2207
joachim99@51 2208 bool bContinueWithCurrentItem = bStart; // true for first item, else false
joachim99@8 2209 bool bSkipItem = false;
joachim99@51 2210 if ( !bStart && m_bError && pCurrentItemForOperation!=0 )
joachim99@8 2211 {
joachim99@8 2212 int status = KMessageBox::warningYesNoCancel(this,
joachim99@8 2213 i18n("There was an error in the last step.\n"
joachim99@8 2214 "Do you want to continue with the item that caused the error or do you want to skip this item?"),
joachim99@51 2215 i18n("Continue merge after an error"), i18n("Continue With Last Item"), i18n("Skip Item") );
joachim99@51 2216 if (status==KMessageBox::Yes) bContinueWithCurrentItem = true;
joachim99@8 2217 else if (status==KMessageBox::No ) bSkipItem = true;
joachim99@8 2218 else return;
joachim99@8 2219 m_bError = false;
joachim99@8 2220 }
joachim99@8 2221
joachim99@8 2222 bool bSuccess = true;
joachim99@8 2223 bool bSingleFileMerge = false;
joachim99@8 2224 bool bSim = m_bSimulatedMergeStarted;
joachim99@8 2225 while( bSuccess )
joachim99@8 2226 {
joachim99@51 2227 if ( pCurrentItemForOperation==0 )
joachim99@51 2228 {
joachim99@51 2229 m_mergeItemList.clear();
joachim99@51 2230 m_bRealMergeStarted=false;
joachim99@51 2231 break;
joachim99@51 2232 }
joachim99@51 2233
joachim99@51 2234 if ( pCurrentItemForOperation!=0 && !bContinueWithCurrentItem )
joachim99@8 2235 {
joachim99@8 2236 if ( bSim )
joachim99@8 2237 {
joachim99@75 2238 if( pCurrentItemForOperation->childCount()==0 )
joachim99@8 2239 {
joachim99@51 2240 pCurrentItemForOperation->m_pMFI->m_bSimOpComplete = true;
joachim99@8 2241 }
joachim99@8 2242 }
joachim99@8 2243 else
joachim99@8 2244 {
joachim99@75 2245 if( pCurrentItemForOperation->childCount()==0 )
joachim99@8 2246 {
joachim99@51 2247 if( !pCurrentItemForOperation->m_pMFI->m_bOperationComplete )
joachim99@8 2248 {
joachim99@51 2249 pCurrentItemForOperation->setText( s_OpStatusCol, bSkipItem ? i18n("Skipped.") : i18n("Done.") );
joachim99@51 2250 pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true;
joachim99@8 2251 bSkipItem = false;
joachim99@8 2252 }
joachim99@8 2253 }
joachim99@8 2254 else
joachim99@8 2255 {
joachim99@51 2256 pCurrentItemForOperation->setText( s_OpStatusCol, i18n("In progress...") );
joachim99@8 2257 }
joachim99@8 2258 }
joachim99@8 2259 }
joachim99@8 2260
joachim99@51 2261 if ( ! bContinueWithCurrentItem )
joachim99@8 2262 {
joachim99@51 2263 // Depth first
joachim99@75 2264 QTreeWidgetItem* pPrevItem = pCurrentItemForOperation;
joachim99@51 2265 ++m_currentItemForOperation;
joachim99@51 2266 pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation;
joachim99@51 2267 if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->parent()!=pPrevItem->parent()) && pPrevItem->parent()!=0 )
joachim99@8 2268 {
joachim99@51 2269 // Check if the parent may be set to "Done"
joachim99@75 2270 QTreeWidgetItem* pParent = pPrevItem->parent();
joachim99@51 2271 bool bDone = true;
joachim99@51 2272 while ( bDone && pParent!=0 )
joachim99@8 2273 {
joachim99@75 2274 for( int childIdx = 0; childIdx<pParent->childCount(); ++childIdx )
joachim99@8 2275 {
joachim99@75 2276 DirMergeItem* pDMI = static_cast<DirMergeItem*>(pParent->child(childIdx));
joachim99@51 2277 if ( !bSim && ! pDMI->m_pMFI->m_bOperationComplete || bSim && pDMI->m_pMFI->m_bSimOpComplete )
joachim99@8 2278 {
joachim99@51 2279 bDone=false;
joachim99@51 2280 break;
joachim99@8 2281 }
joachim99@8 2282 }
joachim99@51 2283 if ( bDone )
joachim99@51 2284 {
joachim99@51 2285 if (bSim)
joachim99@51 2286 static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bSimOpComplete = bDone;
joachim99@51 2287 else
joachim99@51 2288 {
joachim99@51 2289 pParent->setText( s_OpStatusCol, i18n("Done.") );
joachim99@51 2290 static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bOperationComplete = bDone;
joachim99@51 2291 }
joachim99@51 2292 }
joachim99@51 2293 pParent = pParent->parent();
joachim99@8 2294 }
joachim99@8 2295 }
joachim99@8 2296 }
joachim99@8 2297
joachim99@51 2298 if ( pCurrentItemForOperation == 0 ) // end?
joachim99@8 2299 {
joachim99@8 2300 if ( m_bRealMergeStarted )
joachim99@8 2301 {
joachim99@51 2302 if (bVerbose)
joachim99@51 2303 {
joachim99@51 2304 KMessageBox::information( this, i18n("Merge operation complete."), i18n("Merge Complete") );
joachim99@51 2305 }
joachim99@8 2306 m_bRealMergeStarted = false;
joachim99@75 2307 m_pStatusInfo->setWindowTitle(i18n("Merge Complete"));
joachim99@8 2308 }
joachim99@8 2309 if ( m_bSimulatedMergeStarted )
joachim99@8 2310 {
joachim99@8 2311 m_bSimulatedMergeStarted = false;
joachim99@75 2312 QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0;
joachim99@75 2313 for( ; p!=0; p=treeIterator(p) )
joachim99@8 2314 {
joachim99@8 2315 static_cast<DirMergeItem*>(p)->m_pMFI->m_bSimOpComplete = false;
joachim99@8 2316 }
joachim99@75 2317 m_pStatusInfo->setWindowTitle(i18n("Simulated merge complete: Check if you agree with the proposed operations."));
joachim99@8 2318 m_pStatusInfo->show();
joachim99@8 2319 }
joachim99@51 2320 m_mergeItemList.clear();
joachim99@51 2321 m_bRealMergeStarted=false;
joachim99@8 2322 return;
joachim99@8 2323 }
joachim99@8 2324
joachim99@51 2325 MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI;
joachim99@8 2326
joachim99@66 2327 pp.setInformation( mfi.m_subPath,
joachim99@8 2328 bSim ? double(nrOfCompletedSimItems)/nrOfItems : double(nrOfCompletedItems)/nrOfItems,
joachim99@51 2329 false // bRedrawUpdate
joachim99@8 2330 );
joachim99@8 2331
joachim99@51 2332 bSuccess = executeMergeOperation( mfi, bSingleFileMerge ); // Here the real operation happens.
joachim99@8 2333
joachim99@8 2334 if ( bSuccess )
joachim99@8 2335 {
joachim99@8 2336 if(bSim) ++nrOfCompletedSimItems;
joachim99@8 2337 else ++nrOfCompletedItems;
joachim99@8 2338 bContinueWithCurrentItem = false;
joachim99@8 2339 }
joachim99@51 2340
joachim99@66 2341 if( pp.wasCancelled() )
joachim99@51 2342 break;
joachim99@8 2343 } // end while
joachim99@8 2344
joachim99@66 2345 //g_pProgressDialog->hide();
joachim99@8 2346
joachim99@51 2347 setCurrentItem( pCurrentItemForOperation );
joachim99@75 2348 scrollToItem( pCurrentItemForOperation, EnsureVisible );
joachim99@8 2349 if ( !bSuccess && !bSingleFileMerge )
joachim99@8 2350 {
joachim99@51 2351 KMessageBox::error(this, i18n("An error occurred. Press OK to see detailed information.\n"), i18n("Error") );
joachim99@75 2352 m_pStatusInfo->setWindowTitle(i18n("Merge Error"));
joachim99@8 2353 m_pStatusInfo->show();
joachim99@69 2354 //if ( m_pStatusInfo->firstChild()!=0 )
joachim99@69 2355 // m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() );
joachim99@8 2356 m_bError = true;
joachim99@51 2357 pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") );
joachim99@8 2358 }
joachim99@8 2359 else
joachim99@8 2360 {
joachim99@8 2361 m_bError = false;
joachim99@8 2362 }
joachim99@8 2363 emit updateAvailabilities();
joachim99@51 2364
joachim99@51 2365 if ( m_currentItemForOperation==m_mergeItemList.end() )
joachim99@51 2366 {
joachim99@51 2367 m_mergeItemList.clear();
joachim99@51 2368 m_bRealMergeStarted=false;
joachim99@51 2369 }
joachim99@8 2370 }
joachim99@8 2371
joachim99@8 2372 void DirectoryMergeWindow::allowResizeEvents(bool bAllowResizeEvents )
joachim99@8 2373 {
joachim99@8 2374 m_bAllowResizeEvents = bAllowResizeEvents;
joachim99@8 2375 }
joachim99@8 2376
joachim99@8 2377 void DirectoryMergeWindow::resizeEvent( QResizeEvent* e )
joachim99@8 2378 {
joachim99@8 2379 if (m_bAllowResizeEvents)
joachim99@75 2380 QTreeWidget::resizeEvent(e);
joachim99@8 2381 }
joachim99@8 2382
joachim99@8 2383 bool DirectoryMergeWindow::deleteFLD( const QString& name, bool bCreateBackup )
joachim99@8 2384 {
joachim99@8 2385 FileAccess fi(name, true);
joachim99@8 2386 if ( !fi.exists() )
joachim99@8 2387 return true;
joachim99@8 2388
joachim99@8 2389 if ( bCreateBackup )
joachim99@8 2390 {
joachim99@8 2391 bool bSuccess = renameFLD( name, name+".orig" );
joachim99@8 2392 if (!bSuccess)
joachim99@8 2393 {
joachim99@51 2394 m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").arg(name) );
joachim99@8 2395 return false;
joachim99@8 2396 }
joachim99@8 2397 }
joachim99@8 2398 else
joachim99@8 2399 {
joachim99@8 2400 if ( fi.isDir() && !fi.isSymLink() )
joachim99@51 2401 m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").arg(name));
joachim99@8 2402 else
joachim99@51 2403 m_pStatusInfo->addText(i18n("delete( %1 )").arg(name));
joachim99@8 2404
joachim99@8 2405 if ( m_bSimulatedMergeStarted )
joachim99@8 2406 {
joachim99@8 2407 return true;
joachim99@8 2408 }
joachim99@8 2409
joachim99@8 2410 if ( fi.isDir() && !fi.isSymLink() )// recursive directory delete only for real dirs, not symlinks
joachim99@8 2411 {
joachim99@8 2412 t_DirectoryList dirList;
joachim99@8 2413 bool bSuccess = fi.listDir( &dirList, false, true, "*", "", "", false, false ); // not recursive, find hidden files
joachim99@8 2414
joachim99@8 2415 if ( !bSuccess )
joachim99@8 2416 {
joachim99@8 2417 // No Permission to read directory or other error.
joachim99@51 2418 m_pStatusInfo->addText( i18n("Error: delete dir operation failed while trying to read the directory.") );
joachim99@8 2419 return false;
joachim99@8 2420 }
joachim99@8 2421
joachim99@8 2422 t_DirectoryList::iterator it; // create list iterator
joachim99@8 2423
joachim99@8 2424 for ( it=dirList.begin(); it!=dirList.end(); ++it ) // for each file...
joachim99@8 2425 {
joachim99@8 2426 FileAccess& fi2 = *it;
joachim99@8 2427 if ( fi2.fileName() == "." || fi2.fileName()==".." )
joachim99@8 2428 continue;
joachim99@8 2429 bSuccess = deleteFLD( fi2.absFilePath(), false );
joachim99@8 2430 if (!bSuccess) break;
joachim99@8 2431 }
joachim99@8 2432 if (bSuccess)
joachim99@8 2433 {
joachim99@8 2434 bSuccess = FileAccess::removeDir( name );
joachim99@8 2435 if ( !bSuccess )
joachim99@8 2436 {
joachim99@51 2437 m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").arg(name));
joachim99@8 2438 return false;
joachim99@8 2439 }
joachim99@8 2440 }
joachim99@8 2441 }
joachim99@8 2442 else
joachim99@8 2443 {
joachim99@8 2444 bool bSuccess = FileAccess::removeFile( name );
joachim99@8 2445 if ( !bSuccess )
joachim99@8 2446 {
joachim99@51 2447 m_pStatusInfo->addText( i18n("Error: delete operation failed.") );
joachim99@8 2448 return false;
joachim99@8 2449 }
joachim99@8 2450 }
joachim99@8 2451 }
joachim99@8 2452 return true;
joachim99@8 2453 }
joachim99@8 2454
joachim99@8 2455 bool DirectoryMergeWindow::mergeFLD( const QString& nameA,const QString& nameB,const QString& nameC,const QString& nameDest, bool& bSingleFileMerge )
joachim99@8 2456 {
joachim99@8 2457 FileAccess fi(nameA);
joachim99@8 2458 if (fi.isDir())
joachim99@8 2459 {
joachim99@8 2460 return makeDir(nameDest);
joachim99@8 2461 }
joachim99@8 2462
joachim99@8 2463 // Make sure that the dir exists, into which we will save the file later.
joachim99@75 2464 int pos=nameDest.lastIndexOf('/');
joachim99@8 2465 if ( pos>0 )
joachim99@8 2466 {
joachim99@8 2467 QString parentName = nameDest.left(pos);
joachim99@8 2468 bool bSuccess = makeDir(parentName, true /*quiet*/);
joachim99@8 2469 if (!bSuccess)
joachim99@8 2470 return false;
joachim99@8 2471 }
joachim99@8 2472
joachim99@51 2473 m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").arg(nameA).arg(nameB).arg(nameC).arg(nameDest));
joachim99@8 2474 if ( m_bSimulatedMergeStarted )
joachim99@8 2475 {
joachim99@66 2476 m_pStatusInfo->addText(i18n(" Note: After a manual merge the user should continue by pressing F7.") );
joachim99@8 2477 return true;
joachim99@8 2478 }
joachim99@8 2479
joachim99@8 2480 bSingleFileMerge = true;
joachim99@51 2481 (*m_currentItemForOperation)->setText( s_OpStatusCol, i18n("In progress...") );
joachim99@75 2482 scrollToItem( *m_currentItemForOperation, EnsureVisible );
joachim99@8 2483
joachim99@66 2484 emit startDiffMerge( nameA, nameB, nameC, nameDest, "","","",0 );
joachim99@8 2485
joachim99@8 2486 return false;
joachim99@8 2487 }
joachim99@8 2488
joachim99@8 2489 bool DirectoryMergeWindow::copyFLD( const QString& srcName, const QString& destName )
joachim99@8 2490 {
joachim99@8 2491 if ( srcName == destName )
joachim99@8 2492 return true;
joachim99@8 2493
joachim99@8 2494 if ( FileAccess(destName, true).exists() )
joachim99@8 2495 {
joachim99@8 2496 bool bSuccess = deleteFLD( destName, m_pOptions->m_bDmCreateBakFiles );
joachim99@8 2497 if ( !bSuccess )
joachim99@8 2498 {
joachim99@51 2499 m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed."
joachim99@51 2500 "Deleting existing destination failed.").arg(srcName).arg(destName));
joachim99@8 2501 return false;
joachim99@8 2502 }
joachim99@8 2503 }
joachim99@8 2504
joachim99@8 2505 FileAccess fi( srcName );
joachim99@8 2506
joachim99@69 2507 if ( fi.isSymLink() && (fi.isDir() && !m_bFollowDirLinks || !fi.isDir() && !m_bFollowFileLinks) )
joachim99@8 2508 {
joachim99@51 2509 m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").arg(srcName).arg(destName));
joachim99@8 2510 #ifdef _WIN32
joachim99@8 2511 // What are links?
joachim99@8 2512 #else
joachim99@8 2513 if ( m_bSimulatedMergeStarted )
joachim99@8 2514 {
joachim99@8 2515 return true;
joachim99@8 2516 }
joachim99@8 2517 FileAccess destFi(destName);
joachim99@8 2518 if ( !destFi.isLocal() || !fi.isLocal() )
joachim99@8 2519 {
joachim99@51 2520 m_pStatusInfo->addText(i18n("Error: copyLink failed: Remote links are not yet supported."));
joachim99@8 2521 return false;
joachim99@8 2522 }
joachim99@8 2523 QString linkTarget = fi.readLink();
joachim99@8 2524 bool bSuccess = FileAccess::symLink( linkTarget, destName );
joachim99@8 2525 if (!bSuccess)
joachim99@51 2526 m_pStatusInfo->addText(i18n("Error: copyLink failed."));
joachim99@8 2527 return bSuccess;
joachim99@8 2528 #endif
joachim99@8 2529 }
joachim99@8 2530
joachim99@8 2531 if ( fi.isDir() )
joachim99@8 2532 {
joachim99@8 2533 bool bSuccess = makeDir( destName );
joachim99@8 2534 return bSuccess;
joachim99@8 2535 }
joachim99@8 2536
joachim99@75 2537 int pos=destName.lastIndexOf('/');
joachim99@8 2538 if ( pos>0 )
joachim99@8 2539 {
joachim99@8 2540 QString parentName = destName.left(pos);
joachim99@8 2541 bool bSuccess = makeDir(parentName, true /*quiet*/);
joachim99@8 2542 if (!bSuccess)
joachim99@8 2543 return false;
joachim99@8 2544 }
joachim99@8 2545
joachim99@51 2546 m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").arg(srcName).arg(destName));
joachim99@8 2547
joachim99@8 2548 if ( m_bSimulatedMergeStarted )
joachim99@8 2549 {
joachim99@8 2550 return true;
joachim99@8 2551 }
joachim99@8 2552
joachim99@8 2553 FileAccess faSrc ( srcName );
joachim99@8 2554 bool bSuccess = faSrc.copyFile( destName );
joachim99@8 2555 if (! bSuccess ) m_pStatusInfo->addText( faSrc.getStatusText() );
joachim99@8 2556 return bSuccess;
joachim99@8 2557 }
joachim99@8 2558
joachim99@8 2559 // Rename is not an operation that can be selected by the user.
joachim99@8 2560 // It will only be used to create backups.
joachim99@8 2561 // Hence it will delete an existing destination without making a backup (of the old backup.)
joachim99@8 2562 bool DirectoryMergeWindow::renameFLD( const QString& srcName, const QString& destName )
joachim99@8 2563 {
joachim99@8 2564 if ( srcName == destName )
joachim99@8 2565 return true;
joachim99@8 2566
joachim99@8 2567 if ( FileAccess(destName, true).exists() )
joachim99@8 2568 {
joachim99@8 2569 bool bSuccess = deleteFLD( destName, false /*no backup*/ );
joachim99@8 2570 if (!bSuccess)
joachim99@8 2571 {
joachim99@51 2572 m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): "
joachim99@51 2573 "Cannot delete existing destination." ).arg(srcName).arg(destName));
joachim99@8 2574 return false;
joachim99@8 2575 }
joachim99@8 2576 }
joachim99@8 2577
joachim99@68 2578 m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").arg(srcName).arg(destName));
joachim99@8 2579 if ( m_bSimulatedMergeStarted )
joachim99@8 2580 {
joachim99@8 2581 return true;
joachim99@8 2582 }
joachim99@8 2583
joachim99@8 2584 bool bSuccess = FileAccess( srcName ).rename( destName );
joachim99@8 2585 if (!bSuccess)
joachim99@8 2586 {
joachim99@51 2587 m_pStatusInfo->addText( i18n("Error: Rename failed.") );
joachim99@8 2588 return false;
joachim99@8 2589 }
joachim99@8 2590
joachim99@8 2591 return true;
joachim99@8 2592 }
joachim99@8 2593
joachim99@8 2594 bool DirectoryMergeWindow::makeDir( const QString& name, bool bQuiet )
joachim99@8 2595 {
joachim99@8 2596 FileAccess fi(name, true);
joachim99@8 2597 if( fi.exists() && fi.isDir() )
joachim99@8 2598 return true;
joachim99@8 2599
joachim99@8 2600 if( fi.exists() && !fi.isDir() )
joachim99@8 2601 {
joachim99@8 2602 bool bSuccess = deleteFLD( name, true );
joachim99@8 2603 if (!bSuccess)
joachim99@8 2604 {
joachim99@51 2605 m_pStatusInfo->addText( i18n("Error during makeDir of %1. "
joachim99@51 2606 "Cannot delete existing file." ).arg(name));
joachim99@8 2607 return false;
joachim99@8 2608 }
joachim99@8 2609 }
joachim99@8 2610
joachim99@75 2611 int pos=name.lastIndexOf('/');
joachim99@8 2612 if ( pos>0 )
joachim99@8 2613 {
joachim99@8 2614 QString parentName = name.left(pos);
joachim99@8 2615 bool bSuccess = makeDir(parentName,true);
joachim99@8 2616 if (!bSuccess)
joachim99@8 2617 return false;
joachim99@8 2618 }
joachim99@8 2619
joachim99@8 2620 if ( ! bQuiet )
joachim99@51 2621 m_pStatusInfo->addText(i18n("makeDir( %1 )").arg(name));
joachim99@8 2622
joachim99@8 2623 if ( m_bSimulatedMergeStarted )
joachim99@8 2624 {
joachim99@8 2625 return true;
joachim99@8 2626 }
joachim99@8 2627
joachim99@8 2628 bool bSuccess = FileAccess::makeDir( name );
joachim99@8 2629 if ( bSuccess == false )
joachim99@8 2630 {
joachim99@51 2631 m_pStatusInfo->addText( i18n("Error while creating directory.") );
joachim99@8 2632 return false;
joachim99@8 2633 }
joachim99@8 2634 return true;
joachim99@8 2635 }
joachim99@8 2636
joachim99@8 2637
joachim99@8 2638 DirectoryMergeInfo::DirectoryMergeInfo( QWidget* pParent )
joachim99@75 2639 : QFrame(pParent)
joachim99@8 2640 {
joachim99@75 2641 QVBoxLayout *topLayout = new QVBoxLayout( this );
joachim99@75 2642 topLayout->setMargin(0);
joachim99@75 2643
joachim99@75 2644 QGridLayout *grid = new QGridLayout();
joachim99@75 2645 topLayout->addLayout(grid);
joachim99@75 2646 grid->setColumnStretch(1,10);
joachim99@8 2647
joachim99@8 2648 int line=0;
joachim99@8 2649
joachim99@8 2650 m_pA = new QLabel("A",this); grid->addWidget( m_pA,line, 0 );
joachim99@8 2651 m_pInfoA = new QLabel(this); grid->addWidget( m_pInfoA,line,1 ); ++line;
joachim99@8 2652 m_pB = new QLabel("B",this); grid->addWidget( m_pB,line, 0 );
joachim99@8 2653 m_pInfoB = new QLabel(this); grid->addWidget( m_pInfoB,line,1 ); ++line;
joachim99@8 2654 m_pC = new QLabel("C",this); grid->addWidget( m_pC,line, 0 );
joachim99@8 2655 m_pInfoC = new QLabel(this); grid->addWidget( m_pInfoC,line,1 ); ++line;
joachim99@51 2656 m_pDest = new QLabel(i18n("Dest"),this); grid->addWidget( m_pDest,line, 0 );
joachim99@8 2657 m_pInfoDest = new QLabel(this); grid->addWidget( m_pInfoDest,line,1 ); ++line;
joachim99@8 2658
joachim99@75 2659 m_pInfoList = new QTreeWidget(this); topLayout->addWidget( m_pInfoList );
joachim99@75 2660 m_pInfoList->setHeaderLabels( QStringList() << i18n("Dir") << i18n("Type") << i18n("Size")
joachim99@75 2661 << i18n("Attr") << i18n("Last Modification") << i18n("Link-Destination") );
joachim99@8 2662 setMinimumSize( 100,100 );
joachim99@68 2663
joachim99@66 2664 m_pInfoList->installEventFilter(this);
joachim99@75 2665 m_pInfoList->setRootIsDecorated( false );
joachim99@66 2666 }
joachim99@66 2667
joachim99@66 2668 bool DirectoryMergeInfo::eventFilter(QObject*o, QEvent* e)
joachim99@66 2669 {
joachim99@66 2670 if ( e->type()==QEvent::FocusIn && o==m_pInfoList )
joachim99@66 2671 emit gotFocus();
joachim99@66 2672 return false;
joachim99@8 2673 }
joachim99@8 2674
joachim99@75 2675 static void addListViewItem( QTreeWidget* pListView, const QString& dir,
joachim99@8 2676 const QString& basePath, FileAccess& fi )
joachim99@8 2677 {
joachim99@8 2678 if ( basePath.isEmpty() )
joachim99@8 2679 {
joachim99@8 2680 return;
joachim99@8 2681 }
joachim99@8 2682 else
joachim99@8 2683 {
joachim99@8 2684 if ( fi.exists() )
joachim99@8 2685 {
joachim99@8 2686 QString dateString = fi.lastModified().toString("yyyy-MM-dd hh:mm:ss");
joachim99@75 2687
joachim99@75 2688 new QTreeWidgetItem(
joachim99@8 2689 pListView,
joachim99@75 2690 QStringList() << dir <<
joachim99@75 2691 QString( fi.isDir() ? i18n("Dir") : i18n("File") ) + (fi.isSymLink() ? "-Link" : "") <<
joachim99@75 2692 QString::number(fi.size()) <<
joachim99@8 2693 QString(fi.isReadable() ? "r" : " ") + (fi.isWritable()?"w" : " ")
joachim99@8 2694 #ifdef _WIN32
joachim99@75 2695 /*Future: Use GetFileAttributes()*/ <<
joachim99@8 2696 #else
joachim99@75 2697 + (fi.isExecutable()?"x" : " ") <<
joachim99@8 2698 #endif
joachim99@75 2699 dateString <<
joachim99@8 2700 QString(fi.isSymLink() ? (" -> " + fi.readLink()) : QString(""))
joachim99@8 2701 );
joachim99@8 2702 }
joachim99@8 2703 else
joachim99@8 2704 {
joachim99@75 2705 new QTreeWidgetItem(
joachim99@8 2706 pListView,
joachim99@75 2707 QStringList() << dir <<
joachim99@75 2708 i18n("not available") <<
joachim99@75 2709 "" <<
joachim99@75 2710 "" <<
joachim99@75 2711 "" <<
joachim99@8 2712 ""
joachim99@8 2713 );
joachim99@8 2714 }
joachim99@8 2715 }
joachim99@8 2716 }
joachim99@8 2717
joachim99@8 2718 void DirectoryMergeInfo::setInfo(
joachim99@8 2719 const FileAccess& dirA,
joachim99@8 2720 const FileAccess& dirB,
joachim99@8 2721 const FileAccess& dirC,
joachim99@8 2722 const FileAccess& dirDest,
joachim99@8 2723 MergeFileInfos& mfi )
joachim99@8 2724 {
joachim99@8 2725 bool bHideDest = false;
joachim99@8 2726 if ( dirA.absFilePath()==dirDest.absFilePath() )
joachim99@8 2727 {
joachim99@51 2728 m_pA->setText( i18n("A (Dest): ") ); bHideDest=true;
joachim99@8 2729 }
joachim99@8 2730 else
joachim99@51 2731 m_pA->setText( !dirC.isValid() ? QString("A: ") : i18n("A (Base): "));
joachim99@8 2732
joachim99@8 2733 m_pInfoA->setText( dirA.prettyAbsPath() );
joachim99@8 2734
joachim99@8 2735 if ( dirB.absFilePath()==dirDest.absFilePath() )
joachim99@8 2736 {
joachim99@51 2737 m_pB->setText( i18n("B (Dest): ") ); bHideDest=true;
joachim99@8 2738 }
joachim99@8 2739 else
joachim99@8 2740 m_pB->setText( "B: " );
joachim99@8 2741 m_pInfoB->setText( dirB.prettyAbsPath() );
joachim99@8 2742
joachim99@8 2743 if ( dirC.absFilePath()==dirDest.absFilePath() )
joachim99@8 2744 {
joachim99@51 2745 m_pC->setText( i18n("C (Dest): ") ); bHideDest=true;
joachim99@8 2746 }
joachim99@8 2747 else
joachim99@8 2748 m_pC->setText( "C: " );
joachim99@8 2749 m_pInfoC->setText( dirC.prettyAbsPath() );
joachim99@8 2750
joachim99@51 2751 m_pDest->setText( i18n("Dest: ") ); m_pInfoDest->setText( dirDest.prettyAbsPath() );
joachim99@8 2752
joachim99@8 2753 if (!dirC.isValid()) { m_pC->hide(); m_pInfoC->hide(); }
joachim99@8 2754 else { m_pC->show(); m_pInfoC->show(); }
joachim99@8 2755
joachim99@8 2756 if (!dirDest.isValid()||bHideDest) { m_pDest->hide(); m_pInfoDest->hide(); }
joachim99@8 2757 else { m_pDest->show(); m_pInfoDest->show(); }
joachim99@8 2758
joachim99@8 2759 m_pInfoList->clear();
joachim99@8 2760 addListViewItem( m_pInfoList, "A", dirA.prettyAbsPath(), mfi.m_fileInfoA );
joachim99@8 2761 addListViewItem( m_pInfoList, "B", dirB.prettyAbsPath(), mfi.m_fileInfoB );
joachim99@8 2762 addListViewItem( m_pInfoList, "C", dirC.prettyAbsPath(), mfi.m_fileInfoC );
joachim99@8 2763 if (!bHideDest)
joachim99@8 2764 {
joachim99@8 2765 FileAccess fiDest( dirDest.prettyAbsPath() + "/" + mfi.m_subPath, true );
joachim99@51 2766 addListViewItem( m_pInfoList, i18n("Dest"), dirDest.prettyAbsPath(), fiDest );
joachim99@8 2767 }
joachim99@75 2768 for (int i=0;i<m_pInfoList->columnCount();++i)
joachim99@75 2769 m_pInfoList->resizeColumnToContents ( i );
joachim99@8 2770 }
joachim99@8 2771
joachim99@69 2772 QTextStream& operator<<( QTextStream& ts, MergeFileInfos& mfi )
joachim99@69 2773 {
joachim99@69 2774 ts << "{\n";
joachim99@69 2775 ValueMap vm;
joachim99@69 2776 vm.writeEntry( "SubPath", mfi.m_subPath );
joachim99@69 2777 vm.writeEntry( "ExistsInA", mfi.m_bExistsInA );
joachim99@69 2778 vm.writeEntry( "ExistsInB", mfi.m_bExistsInB );
joachim99@69 2779 vm.writeEntry( "ExistsInC", mfi.m_bExistsInC );
joachim99@69 2780 vm.writeEntry( "EqualAB", mfi.m_bEqualAB );
joachim99@69 2781 vm.writeEntry( "EqualAC", mfi.m_bEqualAC );
joachim99@69 2782 vm.writeEntry( "EqualBC", mfi.m_bEqualBC );
joachim99@69 2783 //DirMergeItem* m_pDMI;
joachim99@69 2784 //MergeFileInfos* m_pParent;
joachim99@69 2785 vm.writeEntry( "MergeOperation", (int) mfi.m_eMergeOperation );
joachim99@69 2786 vm.writeEntry( "DirA", mfi.m_bDirA );
joachim99@69 2787 vm.writeEntry( "DirB", mfi.m_bDirB );
joachim99@69 2788 vm.writeEntry( "DirC", mfi.m_bDirC );
joachim99@69 2789 vm.writeEntry( "LinkA", mfi.m_bLinkA );
joachim99@69 2790 vm.writeEntry( "LinkB", mfi.m_bLinkB );
joachim99@69 2791 vm.writeEntry( "LinkC", mfi.m_bLinkC );
joachim99@69 2792 vm.writeEntry( "OperationComplete", mfi.m_bOperationComplete );
joachim99@69 2793 //bool m_bSimOpComplete );
joachim99@69 2794
joachim99@69 2795 vm.writeEntry( "AgeA", (int) mfi.m_ageA );
joachim99@69 2796 vm.writeEntry( "AgeB", (int) mfi.m_ageB );
joachim99@69 2797 vm.writeEntry( "AgeC", (int) mfi.m_ageC );
joachim99@69 2798 vm.writeEntry( "ConflictingAges", mfi.m_bConflictingAges ); // Equal age but files are not!
joachim99@69 2799
joachim99@69 2800 //FileAccess m_fileInfoA;
joachim99@69 2801 //FileAccess m_fileInfoB;
joachim99@69 2802 //FileAccess m_fileInfoC;
joachim99@69 2803
joachim99@69 2804 //TotalDiffStatus m_totalDiffStatus;
joachim99@69 2805
joachim99@69 2806 vm.save(ts);
joachim99@69 2807
joachim99@69 2808 ts << "}\n";
joachim99@69 2809
joachim99@69 2810 return ts;
joachim99@69 2811 }
joachim99@69 2812
joachim99@69 2813 void DirectoryMergeWindow::slotSaveMergeState()
joachim99@69 2814 {
joachim99@69 2815 //slotStatusMsg(i18n("Saving Directory Merge State ..."));
joachim99@69 2816
joachim99@69 2817 //QString s = KFileDialog::getSaveURL( QDir::currentDirPath(), 0, this, i18n("Save As...") ).url();
joachim99@75 2818 QString s = KFileDialog::getSaveFileName( QDir::currentPath(), 0, this, i18n("Save Directory Merge State As...") );
joachim99@69 2819 if(!s.isEmpty())
joachim99@69 2820 {
joachim99@69 2821 m_dirMergeStateFilename = s;
joachim99@69 2822
joachim99@69 2823
joachim99@69 2824 QFile file(m_dirMergeStateFilename);
joachim99@70 2825 bool bSuccess = file.open( QIODevice::WriteOnly );
joachim99@69 2826 if ( bSuccess )
joachim99@69 2827 {
joachim99@69 2828 QTextStream ts( &file );
joachim99@69 2829
joachim99@75 2830 QTreeWidgetItemIterator it( this );
joachim99@75 2831 while ( *it ) {
joachim99@75 2832 DirMergeItem* item = static_cast<DirMergeItem*>(*it);
joachim99@69 2833 MergeFileInfos* pMFI = item->m_pMFI;
joachim99@69 2834 ts << *pMFI;
joachim99@69 2835 ++it;
joachim99@69 2836 }
joachim99@69 2837 }
joachim99@69 2838 }
joachim99@69 2839
joachim99@69 2840 //slotStatusMsg(i18n("Ready."));
joachim99@69 2841
joachim99@69 2842 }
joachim99@69 2843
joachim99@69 2844 void DirectoryMergeWindow::slotLoadMergeState()
joachim99@69 2845 {
joachim99@69 2846 }
joachim99@69 2847
joachim99@69 2848 void DirectoryMergeWindow::updateFileVisibilities()
joachim99@69 2849 {
joachim99@69 2850 bool bShowIdentical = m_pDirShowIdenticalFiles->isChecked();
joachim99@69 2851 bool bShowDifferent = m_pDirShowDifferentFiles->isChecked();
joachim99@69 2852 bool bShowOnlyInA = m_pDirShowFilesOnlyInA->isChecked();
joachim99@69 2853 bool bShowOnlyInB = m_pDirShowFilesOnlyInB->isChecked();
joachim99@69 2854 bool bShowOnlyInC = m_pDirShowFilesOnlyInC->isChecked();
joachim99@69 2855 bool bThreeDirs = m_dirC.isValid();
joachim99@69 2856 m_pSelection1Item = 0;
joachim99@69 2857 m_pSelection2Item = 0;
joachim99@69 2858 m_pSelection3Item = 0;
joachim99@69 2859
joachim99@75 2860 QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0;
joachim99@69 2861 while(p)
joachim99@69 2862 {
joachim99@69 2863 DirMergeItem* pDMI = static_cast<DirMergeItem*>(p);
joachim99@69 2864 MergeFileInfos* pMFI = pDMI->m_pMFI;
joachim99@69 2865 bool bDir = pMFI->m_bDirA || pMFI->m_bDirB || pMFI->m_bDirC;
joachim99@69 2866 bool bExistsEverywhere = pMFI->m_bExistsInA && pMFI->m_bExistsInB && (pMFI->m_bExistsInC || !bThreeDirs);
joachim99@69 2867 int existCount = int(pMFI->m_bExistsInA) + int(pMFI->m_bExistsInB) + int(pMFI->m_bExistsInC);
joachim99@69 2868 bool bVisible =
joachim99@69 2869 ( bShowIdentical && bExistsEverywhere && pMFI->m_bEqualAB && (pMFI->m_bEqualAC || !bThreeDirs) )
joachim99@69 2870 || ( (bShowDifferent||bDir) && existCount>=2 && (!pMFI->m_bEqualAB || !(pMFI->m_bEqualAC || !bThreeDirs)))
joachim99@69 2871 || ( bShowOnlyInA && pMFI->m_bExistsInA && !pMFI->m_bExistsInB && !pMFI->m_bExistsInC )
joachim99@69 2872 || ( bShowOnlyInB && !pMFI->m_bExistsInA && pMFI->m_bExistsInB && !pMFI->m_bExistsInC )
joachim99@69 2873 || ( bShowOnlyInC && !pMFI->m_bExistsInA && !pMFI->m_bExistsInB && pMFI->m_bExistsInC );
joachim99@69 2874
joachim99@69 2875 QString fileName = pMFI->m_subPath.section( '/', -1 );
joachim99@69 2876 bVisible = bVisible && (
joachim99@69 2877 bDir && ! wildcardMultiMatch( m_pOptions->m_DmDirAntiPattern, fileName, m_bCaseSensitive )
joachim99@69 2878 || wildcardMultiMatch( m_pOptions->m_DmFilePattern, fileName, m_bCaseSensitive )
joachim99@69 2879 && !wildcardMultiMatch( m_pOptions->m_DmFileAntiPattern, fileName, m_bCaseSensitive ) );
joachim99@69 2880
joachim99@75 2881 p->setHidden(!bVisible);
joachim99@69 2882 p = treeIterator( p, true, true );
joachim99@69 2883 }
joachim99@69 2884 }
joachim99@69 2885
joachim99@69 2886 void DirectoryMergeWindow::slotShowIdenticalFiles() { m_pOptions->m_bDmShowIdenticalFiles=m_pDirShowIdenticalFiles->isChecked();
joachim99@69 2887 updateFileVisibilities(); }
joachim99@69 2888 void DirectoryMergeWindow::slotShowDifferentFiles() { updateFileVisibilities(); }
joachim99@69 2889 void DirectoryMergeWindow::slotShowFilesOnlyInA() { updateFileVisibilities(); }
joachim99@69 2890 void DirectoryMergeWindow::slotShowFilesOnlyInB() { updateFileVisibilities(); }
joachim99@69 2891 void DirectoryMergeWindow::slotShowFilesOnlyInC() { updateFileVisibilities(); }
joachim99@69 2892
joachim99@69 2893 void DirectoryMergeWindow::slotSynchronizeDirectories() { }
joachim99@69 2894 void DirectoryMergeWindow::slotChooseNewerFiles() { }
joachim99@51 2895
joachim99@51 2896 void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac )
joachim99@51 2897 {
joachim99@51 2898 #include "xpm/startmerge.xpm"
joachim99@69 2899 #include "xpm/showequalfiles.xpm"
joachim99@69 2900 #include "xpm/showfilesonlyina.xpm"
joachim99@69 2901 #include "xpm/showfilesonlyinb.xpm"
joachim99@69 2902 #include "xpm/showfilesonlyinc.xpm"
joachim99@51 2903 DirectoryMergeWindow* p = this;
joachim99@51 2904
joachim99@69 2905 m_pDirStartOperation = new KAction(i18n("Start/Continue Directory Merge"), Qt::Key_F7, p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
joachim99@69 2906 m_pDirRunOperationForCurrentItem = new KAction(i18n("Run Operation for Current Item"), Qt::Key_F6, p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
joachim99@69 2907 m_pDirCompareCurrent = new KAction(i18n("Compare Selected File"), 0, p, SLOT(compareCurrentFile()), ac, "dir_compare_current");
joachim99@70 2908 m_pDirMergeCurrent = new KAction(i18n("Merge Current File"), QIcon(QPixmap(startmerge)), 0, pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current");
joachim99@69 2909 m_pDirFoldAll = new KAction(i18n("Fold All Subdirs"), 0, p, SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all");
joachim99@69 2910 m_pDirUnfoldAll = new KAction(i18n("Unfold All Subdirs"), 0, p, SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all");
joachim99@69 2911 m_pDirRescan = new KAction(i18n("Rescan"), Qt::SHIFT+Qt::Key_F5, p, SLOT(reload()), ac, "dir_rescan");
joachim99@73 2912 m_pDirSaveMergeState = 0; //new KAction(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
joachim99@73 2913 m_pDirLoadMergeState = 0; //new KAction(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
joachim99@69 2914 m_pDirChooseAEverywhere = new KAction(i18n("Choose A for All Items"), 0, p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
joachim99@69 2915 m_pDirChooseBEverywhere = new KAction(i18n("Choose B for All Items"), 0, p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
joachim99@69 2916 m_pDirChooseCEverywhere = new KAction(i18n("Choose C for All Items"), 0, p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
joachim99@69 2917 m_pDirAutoChoiceEverywhere = new KAction(i18n("Auto-Choose Operation for All Items"), 0, p, SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
joachim99@69 2918 m_pDirDoNothingEverywhere = new KAction(i18n("No Operation for All Items"), 0, p, SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
joachim99@69 2919
joachim99@69 2920 // m_pDirSynchronizeDirectories = new KToggleAction(i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories");
joachim99@69 2921 // m_pDirChooseNewerFiles = new KToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files");
joachim99@69 2922
joachim99@70 2923 m_pDirShowIdenticalFiles = new KToggleAction(i18n("Show Identical Files"), QIcon(QPixmap(showequalfiles)), 0, this, SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files");
joachim99@69 2924 m_pDirShowDifferentFiles = new KToggleAction(i18n("Show Different Files"), 0, this, SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files");
joachim99@70 2925 m_pDirShowFilesOnlyInA = new KToggleAction(i18n("Show Files only in A"), QIcon(QPixmap(showfilesonlyina)), 0, this, SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a");
joachim99@70 2926 m_pDirShowFilesOnlyInB = new KToggleAction(i18n("Show Files only in B"), QIcon(QPixmap(showfilesonlyinb)), 0, this, SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b");
joachim99@70 2927 m_pDirShowFilesOnlyInC = new KToggleAction(i18n("Show Files only in C"), QIcon(QPixmap(showfilesonlyinc)), 0, this, SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c");
joachim99@69 2928
joachim99@69 2929 m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles );
joachim99@69 2930
joachim99@69 2931 m_pDirCompareExplicit = new KAction(i18n("Compare Explicitly Selected Files"), 0, p, SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
joachim99@69 2932 m_pDirMergeExplicit = new KAction(i18n("Merge Explicitly Selected Files"), 0, p, SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
joachim99@69 2933
joachim99@69 2934 m_pDirCurrentDoNothing = new KAction(i18n("Do Nothing"), 0, p, SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
joachim99@69 2935 m_pDirCurrentChooseA = new KAction(i18n("A"), 0, p, SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
joachim99@69 2936 m_pDirCurrentChooseB = new KAction(i18n("B"), 0, p, SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
joachim99@69 2937 m_pDirCurrentChooseC = new KAction(i18n("C"), 0, p, SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
joachim99@69 2938 m_pDirCurrentMerge = new KAction(i18n("Merge"), 0, p, SLOT(slotCurrentMerge()), ac, "dir_current_merge");
joachim99@69 2939 m_pDirCurrentDelete = new KAction(i18n("Delete (if exists)"), 0, p, SLOT(slotCurrentDelete()), ac, "dir_current_delete");
joachim99@69 2940
joachim99@69 2941 m_pDirCurrentSyncDoNothing = new KAction(i18n("Do Nothing"), 0, p, SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
joachim99@69 2942 m_pDirCurrentSyncCopyAToB = new KAction(i18n("Copy A to B"), 0, p, SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
joachim99@69 2943 m_pDirCurrentSyncCopyBToA = new KAction(i18n("Copy B to A"), 0, p, SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
joachim99@69 2944 m_pDirCurrentSyncDeleteA = new KAction(i18n("Delete A"), 0, p, SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
joachim99@69 2945 m_pDirCurrentSyncDeleteB = new KAction(i18n("Delete B"), 0, p, SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
joachim99@69 2946 m_pDirCurrentSyncDeleteAAndB = new KAction(i18n("Delete A && B"), 0, p, SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
joachim99@69 2947 m_pDirCurrentSyncMergeToA = new KAction(i18n("Merge to A"), 0, p, SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
joachim99@69 2948 m_pDirCurrentSyncMergeToB = new KAction(i18n("Merge to B"), 0, p, SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
joachim99@69 2949 m_pDirCurrentSyncMergeToAAndB = new KAction(i18n("Merge to A && B"), 0, p, SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
joachim99@69 2950
joachim99@69 2951
joachim99@51 2952 }
joachim99@51 2953
joachim99@51 2954
joachim99@53 2955 void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible,
joachim99@53 2956 KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC )
joachim99@51 2957 {
joachim99@69 2958 m_pDirStartOperation->setEnabled( bDirCompare );
joachim99@69 2959 m_pDirRunOperationForCurrentItem->setEnabled( bDirCompare );
joachim99@69 2960 m_pDirFoldAll->setEnabled( bDirCompare );
joachim99@69 2961 m_pDirUnfoldAll->setEnabled( bDirCompare );
joachim99@69 2962
joachim99@69 2963 m_pDirCompareCurrent->setEnabled( bDirCompare && isVisible() && isFileSelected() );
joachim99@69 2964
joachim99@69 2965 m_pDirMergeCurrent->setEnabled( bDirCompare && isVisible() && isFileSelected()
joachim99@51 2966 || bDiffWindowVisible );
joachim99@51 2967
joachim99@69 2968 m_pDirRescan->setEnabled( bDirCompare );
joachim99@69 2969
joachim99@69 2970 m_pDirAutoChoiceEverywhere->setEnabled( bDirCompare && isVisible() );
joachim99@69 2971 m_pDirDoNothingEverywhere->setEnabled( bDirCompare && isVisible() );
joachim99@69 2972 m_pDirChooseAEverywhere->setEnabled( bDirCompare && isVisible() );
joachim99@69 2973 m_pDirChooseBEverywhere->setEnabled( bDirCompare && isVisible() );
joachim99@69 2974 m_pDirChooseCEverywhere->setEnabled( bDirCompare && isVisible() );
joachim99@51 2975
joachim99@51 2976 bool bThreeDirs = m_dirC.isValid();
joachim99@51 2977
joachim99@75 2978 QTreeWidgetItem* lvi = currentItem();
joachim99@51 2979 DirMergeItem* pDMI = lvi==0 ? 0 : static_cast<DirMergeItem*>(lvi);
joachim99@51 2980 MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI;
joachim99@51 2981
joachim99@51 2982 bool bItemActive = bDirCompare && isVisible() && pMFI!=0;// && hasFocus();
joachim99@51 2983 bool bMergeMode = bThreeDirs || !m_bSyncMode;
joachim99@51 2984 bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI);
joachim99@51 2985
joachim99@53 2986 bool bDirWindowHasFocus = isVisible() && hasFocus();
joachim99@68 2987
joachim99@69 2988 m_pDirShowIdenticalFiles->setEnabled( bDirCompare && isVisible() );
joachim99@69 2989 m_pDirShowDifferentFiles->setEnabled( bDirCompare && isVisible() );
joachim99@69 2990 m_pDirShowFilesOnlyInA->setEnabled( bDirCompare && isVisible() );
joachim99@69 2991 m_pDirShowFilesOnlyInB->setEnabled( bDirCompare && isVisible() );
joachim99@69 2992 m_pDirShowFilesOnlyInC->setEnabled( bDirCompare && isVisible() && bThreeDirs );
joachim99@69 2993
joachim99@69 2994 m_pDirCompareExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=0 );
joachim99@69 2995 m_pDirMergeExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=0 );
joachim99@69 2996
joachim99@69 2997 m_pDirCurrentDoNothing->setEnabled( bItemActive && bMergeMode );
joachim99@69 2998 m_pDirCurrentChooseA->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInA );
joachim99@69 2999 m_pDirCurrentChooseB->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInB );
joachim99@69 3000 m_pDirCurrentChooseC->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInC );
joachim99@69 3001 m_pDirCurrentMerge->setEnabled( bItemActive && bMergeMode && !bFTConflict );
joachim99@69 3002 m_pDirCurrentDelete->setEnabled( bItemActive && bMergeMode );
joachim99@53 3003 if ( bDirWindowHasFocus )
joachim99@53 3004 {
joachim99@53 3005 chooseA->setEnabled( bItemActive && pMFI->m_bExistsInA );
joachim99@53 3006 chooseB->setEnabled( bItemActive && pMFI->m_bExistsInB );
joachim99@53 3007 chooseC->setEnabled( bItemActive && pMFI->m_bExistsInC );
joachim99@53 3008 chooseA->setChecked( false );
joachim99@53 3009 chooseB->setChecked( false );
joachim99@53 3010 chooseC->setChecked( false );
joachim99@53 3011 }
joachim99@68 3012
joachim99@69 3013 m_pDirCurrentSyncDoNothing->setEnabled( bItemActive && !bMergeMode );
joachim99@69 3014 m_pDirCurrentSyncCopyAToB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA );
joachim99@69 3015 m_pDirCurrentSyncCopyBToA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB );
joachim99@69 3016 m_pDirCurrentSyncDeleteA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA );
joachim99@69 3017 m_pDirCurrentSyncDeleteB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB );
joachim99@69 3018 m_pDirCurrentSyncDeleteAAndB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB && pMFI->m_bExistsInB );
joachim99@69 3019 m_pDirCurrentSyncMergeToA->setEnabled( bItemActive && !bMergeMode && !bFTConflict );
joachim99@69 3020 m_pDirCurrentSyncMergeToB->setEnabled( bItemActive && !bMergeMode && !bFTConflict );
joachim99@69 3021 m_pDirCurrentSyncMergeToAAndB->setEnabled( bItemActive && !bMergeMode && !bFTConflict );
joachim99@51 3022 }
joachim99@51 3023
joachim99@51 3024
joachim99@70 3025 //#include "directorymergewindow.moc"