Mercurial > hg > easyhg-kdiff3
view kdiff3/src-QT4/directorymergewindow.cpp @ 113:7bca1f1340f6 tip
Build fixes for Xcode 10 / Qt 5.12
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Dec 2018 11:13:01 +0000 |
| parents | 236f1c9c3fbf |
| children | 2df4daf33fbd |
line wrap: on
line source
/*************************************************************************** directorymergewindow.cpp ----------------- begin : Sat Oct 19 2002 copyright : (C) 2002-2007 by Joachim Eibl email : joachim.eibl at gmx.de ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "directorymergewindow.h" #include "optiondialog.h" #include <vector> #include <map> #include <QDir> #include <QApplication> #include <QPixmap> #include <QImage> #include <QTextStream> #include <QKeyEvent> #include <QMenu> #include <QRegExp> #include <QMessageBox> #include <QLayout> #include <QLabel> #include <QSplitter> #include <QTextEdit> #include <QItemDelegate> #include <kmenu.h> #include <kaction.h> #include <kmessagebox.h> #include <kfiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <ktoggleaction.h> #include <iostream> #include <assert.h> //#include <konq_popupmenu.h> #include "guiutils.h" static bool conflictingFileTypes(MergeFileInfos& mfi); class StatusInfo : public QTextEdit { public: StatusInfo(QWidget* pParent) : QTextEdit( pParent ) { setObjectName("StatusInfo"); setWindowFlags(Qt::Dialog); setWordWrapMode(QTextOption::NoWrap); setReadOnly(true); setWindowModality( Qt::ApplicationModal ); //showMaximized(); } bool isEmpty(){ return toPlainText().isEmpty(); } void addText(const QString& s ) { append(s); } void setVisible(bool bVisible) { if (bVisible) { moveCursor ( QTextCursor::End ); moveCursor ( QTextCursor::StartOfLine ); ensureCursorVisible(); } QTextEdit::setVisible(bVisible); } }; class TempRemover { public: TempRemover( const QString& origName, FileAccess& fa ); ~TempRemover(); QString name() { return m_name; } bool success() { return m_bSuccess; } private: QString m_name; bool m_bTemp; bool m_bSuccess; }; TempRemover::TempRemover(const QString& origName, FileAccess& fa) { if ( fa.isLocal() ) { m_name = origName; m_bTemp = false; m_bSuccess = true; } else { m_name = FileAccess::tempFileName(); m_bSuccess = fa.copyFile( m_name ); m_bTemp = m_bSuccess; } } TempRemover::~TempRemover() { if ( m_bTemp && ! m_name.isEmpty() ) FileAccess::removeTempFile(m_name); } void DirectoryMergeWindow::fastFileComparison( FileAccess& fi1, FileAccess& fi2, bool& bEqual, bool& bError, QString& status ) { ProgressProxy pp; status = ""; bEqual = false; bError = true; if ( !m_bFollowFileLinks ) { if ( fi1.isSymLink() != fi2.isSymLink() ) { status = i18n("Mix of links and normal files."); return; } else if ( fi1.isSymLink() && fi2.isSymLink() ) { bError = false; bEqual = fi1.readLink() == fi2.readLink(); status = i18n("Link: "); return; } } if ( fi1.size()!=fi2.size() ) { bEqual = false; status = i18n("Size. "); return; } else if ( m_pOptions->m_bDmTrustSize ) { bEqual = true; return; } if ( m_pOptions->m_bDmTrustDate ) { bEqual = ( fi1.lastModified() == fi2.lastModified() && fi1.size()==fi2.size() ); bError = false; status = i18n("Date & Size: "); return; } if ( m_pOptions->m_bDmTrustDateFallbackToBinary ) { bEqual = ( fi1.lastModified() == fi2.lastModified() && fi1.size()==fi2.size() ); if ( bEqual ) { bError = false; status = i18n("Date & Size: "); return; } } QString fileName1 = fi1.absoluteFilePath(); QString fileName2 = fi2.absoluteFilePath(); TempRemover tr1( fileName1, fi1 ); if ( !tr1.success() ) { status = i18n("Creating temp copy of %1 failed.",fileName1); return; } TempRemover tr2( fileName2, fi2 ); if ( !tr2.success() ) { status = i18n("Creating temp copy of %1 failed.",fileName2); return; } std::vector<char> buf1(100000); std::vector<char> buf2(buf1.size()); QFile file1( tr1.name() ); if ( ! file1.open(QIODevice::ReadOnly) ) { status = i18n("Opening %1 failed.",fileName1); return; } QFile file2( tr2.name() ); if ( ! file2.open(QIODevice::ReadOnly) ) { status = i18n("Opening %1 failed.",fileName2); return; } pp.setInformation( i18n("Comparing file..."), 0, false ); typedef qint64 t_FileSize; t_FileSize fullSize = file1.size(); t_FileSize sizeLeft = fullSize; while( sizeLeft>0 && ! pp.wasCancelled() ) { int len = min2( sizeLeft, (t_FileSize)buf1.size() ); if( len != file1.read( &buf1[0], len ) ) { status = i18n("Error reading from %1",fileName1); return; } if( len != file2.read( &buf2[0], len ) ) { status = i18n("Error reading from %1",fileName2); return; } if ( memcmp( &buf1[0], &buf2[0], len ) != 0 ) { bError = false; return; } sizeLeft-=len; pp.setCurrent(double(fullSize-sizeLeft)/fullSize, false ); } // If the program really arrives here, then the files are really equal. bError = false; bEqual = true; } static int s_NameCol = 0; static int s_ACol = 1; static int s_BCol = 2; static int s_CCol = 3; static int s_OpCol = 4; static int s_OpStatusCol = 5; static int s_UnsolvedCol = 6; // Nr of unsolved conflicts (for 3 input files) static int s_SolvedCol = 7; // Nr of auto-solvable conflicts (for 3 input files) static int s_NonWhiteCol = 8; // Nr of nonwhite deltas (for 2 input files) static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files) // Previously Q3ListViewItem::paintCell(p,cg,column,width,align); class DirectoryMergeWindow::DirMergeItemDelegate : public QItemDelegate { DirectoryMergeWindow* m_pDMW; public: DirMergeItemDelegate(DirectoryMergeWindow* pParent) : QItemDelegate(pParent), m_pDMW(pParent) { } void paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const { int column = index.column(); if (column == s_ACol || column == s_BCol || column == s_CCol ) { QVariant value = index.data( Qt::DecorationRole ); QPixmap icon; if ( value.isValid() ) { if (value.type() == QVariant::Icon) { icon = qvariant_cast<QIcon>(value).pixmap(16,16); //icon = qvariant_cast<QIcon>(value); //decorationRect = QRect(QPoint(0, 0), icon.actualSize(option.decorationSize, iconMode, iconState)); } else { icon = qvariant_cast<QPixmap>(value); //decorationRect = QRect(QPoint(0, 0), option.decorationSize).intersected(pixmap.rect()); } } int x = option.rect.left(); int y = option.rect.top(); //QPixmap icon = value.value<QPixmap>(); //pixmap(column); if ( !icon.isNull() ) { int yOffset = (sizeHint(option,index).height() - icon.height()) / 2; p->drawPixmap( x+2, y+yOffset, icon ); QTreeWidgetItem* pTWI = reinterpret_cast<QTreeWidgetItem*>( index.internalPointer() ); DirMergeItem* pDMI = static_cast<DirMergeItem*>(pTWI); int i = pDMI==m_pDMW->m_pSelection1Item && column == m_pDMW->m_selection1Column ? 1 : pDMI==m_pDMW->m_pSelection2Item && column == m_pDMW->m_selection2Column ? 2 : pDMI==m_pDMW->m_pSelection3Item && column == m_pDMW->m_selection3Column ? 3 : 0; if ( i!=0 ) { OptionDialog* pOD = m_pDMW->m_pOptions; QColor c ( i==1 ? pOD->m_colorA : i==2 ? pOD->m_colorB : pOD->m_colorC ); p->setPen( c );// highlight() ); p->drawRect( x+2, y+yOffset, icon.width(), icon.height()); p->setPen( QPen( c, 0, Qt::DotLine) ); p->drawRect( x+1, y+yOffset-1, icon.width()+2, icon.height()+2); p->setPen( Qt::white ); QString s( QChar('A'+i-1) ); p->drawText( x+2 + (icon.width() - p->fontMetrics().width(s))/2, y+yOffset + (icon.height() + p->fontMetrics().ascent())/2-1, s ); } else { p->setPen( m_pDMW->palette().background().color() ); p->drawRect( x+1, y+yOffset-1, icon.width()+2, icon.height()+2); } return; } } QStyleOptionViewItem option2 = option; if ( column>=s_UnsolvedCol ) { option2.displayAlignment = Qt::AlignRight; } QItemDelegate::paint( p, option2, index ); } }; DirectoryMergeWindow::DirectoryMergeWindow( QWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader ) : QTreeWidget( pParent ) { setItemDelegate( new DirMergeItemDelegate(this) ); connect( this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(onDoubleClick(QTreeWidgetItem*))); connect( this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(onCurrentChanged(QTreeWidgetItem*))); connect( this, SIGNAL(expanded(const QModelIndex&)), this, SLOT(onExpanded())); m_pOptions = pOptions; m_pIconLoader = pIconLoader; m_pDirectoryMergeInfo = 0; m_bSimulatedMergeStarted=false; m_bRealMergeStarted=false; m_bError = false; m_bSyncMode = false; m_pStatusInfo = new StatusInfo(0); m_pStatusInfo->hide(); m_bScanning = false; m_pSelection1Item = 0; m_pSelection2Item = 0; m_pSelection3Item = 0; m_bCaseSensitive = true; QStringList sl; sl << i18n("Name") << "A" << "B" << "C" << i18n("Operation") << i18n("Status") << i18n("Unsolved") << i18n("Solved") << i18n("Nonwhite") << i18n("White") << ""; setHeaderLabels(sl); //TODO setColumnAlignment( s_UnsolvedCol, Qt::AlignRight ); //setColumnAlignment( s_SolvedCol, Qt::AlignRight ); //setColumnAlignment( s_NonWhiteCol, Qt::AlignRight ); //setColumnAlignment( s_WhiteCol, Qt::AlignRight ); } DirectoryMergeWindow::~DirectoryMergeWindow() { } int DirectoryMergeWindow::totalColumnWidth() { int w=0; for (int i=0; i<s_OpStatusCol; ++i) { w += columnWidth(i); } return w; } void DirectoryMergeWindow::reload() { if ( isDirectoryMergeInProgress() ) { int result = KMessageBox::warningYesNo(this, i18n("You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?"), i18n("Warning"), KGuiItem( i18n("Rescan") ), KGuiItem( i18n("Continue Merging") ) ); if ( result!=KMessageBox::Yes ) return; } init( m_dirA, m_dirB, m_dirC, m_dirDest, m_bDirectoryMerge, true ); } // Copy pm2 onto pm1, but preserve the alpha value from pm1 where pm2 is transparent. static QPixmap pixCombiner( const QPixmap* pm1, const QPixmap* pm2 ) { QImage img1 = pm1->toImage().convertToFormat(QImage::Format_ARGB32); QImage img2 = pm2->toImage().convertToFormat(QImage::Format_ARGB32); for (int y = 0; y < img1.height(); y++) { quint32 *line1 = reinterpret_cast<quint32 *>(img1.scanLine(y)); quint32 *line2 = reinterpret_cast<quint32 *>(img2.scanLine(y)); for (int x = 0; x < img1.width(); x++) { if ( qAlpha( line2[x] ) >0 ) line1[x] = (line2[x] | 0xff000000); } } return QPixmap::fromImage(img1); } // like pixCombiner but let the pm1 color shine through static QPixmap pixCombiner2( const QPixmap* pm1, const QPixmap* pm2 ) { QPixmap pix=*pm1; QPainter p(&pix); p.setOpacity(0.5); p.drawPixmap( 0,0,*pm2 ); p.end(); return pix; } static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles, int& nofDirs, int& nofEqualFiles, int& nofManualMerges ) { if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC ) { ++nofDirs; } else { ++nofFiles; if ( i->m_pMFI->m_bEqualAB && (!bThreeDirs || i->m_pMFI->m_bEqualAC )) { ++nofEqualFiles; } else { if ( i->m_pMFI->m_eMergeOperation==eMergeABCToDest || i->m_pMFI->m_eMergeOperation==eMergeABToDest ) ++nofManualMerges; } } for( int childIdx=0; childIdx<i->childCount(); ++childIdx ) calcDirStatus( bThreeDirs, static_cast<DirMergeItem*>(i->child(childIdx)), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); } static QString sortString(const QString& s, bool bCaseSensitive) { if (bCaseSensitive) return s; else return s.toUpper(); } struct t_ItemInfo { bool bExpanded; bool bOperationComplete; QString status; e_MergeOperation eMergeOperation; }; bool DirectoryMergeWindow::init ( FileAccess& dirA, FileAccess& dirB, FileAccess& dirC, FileAccess& dirDest, bool bDirectoryMerge, bool bReload ) { if ( m_pOptions->m_bDmFullAnalysis ) { // A full analysis uses the same ressources that a normal text-diff/merge uses. // So make sure that the user saves his data first. bool bCanContinue=false; checkIfCanContinue( &bCanContinue ); if ( !bCanContinue ) return false; startDiffMerge("","","","","","","",0); // hide main window } show(); setUpdatesEnabled(true); std::map<QString,t_ItemInfo> expandedDirsMap; if ( bReload ) { // Remember expandes items QTreeWidgetItemIterator it( this ); while ( *it ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( *it ); t_ItemInfo& ii = expandedDirsMap[ pDMI->m_pMFI->m_subPath ]; ii.bExpanded = pDMI->isExpanded(); ii.bOperationComplete = pDMI->m_pMFI->m_bOperationComplete; ii.status = pDMI->text( s_OpStatusCol ); ii.eMergeOperation = pDMI->m_pMFI->m_eMergeOperation; ++it; } } ProgressProxy pp; m_bFollowDirLinks = m_pOptions->m_bDmFollowDirLinks; m_bFollowFileLinks = m_pOptions->m_bDmFollowFileLinks; m_bSimulatedMergeStarted=false; m_bRealMergeStarted=false; m_bError=false; m_bDirectoryMerge = bDirectoryMerge; m_pSelection1Item = 0; m_pSelection2Item = 0; m_pSelection3Item = 0; m_bCaseSensitive = m_pOptions->m_bDmCaseSensitiveFilenameComparison; clear(); m_mergeItemList.clear(); m_currentItemForOperation = m_mergeItemList.end(); m_dirA = dirA; m_dirB = dirB; m_dirC = dirC; m_dirDest = dirDest; if ( !bReload ) { m_pDirShowIdenticalFiles->setChecked(true); m_pDirShowDifferentFiles->setChecked(true); m_pDirShowFilesOnlyInA->setChecked(true); m_pDirShowFilesOnlyInB->setChecked(true); m_pDirShowFilesOnlyInC->setChecked(true); } // Check if all input directories exist and are valid. The dest dir is not tested now. // The test will happen only when we are going to write to it. if ( !m_dirA.isDir() || !m_dirB.isDir() || (m_dirC.isValid() && !m_dirC.isDir()) ) { QString text( i18n("Opening of directories failed:") ); text += "\n\n"; if ( !dirA.isDir() ) { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n",m_dirA.prettyAbsPath()); } if ( !dirB.isDir() ) { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n",m_dirB.prettyAbsPath()); } if ( m_dirC.isValid() && !m_dirC.isDir() ) { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n",m_dirC.prettyAbsPath()); } KMessageBox::sorry( this, text, i18n("Directory Open Error") ); return false; } if ( m_dirC.isValid() && (m_dirDest.prettyAbsPath() == m_dirA.prettyAbsPath() || m_dirDest.prettyAbsPath()==m_dirB.prettyAbsPath() ) ) { KMessageBox::error(this, i18n( "The destination directory must not be the same as A or B when " "three directories are merged.\nCheck again before continuing."), i18n("Parameter Warning")); return false; } m_bScanning = true; statusBarMessage(i18n("Scanning directories...")); m_bSyncMode = m_pOptions->m_bDmSyncMode && !m_dirC.isValid() && !m_dirDest.isValid(); if ( m_dirDest.isValid() ) m_dirDestInternal = m_dirDest; else m_dirDestInternal = m_dirC.isValid() ? m_dirC : m_dirB; QString origCurrentDirectory = QDir::currentPath(); m_fileMergeMap.clear(); t_DirectoryList::iterator i; // calc how many directories will be read: double nofScans = ( m_dirA.isValid() ? 1 : 0 )+( m_dirB.isValid() ? 1 : 0 )+( m_dirC.isValid() ? 1 : 0 ); int currentScan = 0; //TODO setColumnWidthMode(s_UnsolvedCol, Q3ListView::Manual); // setColumnWidthMode(s_SolvedCol, Q3ListView::Manual); // setColumnWidthMode(s_WhiteCol, Q3ListView::Manual); // setColumnWidthMode(s_NonWhiteCol, Q3ListView::Manual); setColumnHidden( s_CCol, !m_dirC.isValid() ); setColumnHidden( s_WhiteCol, !m_pOptions->m_bDmFullAnalysis ); setColumnHidden( s_NonWhiteCol, !m_pOptions->m_bDmFullAnalysis ); setColumnHidden( s_UnsolvedCol, !m_pOptions->m_bDmFullAnalysis ); setColumnHidden( s_SolvedCol, !( m_pOptions->m_bDmFullAnalysis && m_dirC.isValid() ) ); bool bListDirSuccessA = true; bool bListDirSuccessB = true; bool bListDirSuccessC = true; if ( m_dirA.isValid() ) { pp.setInformation(i18n("Reading Directory A")); pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); ++currentScan; t_DirectoryList dirListA; bListDirSuccessA = m_dirA.listDir( &dirListA, m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, m_pOptions->m_bDmUseCvsIgnore); for (i=dirListA.begin(); i!=dirListA.end();++i ) { MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(), m_bCaseSensitive)]; //std::cout <<i->filePath()<<std::endl; mfi.m_bExistsInA = true; mfi.m_fileInfoA = *i; } } if ( m_dirB.isValid() ) { pp.setInformation(i18n("Reading Directory B")); pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); ++currentScan; t_DirectoryList dirListB; bListDirSuccessB = m_dirB.listDir( &dirListB, m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, m_pOptions->m_bDmUseCvsIgnore); for (i=dirListB.begin(); i!=dirListB.end();++i ) { MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(), m_bCaseSensitive)]; mfi.m_bExistsInB = true; mfi.m_fileInfoB = *i; } } e_MergeOperation eDefaultMergeOp; if ( m_dirC.isValid() ) { pp.setInformation(i18n("Reading Directory C")); pp.setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); ++currentScan; t_DirectoryList dirListC; bListDirSuccessC = m_dirC.listDir( &dirListC, m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, m_pOptions->m_bDmUseCvsIgnore); for (i=dirListC.begin(); i!=dirListC.end();++i ) { MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath(),m_bCaseSensitive)]; mfi.m_bExistsInC = true; mfi.m_fileInfoC = *i; } eDefaultMergeOp = eMergeABCToDest; } else eDefaultMergeOp = m_bSyncMode ? eMergeToAB : eMergeABToDest; bool bContinue = true; if ( !bListDirSuccessA || !bListDirSuccessB || !bListDirSuccessC ) { QString s = i18n("Some subdirectories were not readable in"); if ( !bListDirSuccessA ) s += "\nA: " + m_dirA.prettyAbsPath(); if ( !bListDirSuccessB ) s += "\nB: " + m_dirB.prettyAbsPath(); if ( !bListDirSuccessC ) s += "\nC: " + m_dirC.prettyAbsPath(); s+="\n"; s+= i18n("Check the permissions of the subdirectories."); bContinue = KMessageBox::Continue == KMessageBox::warningContinueCancel( this, s ); } if ( bContinue ) { prepareListView(pp); updateFileVisibilities(); for( int childIdx = 0; childIdx<topLevelItemCount(); ++childIdx ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( topLevelItem(childIdx) ); calcSuggestedOperation( *pDMI->m_pMFI, eDefaultMergeOp ); } } sortItems(0,Qt::AscendingOrder); for (int i=0;i<columnCount();++i) resizeColumnToContents(i); // Try to improve the view a little bit. QWidget* pParent = parentWidget(); QSplitter* pSplitter = static_cast<QSplitter*>(pParent); if (pSplitter!=0) { QList<int> sizes = pSplitter->sizes(); int total = sizes[0] + sizes[1]; if ( total < 10 ) total = 100; sizes[0]=total*6/10; sizes[1]=total - sizes[0]; pSplitter->setSizes( sizes ); } QDir::setCurrent(origCurrentDirectory); m_bScanning = false; statusBarMessage(i18n("Ready.")); if ( bContinue ) { // Generate a status report int nofFiles=0; int nofDirs=0; int nofEqualFiles=0; int nofManualMerges=0; for( int childIdx = 0; childIdx<topLevelItemCount(); ++childIdx ) calcDirStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(topLevelItem(childIdx)), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); QString s; s = i18n("Directory Comparison Status") + "\n\n" + i18n("Number of subdirectories:") +" "+ QString::number(nofDirs) + "\n"+ i18n("Number of equal files:") +" "+ QString::number(nofEqualFiles) + "\n"+ i18n("Number of different files:") +" "+ QString::number(nofFiles-nofEqualFiles); if ( m_dirC.isValid() ) s += "\n" + i18n("Number of manual merges:") +" "+ QString::number(nofManualMerges); KMessageBox::information( this, s ); if ( topLevelItemCount()>0 ) { topLevelItem(0)->setSelected(true); setCurrentItem( topLevelItem(0) ); } } if ( bReload ) { // Remember expanded items QTreeWidgetItemIterator it( this ); while ( *it ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( *it ); std::map<QString,t_ItemInfo>::iterator i = expandedDirsMap.find( pDMI->m_pMFI->m_subPath ); if ( i!=expandedDirsMap.end() ) { t_ItemInfo& ii = i->second; pDMI->setExpanded( ii.bExpanded ); //pDMI->m_pMFI->setMergeOperation( ii.eMergeOperation, false ); unsafe, might have changed pDMI->m_pMFI->m_bOperationComplete = ii.bOperationComplete; pDMI->setText( s_OpStatusCol, ii.status ); } ++it; } } return true; } void DirectoryMergeWindow::onExpanded() { resizeColumnToContents(s_NameCol); } void DirectoryMergeWindow::slotChooseAEverywhere(){ setAllMergeOperations( eCopyAToDest ); } void DirectoryMergeWindow::slotChooseBEverywhere(){ setAllMergeOperations( eCopyBToDest ); } void DirectoryMergeWindow::slotChooseCEverywhere(){ setAllMergeOperations( eCopyCToDest ); } void DirectoryMergeWindow::slotAutoChooseEverywhere() { e_MergeOperation eDefaultMergeOp = m_dirC.isValid() ? eMergeABCToDest : m_bSyncMode ? eMergeToAB : eMergeABToDest; setAllMergeOperations(eDefaultMergeOp ); } void DirectoryMergeWindow::slotNoOpEverywhere(){ setAllMergeOperations(eNoOperation); } static void setListViewItemOpen( QTreeWidgetItem* p, bool bOpen ) { if ( p->childCount() > 0 ) { for( int childIdx=0; childIdx<p->childCount(); ++childIdx ) setListViewItemOpen( p->child(childIdx), bOpen ); p->setExpanded( bOpen ); } } void DirectoryMergeWindow::slotFoldAllSubdirs() { for( int i=0; i<topLevelItemCount(); ++i ) setListViewItemOpen( topLevelItem(i), false ); } void DirectoryMergeWindow::slotUnfoldAllSubdirs() { for( int i=0; i<topLevelItemCount(); ++i ) setListViewItemOpen( topLevelItem(i), true ); } static void setMergeOperation( QTreeWidgetItem* pLVI, e_MergeOperation eMergeOp ) { if ( pLVI==0 ) return; DirMergeItem* pDMI = static_cast<DirMergeItem*>(pLVI); MergeFileInfos& mfi = *pDMI->m_pMFI; mfi.setMergeOperation(eMergeOp ); } // Merge current item (merge mode) void DirectoryMergeWindow::slotCurrentDoNothing() { setMergeOperation(currentItem(), eNoOperation ); } void DirectoryMergeWindow::slotCurrentChooseA() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyAToB : eCopyAToDest ); } void DirectoryMergeWindow::slotCurrentChooseB() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyBToA : eCopyBToDest ); } void DirectoryMergeWindow::slotCurrentChooseC() { setMergeOperation(currentItem(), eCopyCToDest ); } void DirectoryMergeWindow::slotCurrentMerge() { bool bThreeDirs = m_dirC.isValid(); setMergeOperation(currentItem(), bThreeDirs ? eMergeABCToDest : eMergeABToDest ); } void DirectoryMergeWindow::slotCurrentDelete() { setMergeOperation(currentItem(), eDeleteFromDest ); } // Sync current item void DirectoryMergeWindow::slotCurrentCopyAToB() { setMergeOperation(currentItem(), eCopyAToB ); } void DirectoryMergeWindow::slotCurrentCopyBToA() { setMergeOperation(currentItem(), eCopyBToA ); } void DirectoryMergeWindow::slotCurrentDeleteA() { setMergeOperation(currentItem(), eDeleteA ); } void DirectoryMergeWindow::slotCurrentDeleteB() { setMergeOperation(currentItem(), eDeleteB ); } void DirectoryMergeWindow::slotCurrentDeleteAAndB() { setMergeOperation(currentItem(), eDeleteAB ); } void DirectoryMergeWindow::slotCurrentMergeToA() { setMergeOperation(currentItem(), eMergeToA ); } void DirectoryMergeWindow::slotCurrentMergeToB() { setMergeOperation(currentItem(), eMergeToB ); } void DirectoryMergeWindow::slotCurrentMergeToAAndB() { setMergeOperation(currentItem(), eMergeToAB ); } void DirectoryMergeWindow::keyPressEvent( QKeyEvent* e ) { if ( (e->QInputEvent::modifiers() & Qt::ControlModifier)!=0 ) { bool bThreeDirs = m_dirC.isValid(); QTreeWidgetItem* lvi = currentItem(); DirMergeItem* pDMI = lvi==0 ? 0 : static_cast<DirMergeItem*>(lvi); MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI; if ( pMFI==0 ) return; bool bMergeMode = bThreeDirs || !m_bSyncMode; bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI); if ( bMergeMode ) { switch(e->key()) { case Qt::Key_1: if(pMFI->m_bExistsInA){ slotCurrentChooseA(); } return; case Qt::Key_2: if(pMFI->m_bExistsInB){ slotCurrentChooseB(); } return; case Qt::Key_3: if(pMFI->m_bExistsInC){ slotCurrentChooseC(); } return; case Qt::Key_Space: slotCurrentDoNothing(); return; case Qt::Key_4: if ( !bFTConflict ) { slotCurrentMerge(); } return; case Qt::Key_Delete: slotCurrentDelete(); return; default: break; } } else { switch(e->key()) { case Qt::Key_1: if(pMFI->m_bExistsInA){ slotCurrentCopyAToB(); } return; case Qt::Key_2: if(pMFI->m_bExistsInB){ slotCurrentCopyBToA(); } return; case Qt::Key_Space: slotCurrentDoNothing(); return; case Qt::Key_4: if ( !bFTConflict ) { slotCurrentMergeToAAndB(); } return; case Qt::Key_Delete: if( pMFI->m_bExistsInA && pMFI->m_bExistsInB ) slotCurrentDeleteAAndB(); else if( pMFI->m_bExistsInA ) slotCurrentDeleteA(); else if( pMFI->m_bExistsInB ) slotCurrentDeleteB(); return; default: break; } } } else if ( e->key()==Qt::Key_Return || e->key()==Qt::Key_Enter ) { onDoubleClick( currentItem() ); return; } QTreeWidget::keyPressEvent(e); } void DirectoryMergeWindow::focusInEvent(QFocusEvent*) { updateAvailabilities(); } void DirectoryMergeWindow::focusOutEvent(QFocusEvent*) { updateAvailabilities(); } void DirectoryMergeWindow::setAllMergeOperations( e_MergeOperation eDefaultOperation ) { if ( KMessageBox::Yes == KMessageBox::warningYesNo(this, i18n("This affects all merge operations."), i18n("Changing All Merge Operations"), KStandardGuiItem::cont(), KStandardGuiItem::cancel() ) ) { for( int i=0; i<topLevelItemCount(); ++i ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( topLevelItem(i) ); calcSuggestedOperation( *pDMI->m_pMFI, eDefaultOperation ); } } } void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi ) { std::map<QDateTime,int> dateMap; if( mfi.m_bExistsInA ) { mfi.m_bLinkA = mfi.m_fileInfoA.isSymLink(); mfi.m_bDirA = mfi.m_fileInfoA.isDir(); dateMap[ mfi.m_fileInfoA.lastModified() ] = 0; } if( mfi.m_bExistsInB ) { mfi.m_bLinkB = mfi.m_fileInfoB.isSymLink(); mfi.m_bDirB = mfi.m_fileInfoB.isDir(); dateMap[ mfi.m_fileInfoB.lastModified() ] = 1; } if( mfi.m_bExistsInC ) { mfi.m_bLinkC = mfi.m_fileInfoC.isSymLink(); mfi.m_bDirC = mfi.m_fileInfoC.isDir(); dateMap[ mfi.m_fileInfoC.lastModified() ] = 2; } if ( m_pOptions->m_bDmFullAnalysis ) { if( (mfi.m_bExistsInA && mfi.m_bDirA) || (mfi.m_bExistsInB && mfi.m_bDirB) || (mfi.m_bExistsInC && mfi.m_bDirC) ) { // If any input is a directory, don't start any comparison. mfi.m_bEqualAB=mfi.m_bExistsInA && mfi.m_bExistsInB; mfi.m_bEqualAC=mfi.m_bExistsInA && mfi.m_bExistsInC; mfi.m_bEqualBC=mfi.m_bExistsInB && mfi.m_bExistsInC; } else { emit startDiffMerge( mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : QString(""), mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : QString(""), mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : QString(""), "", "","","",&mfi.m_totalDiffStatus ); int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts + mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts; if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0) { mfi.m_bEqualAB = mfi.m_bExistsInA && mfi.m_bExistsInB; mfi.m_bEqualAC = mfi.m_bExistsInA && mfi.m_bExistsInC; mfi.m_bEqualBC = mfi.m_bExistsInB && mfi.m_bExistsInC; } else { mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB; mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC; mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC; } } } else { bool bError; QString eqStatus; if( mfi.m_bExistsInA && mfi.m_bExistsInB ) { if( mfi.m_bDirA ) mfi.m_bEqualAB=true; else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus ); } if( mfi.m_bExistsInA && mfi.m_bExistsInC ) { if( mfi.m_bDirA ) mfi.m_bEqualAC=true; else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus ); } if( mfi.m_bExistsInB && mfi.m_bExistsInC ) { if (mfi.m_bEqualAB && mfi.m_bEqualAC) mfi.m_bEqualBC = true; else { if( mfi.m_bDirB ) mfi.m_bEqualBC=true; else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus ); } } } if (mfi.m_bLinkA!=mfi.m_bLinkB) mfi.m_bEqualAB=false; if (mfi.m_bLinkA!=mfi.m_bLinkC) mfi.m_bEqualAC=false; if (mfi.m_bLinkB!=mfi.m_bLinkC) mfi.m_bEqualBC=false; if (mfi.m_bDirA!=mfi.m_bDirB) mfi.m_bEqualAB=false; if (mfi.m_bDirA!=mfi.m_bDirC) mfi.m_bEqualAC=false; if (mfi.m_bDirB!=mfi.m_bDirC) mfi.m_bEqualBC=false; assert(eNew==0 && eMiddle==1 && eOld==2); // The map automatically sorts the keys. int age = eNew; std::map<QDateTime,int>::reverse_iterator i; for( i=dateMap.rbegin(); i!=dateMap.rend(); ++i ) { int n = i->second; if ( n==0 && mfi.m_ageA==eNotThere ) { mfi.m_ageA = (e_Age)age; ++age; if ( mfi.m_bEqualAB ) { mfi.m_ageB = mfi.m_ageA; ++age; } if ( mfi.m_bEqualAC ) { mfi.m_ageC = mfi.m_ageA; ++age; } } else if ( n==1 && mfi.m_ageB==eNotThere ) { mfi.m_ageB = (e_Age)age; ++age; if ( mfi.m_bEqualAB ) { mfi.m_ageA = mfi.m_ageB; ++age; } if ( mfi.m_bEqualBC ) { mfi.m_ageC = mfi.m_ageB; ++age; } } else if ( n==2 && mfi.m_ageC==eNotThere) { mfi.m_ageC = (e_Age)age; ++age; if ( mfi.m_bEqualAC ) { mfi.m_ageA = mfi.m_ageC; ++age; } if ( mfi.m_bEqualBC ) { mfi.m_ageB = mfi.m_ageC; ++age; } } } // The checks below are necessary when the dates of the file are equal but the // files are not. One wouldn't expect this to happen, yet it happens sometimes. if ( mfi.m_bExistsInC && mfi.m_ageC==eNotThere ) { mfi.m_ageC = (e_Age)age; ++age; mfi.m_bConflictingAges = true; } if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere ) { mfi.m_ageB = (e_Age)age; ++age; mfi.m_bConflictingAges = true; } if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere ) { mfi.m_ageA = (e_Age)age; ++age; mfi.m_bConflictingAges = true; } if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld ) { if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld; if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld; if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld; } } static QPixmap* s_pm_dir; static QPixmap* s_pm_file; static QPixmap* pmNotThere; static QPixmap* pmNew; static QPixmap* pmOld; static QPixmap* pmMiddle; static QPixmap* pmLink; static QPixmap* pmDirLink; static QPixmap* pmFileLink; static QPixmap* pmNewLink; static QPixmap* pmOldLink; static QPixmap* pmMiddleLink; static QPixmap* pmNewDir; static QPixmap* pmMiddleDir; static QPixmap* pmOldDir; static QPixmap* pmNewDirLink; static QPixmap* pmMiddleDirLink; static QPixmap* pmOldDirLink; static QPixmap colorToPixmap(QColor c) { QPixmap pm(16,16); QPainter p(&pm); p.setPen( Qt::black ); p.setBrush( c ); p.drawRect(0,0,pm.width(),pm.height()); return pm; } static void initPixmaps( QColor newest, QColor oldest, QColor middle, QColor notThere ) { if (pmNew==0) { pmNotThere = new QPixmap; pmNew = new QPixmap; pmOld = new QPixmap; pmMiddle = new QPixmap; #include "xpm/link_arrow.xpm" pmLink = new QPixmap(link_arrow); pmDirLink = new QPixmap; pmFileLink = new QPixmap; pmNewLink = new QPixmap; pmOldLink = new QPixmap; pmMiddleLink = new QPixmap; pmNewDir = new QPixmap; pmMiddleDir = new QPixmap; pmOldDir = new QPixmap; pmNewDirLink = new QPixmap; pmMiddleDirLink = new QPixmap; pmOldDirLink = new QPixmap; } *pmNotThere = colorToPixmap(notThere); *pmNew = colorToPixmap(newest); *pmOld = colorToPixmap(oldest); *pmMiddle = colorToPixmap(middle); *pmDirLink = pixCombiner( s_pm_dir, pmLink); *pmFileLink = pixCombiner( s_pm_file, pmLink ); *pmNewLink = pixCombiner( pmNew, pmLink); *pmOldLink = pixCombiner( pmOld, pmLink); *pmMiddleLink = pixCombiner( pmMiddle, pmLink); *pmNewDir = pixCombiner2( pmNew, s_pm_dir); *pmMiddleDir = pixCombiner2( pmMiddle, s_pm_dir); *pmOldDir = pixCombiner2( pmOld, s_pm_dir); *pmNewDirLink = pixCombiner( pmNewDir, pmLink); *pmMiddleDirLink = pixCombiner( pmMiddleDir, pmLink); *pmOldDirLink = pixCombiner( pmOldDir, pmLink); } static void setOnePixmap( QTreeWidgetItem* pLVI, int col, e_Age eAge, bool bLink, bool bDir ) { static QPixmap* ageToPm[]= { pmNew, pmMiddle, pmOld, pmNotThere, s_pm_file }; static QPixmap* ageToPmLink[]= { pmNewLink, pmMiddleLink, pmOldLink, pmNotThere, pmFileLink }; static QPixmap* ageToPmDir[]= { pmNewDir, pmMiddleDir, pmOldDir, pmNotThere, s_pm_dir }; static QPixmap* ageToPmDirLink[]={ pmNewDirLink, pmMiddleDirLink, pmOldDirLink, pmNotThere, pmDirLink }; QPixmap** ppPm = bDir ? ( bLink ? ageToPmDirLink : ageToPmDir ): ( bLink ? ageToPmLink : ageToPm ); pLVI->setIcon( col, *ppPm[eAge] ); } static void setPixmaps( MergeFileInfos& mfi, bool bCheckC ) { setOnePixmap( mfi.m_pDMI, s_NameCol, eAgeEnd, mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC, mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ); if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ) { mfi.m_ageA=eNotThere; mfi.m_ageB=eNotThere; mfi.m_ageC=eNotThere; int age = eNew; if ( mfi.m_bExistsInC ) { mfi.m_ageC = (e_Age)age; if (mfi.m_bEqualAC) mfi.m_ageA = (e_Age)age; if (mfi.m_bEqualBC) mfi.m_ageB = (e_Age)age; ++age; } if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere ) { mfi.m_ageB = (e_Age)age; if (mfi.m_bEqualAB) mfi.m_ageA = (e_Age)age; ++age; } if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere ) { mfi.m_ageA = (e_Age)age; } if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld ) { if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld; if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld; if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld; } } setOnePixmap( mfi.m_pDMI, s_ACol, mfi.m_ageA, mfi.m_bLinkA, mfi.m_bDirA ); setOnePixmap( mfi.m_pDMI, s_BCol, mfi.m_ageB, mfi.m_bLinkB, mfi.m_bDirB ); if ( bCheckC ) setOnePixmap( mfi.m_pDMI, s_CCol, mfi.m_ageC, mfi.m_bLinkC, mfi.m_bDirC ); } static QTreeWidgetItem* nextSibling(const QTreeWidgetItem* p) { QTreeWidgetItem* pParent = p->parent(); if ( pParent ) { int currentIdx = pParent->indexOfChild( const_cast<QTreeWidgetItem*>(p) ); if ( currentIdx+1 < pParent->childCount() ) return pParent->child(currentIdx+1); } else { QTreeWidget* pParentTreeWidget = p->treeWidget(); if ( pParentTreeWidget ) { int currentIdx = pParentTreeWidget->indexOfTopLevelItem( const_cast<QTreeWidgetItem*>(p) ); if ( currentIdx+1 < pParentTreeWidget->topLevelItemCount() ) return pParentTreeWidget->topLevelItem(currentIdx+1); } } return 0; } // Iterate through the complete tree. Start by specifying QListView::firstChild(). static QTreeWidgetItem* treeIterator( QTreeWidgetItem* p, bool bVisitChildren=true, bool bFindInvisible=false ) { if( p!=0 ) { do { if ( bVisitChildren && p->childCount() != 0 ) p = p->child(0); else { QTreeWidgetItem* pNextSibling = nextSibling(p); if ( pNextSibling ) p = pNextSibling; else { p = p->parent(); while ( p!=0 ) { QTreeWidgetItem* pNextSibling = nextSibling(p); if( pNextSibling ) { p = pNextSibling; break; } else { p = p->parent(); } } } } } while( p && p->isHidden() && !bFindInvisible ); } return p; } void DirectoryMergeWindow::prepareListView( ProgressProxy& pp ) { static bool bFirstTime = true; if (bFirstTime) { #include "xpm/file.xpm" #include "xpm/folder.xpm" // FIXME specify correct icon loader group s_pm_dir = new QPixmap( m_pIconLoader->loadIcon("folder", KIconLoader::NoGroup, KIconLoader::Small ) ); if (s_pm_dir->size()!=QSize(16,16)) { delete s_pm_dir; s_pm_dir = new QPixmap( folder_pm ); } s_pm_file= new QPixmap( file_pm ); bFirstTime=false; } clear(); initPixmaps( m_pOptions->m_newestFileColor, m_pOptions->m_oldestFileColor, m_pOptions->m_midAgeFileColor, m_pOptions->m_missingFileColor ); setRootIsDecorated( true ); bool bCheckC = m_dirC.isValid(); std::map<QString, MergeFileInfos>::iterator j; int nrOfFiles = m_fileMergeMap.size(); int currentIdx = 1; QTime t; t.start(); for( j=m_fileMergeMap.begin(); j!=m_fileMergeMap.end(); ++j ) { MergeFileInfos& mfi = j->second; mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() : mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() : mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : QString(""); // const QString& fileName = j->first; const QString& fileName = mfi.m_subPath; pp.setInformation( i18n("Processing ") + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles) +"\n" + fileName, double(currentIdx) / nrOfFiles, false ); if ( pp.wasCancelled() ) break; ++currentIdx; // The comparisons and calculations for each file take place here. compareFilesAndCalcAges( mfi ); // Get dirname from fileName: Search for "/" from end: int pos = fileName.lastIndexOf('/'); QString dirPart; QString filePart; if (pos==-1) { // Top dir filePart = fileName; } else { dirPart = fileName.left(pos); filePart = fileName.mid(pos+1); } if ( dirPart.isEmpty() ) // Top level { new DirMergeItem( this, filePart, &mfi ); } else { MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // parent assert(dirMfi.m_pDMI!=0); new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); mfi.m_pParent = &dirMfi; // Equality for parent dirs is set in updateFileVisibilities() } setPixmaps( mfi, bCheckC ); } } static bool conflictingFileTypes(MergeFileInfos& mfi) { // Now check if file/dir-types fit. if ( mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC ) { if ( (mfi.m_bExistsInA && ! mfi.m_bLinkA) || (mfi.m_bExistsInB && ! mfi.m_bLinkB) || (mfi.m_bExistsInC && ! mfi.m_bLinkC) ) { return true; } } if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ) { if ( (mfi.m_bExistsInA && ! mfi.m_bDirA) || (mfi.m_bExistsInB && ! mfi.m_bDirB) || (mfi.m_bExistsInC && ! mfi.m_bDirC) ) { return true; } } return false; } void DirectoryMergeWindow::calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultMergeOp ) { bool bCheckC = m_dirC.isValid(); bool bCopyNewer = m_pOptions->m_bDmCopyNewer; bool bOtherDest = !( (m_dirDestInternal.absoluteFilePath() == m_dirA.absoluteFilePath()) || (m_dirDestInternal.absoluteFilePath() == m_dirB.absoluteFilePath()) || (bCheckC && m_dirDestInternal.absoluteFilePath() == m_dirC.absoluteFilePath()) ); if ( eDefaultMergeOp == eMergeABCToDest && !bCheckC ) { eDefaultMergeOp = eMergeABToDest; } if ( eDefaultMergeOp == eMergeToAB && bCheckC ) { assert(false); } if ( eDefaultMergeOp == eMergeToA || eDefaultMergeOp == eMergeToB || eDefaultMergeOp == eMergeABCToDest || eDefaultMergeOp == eMergeABToDest || eDefaultMergeOp == eMergeToAB ) { if ( !bCheckC ) { if ( mfi.m_bEqualAB ) { mfi.setMergeOperation( bOtherDest ? eCopyBToDest : eNoOperation ); } else if ( mfi.m_bExistsInA && mfi.m_bExistsInB ) { if ( !bCopyNewer || mfi.m_bDirA ) mfi.setMergeOperation( eDefaultMergeOp ); else if ( bCopyNewer && mfi.m_bConflictingAges ) { mfi.setMergeOperation( eConflictingAges ); } else { if ( mfi.m_ageA == eNew ) mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyAToB : eCopyAToDest ); else mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyBToA : eCopyBToDest ); } } else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB ) { if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyBToDest ); else if ( eDefaultMergeOp==eMergeToB ) mfi.setMergeOperation( eNoOperation ); else mfi.setMergeOperation( eCopyBToA ); } else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB ) { if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyAToDest ); else if ( eDefaultMergeOp==eMergeToA ) mfi.setMergeOperation( eNoOperation ); else mfi.setMergeOperation( eCopyAToB ); } else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB ) { mfi.setMergeOperation( eNoOperation ); assert(false); } } else { if ( mfi.m_bEqualAB && mfi.m_bEqualAC ) { mfi.setMergeOperation( bOtherDest ? eCopyCToDest : eNoOperation ); } else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC) { if ( mfi.m_bEqualAB ) mfi.setMergeOperation( eCopyCToDest ); else if ( mfi.m_bEqualAC ) mfi.setMergeOperation( eCopyBToDest ); else if ( mfi.m_bEqualBC ) mfi.setMergeOperation( eCopyCToDest ); else mfi.setMergeOperation( eMergeABCToDest ); } else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC ) { if ( mfi.m_bEqualAB ) mfi.setMergeOperation( eDeleteFromDest ); else mfi.setMergeOperation( eChangedAndDeleted ); } else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) { if ( mfi.m_bEqualAC ) mfi.setMergeOperation( eDeleteFromDest ); else mfi.setMergeOperation( eChangedAndDeleted ); } else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC ) { if ( mfi.m_bEqualBC ) mfi.setMergeOperation( eCopyCToDest ); else mfi.setMergeOperation( eMergeABCToDest ); } else if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) { mfi.setMergeOperation( eCopyCToDest ); } else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC ) { mfi.setMergeOperation( eCopyBToDest ); } else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC) { mfi.setMergeOperation( eDeleteFromDest ); } else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC ) { mfi.setMergeOperation( eNoOperation ); assert(false); } } // Now check if file/dir-types fit. if ( conflictingFileTypes(mfi) ) { mfi.setMergeOperation( eConflictingFileTypes ); } } else { e_MergeOperation eMO = eDefaultMergeOp; switch ( eDefaultMergeOp ) { case eConflictingFileTypes: case eChangedAndDeleted: case eConflictingAges: case eDeleteA: case eDeleteB: case eDeleteAB: case eDeleteFromDest: case eNoOperation: break; case eCopyAToB: if ( !mfi.m_bExistsInA ) { eMO = eDeleteB; } break; case eCopyBToA: if ( !mfi.m_bExistsInB ) { eMO = eDeleteA; } break; case eCopyAToDest: if ( !mfi.m_bExistsInA ) { eMO = eDeleteFromDest; } break; case eCopyBToDest: if ( !mfi.m_bExistsInB ) { eMO = eDeleteFromDest; } break; case eCopyCToDest: if ( !mfi.m_bExistsInC ) { eMO = eDeleteFromDest; } break; case eMergeToA: case eMergeToB: case eMergeToAB: case eMergeABCToDest: case eMergeABToDest: default: assert(false); } mfi.setMergeOperation( eMO ); } } void DirectoryMergeWindow::onDoubleClick( QTreeWidgetItem* lvi ) { if (lvi==0) return; if ( m_bDirectoryMerge ) mergeCurrentFile(); else compareCurrentFile(); } void DirectoryMergeWindow::onCurrentChanged(QTreeWidgetItem* lvi) { if ( lvi==0 ) return; DirMergeItem* pDMI = static_cast<DirMergeItem*>(lvi); MergeFileInfos& mfi = *pDMI->m_pMFI; assert( mfi.m_pDMI==pDMI ); m_pDirectoryMergeInfo->setInfo( m_dirA, m_dirB, m_dirC, m_dirDestInternal, mfi ); } void DirectoryMergeWindow::mousePressEvent( QMouseEvent* e ) { QTreeWidget::mousePressEvent(e); int c = columnAt( e->x() ); QTreeWidgetItem* lvi = itemAt( e->pos() ); QPoint p = e->globalPos(); if ( lvi==0 ) return; DirMergeItem* pDMI = static_cast<DirMergeItem*>(lvi); MergeFileInfos& mfi = *pDMI->m_pMFI; assert( mfi.m_pDMI==pDMI ); if ( c==s_OpCol ) { bool bThreeDirs = m_dirC.isValid(); KMenu m(this); if ( bThreeDirs ) { m.addAction( m_pDirCurrentDoNothing ); int count=0; if ( mfi.m_bExistsInA ) { m.addAction( m_pDirCurrentChooseA ); ++count; } if ( mfi.m_bExistsInB ) { m.addAction( m_pDirCurrentChooseB ); ++count; } if ( mfi.m_bExistsInC ) { m.addAction( m_pDirCurrentChooseC ); ++count; } if ( !conflictingFileTypes(mfi) && count>1 ) m.addAction( m_pDirCurrentMerge ); m.addAction( m_pDirCurrentDelete ); } else if ( m_bSyncMode ) { m.addAction( m_pDirCurrentSyncDoNothing ); if ( mfi.m_bExistsInA ) m.addAction( m_pDirCurrentSyncCopyAToB ); if ( mfi.m_bExistsInB ) m.addAction( m_pDirCurrentSyncCopyBToA ); if ( mfi.m_bExistsInA ) m.addAction( m_pDirCurrentSyncDeleteA ); if ( mfi.m_bExistsInB ) m.addAction( m_pDirCurrentSyncDeleteB ); if ( mfi.m_bExistsInA && mfi.m_bExistsInB ) { m.addAction( m_pDirCurrentSyncDeleteAAndB ); if ( !conflictingFileTypes(mfi)) { m.addAction( m_pDirCurrentSyncMergeToA ); m.addAction( m_pDirCurrentSyncMergeToB ); m.addAction( m_pDirCurrentSyncMergeToAAndB ); } } } else { m.addAction( m_pDirCurrentDoNothing ); if ( mfi.m_bExistsInA ) { m.addAction( m_pDirCurrentChooseA ); } if ( mfi.m_bExistsInB ) { m.addAction( m_pDirCurrentChooseB ); } if ( !conflictingFileTypes(mfi) && mfi.m_bExistsInA && mfi.m_bExistsInB ) m.addAction( m_pDirCurrentMerge ); m.addAction( m_pDirCurrentDelete ); } m.exec( p ); } else if ( c == s_ACol || c==s_BCol || c==s_CCol ) { QString itemPath; if ( c == s_ACol && mfi.m_bExistsInA ){ itemPath = fullNameA(mfi); } else if ( c == s_BCol && mfi.m_bExistsInB ){ itemPath = fullNameB(mfi); } else if ( c == s_CCol && mfi.m_bExistsInC ){ itemPath = fullNameC(mfi); } if (!itemPath.isEmpty()) { selectItemAndColumn( pDMI, c, e->button()==Qt::RightButton ); } } } void DirectoryMergeWindow::contextMenuEvent(QContextMenuEvent* e) { QTreeWidgetItem* lvi = itemAt( e->pos() ); int c = columnAt( e->x() ); QPoint p = e->globalPos(); if ( lvi==0 ) return; DirMergeItem* pDMI = static_cast<DirMergeItem*>(lvi); MergeFileInfos& mfi = *pDMI->m_pMFI; assert( mfi.m_pDMI==pDMI ); if ( c == s_ACol || c==s_BCol || c==s_CCol ) { QString itemPath; if ( c == s_ACol && mfi.m_bExistsInA ){ itemPath = fullNameA(mfi); } else if ( c == s_BCol && mfi.m_bExistsInB ){ itemPath = fullNameB(mfi); } else if ( c == s_CCol && mfi.m_bExistsInC ){ itemPath = fullNameC(mfi); } if (!itemPath.isEmpty()) { selectItemAndColumn(pDMI, c, true); KMenu m(this); m.addAction( m_pDirCompareExplicit ); m.addAction( m_pDirMergeExplicit ); #ifndef _WIN32 m.exec( p ); #else void showShellContextMenu( const QString&, QPoint, QWidget*, QMenu* ); showShellContextMenu( itemPath, p, this, &m ); #endif } } } static QString getFileName( DirMergeItem* pDMI, int column ) { if ( pDMI != 0 ) { MergeFileInfos& mfi = *pDMI->m_pMFI; return column == s_ACol ? mfi.m_fileInfoA.absoluteFilePath() : column == s_BCol ? mfi.m_fileInfoB.absoluteFilePath() : column == s_CCol ? mfi.m_fileInfoC.absoluteFilePath() : QString(""); } return ""; } static bool isDir( DirMergeItem* pDMI, int column ) { if ( pDMI != 0 ) { MergeFileInfos& mfi = *pDMI->m_pMFI; return column == s_ACol ? mfi.m_bDirA : column == s_BCol ? mfi.m_bDirB : mfi.m_bDirC; } return false; } void DirectoryMergeWindow::selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu) { if ( bContextMenu && ( (pDMI==m_pSelection1Item && c==m_selection1Column) || (pDMI==m_pSelection2Item && c==m_selection2Column) || (pDMI==m_pSelection3Item && c==m_selection3Column) ) ) return; DirMergeItem* pOld1=m_pSelection1Item; DirMergeItem* pOld2=m_pSelection2Item; DirMergeItem* pOld3=m_pSelection3Item; bool bReset = false; if ( m_pSelection1Item ) { if (isDir( m_pSelection1Item, m_selection1Column )!=isDir( pDMI, c )) bReset = true; } if ( bReset || m_pSelection3Item!=0 || (pDMI==m_pSelection1Item && c==m_selection1Column) || (pDMI==m_pSelection2Item && c==m_selection2Column) || (pDMI==m_pSelection3Item && c==m_selection3Column)) { m_pSelection1Item = 0; m_pSelection2Item = 0; m_pSelection3Item = 0; } else if ( m_pSelection1Item==0 ) { m_pSelection1Item = pDMI; m_selection1Column = c; m_pSelection2Item = 0; m_pSelection3Item = 0; } else if ( m_pSelection2Item==0 ) { m_pSelection2Item = pDMI; m_selection2Column = c; m_pSelection3Item = 0; } else if ( m_pSelection3Item==0 ) { m_pSelection3Item = pDMI; m_selection3Column = c; } if (pOld1) dataChanged( indexFromItem( pOld1, s_ACol ), indexFromItem( pOld1, s_CCol ) ); if (pOld2) dataChanged( indexFromItem( pOld2, s_ACol ), indexFromItem( pOld2, s_CCol ) ); if (pOld3) dataChanged( indexFromItem( pOld3, s_ACol ), indexFromItem( pOld3, s_CCol ) ); if (m_pSelection1Item) dataChanged( indexFromItem( m_pSelection1Item, s_ACol ), indexFromItem( m_pSelection1Item, s_CCol ) ); if (m_pSelection2Item) dataChanged( indexFromItem( m_pSelection2Item, s_ACol ), indexFromItem( m_pSelection2Item, s_CCol ) ); if (m_pSelection3Item) dataChanged( indexFromItem( m_pSelection3Item, s_ACol ), indexFromItem( m_pSelection3Item, s_CCol ) ); emit updateAvailabilities(); } DirMergeItem::DirMergeItem( QTreeWidget* pParent, const QString& fileName, MergeFileInfos* pMFI ) : QTreeWidgetItem( pParent, QStringList() << fileName << "" << "" << "" << i18n("To do.") << "" ) { init(pMFI); } DirMergeItem::DirMergeItem( DirMergeItem* pParent, const QString& fileName, MergeFileInfos* pMFI ) : QTreeWidgetItem( pParent, QStringList() << fileName << "" << "" << "" << i18n("To do.") << "" ) { init(pMFI); } void DirMergeItem::init(MergeFileInfos* pMFI) { pMFI->m_pDMI = this; m_pMFI = pMFI; TotalDiffStatus& tds = pMFI->m_totalDiffStatus; if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC ) { } else { setText( s_UnsolvedCol, QString::number( tds.nofUnsolvedConflicts ) ); setText( s_SolvedCol, QString::number( tds.nofSolvedConflicts ) ); setText( s_NonWhiteCol, QString::number( tds.nofUnsolvedConflicts + tds.nofSolvedConflicts - tds.nofWhitespaceConflicts ) ); setText( s_WhiteCol, QString::number( tds.nofWhitespaceConflicts ) ); } setSizeHint( s_ACol, QSize(17,17) ); // Iconsize setSizeHint( s_BCol, QSize(17,17) ); // Iconsize setSizeHint( s_CCol, QSize(17,17) ); // Iconsize } bool DirMergeItem::operator<(const QTreeWidgetItem& i) const { int col = treeWidget()->sortColumn(); const DirMergeItem* pDMI = static_cast<const DirMergeItem*>(&i); bool bDir1 = m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC; bool bDir2 = pDMI->m_pMFI->m_bDirA || pDMI->m_pMFI->m_bDirB || pDMI->m_pMFI->m_bDirC; if ( m_pMFI==0 || pDMI->m_pMFI==0 || bDir1 == bDir2 ) { if(col==s_UnsolvedCol || col==s_SolvedCol || col==s_NonWhiteCol || col==s_WhiteCol) return text(col).toInt() > i.text(col).toInt(); else if ( col == s_NameCol ) return text(col).compare( i.text(col), Qt::CaseInsensitive )<0; else return QTreeWidgetItem::operator<(i); } else return bDir1; } DirMergeItem::~DirMergeItem() { m_pMFI->m_pDMI = 0; } void MergeFileInfos::setMergeOperation( e_MergeOperation eMOp, bool bRecursive ) { if ( eMOp != m_eMergeOperation ) { m_bOperationComplete = false; m_pDMI->setText( s_OpStatusCol, "" ); } m_eMergeOperation = eMOp; QString s; bool bDir = m_bDirA || m_bDirB || m_bDirC; if( m_pDMI!=0 ) { switch( m_eMergeOperation ) { case eNoOperation: s=""; m_pDMI->setText(s_OpCol,""); break; case eCopyAToB: s=i18n("Copy A to B"); break; case eCopyBToA: s=i18n("Copy B to A"); break; case eDeleteA: s=i18n("Delete A"); break; case eDeleteB: s=i18n("Delete B"); break; case eDeleteAB: s=i18n("Delete A & B"); break; case eMergeToA: s=i18n("Merge to A"); break; case eMergeToB: s=i18n("Merge to B"); break; case eMergeToAB: s=i18n("Merge to A & B"); break; case eCopyAToDest: s="A"; break; case eCopyBToDest: s="B"; break; case eCopyCToDest: s="C"; break; case eDeleteFromDest: s=i18n("Delete (if exists)"); break; case eMergeABCToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; case eMergeABToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; case eConflictingFileTypes: s=i18n("Error: Conflicting File Types"); break; case eChangedAndDeleted: s=i18n("Error: Changed and Deleted"); break; case eConflictingAges: s=i18n("Error: Dates are equal but files are not."); break; default: assert(false); break; } m_pDMI->setText(s_OpCol,s); if ( bRecursive ) { e_MergeOperation eChildrenMergeOp = m_eMergeOperation; if ( eChildrenMergeOp == eConflictingFileTypes ) eChildrenMergeOp = eMergeABCToDest; for( int childIdx=0; childIdx<m_pDMI->childCount(); ++childIdx ) { QTreeWidgetItem* p = m_pDMI->child(childIdx); DirMergeItem* pDMI = static_cast<DirMergeItem*>( p ); DirectoryMergeWindow* pDMW = static_cast<DirectoryMergeWindow*>( p->treeWidget() ); pDMW->calcSuggestedOperation( *pDMI->m_pMFI, eChildrenMergeOp ); } } } } void DirectoryMergeWindow::compareCurrentFile() { if (!canContinue()) return; if ( m_bRealMergeStarted ) { KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); return; } if ( currentItem() != 0 ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( currentItem() ); MergeFileInfos& mfi = *pDMI->m_pMFI; if ( !(mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC) ) { emit startDiffMerge( mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : QString(""), mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : QString(""), mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : QString(""), "", "","","",0 ); } } emit updateAvailabilities(); } void DirectoryMergeWindow::slotCompareExplicitlySelectedFiles() { if ( ! isDir(m_pSelection1Item,m_selection1Column) && !canContinue() ) return; if ( m_bRealMergeStarted ) { KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); return; } emit startDiffMerge( getFileName( m_pSelection1Item, m_selection1Column ), getFileName( m_pSelection2Item, m_selection2Column ), getFileName( m_pSelection3Item, m_selection3Column ), "", "","","",0 ); m_pSelection1Item=0; m_pSelection2Item=0; m_pSelection3Item=0; emit updateAvailabilities(); update(); } void DirectoryMergeWindow::slotMergeExplicitlySelectedFiles() { if ( ! isDir(m_pSelection1Item,m_selection1Column) && !canContinue() ) return; if ( m_bRealMergeStarted ) { KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); return; } QString fn1 = getFileName( m_pSelection1Item, m_selection1Column ); QString fn2 = getFileName( m_pSelection2Item, m_selection2Column ); QString fn3 = getFileName( m_pSelection3Item, m_selection3Column ); emit startDiffMerge( fn1, fn2, fn3, fn3.isEmpty() ? fn2 : fn3, "","","",0 ); m_pSelection1Item=0; m_pSelection2Item=0; m_pSelection3Item=0; emit updateAvailabilities(); update(); } bool DirectoryMergeWindow::isFileSelected() { if ( currentItem() != 0 ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( currentItem() ); MergeFileInfos& mfi = *pDMI->m_pMFI; return ! (mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC || conflictingFileTypes(mfi) ); } return false; } void DirectoryMergeWindow::mergeResultSaved(const QString& fileName) { DirMergeItem* pCurrentItemForOperation = (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) ? 0 : *m_currentItemForOperation; if ( pCurrentItemForOperation!=0 && pCurrentItemForOperation->m_pMFI==0 ) { 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") ); return; } if ( pCurrentItemForOperation!=0 && fileName == fullNameDest(*pCurrentItemForOperation->m_pMFI) ) { if ( pCurrentItemForOperation->m_pMFI->m_eMergeOperation==eMergeToAB ) { MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI; bool bSuccess = copyFLD( fullNameB(mfi), fullNameA(mfi) ); if (!bSuccess) { KMessageBox::error(this, i18n("An error occurred while copying.\n"), i18n("Error") ); m_pStatusInfo->setWindowTitle(i18n("Merge Error")); m_pStatusInfo->showMaximized(); //if ( m_pStatusInfo->firstChild()!=0 ) // m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() ); m_bError = true; pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") ); mfi.m_eMergeOperation = eCopyBToA; return; } } pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Done.") ); pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; if ( m_mergeItemList.size()==1 ) { m_mergeItemList.clear(); m_bRealMergeStarted=false; } } emit updateAvailabilities(); } bool DirectoryMergeWindow::canContinue() { bool bCanContinue=false; checkIfCanContinue( &bCanContinue ); if ( bCanContinue && !m_bError ) { DirMergeItem* pCurrentItemForOperation = (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) ? 0 : *m_currentItemForOperation; if ( pCurrentItemForOperation!=0 && ! pCurrentItemForOperation->m_pMFI->m_bOperationComplete ) { pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Not saved.") ); pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; if ( m_mergeItemList.size()==1 ) { m_mergeItemList.clear(); m_bRealMergeStarted=false; } } } return bCanContinue; } bool DirectoryMergeWindow::executeMergeOperation( MergeFileInfos& mfi, bool& bSingleFileMerge ) { bool bCreateBackups = m_pOptions->m_bDmCreateBakFiles; // First decide destname QString destName; switch( mfi.m_eMergeOperation ) { case eNoOperation: break; case eDeleteAB: break; case eMergeToAB: // let the user save in B. In mergeResultSaved() the file will be copied to A. case eMergeToB: case eDeleteB: case eCopyAToB: destName = fullNameB(mfi); break; case eMergeToA: case eDeleteA: case eCopyBToA: destName = fullNameA(mfi); break; case eMergeABToDest: case eMergeABCToDest: case eCopyAToDest: case eCopyBToDest: case eCopyCToDest: case eDeleteFromDest: destName = fullNameDest(mfi); break; default: KMessageBox::error( this, i18n("Unknown merge operation. (This must never happen!)"), i18n("Error") ); assert(false); } bool bSuccess = false; bSingleFileMerge = false; switch( mfi.m_eMergeOperation ) { case eNoOperation: bSuccess = true; break; case eCopyAToDest: case eCopyAToB: bSuccess = copyFLD( fullNameA(mfi), destName ); break; case eCopyBToDest: case eCopyBToA: bSuccess = copyFLD( fullNameB(mfi), destName ); break; case eCopyCToDest: bSuccess = copyFLD( fullNameC(mfi), destName ); break; case eDeleteFromDest: case eDeleteA: case eDeleteB: bSuccess = deleteFLD( destName, bCreateBackups ); break; case eDeleteAB: bSuccess = deleteFLD( fullNameA(mfi), bCreateBackups ) && deleteFLD( fullNameB(mfi), bCreateBackups ); break; case eMergeABToDest: case eMergeToA: case eMergeToAB: case eMergeToB: bSuccess = mergeFLD( fullNameA(mfi), fullNameB(mfi), "", destName, bSingleFileMerge ); break; case eMergeABCToDest:bSuccess = mergeFLD( mfi.m_bExistsInA ? fullNameA(mfi) : QString(""), mfi.m_bExistsInB ? fullNameB(mfi) : QString(""), mfi.m_bExistsInC ? fullNameC(mfi) : QString(""), destName, bSingleFileMerge ); break; default: KMessageBox::error( this, i18n("Unknown merge operation."), i18n("Error") ); assert(false); } return bSuccess; } // Check if the merge can start, and prepare the m_mergeItemList which then contains all // items that must be merged. void DirectoryMergeWindow::prepareMergeStart( QTreeWidgetItem* pBegin, QTreeWidgetItem* pEnd, bool bVerbose ) { if ( bVerbose ) { int status = KMessageBox::warningYesNoCancel(this, i18n("The merge is about to begin.\n\n" "Choose \"Do it\" if you have read the instructions and know what you are doing.\n" "Choosing \"Simulate it\" will tell you what would happen.\n\n" "Be aware that this program still has beta status " "and there is NO WARRANTY whatsoever! Make backups of your vital data!"), i18n("Starting Merge"), KGuiItem( i18n("Do It") ), KGuiItem( i18n("Simulate It") ) ); if (status==KMessageBox::Yes) m_bRealMergeStarted = true; else if (status==KMessageBox::No ) m_bSimulatedMergeStarted = true; else return; } else { m_bRealMergeStarted = true; } m_mergeItemList.clear(); if (pBegin == 0) return; for( QTreeWidgetItem* p = pBegin; p!= pEnd; p = treeIterator( p ) ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>(p); if ( pDMI && ! pDMI->m_pMFI->m_bOperationComplete ) { m_mergeItemList.push_back(pDMI); if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingFileTypes ) { scrollToItem( pDMI, QAbstractItemView::EnsureVisible ); pDMI->setSelected( true ); KMessageBox::error(this, i18n("The highlighted item has a different type in the different directories. Select what to do."), i18n("Error")); m_mergeItemList.clear(); m_bRealMergeStarted=false; return; } if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingAges ) { scrollToItem ( pDMI, QAbstractItemView::EnsureVisible ); pDMI->setSelected( true ); KMessageBox::error(this, i18n("The modification dates of the file are equal but the files are not. Select what to do."), i18n("Error")); m_mergeItemList.clear(); m_bRealMergeStarted=false; return; } if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eChangedAndDeleted ) { scrollToItem( pDMI, QAbstractItemView::EnsureVisible ); pDMI->setSelected( true ); KMessageBox::error(this, i18n("The highlighted item was changed in one directory and deleted in the other. Select what to do."), i18n("Error")); m_mergeItemList.clear(); m_bRealMergeStarted=false; return; } } } m_currentItemForOperation = m_mergeItemList.begin(); return; } void DirectoryMergeWindow::slotRunOperationForCurrentItem() { if ( ! canContinue() ) return; bool bVerbose = false; if ( m_mergeItemList.empty() ) { QTreeWidgetItem* pBegin = currentItem(); QTreeWidgetItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no children) prepareMergeStart( pBegin, pEnd, bVerbose ); mergeContinue(true, bVerbose); } else mergeContinue(false, bVerbose); } void DirectoryMergeWindow::slotRunOperationForAllItems() { if ( ! canContinue() ) return; bool bVerbose = true; if ( m_mergeItemList.empty() ) { QTreeWidgetItem* pBegin = topLevelItemCount()>0 ? topLevelItem(0) : 0; prepareMergeStart( pBegin, 0, bVerbose ); mergeContinue(true, bVerbose); } else mergeContinue(false, bVerbose); } void DirectoryMergeWindow::mergeCurrentFile() { if (!canContinue()) return; if ( m_bRealMergeStarted ) { KMessageBox::sorry(this,i18n("This operation is currently not possible because directory merge is currently running."),i18n("Operation Not Possible")); return; } if ( isFileSelected() ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( currentItem() ); if ( pDMI != 0 ) { MergeFileInfos& mfi = *pDMI->m_pMFI; m_mergeItemList.clear(); m_mergeItemList.push_back( pDMI ); m_currentItemForOperation=m_mergeItemList.begin(); bool bDummy=false; mergeFLD( mfi.m_bExistsInA ? mfi.m_fileInfoA.absoluteFilePath() : QString(""), mfi.m_bExistsInB ? mfi.m_fileInfoB.absoluteFilePath() : QString(""), mfi.m_bExistsInC ? mfi.m_fileInfoC.absoluteFilePath() : QString(""), fullNameDest(mfi), bDummy ); } } emit updateAvailabilities(); } // When bStart is true then m_currentItemForOperation must still be processed. // When bVerbose is true then a messagebox will tell when the merge is complete. void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose) { ProgressProxy pp; if ( m_mergeItemList.empty() ) return; int nrOfItems = 0; int nrOfCompletedItems = 0; int nrOfCompletedSimItems = 0; // Count the number of completed items (for the progress bar). for( MergeItemList::iterator i = m_mergeItemList.begin(); i!=m_mergeItemList.end(); ++i ) { DirMergeItem* pDMI = *i; ++nrOfItems; if ( pDMI->m_pMFI->m_bOperationComplete ) ++nrOfCompletedItems; if ( pDMI->m_pMFI->m_bSimOpComplete ) ++nrOfCompletedSimItems; } m_pStatusInfo->hide(); m_pStatusInfo->clear(); DirMergeItem* pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; bool bContinueWithCurrentItem = bStart; // true for first item, else false bool bSkipItem = false; if ( !bStart && m_bError && pCurrentItemForOperation!=0 ) { int status = KMessageBox::warningYesNoCancel(this, i18n("There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want to skip this item?"), i18n("Continue merge after an error"), KGuiItem( i18n("Continue With Last Item") ), KGuiItem( i18n("Skip Item") ) ); if (status==KMessageBox::Yes) bContinueWithCurrentItem = true; else if (status==KMessageBox::No ) bSkipItem = true; else return; m_bError = false; } bool bSuccess = true; bool bSingleFileMerge = false; bool bSim = m_bSimulatedMergeStarted; while( bSuccess ) { if ( pCurrentItemForOperation==0 ) { m_mergeItemList.clear(); m_bRealMergeStarted=false; break; } if ( pCurrentItemForOperation!=0 && !bContinueWithCurrentItem ) { if ( bSim ) { if( pCurrentItemForOperation->childCount()==0 ) { pCurrentItemForOperation->m_pMFI->m_bSimOpComplete = true; } } else { if( pCurrentItemForOperation->childCount()==0 ) { if( !pCurrentItemForOperation->m_pMFI->m_bOperationComplete ) { pCurrentItemForOperation->setText( s_OpStatusCol, bSkipItem ? i18n("Skipped.") : i18n("Done.") ); pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; bSkipItem = false; } } else { pCurrentItemForOperation->setText( s_OpStatusCol, i18n("In progress...") ); } } } if ( ! bContinueWithCurrentItem ) { // Depth first QTreeWidgetItem* pPrevItem = pCurrentItemForOperation; ++m_currentItemForOperation; pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->parent()!=pPrevItem->parent()) && pPrevItem->parent()!=0 ) { // Check if the parent may be set to "Done" QTreeWidgetItem* pParent = pPrevItem->parent(); bool bDone = true; while ( bDone && pParent!=0 ) { for( int childIdx = 0; childIdx<pParent->childCount(); ++childIdx ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>(pParent->child(childIdx)); if ( (!bSim && ! pDMI->m_pMFI->m_bOperationComplete) || (bSim && pDMI->m_pMFI->m_bSimOpComplete) ) { bDone=false; break; } } if ( bDone ) { if (bSim) static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bSimOpComplete = bDone; else { pParent->setText( s_OpStatusCol, i18n("Done.") ); static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bOperationComplete = bDone; } } pParent = pParent->parent(); } } } if ( pCurrentItemForOperation == 0 ) // end? { if ( m_bRealMergeStarted ) { if (bVerbose) { KMessageBox::information( this, i18n("Merge operation complete."), i18n("Merge Complete") ); } m_bRealMergeStarted = false; m_pStatusInfo->setWindowTitle(i18n("Merge Complete")); } if ( m_bSimulatedMergeStarted ) { m_bSimulatedMergeStarted = false; QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0; for( ; p!=0; p=treeIterator(p) ) { static_cast<DirMergeItem*>(p)->m_pMFI->m_bSimOpComplete = false; } m_pStatusInfo->setWindowTitle(i18n("Simulated merge complete: Check if you agree with the proposed operations.")); m_pStatusInfo->showMaximized(); } m_mergeItemList.clear(); m_bRealMergeStarted=false; return; } MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI; pp.setInformation( mfi.m_subPath, bSim ? double(nrOfCompletedSimItems)/nrOfItems : double(nrOfCompletedItems)/nrOfItems, false // bRedrawUpdate ); bSuccess = executeMergeOperation( mfi, bSingleFileMerge ); // Here the real operation happens. if ( bSuccess ) { if(bSim) ++nrOfCompletedSimItems; else ++nrOfCompletedItems; bContinueWithCurrentItem = false; } if( pp.wasCancelled() ) break; } // end while //g_pProgressDialog->hide(); setCurrentItem( pCurrentItemForOperation ); scrollToItem( pCurrentItemForOperation, EnsureVisible ); if ( !bSuccess && !bSingleFileMerge ) { KMessageBox::error(this, i18n("An error occurred. Press OK to see detailed information.\n"), i18n("Error") ); m_pStatusInfo->setWindowTitle(i18n("Merge Error")); m_pStatusInfo->showMaximized(); //if ( m_pStatusInfo->firstChild()!=0 ) // m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() ); m_bError = true; pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") ); } else { m_bError = false; } emit updateAvailabilities(); if ( m_currentItemForOperation==m_mergeItemList.end() ) { m_mergeItemList.clear(); m_bRealMergeStarted=false; } } bool DirectoryMergeWindow::deleteFLD( const QString& name, bool bCreateBackup ) { FileAccess fi(name, true); if ( !fi.exists() ) return true; if ( bCreateBackup ) { bool bSuccess = renameFLD( name, name+".orig" ); if (!bSuccess) { m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.",name) ); return false; } } else { if ( fi.isDir() && !fi.isSymLink() ) m_pStatusInfo->addText(i18n("delete directory recursively( %1 )",name)); else m_pStatusInfo->addText(i18n("delete( %1 )",name)); if ( m_bSimulatedMergeStarted ) { return true; } if ( fi.isDir() && !fi.isSymLink() )// recursive directory delete only for real dirs, not symlinks { t_DirectoryList dirList; bool bSuccess = fi.listDir( &dirList, false, true, "*", "", "", false, false ); // not recursive, find hidden files if ( !bSuccess ) { // No Permission to read directory or other error. m_pStatusInfo->addText( i18n("Error: delete dir operation failed while trying to read the directory.") ); return false; } t_DirectoryList::iterator it; // create list iterator for ( it=dirList.begin(); it!=dirList.end(); ++it ) // for each file... { FileAccess& fi2 = *it; if ( fi2.fileName() == "." || fi2.fileName()==".." ) continue; bSuccess = deleteFLD( fi2.absoluteFilePath(), false ); if (!bSuccess) break; } if (bSuccess) { bSuccess = FileAccess::removeDir( name ); if ( !bSuccess ) { m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.",name)); return false; } } } else { bool bSuccess = FileAccess::removeFile( name ); if ( !bSuccess ) { m_pStatusInfo->addText( i18n("Error: delete operation failed.") ); return false; } } } return true; } bool DirectoryMergeWindow::mergeFLD( const QString& nameA,const QString& nameB,const QString& nameC,const QString& nameDest, bool& bSingleFileMerge ) { FileAccess fi(nameA); if (fi.isDir()) { return makeDir(nameDest); } // Make sure that the dir exists, into which we will save the file later. int pos=nameDest.lastIndexOf('/'); if ( pos>0 ) { QString parentName = nameDest.left(pos); bool bSuccess = makeDir(parentName, true /*quiet*/); if (!bSuccess) return false; } m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)",nameA,nameB,nameC,nameDest)); if ( m_bSimulatedMergeStarted ) { m_pStatusInfo->addText(i18n(" Note: After a manual merge the user should continue by pressing F7.") ); return true; } bSingleFileMerge = true; (*m_currentItemForOperation)->setText( s_OpStatusCol, i18n("In progress...") ); scrollToItem( *m_currentItemForOperation, EnsureVisible ); emit startDiffMerge( nameA, nameB, nameC, nameDest, "","","",0 ); return false; } bool DirectoryMergeWindow::copyFLD( const QString& srcName, const QString& destName ) { if ( srcName == destName ) return true; FileAccess fi( srcName ); FileAccess faDest(destName, true); if ( faDest.exists() && !( fi.isDir() && faDest.isDir() && (fi.isSymLink()==faDest.isSymLink())) ) { bool bSuccess = deleteFLD( destName, m_pOptions->m_bDmCreateBakFiles ); if ( !bSuccess ) { m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed." "Deleting existing destination failed.",srcName,destName)); return false; } } if ( fi.isSymLink() && ((fi.isDir() && !m_bFollowDirLinks) || (!fi.isDir() && !m_bFollowFileLinks)) ) { m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )",srcName,destName)); #if defined(_WIN32) || defined(Q_OS_OS2) // What are links? #else if ( m_bSimulatedMergeStarted ) { return true; } FileAccess destFi(destName); if ( !destFi.isLocal() || !fi.isLocal() ) { m_pStatusInfo->addText(i18n("Error: copyLink failed: Remote links are not yet supported.")); return false; } QString linkTarget = fi.readLink(); bool bSuccess = FileAccess::symLink( linkTarget, destName ); if (!bSuccess) m_pStatusInfo->addText(i18n("Error: copyLink failed.")); return bSuccess; #endif } if ( fi.isDir() ) { if ( faDest.exists() ) return true; else { bool bSuccess = makeDir( destName ); return bSuccess; } } int pos=destName.lastIndexOf('/'); if ( pos>0 ) { QString parentName = destName.left(pos); bool bSuccess = makeDir(parentName, true /*quiet*/); if (!bSuccess) return false; } m_pStatusInfo->addText(i18n("copy( %1 -> %2 )",srcName,destName)); if ( m_bSimulatedMergeStarted ) { return true; } FileAccess faSrc ( srcName ); bool bSuccess = faSrc.copyFile( destName ); if (! bSuccess ) m_pStatusInfo->addText( faSrc.getStatusText() ); return bSuccess; } // Rename is not an operation that can be selected by the user. // It will only be used to create backups. // Hence it will delete an existing destination without making a backup (of the old backup.) bool DirectoryMergeWindow::renameFLD( const QString& srcName, const QString& destName ) { if ( srcName == destName ) return true; if ( FileAccess(destName, true).exists() ) { bool bSuccess = deleteFLD( destName, false /*no backup*/ ); if (!bSuccess) { m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): " "Cannot delete existing destination." ,srcName,destName)); return false; } } m_pStatusInfo->addText(i18n("rename( %1 -> %2 )",srcName,destName)); if ( m_bSimulatedMergeStarted ) { return true; } bool bSuccess = FileAccess( srcName ).rename( destName ); if (!bSuccess) { m_pStatusInfo->addText( i18n("Error: Rename failed.") ); return false; } return true; } bool DirectoryMergeWindow::makeDir( const QString& name, bool bQuiet ) { FileAccess fi(name, true); if( fi.exists() && fi.isDir() ) return true; if( fi.exists() && !fi.isDir() ) { bool bSuccess = deleteFLD( name, true ); if (!bSuccess) { m_pStatusInfo->addText( i18n("Error during makeDir of %1. " "Cannot delete existing file." ,name)); return false; } } int pos=name.lastIndexOf('/'); if ( pos>0 ) { QString parentName = name.left(pos); bool bSuccess = makeDir(parentName,true); if (!bSuccess) return false; } if ( ! bQuiet ) m_pStatusInfo->addText(i18n("makeDir( %1 )",name)); if ( m_bSimulatedMergeStarted ) { return true; } bool bSuccess = FileAccess::makeDir( name ); if ( bSuccess == false ) { m_pStatusInfo->addText( i18n("Error while creating directory.") ); return false; } return true; } DirectoryMergeInfo::DirectoryMergeInfo( QWidget* pParent ) : QFrame(pParent) { QVBoxLayout *topLayout = new QVBoxLayout( this ); topLayout->setMargin(0); QGridLayout *grid = new QGridLayout(); topLayout->addLayout(grid); grid->setColumnStretch(1,10); int line=0; m_pA = new QLabel("A",this); grid->addWidget( m_pA,line, 0 ); m_pInfoA = new QLabel(this); grid->addWidget( m_pInfoA,line,1 ); ++line; m_pB = new QLabel("B",this); grid->addWidget( m_pB,line, 0 ); m_pInfoB = new QLabel(this); grid->addWidget( m_pInfoB,line,1 ); ++line; m_pC = new QLabel("C",this); grid->addWidget( m_pC,line, 0 ); m_pInfoC = new QLabel(this); grid->addWidget( m_pInfoC,line,1 ); ++line; m_pDest = new QLabel(i18n("Dest"),this); grid->addWidget( m_pDest,line, 0 ); m_pInfoDest = new QLabel(this); grid->addWidget( m_pInfoDest,line,1 ); ++line; m_pInfoList = new QTreeWidget(this); topLayout->addWidget( m_pInfoList ); m_pInfoList->setHeaderLabels( QStringList() << i18n("Dir") << i18n("Type") << i18n("Size") << i18n("Attr") << i18n("Last Modification") << i18n("Link-Destination") ); setMinimumSize( 100,100 ); m_pInfoList->installEventFilter(this); m_pInfoList->setRootIsDecorated( false ); } bool DirectoryMergeInfo::eventFilter(QObject*o, QEvent* e) { if ( e->type()==QEvent::FocusIn && o==m_pInfoList ) emit gotFocus(); return false; } static void addListViewItem( QTreeWidget* pListView, const QString& dir, const QString& basePath, FileAccess& fi ) { if ( basePath.isEmpty() ) { return; } else { if ( fi.exists() ) { QString dateString = fi.lastModified().toString("yyyy-MM-dd hh:mm:ss"); new QTreeWidgetItem( pListView, QStringList() << dir << QString( fi.isDir() ? i18n("Dir") : i18n("File") ) + (fi.isSymLink() ? "-Link" : "") << QString::number(fi.size()) << QString(fi.isReadable() ? "r" : " ") + (fi.isWritable()?"w" : " ") #ifdef _WIN32 /*Future: Use GetFileAttributes()*/ << #else + (fi.isExecutable()?"x" : " ") << #endif dateString << QString(fi.isSymLink() ? (" -> " + fi.readLink()) : QString("")) ); } else { new QTreeWidgetItem( pListView, QStringList() << dir << i18n("not available") << "" << "" << "" << "" ); } } } void DirectoryMergeInfo::setInfo( const FileAccess& dirA, const FileAccess& dirB, const FileAccess& dirC, const FileAccess& dirDest, MergeFileInfos& mfi ) { bool bHideDest = false; if ( dirA.absoluteFilePath()==dirDest.absoluteFilePath() ) { m_pA->setText( i18n("A (Dest): ") ); bHideDest=true; } else m_pA->setText( !dirC.isValid() ? QString("A: ") : i18n("A (Base): ")); m_pInfoA->setText( dirA.prettyAbsPath() ); if ( dirB.absoluteFilePath()==dirDest.absoluteFilePath() ) { m_pB->setText( i18n("B (Dest): ") ); bHideDest=true; } else m_pB->setText( "B: " ); m_pInfoB->setText( dirB.prettyAbsPath() ); if ( dirC.absoluteFilePath()==dirDest.absoluteFilePath() ) { m_pC->setText( i18n("C (Dest): ") ); bHideDest=true; } else m_pC->setText( "C: " ); m_pInfoC->setText( dirC.prettyAbsPath() ); m_pDest->setText( i18n("Dest: ") ); m_pInfoDest->setText( dirDest.prettyAbsPath() ); if (!dirC.isValid()) { m_pC->hide(); m_pInfoC->hide(); } else { m_pC->show(); m_pInfoC->show(); } if (!dirDest.isValid()||bHideDest) { m_pDest->hide(); m_pInfoDest->hide(); } else { m_pDest->show(); m_pInfoDest->show(); } m_pInfoList->clear(); addListViewItem( m_pInfoList, "A", dirA.prettyAbsPath(), mfi.m_fileInfoA ); addListViewItem( m_pInfoList, "B", dirB.prettyAbsPath(), mfi.m_fileInfoB ); addListViewItem( m_pInfoList, "C", dirC.prettyAbsPath(), mfi.m_fileInfoC ); if (!bHideDest) { FileAccess fiDest( dirDest.prettyAbsPath() + "/" + mfi.m_subPath, true ); addListViewItem( m_pInfoList, i18n("Dest"), dirDest.prettyAbsPath(), fiDest ); } for (int i=0;i<m_pInfoList->columnCount();++i) m_pInfoList->resizeColumnToContents ( i ); } QTextStream& operator<<( QTextStream& ts, MergeFileInfos& mfi ) { ts << "{\n"; ValueMap vm; vm.writeEntry( "SubPath", mfi.m_subPath ); vm.writeEntry( "ExistsInA", mfi.m_bExistsInA ); vm.writeEntry( "ExistsInB", mfi.m_bExistsInB ); vm.writeEntry( "ExistsInC", mfi.m_bExistsInC ); vm.writeEntry( "EqualAB", mfi.m_bEqualAB ); vm.writeEntry( "EqualAC", mfi.m_bEqualAC ); vm.writeEntry( "EqualBC", mfi.m_bEqualBC ); //DirMergeItem* m_pDMI; //MergeFileInfos* m_pParent; vm.writeEntry( "MergeOperation", (int) mfi.m_eMergeOperation ); vm.writeEntry( "DirA", mfi.m_bDirA ); vm.writeEntry( "DirB", mfi.m_bDirB ); vm.writeEntry( "DirC", mfi.m_bDirC ); vm.writeEntry( "LinkA", mfi.m_bLinkA ); vm.writeEntry( "LinkB", mfi.m_bLinkB ); vm.writeEntry( "LinkC", mfi.m_bLinkC ); vm.writeEntry( "OperationComplete", mfi.m_bOperationComplete ); //bool m_bSimOpComplete ); vm.writeEntry( "AgeA", (int) mfi.m_ageA ); vm.writeEntry( "AgeB", (int) mfi.m_ageB ); vm.writeEntry( "AgeC", (int) mfi.m_ageC ); vm.writeEntry( "ConflictingAges", mfi.m_bConflictingAges ); // Equal age but files are not! //FileAccess m_fileInfoA; //FileAccess m_fileInfoB; //FileAccess m_fileInfoC; //TotalDiffStatus m_totalDiffStatus; vm.save(ts); ts << "}\n"; return ts; } void DirectoryMergeWindow::slotSaveMergeState() { //slotStatusMsg(i18n("Saving Directory Merge State ...")); //QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); QString s = KFileDialog::getSaveFileName( QDir::currentPath(), 0, this, i18n("Save Directory Merge State As...") ); if(!s.isEmpty()) { m_dirMergeStateFilename = s; QFile file(m_dirMergeStateFilename); bool bSuccess = file.open( QIODevice::WriteOnly ); if ( bSuccess ) { QTextStream ts( &file ); QTreeWidgetItemIterator it( this ); while ( *it ) { DirMergeItem* item = static_cast<DirMergeItem*>(*it); MergeFileInfos* pMFI = item->m_pMFI; ts << *pMFI; ++it; } } } //slotStatusMsg(i18n("Ready.")); } void DirectoryMergeWindow::slotLoadMergeState() { } void DirectoryMergeWindow::updateFileVisibilities() { bool bShowIdentical = m_pDirShowIdenticalFiles->isChecked(); bool bShowDifferent = m_pDirShowDifferentFiles->isChecked(); bool bShowOnlyInA = m_pDirShowFilesOnlyInA->isChecked(); bool bShowOnlyInB = m_pDirShowFilesOnlyInB->isChecked(); bool bShowOnlyInC = m_pDirShowFilesOnlyInC->isChecked(); bool bThreeDirs = m_dirC.isValid(); m_pSelection1Item = 0; m_pSelection2Item = 0; m_pSelection3Item = 0; // in first run set all dirs to equal and determine if they are not equal. // on second run don't change the equal-status anymore; it is needed to // set the visibility (when bShowIdentical is false). for( int loop=0; loop<2; ++loop ) { QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0; while(p) { DirMergeItem* pDMI = static_cast<DirMergeItem*>(p); MergeFileInfos* pMFI = pDMI->m_pMFI; bool bDir = pMFI->m_bDirA || pMFI->m_bDirB || pMFI->m_bDirC; if ( loop==0 && bDir ) { bool bChange = false; if ( !pMFI->m_bEqualAB ){ pMFI->m_bEqualAB = true; bChange=true; } if ( !pMFI->m_bEqualBC ){ pMFI->m_bEqualBC = true; bChange=true; } if ( !pMFI->m_bEqualAC ){ pMFI->m_bEqualAC = true; bChange=true; } if ( bChange ) setPixmaps( *pMFI, bThreeDirs ); } bool bExistsEverywhere = pMFI->m_bExistsInA && pMFI->m_bExistsInB && (pMFI->m_bExistsInC || !bThreeDirs); int existCount = int(pMFI->m_bExistsInA) + int(pMFI->m_bExistsInB) + int(pMFI->m_bExistsInC); bool bVisible = ( bShowIdentical && bExistsEverywhere && pMFI->m_bEqualAB && (pMFI->m_bEqualAC || !bThreeDirs) ) || ( (bShowDifferent||bDir) && existCount>=2 && (!pMFI->m_bEqualAB || !(pMFI->m_bEqualAC || !bThreeDirs))) || ( bShowOnlyInA && pMFI->m_bExistsInA && !pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) || ( bShowOnlyInB && !pMFI->m_bExistsInA && pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) || ( bShowOnlyInC && !pMFI->m_bExistsInA && !pMFI->m_bExistsInB && pMFI->m_bExistsInC ); QString fileName = pMFI->m_subPath.section( '/', -1 ); bVisible = bVisible && ( (bDir && ! wildcardMultiMatch( m_pOptions->m_DmDirAntiPattern, fileName, m_bCaseSensitive )) || (wildcardMultiMatch( m_pOptions->m_DmFilePattern, fileName, m_bCaseSensitive ) && !wildcardMultiMatch( m_pOptions->m_DmFileAntiPattern, fileName, m_bCaseSensitive )) ); p->setHidden(!bVisible); bool bEqual = bThreeDirs ? pMFI->m_bEqualAB && pMFI->m_bEqualAC : pMFI->m_bEqualAB; if ( !bEqual && bVisible && loop==0 ) // Set all parents to "not equal" { MergeFileInfos* p2 = pMFI->m_pParent; while(p2!=0) { bool bChange = false; if ( !pMFI->m_bEqualAB && p2->m_bEqualAB ){ p2->m_bEqualAB = false; bChange=true; } if ( !pMFI->m_bEqualAC && p2->m_bEqualAC ){ p2->m_bEqualAC = false; bChange=true; } if ( !pMFI->m_bEqualBC && p2->m_bEqualBC ){ p2->m_bEqualBC = false; bChange=true; } if ( bChange ) setPixmaps( *p2, bThreeDirs ); else break; p2 = p2->m_pParent; } } p = treeIterator( p, true, true ); } } } void DirectoryMergeWindow::slotShowIdenticalFiles() { m_pOptions->m_bDmShowIdenticalFiles=m_pDirShowIdenticalFiles->isChecked(); updateFileVisibilities(); } void DirectoryMergeWindow::slotShowDifferentFiles() { updateFileVisibilities(); } void DirectoryMergeWindow::slotShowFilesOnlyInA() { updateFileVisibilities(); } void DirectoryMergeWindow::slotShowFilesOnlyInB() { updateFileVisibilities(); } void DirectoryMergeWindow::slotShowFilesOnlyInC() { updateFileVisibilities(); } void DirectoryMergeWindow::slotSynchronizeDirectories() { } void DirectoryMergeWindow::slotChooseNewerFiles() { } void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac ) { #include "xpm/startmerge.xpm" #include "xpm/showequalfiles.xpm" #include "xpm/showfilesonlyina.xpm" #include "xpm/showfilesonlyinb.xpm" #include "xpm/showfilesonlyinc.xpm" DirectoryMergeWindow* p = this; m_pDirStartOperation = KDiff3::createAction< KAction >(i18n("Start/Continue Directory Merge"), KShortcut( Qt::Key_F7 ), p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); m_pDirRunOperationForCurrentItem = KDiff3::createAction< KAction >(i18n("Run Operation for Current Item"), KShortcut( Qt::Key_F6 ), p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); m_pDirCompareCurrent = KDiff3::createAction< KAction >(i18n("Compare Selected File"), p, SLOT(compareCurrentFile()), ac, "dir_compare_current"); m_pDirMergeCurrent = KDiff3::createAction< KAction >(i18n("Merge Current File"), QIcon(QPixmap(startmerge)), i18n("Merge\nFile"), pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current"); m_pDirFoldAll = KDiff3::createAction< KAction >(i18n("Fold All Subdirs"), p, SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); m_pDirUnfoldAll = KDiff3::createAction< KAction >(i18n("Unfold All Subdirs"), p, SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); m_pDirRescan = KDiff3::createAction< KAction >(i18n("Rescan"), KShortcut( Qt::SHIFT+Qt::Key_F5 ), p, SLOT(reload()), ac, "dir_rescan"); m_pDirSaveMergeState = 0; //KDiff3::createAction< KAction >(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); m_pDirLoadMergeState = 0; //KDiff3::createAction< KAction >(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); m_pDirChooseAEverywhere = KDiff3::createAction< KAction >(i18n("Choose A for All Items"), p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); m_pDirChooseBEverywhere = KDiff3::createAction< KAction >(i18n("Choose B for All Items"), p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); m_pDirChooseCEverywhere = KDiff3::createAction< KAction >(i18n("Choose C for All Items"), p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); m_pDirAutoChoiceEverywhere = KDiff3::createAction< KAction >(i18n("Auto-Choose Operation for All Items"), p, SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); m_pDirDoNothingEverywhere = KDiff3::createAction< KAction >(i18n("No Operation for All Items"), p, SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); // m_pDirSynchronizeDirectories = KDiff3::createAction< KToggleAction >(i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); // m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); m_pDirShowIdenticalFiles = KDiff3::createAction< KToggleAction >(i18n("Show Identical Files"), QIcon(QPixmap(showequalfiles)), i18n("Identical\nFiles"), this, SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); m_pDirShowDifferentFiles = KDiff3::createAction< KToggleAction >(i18n("Show Different Files"), this, SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); m_pDirShowFilesOnlyInA = KDiff3::createAction< KToggleAction >(i18n("Show Files only in A"), QIcon(QPixmap(showfilesonlyina)), i18n("Files\nonly in A"), this, SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); m_pDirShowFilesOnlyInB = KDiff3::createAction< KToggleAction >(i18n("Show Files only in B"), QIcon(QPixmap(showfilesonlyinb)), i18n("Files\nonly in B"), this, SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); m_pDirShowFilesOnlyInC = KDiff3::createAction< KToggleAction >(i18n("Show Files only in C"), QIcon(QPixmap(showfilesonlyinc)), i18n("Files\nonly in C"), this, SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles ); m_pDirCompareExplicit = KDiff3::createAction< KAction >(i18n("Compare Explicitly Selected Files"), p, SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); m_pDirMergeExplicit = KDiff3::createAction< KAction >(i18n("Merge Explicitly Selected Files"), p, SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); m_pDirCurrentDoNothing = KDiff3::createAction< KAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); m_pDirCurrentChooseA = KDiff3::createAction< KAction >(i18n("A"), p, SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); m_pDirCurrentChooseB = KDiff3::createAction< KAction >(i18n("B"), p, SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); m_pDirCurrentChooseC = KDiff3::createAction< KAction >(i18n("C"), p, SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); m_pDirCurrentMerge = KDiff3::createAction< KAction >(i18n("Merge"), p, SLOT(slotCurrentMerge()), ac, "dir_current_merge"); m_pDirCurrentDelete = KDiff3::createAction< KAction >(i18n("Delete (if exists)"), p, SLOT(slotCurrentDelete()), ac, "dir_current_delete"); m_pDirCurrentSyncDoNothing = KDiff3::createAction< KAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); m_pDirCurrentSyncCopyAToB = KDiff3::createAction< KAction >(i18n("Copy A to B"), p, SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); m_pDirCurrentSyncCopyBToA = KDiff3::createAction< KAction >(i18n("Copy B to A"), p, SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); m_pDirCurrentSyncDeleteA = KDiff3::createAction< KAction >(i18n("Delete A"), p, SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); m_pDirCurrentSyncDeleteB = KDiff3::createAction< KAction >(i18n("Delete B"), p, SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); m_pDirCurrentSyncDeleteAAndB = KDiff3::createAction< KAction >(i18n("Delete A && B"), p, SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); m_pDirCurrentSyncMergeToA = KDiff3::createAction< KAction >(i18n("Merge to A"), p, SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); m_pDirCurrentSyncMergeToB = KDiff3::createAction< KAction >(i18n("Merge to B"), p, SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); m_pDirCurrentSyncMergeToAAndB = KDiff3::createAction< KAction >(i18n("Merge to A && B"), p, SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); } void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible, KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC ) { m_pDirStartOperation->setEnabled( bDirCompare ); m_pDirRunOperationForCurrentItem->setEnabled( bDirCompare ); m_pDirFoldAll->setEnabled( bDirCompare ); m_pDirUnfoldAll->setEnabled( bDirCompare ); m_pDirCompareCurrent->setEnabled( bDirCompare && isVisible() && isFileSelected() ); m_pDirMergeCurrent->setEnabled( (bDirCompare && isVisible() && isFileSelected()) || bDiffWindowVisible ); m_pDirRescan->setEnabled( bDirCompare ); m_pDirAutoChoiceEverywhere->setEnabled( bDirCompare && isVisible() ); m_pDirDoNothingEverywhere->setEnabled( bDirCompare && isVisible() ); m_pDirChooseAEverywhere->setEnabled( bDirCompare && isVisible() ); m_pDirChooseBEverywhere->setEnabled( bDirCompare && isVisible() ); m_pDirChooseCEverywhere->setEnabled( bDirCompare && isVisible() ); bool bThreeDirs = m_dirC.isValid(); QTreeWidgetItem* lvi = currentItem(); DirMergeItem* pDMI = lvi==0 ? 0 : static_cast<DirMergeItem*>(lvi); MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI; bool bItemActive = bDirCompare && isVisible() && pMFI!=0;// && hasFocus(); bool bMergeMode = bThreeDirs || !m_bSyncMode; bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI); bool bDirWindowHasFocus = isVisible() && hasFocus(); m_pDirShowIdenticalFiles->setEnabled( bDirCompare && isVisible() ); m_pDirShowDifferentFiles->setEnabled( bDirCompare && isVisible() ); m_pDirShowFilesOnlyInA->setEnabled( bDirCompare && isVisible() ); m_pDirShowFilesOnlyInB->setEnabled( bDirCompare && isVisible() ); m_pDirShowFilesOnlyInC->setEnabled( bDirCompare && isVisible() && bThreeDirs ); m_pDirCompareExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=0 ); m_pDirMergeExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=0 ); m_pDirCurrentDoNothing->setEnabled( bItemActive && bMergeMode ); m_pDirCurrentChooseA->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInA ); m_pDirCurrentChooseB->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInB ); m_pDirCurrentChooseC->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInC ); m_pDirCurrentMerge->setEnabled( bItemActive && bMergeMode && !bFTConflict ); m_pDirCurrentDelete->setEnabled( bItemActive && bMergeMode ); if ( bDirWindowHasFocus ) { chooseA->setEnabled( bItemActive && pMFI->m_bExistsInA ); chooseB->setEnabled( bItemActive && pMFI->m_bExistsInB ); chooseC->setEnabled( bItemActive && pMFI->m_bExistsInC ); chooseA->setChecked( false ); chooseB->setChecked( false ); chooseC->setChecked( false ); } m_pDirCurrentSyncDoNothing->setEnabled( bItemActive && !bMergeMode ); m_pDirCurrentSyncCopyAToB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA ); m_pDirCurrentSyncCopyBToA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB ); m_pDirCurrentSyncDeleteA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA ); m_pDirCurrentSyncDeleteB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB ); m_pDirCurrentSyncDeleteAAndB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB && pMFI->m_bExistsInB ); m_pDirCurrentSyncMergeToA->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); m_pDirCurrentSyncMergeToB->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); m_pDirCurrentSyncMergeToAAndB->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); } //#include "directorymergewindow.moc"