joachim99@8: /*************************************************************************** joachim99@8: directorymergewindow.cpp joachim99@58: ----------------- joachim99@8: begin : Sat Oct 19 2002 joachim99@58: copyright : (C) 2002-2004 by Joachim Eibl joachim99@8: email : joachim.eibl@gmx.de joachim99@8: ***************************************************************************/ joachim99@8: joachim99@8: /*************************************************************************** joachim99@8: * * joachim99@8: * This program is free software; you can redistribute it and/or modify * joachim99@8: * it under the terms of the GNU General Public License as published by * joachim99@8: * the Free Software Foundation; either version 2 of the License, or * joachim99@8: * (at your option) any later version. * joachim99@8: * * joachim99@8: ***************************************************************************/ joachim99@8: joachim99@8: #include "directorymergewindow.h" joachim99@8: #include "optiondialog.h" joachim99@8: #include joachim99@8: #include joachim99@8: joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@51: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: joachim99@51: static bool conflictingFileTypes(MergeFileInfos& mfi); joachim99@8: joachim99@8: class StatusInfo : public QListView joachim99@8: { joachim99@8: public: joachim99@8: StatusInfo(QWidget* pParent) : QListView( pParent ) joachim99@8: { joachim99@8: addColumn(""); joachim99@8: setSorting(-1); //disable sorting joachim99@8: } joachim99@8: joachim99@8: QListViewItem* m_pLast; joachim99@8: QListViewItem* last() joachim99@8: { joachim99@8: if (firstChild()==0) return 0; joachim99@8: else return m_pLast; joachim99@8: } joachim99@8: joachim99@8: void addText(const QString& s ) joachim99@8: { joachim99@8: if (firstChild()==0) m_pLast = new QListViewItem( this, s ); joachim99@8: else m_pLast = new QListViewItem( this, last(), s ); joachim99@8: } joachim99@8: }; joachim99@8: joachim99@8: joachim99@8: class TempRemover joachim99@8: { joachim99@8: public: joachim99@8: TempRemover( const QString& origName, FileAccess& fa ); joachim99@8: ~TempRemover(); joachim99@8: QString name() { return m_name; } joachim99@8: bool success() { return m_bSuccess; } joachim99@8: private: joachim99@8: QString m_name; joachim99@8: bool m_bTemp; joachim99@8: bool m_bSuccess; joachim99@8: }; joachim99@8: TempRemover::TempRemover(const QString& origName, FileAccess& fa) joachim99@8: { joachim99@8: if ( fa.isLocal() ) joachim99@8: { joachim99@8: m_name = origName; joachim99@8: m_bTemp = false; joachim99@8: m_bSuccess = true; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: m_name = FileAccess::tempFileName(); joachim99@8: m_bSuccess = fa.copyFile( m_name ); joachim99@8: m_bTemp = m_bSuccess; joachim99@8: } joachim99@8: } joachim99@8: TempRemover::~TempRemover() joachim99@8: { joachim99@8: if ( m_bTemp && ! m_name.isEmpty() ) joachim99@8: FileAccess::removeFile(m_name); joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::fastFileComparison( joachim99@8: FileAccess& fi1, FileAccess& fi2, joachim99@8: bool& bEqual, bool& bError, QString& status ) joachim99@8: { joachim99@8: status = ""; joachim99@8: bEqual = false; joachim99@8: bError = true; joachim99@8: joachim99@8: if ( !m_bFollowFileLinks ) joachim99@8: { joachim99@8: if ( fi1.isSymLink() != fi2.isSymLink() ) joachim99@8: { joachim99@51: status = i18n("Mix of links and normal files."); joachim99@8: return; joachim99@8: } joachim99@8: else if ( fi1.isSymLink() && fi2.isSymLink() ) joachim99@8: { joachim99@8: bError = false; joachim99@8: bEqual = fi1.readLink() == fi2.readLink(); joachim99@51: status = i18n("Link: "); joachim99@8: return; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: if ( fi1.size()!=fi2.size() ) joachim99@8: { joachim99@8: bEqual = false; joachim99@51: status = i18n("Size. "); joachim99@51: return; joachim99@51: } joachim99@51: else if ( m_pOptions->m_bDmTrustSize ) joachim99@51: { joachim99@51: bEqual = true; joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: if ( m_pOptions->m_bDmTrustDate ) joachim99@8: { joachim99@8: bEqual = ( fi1.lastModified() == fi2.lastModified() && fi1.size()==fi2.size() ); joachim99@8: bError = false; joachim99@51: status = i18n("Date & Size: "); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: QString fileName1 = fi1.absFilePath(); joachim99@8: QString fileName2 = fi2.absFilePath(); joachim99@8: TempRemover tr1( fileName1, fi1 ); joachim99@8: if ( !tr1.success() ) joachim99@8: { joachim99@51: status = i18n("Creating temp copy of %1 failed.").arg(fileName1); joachim99@8: return; joachim99@8: } joachim99@8: TempRemover tr2( fileName2, fi2 ); joachim99@8: if ( !tr2.success() ) joachim99@8: { joachim99@51: status = i18n("Creating temp copy of %1 failed.").arg(fileName2); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: std::vector buf1(100000); joachim99@8: std::vector buf2(buf1.size()); joachim99@8: joachim99@8: QFile file1( tr1.name() ); joachim99@8: joachim99@8: if ( ! file1.open(IO_ReadOnly) ) joachim99@8: { joachim99@51: status = i18n("Opening %1 failed.").arg(fileName1); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: QFile file2( tr2.name() ); joachim99@8: joachim99@8: if ( ! file2.open(IO_ReadOnly) ) joachim99@8: { joachim99@51: status = i18n("Opening %1 failed.").arg(fileName2); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: #if QT_VERSION==230 joachim99@8: typedef int t_FileSize; joachim99@8: #else joachim99@8: typedef QFile::Offset t_FileSize; joachim99@8: #endif joachim99@8: t_FileSize size = file1.size(); joachim99@8: joachim99@8: while( size>0 ) joachim99@8: { joachim99@8: int len = min2( size, (t_FileSize)buf1.size() ); joachim99@8: if( len != file1.readBlock( &buf1[0], len ) ) joachim99@8: { joachim99@51: status = i18n("Error reading from %1").arg(fileName1); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: if( len != file2.readBlock( &buf2[0], len ) ) joachim99@8: { joachim99@51: status = i18n("Error reading from %1").arg(fileName2); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: if ( memcmp( &buf1[0], &buf2[0], len ) != 0 ) joachim99@8: { joachim99@8: bError = false; joachim99@8: return; joachim99@8: } joachim99@8: size-=len; joachim99@8: } joachim99@8: joachim99@8: // If the program really arrives here, then the files are really equal. joachim99@8: bError = false; joachim99@8: bEqual = true; joachim99@8: } joachim99@8: joachim99@8: joachim99@8: joachim99@8: joachim99@8: joachim99@8: static int s_nameCol = 0; joachim99@8: static int s_ACol = 1; joachim99@8: static int s_BCol = 2; joachim99@8: static int s_CCol = 3; joachim99@8: static int s_OpCol = 4; joachim99@8: static int s_OpStatusCol = 5; joachim99@8: DirectoryMergeWindow::DirectoryMergeWindow( QWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader ) joachim99@8: : QListView( pParent ) joachim99@8: { joachim99@8: connect( this, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(onDoubleClick(QListViewItem*))); joachim99@8: connect( this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(onDoubleClick(QListViewItem*))); joachim99@8: connect( this, SIGNAL( pressed(QListViewItem*,const QPoint&, int)), joachim99@8: this, SLOT( onClick(QListViewItem*,const QPoint&, int)) ); joachim99@8: connect( this, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(onSelectionChanged(QListViewItem*))); joachim99@8: m_pOptions = pOptions; joachim99@8: m_pIconLoader = pIconLoader; joachim99@8: m_pDirectoryMergeInfo = 0; joachim99@8: m_bAllowResizeEvents = true; joachim99@8: m_bSimulatedMergeStarted=false; joachim99@8: m_bRealMergeStarted=false; joachim99@8: m_bError = false; joachim99@8: m_bSyncMode = false; joachim99@8: m_pStatusInfo = new StatusInfo(0); joachim99@8: m_pStatusInfo->hide(); joachim99@8: joachim99@51: addColumn(i18n("Name")); joachim99@8: addColumn("A"); joachim99@8: addColumn("B"); joachim99@8: addColumn("C"); joachim99@51: addColumn(i18n("Operation")); joachim99@51: addColumn(i18n("Status")); joachim99@8: } joachim99@8: joachim99@8: DirectoryMergeWindow::~DirectoryMergeWindow() joachim99@8: { joachim99@8: } joachim99@8: joachim99@8: joachim99@8: int DirectoryMergeWindow::totalColumnWidth() joachim99@8: { joachim99@8: int w=0; joachim99@8: for (int i=0; i(img1.scanLine(y)); joachim99@8: Q_UINT32 *line2 = reinterpret_cast(img2.scanLine(y)); joachim99@8: for (int x = 0; x < img1.width(); x++) joachim99@8: { joachim99@8: if ( qAlpha( line2[x] ) >0 ) joachim99@8: line1[x] = (line2[x] | 0xff000000); joachim99@8: } joachim99@8: } joachim99@8: QPixmap pix; joachim99@8: pix.convertFromImage(img1); joachim99@8: return pix; joachim99@8: } joachim99@8: joachim99@8: // like pixCombiner but let the pm1 color shine through joachim99@8: static QPixmap pixCombiner2( const QPixmap& pm1, const QPixmap& pm2 ) joachim99@8: { joachim99@8: QImage img1 = pm1.convertToImage().convertDepth(32); joachim99@8: QImage img2 = pm2.convertToImage().convertDepth(32); joachim99@8: joachim99@8: for (int y = 0; y < img1.height(); y++) joachim99@8: { joachim99@8: Q_UINT32 *line1 = reinterpret_cast(img1.scanLine(y)); joachim99@8: Q_UINT32 *line2 = reinterpret_cast(img2.scanLine(y)); joachim99@8: for (int x = 0; x < img1.width(); x++) joachim99@8: { joachim99@8: if ( qAlpha( line2[x] ) >0 ) joachim99@8: { joachim99@8: int r = ( qRed( line1[x] ) + qRed( line2[x] ))/2; joachim99@8: int g = ( qGreen( line1[x] ) + qGreen( line2[x] ))/2; joachim99@8: int b = ( qBlue( line1[x] ) + qBlue( line2[x] ))/2; joachim99@8: line1[x] = qRgba( r,g,b, 0xff ); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: QPixmap pix; joachim99@8: pix.convertFromImage(img1); joachim99@8: return pix; joachim99@8: } joachim99@8: joachim99@8: static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles, joachim99@8: int& nofDirs, int& nofEqualFiles, int& nofManualMerges ) joachim99@8: { joachim99@8: if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC ) joachim99@8: { joachim99@8: ++nofDirs; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: ++nofFiles; joachim99@8: if ( i->m_pMFI->m_bEqualAB && (!bThreeDirs || i->m_pMFI->m_bEqualAC )) joachim99@8: { joachim99@8: ++nofEqualFiles; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( i->m_pMFI->m_eMergeOperation==eMergeABCToDest || i->m_pMFI->m_eMergeOperation==eMergeABToDest ) joachim99@8: ++nofManualMerges; joachim99@8: } joachim99@8: } joachim99@8: for( QListViewItem* p = i->firstChild(); p!=0; p = p->nextSibling() ) joachim99@8: calcDirStatus( bThreeDirs, static_cast(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); joachim99@8: } joachim99@8: joachim99@58: static QString sortString(const QString& s) joachim99@58: { joachim99@58: #ifdef _WIN32 joachim99@58: return s.upper(); joachim99@58: #else joachim99@58: return s; joachim99@58: #endif joachim99@58: } joachim99@58: joachim99@8: bool DirectoryMergeWindow::init joachim99@8: ( joachim99@8: FileAccess& dirA, joachim99@8: FileAccess& dirB, joachim99@8: FileAccess& dirC, joachim99@8: FileAccess& dirDest, joachim99@8: bool bDirectoryMerge joachim99@8: ) joachim99@8: { joachim99@8: m_bFollowDirLinks = m_pOptions->m_bDmFollowDirLinks; joachim99@8: m_bFollowFileLinks = m_pOptions->m_bDmFollowFileLinks; joachim99@8: m_bSimulatedMergeStarted=false; joachim99@8: m_bRealMergeStarted=false; joachim99@8: m_bError=false; joachim99@8: m_bDirectoryMerge = bDirectoryMerge; joachim99@8: joachim99@8: clear(); joachim99@8: joachim99@53: m_mergeItemList.clear(); joachim99@51: m_currentItemForOperation = m_mergeItemList.end(); joachim99@8: joachim99@8: m_dirA = dirA; joachim99@8: m_dirB = dirB; joachim99@8: m_dirC = dirC; joachim99@8: m_dirDest = dirDest; joachim99@8: joachim99@8: // Check if all input directories exist and are valid. The dest dir is not tested now. joachim99@8: // The test will happen only when we are going to write to it. joachim99@8: if ( !m_dirA.isDir() || !m_dirB.isDir() || joachim99@8: (m_dirC.isValid() && !m_dirC.isDir()) ) joachim99@8: { joachim99@8: QString text( i18n("Opening of directories failed:") ); joachim99@8: text += "\n\n"; joachim99@8: if ( !dirA.isDir() ) joachim99@51: { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").arg(m_dirA.prettyAbsPath()); } joachim99@8: joachim99@8: if ( !dirB.isDir() ) joachim99@51: { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").arg(m_dirB.prettyAbsPath()); } joachim99@8: joachim99@8: if ( m_dirC.isValid() && !m_dirC.isDir() ) joachim99@51: { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").arg(m_dirC.prettyAbsPath()); } joachim99@8: joachim99@51: KMessageBox::sorry( this, text, i18n("Directory Open Error") ); joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: if ( m_dirC.isValid() && joachim99@8: (m_dirDest.prettyAbsPath() == m_dirA.prettyAbsPath() || m_dirDest.prettyAbsPath()==m_dirB.prettyAbsPath() ) ) joachim99@8: { joachim99@8: KMessageBox::error(this, joachim99@53: i18n( "The destination directory must not be the same as A or B when " joachim99@8: "three directories are merged.\nCheck again before continuing."), joachim99@51: i18n("Parameter Warning")); joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: m_bSyncMode = m_pOptions->m_bDmSyncMode && !m_dirC.isValid() && !m_dirDest.isValid(); joachim99@8: joachim99@8: if ( m_dirDest.isValid() ) joachim99@8: m_dirDestInternal = m_dirDest; joachim99@8: else joachim99@8: m_dirDestInternal = m_dirC.isValid() ? m_dirC : m_dirB; joachim99@8: joachim99@8: QString origCurrentDirectory = QDir::currentDirPath(); joachim99@8: joachim99@8: g_pProgressDialog->start(); joachim99@8: joachim99@8: m_fileMergeMap.clear(); joachim99@8: t_DirectoryList::iterator i; joachim99@8: joachim99@8: // calc how many directories will be read: joachim99@8: double nofScans = ( m_dirA.isValid() ? 1 : 0 )+( m_dirB.isValid() ? 1 : 0 )+( m_dirC.isValid() ? 1 : 0 ); joachim99@8: int currentScan = 0; joachim99@8: joachim99@8: bool bListDirSuccessA = true; joachim99@8: bool bListDirSuccessB = true; joachim99@8: bool bListDirSuccessC = true; joachim99@8: if ( m_dirA.isValid() ) joachim99@8: { joachim99@51: g_pProgressDialog->setInformation(i18n("Reading Directory A")); joachim99@8: g_pProgressDialog->setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); joachim99@8: ++currentScan; joachim99@8: joachim99@8: t_DirectoryList dirListA; joachim99@8: bListDirSuccessA = m_dirA.listDir( &dirListA, joachim99@8: m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, joachim99@8: m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, joachim99@8: m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, joachim99@8: m_pOptions->m_bDmUseCvsIgnore); joachim99@8: joachim99@8: for (i=dirListA.begin(); i!=dirListA.end();++i ) joachim99@8: { joachim99@58: MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath())]; joachim99@8: //std::cout <filePath()<setInformation(i18n("Reading Directory B")); joachim99@8: g_pProgressDialog->setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); joachim99@8: ++currentScan; joachim99@8: joachim99@8: t_DirectoryList dirListB; joachim99@8: bListDirSuccessB = m_dirB.listDir( &dirListB, joachim99@8: m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, joachim99@8: m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, joachim99@8: m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, joachim99@8: m_pOptions->m_bDmUseCvsIgnore); joachim99@8: joachim99@8: for (i=dirListB.begin(); i!=dirListB.end();++i ) joachim99@8: { joachim99@58: MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath())]; joachim99@8: mfi.m_bExistsInB = true; joachim99@8: mfi.m_fileInfoB = *i; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: e_MergeOperation eDefaultMergeOp; joachim99@8: if ( m_dirC.isValid() ) joachim99@8: { joachim99@51: g_pProgressDialog->setInformation(i18n("Reading Directory C")); joachim99@8: g_pProgressDialog->setSubRangeTransformation(currentScan/nofScans, (currentScan+1)/nofScans); joachim99@8: ++currentScan; joachim99@8: joachim99@8: t_DirectoryList dirListC; joachim99@8: bListDirSuccessC = m_dirC.listDir( &dirListC, joachim99@8: m_pOptions->m_bDmRecursiveDirs, m_pOptions->m_bDmFindHidden, joachim99@8: m_pOptions->m_DmFilePattern, m_pOptions->m_DmFileAntiPattern, joachim99@8: m_pOptions->m_DmDirAntiPattern, m_pOptions->m_bDmFollowDirLinks, joachim99@8: m_pOptions->m_bDmUseCvsIgnore); joachim99@8: joachim99@8: for (i=dirListC.begin(); i!=dirListC.end();++i ) joachim99@8: { joachim99@58: MergeFileInfos& mfi = m_fileMergeMap[sortString(i->filePath())]; joachim99@8: mfi.m_bExistsInC = true; joachim99@8: mfi.m_fileInfoC = *i; joachim99@8: } joachim99@8: joachim99@8: eDefaultMergeOp = eMergeABCToDest; joachim99@8: } joachim99@8: else joachim99@8: eDefaultMergeOp = m_bSyncMode ? eMergeToAB : eMergeABToDest; joachim99@8: joachim99@8: bool bContinue = true; joachim99@8: if ( !bListDirSuccessA || !bListDirSuccessB || !bListDirSuccessC ) joachim99@8: { joachim99@8: QString s = i18n("Some subdirectories were not readable in"); joachim99@8: if ( !bListDirSuccessA ) s += "\nA: " + m_dirA.prettyAbsPath(); joachim99@8: if ( !bListDirSuccessB ) s += "\nB: " + m_dirB.prettyAbsPath(); joachim99@8: if ( !bListDirSuccessC ) s += "\nC: " + m_dirC.prettyAbsPath(); joachim99@8: s+="\n"; joachim99@8: s+= i18n("Check the permissions of the subdirectories."); joachim99@8: bContinue = KMessageBox::Continue == KMessageBox::warningContinueCancel( this, s ); joachim99@8: } joachim99@8: joachim99@8: if ( bContinue ) joachim99@8: { joachim99@8: prepareListView(); joachim99@8: g_pProgressDialog->hide(); joachim99@8: joachim99@8: for( QListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) joachim99@8: { joachim99@8: DirMergeItem* pDMI = static_cast( p ); joachim99@8: calcSuggestedOperation( *pDMI->m_pMFI, eDefaultMergeOp ); joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: g_pProgressDialog->hide(); joachim99@8: setSelected( 0, true ); joachim99@8: } joachim99@8: joachim99@8: QDir::setCurrent(origCurrentDirectory); joachim99@8: joachim99@8: // Try to improve the view a little bit. joachim99@8: QWidget* pParent = parentWidget(); joachim99@8: QSplitter* pSplitter = static_cast(pParent); joachim99@8: if (pSplitter!=0) joachim99@8: { joachim99@8: QValueList sizes = pSplitter->sizes(); joachim99@8: int total = sizes[0] + sizes[1]; joachim99@8: sizes[0]=total*6/10; joachim99@8: sizes[1]=total - sizes[0]; joachim99@8: pSplitter->setSizes( sizes ); joachim99@8: } joachim99@8: joachim99@8: if ( bContinue ) joachim99@8: { joachim99@8: // Generate a status report joachim99@8: int nofFiles=0; joachim99@8: int nofDirs=0; joachim99@8: int nofEqualFiles=0; joachim99@8: int nofManualMerges=0; joachim99@8: for( QListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) joachim99@8: calcDirStatus( m_dirC.isValid(), static_cast(p), joachim99@8: nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); joachim99@8: joachim99@8: QString s; joachim99@51: s = i18n("Directory Comparison Status") + "\n\n" + joachim99@8: i18n("Number of subdirectories:") +" "+ QString::number(nofDirs) + "\n"+ joachim99@8: i18n("Number of equal files:") +" "+ QString::number(nofEqualFiles) + "\n"+ joachim99@8: i18n("Number of different files:") +" "+ QString::number(nofFiles-nofEqualFiles); joachim99@8: joachim99@8: if ( m_dirC.isValid() ) joachim99@8: s += "\n" + i18n("Number of manual merges:") +" "+ QString::number(nofManualMerges); joachim99@8: KMessageBox::information( this, s ); joachim99@8: setSelected( firstChild(), true ); joachim99@8: } joachim99@8: joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: joachim99@8: joachim99@8: void DirectoryMergeWindow::slotChooseAEverywhere(){ setAllMergeOperations( eCopyAToDest ); } joachim99@8: joachim99@8: void DirectoryMergeWindow::slotChooseBEverywhere(){ setAllMergeOperations( eCopyBToDest ); } joachim99@8: joachim99@8: void DirectoryMergeWindow::slotChooseCEverywhere(){ setAllMergeOperations( eCopyCToDest ); } joachim99@8: joachim99@8: void DirectoryMergeWindow::slotAutoChooseEverywhere() joachim99@8: { joachim99@8: e_MergeOperation eDefaultMergeOp = m_dirC.isValid() ? eMergeABCToDest : joachim99@8: m_bSyncMode ? eMergeToAB : eMergeABToDest; joachim99@8: setAllMergeOperations(eDefaultMergeOp ); joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::slotNoOpEverywhere(){ setAllMergeOperations(eNoOperation); } joachim99@8: joachim99@8: static void setListViewItemOpen( QListViewItem* p, bool bOpen ) joachim99@8: { joachim99@8: for( QListViewItem* pChild = p->firstChild(); pChild!=0; pChild = pChild->nextSibling() ) joachim99@8: setListViewItemOpen( pChild, bOpen ); joachim99@8: joachim99@8: p->setOpen( bOpen ); joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::slotFoldAllSubdirs() joachim99@8: { joachim99@8: for( QListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) joachim99@8: setListViewItemOpen( p, false ); joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::slotUnfoldAllSubdirs() joachim99@8: { joachim99@8: for( QListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) joachim99@8: setListViewItemOpen( p, true ); joachim99@8: } joachim99@8: joachim99@51: static void setMergeOperation( QListViewItem* pLVI, e_MergeOperation eMergeOp ) joachim99@51: { joachim99@51: if ( pLVI==0 ) return; joachim99@51: joachim99@51: DirMergeItem* pDMI = static_cast(pLVI); joachim99@51: MergeFileInfos& mfi = *pDMI->m_pMFI; joachim99@51: joachim99@51: mfi.setMergeOperation(eMergeOp ); joachim99@51: } joachim99@51: joachim99@51: // Merge current item (merge mode) joachim99@51: void DirectoryMergeWindow::slotCurrentDoNothing() { setMergeOperation(currentItem(), eNoOperation ); } joachim99@53: void DirectoryMergeWindow::slotCurrentChooseA() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyAToB : eCopyAToDest ); } joachim99@53: void DirectoryMergeWindow::slotCurrentChooseB() { setMergeOperation(currentItem(), m_bSyncMode ? eCopyBToA : eCopyBToDest ); } joachim99@51: void DirectoryMergeWindow::slotCurrentChooseC() { setMergeOperation(currentItem(), eCopyCToDest ); } joachim99@51: void DirectoryMergeWindow::slotCurrentMerge() joachim99@51: { joachim99@51: bool bThreeDirs = m_dirC.isValid(); joachim99@51: setMergeOperation(currentItem(), bThreeDirs ? eMergeABCToDest : eMergeABToDest ); joachim99@51: } joachim99@51: void DirectoryMergeWindow::slotCurrentDelete() { setMergeOperation(currentItem(), eDeleteFromDest ); } joachim99@51: // Sync current item joachim99@51: void DirectoryMergeWindow::slotCurrentCopyAToB() { setMergeOperation(currentItem(), eCopyAToB ); } joachim99@51: void DirectoryMergeWindow::slotCurrentCopyBToA() { setMergeOperation(currentItem(), eCopyBToA ); } joachim99@51: void DirectoryMergeWindow::slotCurrentDeleteA() { setMergeOperation(currentItem(), eDeleteA ); } joachim99@51: void DirectoryMergeWindow::slotCurrentDeleteB() { setMergeOperation(currentItem(), eDeleteB ); } joachim99@51: void DirectoryMergeWindow::slotCurrentDeleteAAndB() { setMergeOperation(currentItem(), eDeleteAB ); } joachim99@51: void DirectoryMergeWindow::slotCurrentMergeToA() { setMergeOperation(currentItem(), eMergeToA ); } joachim99@51: void DirectoryMergeWindow::slotCurrentMergeToB() { setMergeOperation(currentItem(), eMergeToB ); } joachim99@51: void DirectoryMergeWindow::slotCurrentMergeToAAndB() { setMergeOperation(currentItem(), eMergeToAB ); } joachim99@51: joachim99@51: joachim99@51: void DirectoryMergeWindow::keyPressEvent( QKeyEvent* e ) joachim99@51: { joachim99@51: if ( (e->state() & Qt::ControlButton)!=0 ) joachim99@51: { joachim99@51: bool bThreeDirs = m_dirC.isValid(); joachim99@51: joachim99@51: QListViewItem* lvi = currentItem(); joachim99@51: DirMergeItem* pDMI = lvi==0 ? 0 : static_cast(lvi); joachim99@51: MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI; joachim99@51: joachim99@51: if ( pMFI==0 ) return; joachim99@51: bool bMergeMode = bThreeDirs || !m_bSyncMode; joachim99@51: bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI); joachim99@51: joachim99@51: if ( bMergeMode ) joachim99@51: { joachim99@51: switch(e->key()) joachim99@51: { joachim99@51: case Key_1: if(pMFI->m_bExistsInA){ slotCurrentChooseA(); } return; joachim99@51: case Key_2: if(pMFI->m_bExistsInB){ slotCurrentChooseB(); } return; joachim99@51: case Key_3: if(pMFI->m_bExistsInC){ slotCurrentChooseC(); } return; joachim99@51: case Key_Space: slotCurrentDoNothing(); return; joachim99@51: case Key_4: if ( !bFTConflict ) { slotCurrentMerge(); } return; joachim99@51: case Key_Delete: slotCurrentDelete(); return; joachim99@51: default: break; joachim99@51: } joachim99@51: } joachim99@51: else joachim99@51: { joachim99@51: switch(e->key()) joachim99@51: { joachim99@51: case Key_1: if(pMFI->m_bExistsInA){ slotCurrentCopyAToB(); } return; joachim99@51: case Key_2: if(pMFI->m_bExistsInB){ slotCurrentCopyBToA(); } return; joachim99@51: case Key_Space: slotCurrentDoNothing(); return; joachim99@51: case Key_4: if ( !bFTConflict ) { slotCurrentMergeToAAndB(); } return; joachim99@51: case Key_Delete: if( pMFI->m_bExistsInA && pMFI->m_bExistsInB ) slotCurrentDeleteAAndB(); joachim99@51: else if( pMFI->m_bExistsInA ) slotCurrentDeleteA(); joachim99@51: else if( pMFI->m_bExistsInB ) slotCurrentDeleteB(); joachim99@51: return; joachim99@51: default: break; joachim99@51: } joachim99@51: } joachim99@51: } joachim99@51: joachim99@51: QListView::keyPressEvent(e); joachim99@51: } joachim99@51: joachim99@53: void DirectoryMergeWindow::focusInEvent(QFocusEvent*) joachim99@53: { joachim99@53: updateAvailabilities(); joachim99@53: } joachim99@53: void DirectoryMergeWindow::focusOutEvent(QFocusEvent*) joachim99@53: { joachim99@53: updateAvailabilities(); joachim99@53: } joachim99@51: joachim99@8: void DirectoryMergeWindow::setAllMergeOperations( e_MergeOperation eDefaultOperation ) joachim99@8: { joachim99@8: if ( KMessageBox::Yes == KMessageBox::warningYesNo(this, joachim99@8: i18n("This affects all merge operations."), joachim99@51: i18n("Changing All Merge Operations"),i18n("C&ontinue"), i18n("&Cancel") ) ) joachim99@8: { joachim99@8: for( QListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) joachim99@8: { joachim99@8: DirMergeItem* pDMI = static_cast( p ); joachim99@8: calcSuggestedOperation( *pDMI->m_pMFI, eDefaultOperation ); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi ) joachim99@8: { joachim99@8: std::map dateMap; joachim99@8: joachim99@8: if( mfi.m_bExistsInA ) joachim99@8: { joachim99@8: mfi.m_bLinkA = mfi.m_fileInfoA.isSymLink(); joachim99@8: mfi.m_bDirA = mfi.m_fileInfoA.isDir(); joachim99@8: dateMap[ mfi.m_fileInfoA.lastModified() ] = 0; joachim99@8: } joachim99@8: if( mfi.m_bExistsInB ) joachim99@8: { joachim99@8: mfi.m_bLinkB = mfi.m_fileInfoB.isSymLink(); joachim99@8: mfi.m_bDirB = mfi.m_fileInfoB.isDir(); joachim99@8: dateMap[ mfi.m_fileInfoB.lastModified() ] = 1; joachim99@8: } joachim99@8: if( mfi.m_bExistsInC ) joachim99@8: { joachim99@8: mfi.m_bLinkC = mfi.m_fileInfoC.isSymLink(); joachim99@8: mfi.m_bDirC = mfi.m_fileInfoC.isDir(); joachim99@8: dateMap[ mfi.m_fileInfoC.lastModified() ] = 2; joachim99@8: } joachim99@8: joachim99@8: bool bError; joachim99@8: QString eqStatus; joachim99@8: if( mfi.m_bExistsInA && mfi.m_bExistsInB ) joachim99@8: { joachim99@8: if( mfi.m_bDirA ) mfi.m_bEqualAB=true; joachim99@8: else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus ); joachim99@8: } joachim99@8: if( mfi.m_bExistsInA && mfi.m_bExistsInC ) joachim99@8: { joachim99@8: if( mfi.m_bDirA ) mfi.m_bEqualAC=true; joachim99@8: else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus ); joachim99@8: } joachim99@8: if( mfi.m_bExistsInB && mfi.m_bExistsInC ) joachim99@8: { joachim99@8: if (mfi.m_bEqualAB && mfi.m_bEqualAC) joachim99@8: mfi.m_bEqualBC = true; joachim99@8: else joachim99@8: { joachim99@8: if( mfi.m_bDirB ) mfi.m_bEqualBC=true; joachim99@8: else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus ); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: if (mfi.m_bLinkA!=mfi.m_bLinkB) mfi.m_bEqualAB=false; joachim99@8: if (mfi.m_bLinkA!=mfi.m_bLinkC) mfi.m_bEqualAC=false; joachim99@8: if (mfi.m_bLinkB!=mfi.m_bLinkC) mfi.m_bEqualBC=false; joachim99@8: joachim99@8: if (mfi.m_bDirA!=mfi.m_bDirB) mfi.m_bEqualAB=false; joachim99@8: if (mfi.m_bDirA!=mfi.m_bDirC) mfi.m_bEqualAC=false; joachim99@8: if (mfi.m_bDirB!=mfi.m_bDirC) mfi.m_bEqualBC=false; joachim99@8: joachim99@8: assert(eNew==0 && eMiddle==1 && eOld==2); joachim99@8: joachim99@8: // The map automatically sorts the keys. joachim99@8: int age = eNew; joachim99@8: std::map::reverse_iterator i; joachim99@8: for( i=dateMap.rbegin(); i!=dateMap.rend(); ++i ) joachim99@8: { joachim99@8: int n = i->second; joachim99@8: if ( n==0 && mfi.m_ageA==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageA = (e_Age)age; ++age; joachim99@8: if ( mfi.m_bEqualAB ) { mfi.m_ageB = mfi.m_ageA; ++age; } joachim99@8: if ( mfi.m_bEqualAC ) { mfi.m_ageC = mfi.m_ageA; ++age; } joachim99@8: } joachim99@8: else if ( n==1 && mfi.m_ageB==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageB = (e_Age)age; ++age; joachim99@8: if ( mfi.m_bEqualAB ) { mfi.m_ageA = mfi.m_ageB; ++age; } joachim99@8: if ( mfi.m_bEqualBC ) { mfi.m_ageC = mfi.m_ageB; ++age; } joachim99@8: } joachim99@8: else if ( n==2 && mfi.m_ageC==eNotThere) joachim99@8: { joachim99@8: mfi.m_ageC = (e_Age)age; ++age; joachim99@8: if ( mfi.m_bEqualAC ) { mfi.m_ageA = mfi.m_ageC; ++age; } joachim99@8: if ( mfi.m_bEqualBC ) { mfi.m_ageB = mfi.m_ageC; ++age; } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: // The checks below are necessary when the dates of the file are equal but the joachim99@8: // files are not. One wouldn't expect this to happen, yet it happens sometimes. joachim99@8: if ( mfi.m_bExistsInC && mfi.m_ageC==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageC = (e_Age)age; ++age; joachim99@8: mfi.m_bConflictingAges = true; joachim99@8: } joachim99@8: if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageB = (e_Age)age; ++age; joachim99@8: mfi.m_bConflictingAges = true; joachim99@8: } joachim99@8: if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageA = (e_Age)age; ++age; joachim99@8: mfi.m_bConflictingAges = true; joachim99@8: } joachim99@8: joachim99@8: if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld ) joachim99@8: { joachim99@8: if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld; joachim99@8: if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld; joachim99@8: if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: static QPixmap* s_pm_dir; joachim99@8: static QPixmap* s_pm_file; joachim99@8: joachim99@8: static void setOnePixmap( QListViewItem* pLVI, int col, e_Age eAge, bool bLink, bool bDir ) joachim99@8: { joachim99@8: #include "xpm/equal.xpm" joachim99@8: #include "xpm/not_equal.xpm" joachim99@8: #include "xpm/not_everywhere.xpm" joachim99@8: #include "xpm/not_there.xpm" joachim99@8: #include "xpm/link_arrow.xpm" joachim99@8: joachim99@8: static QPixmap pmLink( link_arrow ); joachim99@8: joachim99@8: static QPixmap pmDirLink( pixCombiner( *s_pm_dir, pmLink) ); joachim99@8: static QPixmap pmFileLink( pixCombiner( *s_pm_file, pmLink ) ); joachim99@8: joachim99@8: static QPixmap pmNotThere( not_there_pm ); joachim99@8: joachim99@8: static QPixmap pmNew( equal_pm ); joachim99@8: static QPixmap pmOld( not_equal_pm ); joachim99@8: static QPixmap pmMiddle( not_everywhere_pm ); joachim99@8: joachim99@8: static QPixmap pmNewLink( pixCombiner( pmNew, pmLink) ); joachim99@8: static QPixmap pmOldLink( pixCombiner( pmOld, pmLink) ); joachim99@8: static QPixmap pmMiddleLink( pixCombiner( pmMiddle, pmLink) ); joachim99@8: joachim99@8: static QPixmap pmNewDir( pixCombiner2( pmNew, *s_pm_dir) ); joachim99@8: static QPixmap pmMiddleDir( pixCombiner2( pmMiddle, *s_pm_dir) ); joachim99@8: static QPixmap pmOldDir( pixCombiner2( pmOld, *s_pm_dir) ); joachim99@8: joachim99@8: static QPixmap pmNewDirLink( pixCombiner( pmNewDir, pmLink) ); joachim99@8: static QPixmap pmMiddleDirLink( pixCombiner( pmMiddleDir, pmLink) ); joachim99@8: static QPixmap pmOldDirLink( pixCombiner( pmOldDir, pmLink) ); joachim99@8: joachim99@8: static QPixmap* ageToPm[]= { &pmNew, &pmMiddle, &pmOld, &pmNotThere, s_pm_file }; joachim99@8: static QPixmap* ageToPmLink[]= { &pmNewLink, &pmMiddleLink, &pmOldLink, &pmNotThere, &pmFileLink }; joachim99@8: static QPixmap* ageToPmDir[]= { &pmNewDir, &pmMiddleDir, &pmOldDir, &pmNotThere, s_pm_dir }; joachim99@8: static QPixmap* ageToPmDirLink[]={ &pmNewDirLink, &pmMiddleDirLink, &pmOldDirLink, &pmNotThere, &pmDirLink }; joachim99@8: joachim99@8: QPixmap** ppPm = bDir ? ( bLink ? ageToPmDirLink : ageToPmDir ): joachim99@8: ( bLink ? ageToPmLink : ageToPm ); joachim99@8: joachim99@8: pLVI->setPixmap( col, *ppPm[eAge] ); joachim99@8: } joachim99@8: joachim99@8: static void setPixmaps( MergeFileInfos& mfi, bool bCheckC ) joachim99@8: { joachim99@8: setOnePixmap( mfi.m_pDMI, s_nameCol, eAgeEnd, joachim99@8: mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC, joachim99@8: mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC joachim99@8: ); joachim99@8: joachim99@8: if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ) joachim99@8: { joachim99@8: mfi.m_ageA=eNotThere; joachim99@8: mfi.m_ageB=eNotThere; joachim99@8: mfi.m_ageC=eNotThere; joachim99@8: int age = eNew; joachim99@8: if ( mfi.m_bExistsInC ) joachim99@8: { joachim99@8: mfi.m_ageC = (e_Age)age; joachim99@8: if (mfi.m_bEqualAC) mfi.m_ageA = (e_Age)age; joachim99@8: if (mfi.m_bEqualBC) mfi.m_ageB = (e_Age)age; joachim99@8: ++age; joachim99@8: } joachim99@8: if ( mfi.m_bExistsInB && mfi.m_ageB==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageB = (e_Age)age; joachim99@8: if (mfi.m_bEqualAB) mfi.m_ageA = (e_Age)age; joachim99@8: ++age; joachim99@8: } joachim99@8: if ( mfi.m_bExistsInA && mfi.m_ageA==eNotThere ) joachim99@8: { joachim99@8: mfi.m_ageA = (e_Age)age; joachim99@8: } joachim99@8: if ( mfi.m_ageA != eOld && mfi.m_ageB != eOld && mfi.m_ageC != eOld ) joachim99@8: { joachim99@8: if (mfi.m_ageA == eMiddle) mfi.m_ageA = eOld; joachim99@8: if (mfi.m_ageB == eMiddle) mfi.m_ageB = eOld; joachim99@8: if (mfi.m_ageC == eMiddle) mfi.m_ageC = eOld; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: setOnePixmap( mfi.m_pDMI, s_ACol, mfi.m_ageA, mfi.m_bLinkA, mfi.m_bDirA ); joachim99@8: setOnePixmap( mfi.m_pDMI, s_BCol, mfi.m_ageB, mfi.m_bLinkB, mfi.m_bDirB ); joachim99@8: if ( bCheckC ) joachim99@8: setOnePixmap( mfi.m_pDMI, s_CCol, mfi.m_ageC, mfi.m_bLinkC, mfi.m_bDirC ); joachim99@8: } joachim99@8: joachim99@8: // Iterate through the complete tree. Start by specifying QListView::firstChild(). joachim99@8: static QListViewItem* treeIterator( QListViewItem* p, bool bVisitChildren=true ) joachim99@8: { joachim99@8: if( p!=0 ) joachim99@8: { joachim99@8: if ( bVisitChildren && p->firstChild() != 0 ) p = p->firstChild(); joachim99@8: else if ( p->nextSibling() !=0 ) p = p->nextSibling(); joachim99@8: else joachim99@8: { joachim99@8: p = p->parent(); joachim99@8: while ( p!=0 ) joachim99@8: { joachim99@8: if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; } joachim99@8: else { p = p->parent(); } joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: return p; joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::prepareListView() joachim99@8: { joachim99@8: static bool bFirstTime = true; joachim99@8: if (bFirstTime) joachim99@8: { joachim99@8: #include "xpm/file.xpm" joachim99@8: #include "xpm/folder.xpm" joachim99@8: s_pm_dir = new QPixmap( m_pIconLoader->loadIcon("folder", KIcon::Small ) ); joachim99@8: if (s_pm_dir->size()!=QSize(16,16)) joachim99@8: { joachim99@8: delete s_pm_dir; joachim99@8: s_pm_dir = new QPixmap( folder_pm ); joachim99@8: } joachim99@8: s_pm_file= new QPixmap( file_pm ); joachim99@8: bFirstTime=false; joachim99@8: } joachim99@8: joachim99@8: clear(); joachim99@8: joachim99@8: setRootIsDecorated( true ); joachim99@8: joachim99@8: bool bCheckC = m_dirC.isValid(); joachim99@8: joachim99@8: std::map::iterator j; joachim99@8: int nrOfFiles = m_fileMergeMap.size(); joachim99@8: int currentIdx = 1; joachim99@8: QTime t; joachim99@8: t.start(); joachim99@8: for( j=m_fileMergeMap.begin(); j!=m_fileMergeMap.end(); ++j ) joachim99@8: { joachim99@8: MergeFileInfos& mfi = j->second; joachim99@8: joachim99@8: mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() : joachim99@8: mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() : joachim99@25: mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : joachim99@25: QString(""); joachim99@8: joachim99@58: // const QString& fileName = j->first; joachim99@58: const QString& fileName = mfi.m_subPath; joachim99@58: joachim99@8: g_pProgressDialog->setInformation( joachim99@51: i18n("Processing ") + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles) joachim99@8: +"\n" + fileName, double(currentIdx) / nrOfFiles, false ); joachim99@8: if ( g_pProgressDialog->wasCancelled() ) break; joachim99@8: ++currentIdx; joachim99@8: joachim99@8: joachim99@8: // The comparisons and calculations for each file take place here. joachim99@8: compareFilesAndCalcAges( mfi ); joachim99@8: joachim99@8: bool bEqual = bCheckC ? mfi.m_bEqualAB && mfi.m_bEqualAC : mfi.m_bEqualAB; joachim99@8: bool bDir = mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC; joachim99@8: joachim99@8: if ( m_pOptions->m_bDmShowOnlyDeltas && !bDir && bEqual ) joachim99@8: continue; joachim99@8: joachim99@8: // Get dirname from fileName: Search for "/" from end: joachim99@8: int pos = fileName.findRev('/'); joachim99@8: QString dirPart; joachim99@8: QString filePart; joachim99@8: if (pos==-1) joachim99@8: { joachim99@8: // Top dir joachim99@8: filePart = fileName; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: dirPart = fileName.left(pos); joachim99@8: filePart = fileName.mid(pos+1); joachim99@8: } joachim99@8: joachim99@8: if ( dirPart.isEmpty() ) // Top level joachim99@8: { joachim99@8: new DirMergeItem( this, filePart, &mfi ); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@58: MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart)]; // parent joachim99@8: assert(dirMfi.m_pDMI!=0); joachim99@8: new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); joachim99@8: mfi.m_pParent = &dirMfi; joachim99@8: joachim99@8: if ( !bEqual ) // Set all parents to "not equal" joachim99@8: { joachim99@8: MergeFileInfos* p = mfi.m_pParent; joachim99@8: while(p!=0) joachim99@8: { joachim99@8: bool bChange = false; joachim99@8: if ( !mfi.m_bEqualAB && p->m_bEqualAB ){ p->m_bEqualAB = false; bChange=true; } joachim99@8: if ( !mfi.m_bEqualAC && p->m_bEqualAC ){ p->m_bEqualAC = false; bChange=true; } joachim99@8: if ( !mfi.m_bEqualBC && p->m_bEqualBC ){ p->m_bEqualBC = false; bChange=true; } joachim99@8: joachim99@8: if ( bChange ) joachim99@8: setPixmaps( *p, bCheckC ); joachim99@8: else joachim99@8: break; joachim99@8: joachim99@8: p = p->m_pParent; joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: setPixmaps( mfi, bCheckC ); joachim99@8: } joachim99@8: joachim99@8: if ( m_pOptions->m_bDmShowOnlyDeltas ) joachim99@8: { joachim99@8: // Remove all equals. (Search tree depth first) joachim99@8: QListViewItem* p = firstChild(); joachim99@8: while( p!=0 && firstChild() != 0 ) joachim99@8: { joachim99@8: QListViewItem* pParent = p->parent(); joachim99@8: QListViewItem* pNextSibling = p->nextSibling(); joachim99@8: joachim99@8: DirMergeItem* pDMI = static_cast(p); joachim99@8: bool bDirEqual = bCheckC ? pDMI->m_pMFI->m_bEqualAB && pDMI->m_pMFI->m_bEqualAC joachim99@8: : pDMI->m_pMFI->m_bEqualAB; joachim99@8: if ( pDMI!=0 && pDMI->m_pMFI->m_bDirA && bDirEqual ) joachim99@8: { joachim99@8: delete p; joachim99@8: p=0; joachim99@8: } joachim99@8: joachim99@8: if ( p!=0 && p->firstChild() != 0 ) p = p->firstChild(); joachim99@8: else if ( pNextSibling!=0 ) p = pNextSibling; joachim99@8: else joachim99@8: { joachim99@8: p=pParent; joachim99@8: while ( p!=0 ) joachim99@8: { joachim99@8: if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; } joachim99@8: else { p = p->parent(); } joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: static bool conflictingFileTypes(MergeFileInfos& mfi) joachim99@8: { joachim99@8: // Now check if file/dir-types fit. joachim99@8: if ( mfi.m_bLinkA || mfi.m_bLinkB || mfi.m_bLinkC ) joachim99@8: { joachim99@8: if ( mfi.m_bExistsInA && ! mfi.m_bLinkA || joachim99@8: mfi.m_bExistsInB && ! mfi.m_bLinkB || joachim99@8: mfi.m_bExistsInC && ! mfi.m_bLinkC ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: if ( mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC ) joachim99@8: { joachim99@8: if ( mfi.m_bExistsInA && ! mfi.m_bDirA || joachim99@8: mfi.m_bExistsInB && ! mfi.m_bDirB || joachim99@8: mfi.m_bExistsInC && ! mfi.m_bDirC ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: } joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultMergeOp ) joachim99@8: { joachim99@8: bool bCheckC = m_dirC.isValid(); joachim99@8: bool bCopyNewer = m_pOptions->m_bDmCopyNewer; joachim99@8: joachim99@8: if ( eDefaultMergeOp == eMergeABCToDest && !bCheckC ) { eDefaultMergeOp = eMergeABToDest; } joachim99@8: if ( eDefaultMergeOp == eMergeToAB && bCheckC ) { assert(false); } joachim99@51: joachim99@8: if ( eDefaultMergeOp == eMergeToA || eDefaultMergeOp == eMergeToB || joachim99@8: eDefaultMergeOp == eMergeABCToDest || eDefaultMergeOp == eMergeABToDest || eDefaultMergeOp == eMergeToAB ) joachim99@51: { joachim99@8: if ( !bCheckC ) joachim99@8: { joachim99@8: if ( mfi.m_bEqualAB ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eNoOperation ); // All is well, nothing to do. joachim99@8: } joachim99@8: else if ( mfi.m_bExistsInA && mfi.m_bExistsInB ) joachim99@8: { joachim99@8: if ( !bCopyNewer || mfi.m_bDirA ) joachim99@8: mfi.setMergeOperation( eDefaultMergeOp ); joachim99@8: else if ( bCopyNewer && mfi.m_bConflictingAges ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eConflictingAges ); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( mfi.m_ageA == eNew ) joachim99@8: mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyAToB : eCopyAToDest ); joachim99@8: else joachim99@8: mfi.setMergeOperation( eDefaultMergeOp == eMergeToAB ? eCopyBToA : eCopyBToDest ); joachim99@8: } joachim99@8: } joachim99@8: else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB ) joachim99@8: { joachim99@8: if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyBToDest ); joachim99@8: else if ( eDefaultMergeOp==eMergeToB ) mfi.setMergeOperation( eNoOperation ); joachim99@8: else mfi.setMergeOperation( eCopyBToA ); joachim99@8: } joachim99@8: else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB ) joachim99@8: { joachim99@8: if ( eDefaultMergeOp==eMergeABToDest ) mfi.setMergeOperation( eCopyAToDest ); joachim99@8: else if ( eDefaultMergeOp==eMergeToA ) mfi.setMergeOperation( eNoOperation ); joachim99@8: else mfi.setMergeOperation( eCopyAToB ); joachim99@8: } joachim99@8: else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eNoOperation ); assert(false); joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( mfi.m_bEqualAB && mfi.m_bEqualAC ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eCopyCToDest ); joachim99@8: } joachim99@8: else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC) joachim99@8: { joachim99@8: if ( mfi.m_bEqualAB ) joachim99@8: mfi.setMergeOperation( eCopyCToDest ); joachim99@8: else if ( mfi.m_bEqualAC ) joachim99@8: mfi.setMergeOperation( eCopyBToDest ); joachim99@8: else if ( mfi.m_bEqualBC ) joachim99@8: mfi.setMergeOperation( eCopyCToDest ); joachim99@8: else joachim99@8: mfi.setMergeOperation( eMergeABCToDest ); joachim99@8: } joachim99@8: else if ( mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC ) joachim99@8: { joachim99@8: if ( mfi.m_bEqualAB ) joachim99@8: mfi.setMergeOperation( eDeleteFromDest ); joachim99@8: else joachim99@8: mfi.setMergeOperation( eCopyBToDest ); joachim99@8: } joachim99@8: else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) joachim99@8: { joachim99@8: if ( mfi.m_bEqualAC ) joachim99@8: mfi.setMergeOperation( eDeleteFromDest ); joachim99@8: else joachim99@8: mfi.setMergeOperation( eCopyCToDest ); joachim99@8: } joachim99@8: else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC ) joachim99@8: { joachim99@8: if ( mfi.m_bEqualBC ) joachim99@8: mfi.setMergeOperation( eCopyCToDest ); joachim99@8: else joachim99@8: mfi.setMergeOperation( eMergeABCToDest ); joachim99@8: } joachim99@8: else if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eCopyCToDest ); joachim99@8: } joachim99@8: else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && !mfi.m_bExistsInC ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eCopyBToDest ); joachim99@8: } joachim99@8: else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC) joachim99@8: { joachim99@8: mfi.setMergeOperation( eDeleteFromDest ); joachim99@8: } joachim99@8: else //if ( !mfi.m_bExistsInA && !mfi.m_bExistsInB && !mfi.m_bExistsInC ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eNoOperation ); assert(false); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: // Now check if file/dir-types fit. joachim99@8: if ( conflictingFileTypes(mfi) ) joachim99@8: { joachim99@8: mfi.setMergeOperation( eConflictingFileTypes ); joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: e_MergeOperation eMO = eDefaultMergeOp; joachim99@8: switch ( eDefaultMergeOp ) joachim99@8: { joachim99@8: case eConflictingFileTypes: joachim99@8: case eConflictingAges: joachim99@8: case eDeleteA: joachim99@8: case eDeleteB: joachim99@8: case eDeleteAB: joachim99@8: case eDeleteFromDest: joachim99@8: case eNoOperation: break; joachim99@8: case eCopyAToB: if ( !mfi.m_bExistsInA ) { eMO = eDeleteB; } break; joachim99@8: case eCopyBToA: if ( !mfi.m_bExistsInB ) { eMO = eDeleteA; } break; joachim99@8: case eCopyAToDest: if ( !mfi.m_bExistsInA ) { eMO = eDeleteFromDest; } break; joachim99@8: case eCopyBToDest: if ( !mfi.m_bExistsInB ) { eMO = eDeleteFromDest; } break; joachim99@8: case eCopyCToDest: if ( !mfi.m_bExistsInC ) { eMO = eDeleteFromDest; } break; joachim99@8: joachim99@8: case eMergeToA: joachim99@8: case eMergeToB: joachim99@8: case eMergeToAB: joachim99@8: case eMergeABCToDest: joachim99@8: case eMergeABToDest: joachim99@8: default: joachim99@8: assert(false); joachim99@8: } joachim99@8: mfi.setMergeOperation( eMO ); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::onDoubleClick( QListViewItem* lvi ) joachim99@8: { joachim99@8: if (lvi==0) return; joachim99@8: joachim99@8: if ( m_bDirectoryMerge ) joachim99@8: mergeCurrentFile(); joachim99@8: else joachim99@8: compareCurrentFile(); joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::onSelectionChanged( QListViewItem* lvi ) joachim99@8: { joachim99@8: if ( lvi==0 ) return; joachim99@8: joachim99@8: DirMergeItem* pDMI = static_cast(lvi); joachim99@8: joachim99@8: MergeFileInfos& mfi = *pDMI->m_pMFI; joachim99@8: assert( mfi.m_pDMI==pDMI ); joachim99@8: joachim99@8: m_pDirectoryMergeInfo->setInfo( m_dirA, m_dirB, m_dirC, m_dirDestInternal, mfi ); joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::onClick( QListViewItem* lvi, const QPoint& p, int c ) joachim99@8: { joachim99@8: if ( lvi==0 ) return; joachim99@8: joachim99@8: DirMergeItem* pDMI = static_cast(lvi); joachim99@8: joachim99@8: MergeFileInfos& mfi = *pDMI->m_pMFI; joachim99@8: assert( mfi.m_pDMI==pDMI ); joachim99@8: joachim99@8: if ( c!=s_OpCol ) return; joachim99@8: joachim99@8: bool bThreeDirs = m_dirC.isValid(); joachim99@8: joachim99@8: KPopupMenu m(this); joachim99@8: if ( bThreeDirs ) joachim99@8: { joachim99@51: dirCurrentDoNothing->plug(&m); joachim99@8: int count=0; joachim99@51: if ( mfi.m_bExistsInA ) { dirCurrentChooseA->plug(&m); ++count; } joachim99@51: if ( mfi.m_bExistsInB ) { dirCurrentChooseB->plug(&m); ++count; } joachim99@51: if ( mfi.m_bExistsInC ) { dirCurrentChooseC->plug(&m); ++count; } joachim99@51: if ( !conflictingFileTypes(mfi) && count>1 ) dirCurrentMerge->plug(&m); joachim99@51: dirCurrentDelete->plug(&m); joachim99@8: } joachim99@8: else if ( m_bSyncMode ) joachim99@8: { joachim99@51: dirCurrentSyncDoNothing->plug(&m); joachim99@51: if ( mfi.m_bExistsInA ) dirCurrentSyncCopyAToB->plug(&m); joachim99@51: if ( mfi.m_bExistsInB ) dirCurrentSyncCopyBToA->plug(&m); joachim99@51: if ( mfi.m_bExistsInA ) dirCurrentSyncDeleteA->plug(&m); joachim99@51: if ( mfi.m_bExistsInB ) dirCurrentSyncDeleteB->plug(&m); joachim99@8: if ( mfi.m_bExistsInA && mfi.m_bExistsInB ) joachim99@8: { joachim99@51: dirCurrentSyncDeleteAAndB->plug(&m); joachim99@8: if ( !conflictingFileTypes(mfi)) joachim99@8: { joachim99@51: dirCurrentSyncMergeToA->plug(&m); joachim99@51: dirCurrentSyncMergeToB->plug(&m); joachim99@51: dirCurrentSyncMergeToAAndB->plug(&m); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@51: dirCurrentDoNothing->plug(&m); joachim99@51: if ( mfi.m_bExistsInA ) { dirCurrentChooseA->plug(&m); } joachim99@51: if ( mfi.m_bExistsInB ) { dirCurrentChooseB->plug(&m); } joachim99@51: if ( !conflictingFileTypes(mfi) && mfi.m_bExistsInA && mfi.m_bExistsInB ) dirCurrentMerge->plug(&m); joachim99@51: dirCurrentDelete->plug(&m); joachim99@8: } joachim99@8: joachim99@51: m.exec( p ); joachim99@8: } joachim99@8: joachim99@8: // Since Qt 2.3.0 doesn't allow the specification of a compare operator, this trick emulates it. joachim99@8: #if QT_VERSION==230 joachim99@8: #define DIRSORT(x) ( pMFI->m_bDirA ? " " : "" )+x joachim99@8: #else joachim99@8: #define DIRSORT(x) x joachim99@8: #endif joachim99@8: joachim99@8: DirMergeItem::DirMergeItem( QListView* pParent, const QString& fileName, MergeFileInfos* pMFI ) joachim99@51: : QListViewItem( pParent, DIRSORT( fileName ), "","","", i18n("To do.") ) joachim99@8: { joachim99@8: pMFI->m_pDMI = this; joachim99@8: m_pMFI = pMFI; joachim99@8: } joachim99@8: joachim99@8: DirMergeItem::DirMergeItem( DirMergeItem* pParent, const QString& fileName, MergeFileInfos* pMFI ) joachim99@51: : QListViewItem( pParent, DIRSORT( fileName ), "","","", i18n("To do.") ) joachim99@8: { joachim99@8: pMFI->m_pDMI = this; joachim99@8: m_pMFI = pMFI; joachim99@8: } joachim99@8: joachim99@8: DirMergeItem::~DirMergeItem() joachim99@8: { joachim99@8: m_pMFI->m_pDMI = 0; joachim99@8: } joachim99@8: joachim99@8: void MergeFileInfos::setMergeOperation( e_MergeOperation eMOp ) joachim99@8: { joachim99@51: if ( eMOp != m_eMergeOperation ) joachim99@51: { joachim99@51: m_bOperationComplete = false; joachim99@51: m_pDMI->setText( s_OpStatusCol, "" ); joachim99@51: } joachim99@51: joachim99@8: m_eMergeOperation = eMOp; joachim99@51: QString s; joachim99@8: bool bDir = m_bDirA || m_bDirB || m_bDirC; joachim99@8: if( m_pDMI!=0 ) joachim99@8: { joachim99@8: switch( m_eMergeOperation ) joachim99@8: { joachim99@8: case eNoOperation: s=""; m_pDMI->setText(s_OpCol,""); break; joachim99@51: case eCopyAToB: s=i18n("Copy A to B"); break; joachim99@51: case eCopyBToA: s=i18n("Copy B to A"); break; joachim99@51: case eDeleteA: s=i18n("Delete A"); break; joachim99@51: case eDeleteB: s=i18n("Delete B"); break; joachim99@51: case eDeleteAB: s=i18n("Delete A & B"); break; joachim99@51: case eMergeToA: s=i18n("Merge to A"); break; joachim99@51: case eMergeToB: s=i18n("Merge to B"); break; joachim99@51: case eMergeToAB: s=i18n("Merge to A & B"); break; joachim99@8: case eCopyAToDest: s="A"; break; joachim99@8: case eCopyBToDest: s="B"; break; joachim99@8: case eCopyCToDest: s="C"; break; joachim99@51: case eDeleteFromDest: s=i18n("Delete (if exists)"); break; joachim99@51: case eMergeABCToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; joachim99@51: case eMergeABToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; joachim99@51: case eConflictingFileTypes: s=i18n("Error: Conflicting File Types"); break; joachim99@51: case eConflictingAges: s=i18n("Error: Dates are equal but files are not."); break; joachim99@8: default: assert(false); break; joachim99@8: } joachim99@8: m_pDMI->setText(s_OpCol,s); joachim99@8: joachim99@8: e_MergeOperation eChildrenMergeOp = m_eMergeOperation; joachim99@8: if ( eChildrenMergeOp == eConflictingFileTypes ) eChildrenMergeOp = eMergeABCToDest; joachim99@8: QListViewItem* p = m_pDMI->firstChild(); joachim99@8: while ( p!=0 ) joachim99@8: { joachim99@8: DirMergeItem* pDMI = static_cast( p ); joachim99@8: DirectoryMergeWindow* pDMW = static_cast( p->listView() ); joachim99@8: pDMW->calcSuggestedOperation( *pDMI->m_pMFI, eChildrenMergeOp ); joachim99@8: p = p->nextSibling(); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::compareCurrentFile() joachim99@8: { joachim99@8: if (!canContinue()) return; joachim99@8: joachim99@8: if ( m_bRealMergeStarted ) joachim99@8: { joachim99@51: KMessageBox::sorry(this,i18n("This operation is currently not possible."),i18n("Operation Not Possible")); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: DirMergeItem* pDMI = static_cast( selectedItem() ); joachim99@8: if ( pDMI != 0 ) joachim99@8: { joachim99@8: MergeFileInfos& mfi = *pDMI->m_pMFI; joachim99@8: if ( !(mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC) ) joachim99@8: { joachim99@8: emit startDiffMerge( joachim99@8: mfi.m_bExistsInA ? mfi.m_fileInfoA.absFilePath() : QString(""), joachim99@8: mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : QString(""), joachim99@8: mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : QString(""), joachim99@8: "", joachim99@8: "","","" joachim99@8: ); joachim99@8: } joachim99@8: } joachim99@8: emit updateAvailabilities(); joachim99@8: } joachim99@8: joachim99@8: joachim99@8: joachim99@8: bool DirectoryMergeWindow::isFileSelected() joachim99@8: { joachim99@8: DirMergeItem* pDMI = static_cast( selectedItem() ); joachim99@8: if ( pDMI != 0 ) joachim99@8: { joachim99@8: MergeFileInfos& mfi = *pDMI->m_pMFI; joachim99@8: return ! (mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC || conflictingFileTypes(mfi) ); joachim99@8: } joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::mergeResultSaved(const QString& fileName) joachim99@8: { joachim99@51: DirMergeItem* pCurrentItemForOperation = (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) joachim99@51: ? 0 joachim99@51: : *m_currentItemForOperation; joachim99@51: joachim99@51: if ( pCurrentItemForOperation!=0 && pCurrentItemForOperation->m_pMFI==0 ) joachim99@8: { joachim99@51: 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: return; joachim99@8: } joachim99@51: if ( pCurrentItemForOperation!=0 && fileName == fullNameDest(*pCurrentItemForOperation->m_pMFI) ) joachim99@8: { joachim99@51: if ( pCurrentItemForOperation->m_pMFI->m_eMergeOperation==eMergeToAB ) joachim99@8: { joachim99@51: MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI; joachim99@8: bool bSuccess = copyFLD( fullNameB(mfi), fullNameA(mfi) ); joachim99@8: if (!bSuccess) joachim99@8: { joachim99@51: KMessageBox::error(this, i18n("An error occurred while copying.\n"), i18n("Error") ); joachim99@51: m_pStatusInfo->setCaption(i18n("Merge Error")); joachim99@8: m_pStatusInfo->show(); joachim99@8: if ( m_pStatusInfo->firstChild()!=0 ) joachim99@8: m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() ); joachim99@8: m_bError = true; joachim99@51: pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") ); joachim99@8: mfi.m_eMergeOperation = eCopyBToA; joachim99@8: return; joachim99@8: } joachim99@8: } joachim99@51: pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Done.") ); joachim99@51: pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; joachim99@51: if ( m_mergeItemList.size()==1 ) joachim99@51: { joachim99@51: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@51: } joachim99@8: } joachim99@8: joachim99@8: emit updateAvailabilities(); joachim99@8: } joachim99@8: joachim99@8: bool DirectoryMergeWindow::canContinue() joachim99@8: { joachim99@8: bool bCanContinue=false; joachim99@8: checkIfCanContinue( &bCanContinue ); joachim99@8: if ( bCanContinue && !m_bError ) joachim99@8: { joachim99@51: DirMergeItem* pCurrentItemForOperation = joachim99@51: (m_mergeItemList.empty() || m_currentItemForOperation==m_mergeItemList.end() ) ? 0 : *m_currentItemForOperation; joachim99@51: joachim99@51: if ( pCurrentItemForOperation!=0 && ! pCurrentItemForOperation->m_pMFI->m_bOperationComplete ) joachim99@8: { joachim99@51: pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Not saved.") ); joachim99@51: pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; joachim99@51: if ( m_mergeItemList.size()==1 ) joachim99@51: { joachim99@51: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@51: } joachim99@8: } joachim99@8: } joachim99@8: return bCanContinue; joachim99@8: } joachim99@8: joachim99@51: bool DirectoryMergeWindow::executeMergeOperation( MergeFileInfos& mfi, bool& bSingleFileMerge ) joachim99@8: { joachim99@51: bool bCreateBackups = m_pOptions->m_bDmCreateBakFiles; joachim99@51: // First decide destname joachim99@51: QString destName; joachim99@51: switch( mfi.m_eMergeOperation ) joachim99@51: { joachim99@51: case eNoOperation: break; joachim99@51: case eDeleteAB: break; joachim99@51: case eMergeToAB: // let the user save in B. In mergeResultSaved() the file will be copied to A. joachim99@51: case eMergeToB: joachim99@51: case eDeleteB: joachim99@51: case eCopyAToB: destName = fullNameB(mfi); break; joachim99@51: case eMergeToA: joachim99@51: case eDeleteA: joachim99@51: case eCopyBToA: destName = fullNameA(mfi); break; joachim99@51: case eMergeABToDest: joachim99@51: case eMergeABCToDest: joachim99@51: case eCopyAToDest: joachim99@51: case eCopyBToDest: joachim99@51: case eCopyCToDest: joachim99@51: case eDeleteFromDest: destName = fullNameDest(mfi); break; joachim99@51: default: joachim99@51: KMessageBox::error( this, i18n("Unknown merge operation. (This must never happen!)"), i18n("Error") ); joachim99@51: assert(false); joachim99@51: } joachim99@8: joachim99@51: bool bSuccess = false; joachim99@51: bSingleFileMerge = false; joachim99@51: switch( mfi.m_eMergeOperation ) joachim99@51: { joachim99@51: case eNoOperation: bSuccess = true; break; joachim99@51: case eCopyAToDest: joachim99@51: case eCopyAToB: bSuccess = copyFLD( fullNameA(mfi), destName ); break; joachim99@51: case eCopyBToDest: joachim99@51: case eCopyBToA: bSuccess = copyFLD( fullNameB(mfi), destName ); break; joachim99@51: case eCopyCToDest: bSuccess = copyFLD( fullNameC(mfi), destName ); break; joachim99@51: case eDeleteFromDest: joachim99@51: case eDeleteA: joachim99@51: case eDeleteB: bSuccess = deleteFLD( destName, bCreateBackups ); break; joachim99@51: case eDeleteAB: bSuccess = deleteFLD( fullNameA(mfi), bCreateBackups ) && joachim99@51: deleteFLD( fullNameB(mfi), bCreateBackups ); break; joachim99@51: case eMergeABToDest: joachim99@51: case eMergeToA: joachim99@51: case eMergeToAB: joachim99@51: case eMergeToB: bSuccess = mergeFLD( fullNameA(mfi), fullNameB(mfi), "", joachim99@51: destName, bSingleFileMerge ); joachim99@51: break; joachim99@51: case eMergeABCToDest:bSuccess = mergeFLD( joachim99@51: mfi.m_bExistsInA ? fullNameA(mfi) : QString(""), joachim99@51: mfi.m_bExistsInB ? fullNameB(mfi) : QString(""), joachim99@51: mfi.m_bExistsInC ? fullNameC(mfi) : QString(""), joachim99@51: destName, bSingleFileMerge ); joachim99@51: break; joachim99@51: default: joachim99@51: KMessageBox::error( this, i18n("Unknown merge operation."), i18n("Error") ); joachim99@51: assert(false); joachim99@51: } joachim99@8: joachim99@51: return bSuccess; joachim99@51: } joachim99@8: joachim99@51: joachim99@51: // Check if the merge can start, and prepare the m_mergeItemList which then contains all joachim99@51: // items that must be merged. joachim99@51: void DirectoryMergeWindow::prepareMergeStart( QListViewItem* pBegin, QListViewItem* pEnd, bool bVerbose ) joachim99@51: { joachim99@51: if ( bVerbose ) joachim99@8: { joachim99@51: int status = KMessageBox::warningYesNoCancel(this, joachim99@51: i18n("The merge is about to begin.\n\n" joachim99@51: "Choose \"Do it\" if you have read the instructions and know what you are doing.\n" joachim99@51: "Choosing \"Simulate it\" will tell you what would happen.\n\n" joachim99@51: "Be aware that this program still has beta status " joachim99@51: "and there is NO WARRANTY whatsoever! Make backups of your vital data!"), joachim99@51: i18n("Starting Merge"), i18n("Do It"), i18n("Simulate It") ); joachim99@51: if (status==KMessageBox::Yes) m_bRealMergeStarted = true; joachim99@51: else if (status==KMessageBox::No ) m_bSimulatedMergeStarted = true; joachim99@51: else return; joachim99@51: } joachim99@51: else joachim99@51: { joachim99@51: m_bRealMergeStarted = true; joachim99@51: } joachim99@51: joachim99@51: m_mergeItemList.clear(); joachim99@51: if (pBegin == 0) joachim99@51: return; joachim99@51: joachim99@51: for( QListViewItem* p = pBegin; p!= pEnd; p = treeIterator( p ) ) joachim99@51: { joachim99@51: DirMergeItem* pDMI = static_cast(p); joachim99@51: joachim99@51: if ( ! pDMI->m_pMFI->m_bOperationComplete ) joachim99@8: { joachim99@51: m_mergeItemList.push_back(pDMI); joachim99@51: joachim99@8: if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingFileTypes ) joachim99@8: { joachim99@8: ensureItemVisible( pDMI ); joachim99@8: setSelected( pDMI, true ); joachim99@51: KMessageBox::error(this, i18n("The highlighted item has a different type in the different directories. Select what to do."), i18n("Error")); joachim99@51: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@8: return; joachim99@8: } joachim99@8: if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eConflictingAges ) joachim99@8: { joachim99@8: ensureItemVisible( pDMI ); joachim99@8: setSelected( pDMI, true ); joachim99@51: 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: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@8: return; joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@51: m_currentItemForOperation = m_mergeItemList.begin(); joachim99@51: return; joachim99@51: } joachim99@51: joachim99@51: void DirectoryMergeWindow::slotRunOperationForCurrentItem() joachim99@51: { joachim99@51: if ( ! canContinue() ) return; joachim99@51: joachim99@51: bool bVerbose = false; joachim99@51: if ( m_mergeItemList.empty() ) joachim99@51: { joachim99@51: QListViewItem* pBegin = currentItem(); joachim99@53: QListViewItem* pEnd = pBegin; joachim99@53: while ( pEnd!=0 && pEnd->nextSibling()==0 ) joachim99@53: { joachim99@53: pEnd = pEnd->parent(); joachim99@53: } joachim99@53: if ( pEnd!=0 ) joachim99@53: pEnd=pEnd->nextSibling(); joachim99@51: joachim99@53: prepareMergeStart( pBegin, pEnd, bVerbose ); joachim99@51: mergeContinue(true, bVerbose); joachim99@51: } joachim99@51: else joachim99@51: mergeContinue(false, bVerbose); joachim99@51: } joachim99@51: joachim99@51: void DirectoryMergeWindow::slotRunOperationForAllItems() joachim99@51: { joachim99@51: if ( ! canContinue() ) return; joachim99@51: joachim99@51: bool bVerbose = true; joachim99@51: if ( m_mergeItemList.empty() ) joachim99@51: { joachim99@51: QListViewItem* pBegin = firstChild(); joachim99@51: joachim99@51: prepareMergeStart( pBegin, 0, bVerbose ); joachim99@51: mergeContinue(true, bVerbose); joachim99@51: } joachim99@51: else joachim99@51: mergeContinue(false, bVerbose); joachim99@51: } joachim99@51: joachim99@51: void DirectoryMergeWindow::mergeCurrentFile() joachim99@51: { joachim99@51: if (!canContinue()) return; joachim99@51: joachim99@51: if ( m_bRealMergeStarted ) joachim99@51: { joachim99@51: KMessageBox::sorry(this,i18n("This operation is currently not possible because dir merge currently runs."),i18n("Operation Not Possible")); joachim99@51: return; joachim99@51: } joachim99@51: joachim99@51: if ( isFileSelected() ) joachim99@51: { joachim99@51: DirMergeItem* pDMI = static_cast( selectedItem() ); joachim99@51: if ( pDMI != 0 ) joachim99@51: { joachim99@51: MergeFileInfos& mfi = *pDMI->m_pMFI; joachim99@51: m_mergeItemList.clear(); joachim99@51: m_mergeItemList.push_back( pDMI ); joachim99@51: m_currentItemForOperation=m_mergeItemList.begin(); joachim99@51: bool bDummy=false; joachim99@51: mergeFLD( joachim99@51: mfi.m_bExistsInA ? mfi.m_fileInfoA.absFilePath() : QString(""), joachim99@51: mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : QString(""), joachim99@51: mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : QString(""), joachim99@51: fullNameDest(mfi), joachim99@51: bDummy joachim99@51: ); joachim99@51: } joachim99@51: } joachim99@51: emit updateAvailabilities(); joachim99@51: } joachim99@51: joachim99@51: joachim99@51: // When bStart is true then m_currentItemForOperation must still be processed. joachim99@51: // When bVerbose is true then a messagebox will tell when the merge is complete. joachim99@51: void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose) joachim99@51: { joachim99@51: if ( m_mergeItemList.empty() ) joachim99@51: return; joachim99@51: joachim99@51: int nrOfItems = 0; joachim99@51: int nrOfCompletedItems = 0; joachim99@51: int nrOfCompletedSimItems = 0; joachim99@51: joachim99@51: // Count the number of completed items (for the progress bar). joachim99@51: for( MergeItemList::iterator i = m_mergeItemList.begin(); i!=m_mergeItemList.end(); ++i ) joachim99@51: { joachim99@53: DirMergeItem* pDMI = *i; joachim99@51: ++nrOfItems; joachim99@51: if ( pDMI->m_pMFI->m_bOperationComplete ) joachim99@51: ++nrOfCompletedItems; joachim99@51: if ( pDMI->m_pMFI->m_bSimOpComplete ) joachim99@51: ++nrOfCompletedSimItems; joachim99@51: } joachim99@51: joachim99@51: m_pStatusInfo->hide(); joachim99@51: m_pStatusInfo->clear(); joachim99@51: joachim99@51: DirMergeItem* pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; joachim99@51: joachim99@51: bool bContinueWithCurrentItem = bStart; // true for first item, else false joachim99@8: bool bSkipItem = false; joachim99@51: if ( !bStart && m_bError && pCurrentItemForOperation!=0 ) joachim99@8: { joachim99@8: int status = KMessageBox::warningYesNoCancel(this, joachim99@8: i18n("There was an error in the last step.\n" joachim99@8: "Do you want to continue with the item that caused the error or do you want to skip this item?"), joachim99@51: i18n("Continue merge after an error"), i18n("Continue With Last Item"), i18n("Skip Item") ); joachim99@51: if (status==KMessageBox::Yes) bContinueWithCurrentItem = true; joachim99@8: else if (status==KMessageBox::No ) bSkipItem = true; joachim99@8: else return; joachim99@8: m_bError = false; joachim99@8: } joachim99@8: joachim99@8: g_pProgressDialog->start(); joachim99@8: joachim99@8: bool bSuccess = true; joachim99@8: bool bSingleFileMerge = false; joachim99@8: bool bSim = m_bSimulatedMergeStarted; joachim99@8: while( bSuccess ) joachim99@8: { joachim99@51: if ( pCurrentItemForOperation==0 ) joachim99@51: { joachim99@51: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@51: break; joachim99@51: } joachim99@51: joachim99@51: if ( pCurrentItemForOperation!=0 && !bContinueWithCurrentItem ) joachim99@8: { joachim99@8: if ( bSim ) joachim99@8: { joachim99@51: if( pCurrentItemForOperation->firstChild()==0 ) joachim99@8: { joachim99@51: pCurrentItemForOperation->m_pMFI->m_bSimOpComplete = true; joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@51: if( pCurrentItemForOperation->firstChild()==0 ) joachim99@8: { joachim99@51: if( !pCurrentItemForOperation->m_pMFI->m_bOperationComplete ) joachim99@8: { joachim99@51: pCurrentItemForOperation->setText( s_OpStatusCol, bSkipItem ? i18n("Skipped.") : i18n("Done.") ); joachim99@51: pCurrentItemForOperation->m_pMFI->m_bOperationComplete = true; joachim99@8: bSkipItem = false; joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@51: pCurrentItemForOperation->setText( s_OpStatusCol, i18n("In progress...") ); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@51: if ( ! bContinueWithCurrentItem ) joachim99@8: { joachim99@51: // Depth first joachim99@51: QListViewItem* pPrevItem = pCurrentItemForOperation; joachim99@51: ++m_currentItemForOperation; joachim99@51: pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; joachim99@51: if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->parent()!=pPrevItem->parent()) && pPrevItem->parent()!=0 ) joachim99@8: { joachim99@51: // Check if the parent may be set to "Done" joachim99@51: QListViewItem* pParent = pPrevItem->parent(); joachim99@51: bool bDone = true; joachim99@51: while ( bDone && pParent!=0 ) joachim99@8: { joachim99@51: for( QListViewItem* p = pParent->firstChild(); p!=0; p=p->nextSibling() ) joachim99@8: { joachim99@51: DirMergeItem* pDMI = static_cast(p); joachim99@51: if ( !bSim && ! pDMI->m_pMFI->m_bOperationComplete || bSim && pDMI->m_pMFI->m_bSimOpComplete ) joachim99@8: { joachim99@51: bDone=false; joachim99@51: break; joachim99@8: } joachim99@8: } joachim99@51: if ( bDone ) joachim99@51: { joachim99@51: if (bSim) joachim99@51: static_cast(pParent)->m_pMFI->m_bSimOpComplete = bDone; joachim99@51: else joachim99@51: { joachim99@51: pParent->setText( s_OpStatusCol, i18n("Done.") ); joachim99@51: static_cast(pParent)->m_pMFI->m_bOperationComplete = bDone; joachim99@51: } joachim99@51: } joachim99@51: pParent = pParent->parent(); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@51: if ( pCurrentItemForOperation == 0 ) // end? joachim99@8: { joachim99@8: if ( m_bRealMergeStarted ) joachim99@8: { joachim99@51: if (bVerbose) joachim99@51: { joachim99@51: KMessageBox::information( this, i18n("Merge operation complete."), i18n("Merge Complete") ); joachim99@51: } joachim99@8: m_bRealMergeStarted = false; joachim99@51: m_pStatusInfo->setCaption(i18n("Merge Complete")); joachim99@8: } joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@8: m_bSimulatedMergeStarted = false; joachim99@8: for( QListViewItem* p=firstChild(); p!=0; p=treeIterator(p) ) joachim99@8: { joachim99@8: static_cast(p)->m_pMFI->m_bSimOpComplete = false; joachim99@8: } joachim99@51: m_pStatusInfo->setCaption(i18n("Simulated merge complete: Check if you agree with the proposed operations.")); joachim99@8: m_pStatusInfo->show(); joachim99@8: } joachim99@8: g_pProgressDialog->hide(); joachim99@51: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@8: return; joachim99@8: } joachim99@8: joachim99@51: MergeFileInfos& mfi = *pCurrentItemForOperation->m_pMFI; joachim99@8: joachim99@8: g_pProgressDialog->setInformation( mfi.m_subPath, joachim99@8: bSim ? double(nrOfCompletedSimItems)/nrOfItems : double(nrOfCompletedItems)/nrOfItems, joachim99@51: false // bRedrawUpdate joachim99@8: ); joachim99@8: g_pProgressDialog->show(); joachim99@8: joachim99@51: bSuccess = executeMergeOperation( mfi, bSingleFileMerge ); // Here the real operation happens. joachim99@8: joachim99@8: if ( bSuccess ) joachim99@8: { joachim99@8: if(bSim) ++nrOfCompletedSimItems; joachim99@8: else ++nrOfCompletedItems; joachim99@8: bContinueWithCurrentItem = false; joachim99@8: } joachim99@51: joachim99@51: if( g_pProgressDialog->wasCancelled() ) joachim99@51: break; joachim99@8: } // end while joachim99@8: joachim99@8: g_pProgressDialog->hide(); joachim99@8: joachim99@51: setCurrentItem( pCurrentItemForOperation ); joachim99@51: ensureItemVisible( pCurrentItemForOperation ); joachim99@8: if ( !bSuccess && !bSingleFileMerge ) joachim99@8: { joachim99@51: KMessageBox::error(this, i18n("An error occurred. Press OK to see detailed information.\n"), i18n("Error") ); joachim99@51: m_pStatusInfo->setCaption(i18n("Merge Error")); joachim99@8: m_pStatusInfo->show(); joachim99@8: if ( m_pStatusInfo->firstChild()!=0 ) joachim99@8: m_pStatusInfo->ensureItemVisible( m_pStatusInfo->last() ); joachim99@8: m_bError = true; joachim99@51: pCurrentItemForOperation->setText( s_OpStatusCol, i18n("Error.") ); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: m_bError = false; joachim99@8: } joachim99@8: emit updateAvailabilities(); joachim99@51: joachim99@51: if ( m_currentItemForOperation==m_mergeItemList.end() ) joachim99@51: { joachim99@51: m_mergeItemList.clear(); joachim99@51: m_bRealMergeStarted=false; joachim99@51: } joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::allowResizeEvents(bool bAllowResizeEvents ) joachim99@8: { joachim99@8: m_bAllowResizeEvents = bAllowResizeEvents; joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeWindow::resizeEvent( QResizeEvent* e ) joachim99@8: { joachim99@8: if (m_bAllowResizeEvents) joachim99@8: QListView::resizeEvent(e); joachim99@8: } joachim99@8: joachim99@8: bool DirectoryMergeWindow::deleteFLD( const QString& name, bool bCreateBackup ) joachim99@8: { joachim99@8: FileAccess fi(name, true); joachim99@8: if ( !fi.exists() ) joachim99@8: return true; joachim99@8: joachim99@8: if ( bCreateBackup ) joachim99@8: { joachim99@8: bool bSuccess = renameFLD( name, name+".orig" ); joachim99@8: if (!bSuccess) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").arg(name) ); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( fi.isDir() && !fi.isSymLink() ) joachim99@51: m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").arg(name)); joachim99@8: else joachim99@51: m_pStatusInfo->addText(i18n("delete( %1 )").arg(name)); joachim99@8: joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: if ( fi.isDir() && !fi.isSymLink() )// recursive directory delete only for real dirs, not symlinks joachim99@8: { joachim99@8: t_DirectoryList dirList; joachim99@8: bool bSuccess = fi.listDir( &dirList, false, true, "*", "", "", false, false ); // not recursive, find hidden files joachim99@8: joachim99@8: if ( !bSuccess ) joachim99@8: { joachim99@8: // No Permission to read directory or other error. joachim99@51: m_pStatusInfo->addText( i18n("Error: delete dir operation failed while trying to read the directory.") ); joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: t_DirectoryList::iterator it; // create list iterator joachim99@8: joachim99@8: for ( it=dirList.begin(); it!=dirList.end(); ++it ) // for each file... joachim99@8: { joachim99@8: FileAccess& fi2 = *it; joachim99@8: if ( fi2.fileName() == "." || fi2.fileName()==".." ) joachim99@8: continue; joachim99@8: bSuccess = deleteFLD( fi2.absFilePath(), false ); joachim99@8: if (!bSuccess) break; joachim99@8: } joachim99@8: if (bSuccess) joachim99@8: { joachim99@8: bSuccess = FileAccess::removeDir( name ); joachim99@8: if ( !bSuccess ) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").arg(name)); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: bool bSuccess = FileAccess::removeFile( name ); joachim99@8: if ( !bSuccess ) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error: delete operation failed.") ); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: bool DirectoryMergeWindow::mergeFLD( const QString& nameA,const QString& nameB,const QString& nameC,const QString& nameDest, bool& bSingleFileMerge ) joachim99@8: { joachim99@8: FileAccess fi(nameA); joachim99@8: if (fi.isDir()) joachim99@8: { joachim99@8: return makeDir(nameDest); joachim99@8: } joachim99@8: joachim99@8: // Make sure that the dir exists, into which we will save the file later. joachim99@8: int pos=nameDest.findRev('/'); joachim99@8: if ( pos>0 ) joachim99@8: { joachim99@8: QString parentName = nameDest.left(pos); joachim99@8: bool bSuccess = makeDir(parentName, true /*quiet*/); joachim99@8: if (!bSuccess) joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@51: m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").arg(nameA).arg(nameB).arg(nameC).arg(nameDest)); joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@51: m_pStatusInfo->addText(i18n(" Note: After a manual merge the user should continue via F7.") ); joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: bSingleFileMerge = true; joachim99@51: (*m_currentItemForOperation)->setText( s_OpStatusCol, i18n("In progress...") ); joachim99@51: ensureItemVisible( *m_currentItemForOperation ); joachim99@8: joachim99@8: emit startDiffMerge( nameA, nameB, nameC, nameDest, "","","" ); joachim99@8: joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: bool DirectoryMergeWindow::copyFLD( const QString& srcName, const QString& destName ) joachim99@8: { joachim99@8: if ( srcName == destName ) joachim99@8: return true; joachim99@8: joachim99@8: if ( FileAccess(destName, true).exists() ) joachim99@8: { joachim99@8: bool bSuccess = deleteFLD( destName, m_pOptions->m_bDmCreateBakFiles ); joachim99@8: if ( !bSuccess ) joachim99@8: { joachim99@51: m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed." joachim99@51: "Deleting existing destination failed.").arg(srcName).arg(destName)); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: FileAccess fi( srcName ); joachim99@8: joachim99@8: if ( fi.isSymLink() && (fi.isDir() && !m_bFollowDirLinks || !fi.isDir() && !m_bFollowDirLinks) ) joachim99@8: { joachim99@51: m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").arg(srcName).arg(destName)); joachim99@8: #ifdef _WIN32 joachim99@8: // What are links? joachim99@8: #else joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: FileAccess destFi(destName); joachim99@8: if ( !destFi.isLocal() || !fi.isLocal() ) joachim99@8: { joachim99@51: m_pStatusInfo->addText(i18n("Error: copyLink failed: Remote links are not yet supported.")); joachim99@8: return false; joachim99@8: } joachim99@8: QString linkTarget = fi.readLink(); joachim99@8: bool bSuccess = FileAccess::symLink( linkTarget, destName ); joachim99@8: if (!bSuccess) joachim99@51: m_pStatusInfo->addText(i18n("Error: copyLink failed.")); joachim99@8: return bSuccess; joachim99@8: #endif joachim99@8: } joachim99@8: joachim99@8: if ( fi.isDir() ) joachim99@8: { joachim99@8: bool bSuccess = makeDir( destName ); joachim99@8: return bSuccess; joachim99@8: } joachim99@8: joachim99@8: int pos=destName.findRev('/'); joachim99@8: if ( pos>0 ) joachim99@8: { joachim99@8: QString parentName = destName.left(pos); joachim99@8: bool bSuccess = makeDir(parentName, true /*quiet*/); joachim99@8: if (!bSuccess) joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@51: m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").arg(srcName).arg(destName)); joachim99@8: joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: FileAccess faSrc ( srcName ); joachim99@8: bool bSuccess = faSrc.copyFile( destName ); joachim99@8: if (! bSuccess ) m_pStatusInfo->addText( faSrc.getStatusText() ); joachim99@8: return bSuccess; joachim99@8: } joachim99@8: joachim99@8: // Rename is not an operation that can be selected by the user. joachim99@8: // It will only be used to create backups. joachim99@8: // Hence it will delete an existing destination without making a backup (of the old backup.) joachim99@8: bool DirectoryMergeWindow::renameFLD( const QString& srcName, const QString& destName ) joachim99@8: { joachim99@8: if ( srcName == destName ) joachim99@8: return true; joachim99@8: joachim99@8: if ( FileAccess(destName, true).exists() ) joachim99@8: { joachim99@8: bool bSuccess = deleteFLD( destName, false /*no backup*/ ); joachim99@8: if (!bSuccess) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): " joachim99@51: "Cannot delete existing destination." ).arg(srcName).arg(destName)); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: joachim99@51: m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").arg(srcName).arg(destName)) ; joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: bool bSuccess = FileAccess( srcName ).rename( destName ); joachim99@8: if (!bSuccess) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error: Rename failed.") ); joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: bool DirectoryMergeWindow::makeDir( const QString& name, bool bQuiet ) joachim99@8: { joachim99@8: FileAccess fi(name, true); joachim99@8: if( fi.exists() && fi.isDir() ) joachim99@8: return true; joachim99@8: joachim99@8: if( fi.exists() && !fi.isDir() ) joachim99@8: { joachim99@8: bool bSuccess = deleteFLD( name, true ); joachim99@8: if (!bSuccess) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error during makeDir of %1. " joachim99@51: "Cannot delete existing file." ).arg(name)); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: int pos=name.findRev('/'); joachim99@8: if ( pos>0 ) joachim99@8: { joachim99@8: QString parentName = name.left(pos); joachim99@8: bool bSuccess = makeDir(parentName,true); joachim99@8: if (!bSuccess) joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: if ( ! bQuiet ) joachim99@51: m_pStatusInfo->addText(i18n("makeDir( %1 )").arg(name)); joachim99@8: joachim99@8: if ( m_bSimulatedMergeStarted ) joachim99@8: { joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: bool bSuccess = FileAccess::makeDir( name ); joachim99@8: if ( bSuccess == false ) joachim99@8: { joachim99@51: m_pStatusInfo->addText( i18n("Error while creating directory.") ); joachim99@8: return false; joachim99@8: } joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: joachim99@8: DirectoryMergeInfo::DirectoryMergeInfo( QWidget* pParent ) joachim99@8: : QFrame(pParent) joachim99@8: { joachim99@8: QVBoxLayout *topLayout = new QVBoxLayout( this ); joachim99@8: joachim99@8: QGridLayout *grid = new QGridLayout( topLayout ); joachim99@8: grid->setColStretch(1,10); joachim99@8: joachim99@8: int line=0; joachim99@8: joachim99@8: m_pA = new QLabel("A",this); grid->addWidget( m_pA,line, 0 ); joachim99@8: m_pInfoA = new QLabel(this); grid->addWidget( m_pInfoA,line,1 ); ++line; joachim99@8: m_pB = new QLabel("B",this); grid->addWidget( m_pB,line, 0 ); joachim99@8: m_pInfoB = new QLabel(this); grid->addWidget( m_pInfoB,line,1 ); ++line; joachim99@8: m_pC = new QLabel("C",this); grid->addWidget( m_pC,line, 0 ); joachim99@8: m_pInfoC = new QLabel(this); grid->addWidget( m_pInfoC,line,1 ); ++line; joachim99@51: m_pDest = new QLabel(i18n("Dest"),this); grid->addWidget( m_pDest,line, 0 ); joachim99@8: m_pInfoDest = new QLabel(this); grid->addWidget( m_pInfoDest,line,1 ); ++line; joachim99@8: joachim99@8: m_pInfoList = new QListView(this); topLayout->addWidget( m_pInfoList ); joachim99@51: m_pInfoList->addColumn(i18n("Dir")); joachim99@51: m_pInfoList->addColumn(i18n("Type")); joachim99@51: m_pInfoList->addColumn(i18n("Size")); joachim99@51: m_pInfoList->addColumn(i18n("Attr")); joachim99@51: m_pInfoList->addColumn(i18n("Last Modification")); joachim99@51: m_pInfoList->addColumn(i18n("Link-Destination")); joachim99@8: setMinimumSize( 100,100 ); joachim99@8: } joachim99@8: joachim99@8: static void addListViewItem( QListView* pListView, const QString& dir, joachim99@8: const QString& basePath, FileAccess& fi ) joachim99@8: { joachim99@8: if ( basePath.isEmpty() ) joachim99@8: { joachim99@8: return; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( fi.exists() ) joachim99@8: { joachim99@8: #if QT_VERSION==230 joachim99@8: QString dateString = fi.lastModified().toString(); joachim99@8: #else joachim99@8: QString dateString = fi.lastModified().toString("yyyy-MM-dd hh:mm:ss"); joachim99@8: #endif joachim99@8: joachim99@8: new QListViewItem( joachim99@8: pListView, joachim99@8: dir, joachim99@51: QString( fi.isDir() ? i18n("Dir") : i18n("File") ) + (fi.isSymLink() ? "-Link" : ""), joachim99@8: QString::number(fi.size()), joachim99@8: QString(fi.isReadable() ? "r" : " ") + (fi.isWritable()?"w" : " ") joachim99@8: #ifdef _WIN32 joachim99@8: /*Future: Use GetFileAttributes()*/, joachim99@8: #else joachim99@8: + (fi.isExecutable()?"x" : " "), joachim99@8: #endif joachim99@8: dateString, joachim99@8: QString(fi.isSymLink() ? (" -> " + fi.readLink()) : QString("")) joachim99@8: ); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: new QListViewItem( joachim99@8: pListView, joachim99@8: dir, joachim99@51: i18n("not available"), joachim99@8: "", joachim99@8: "", joachim99@8: "", joachim99@8: "" joachim99@8: ); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void DirectoryMergeInfo::setInfo( joachim99@8: const FileAccess& dirA, joachim99@8: const FileAccess& dirB, joachim99@8: const FileAccess& dirC, joachim99@8: const FileAccess& dirDest, joachim99@8: MergeFileInfos& mfi ) joachim99@8: { joachim99@8: bool bHideDest = false; joachim99@8: if ( dirA.absFilePath()==dirDest.absFilePath() ) joachim99@8: { joachim99@51: m_pA->setText( i18n("A (Dest): ") ); bHideDest=true; joachim99@8: } joachim99@8: else joachim99@51: m_pA->setText( !dirC.isValid() ? QString("A: ") : i18n("A (Base): ")); joachim99@8: joachim99@8: m_pInfoA->setText( dirA.prettyAbsPath() ); joachim99@8: joachim99@8: if ( dirB.absFilePath()==dirDest.absFilePath() ) joachim99@8: { joachim99@51: m_pB->setText( i18n("B (Dest): ") ); bHideDest=true; joachim99@8: } joachim99@8: else joachim99@8: m_pB->setText( "B: " ); joachim99@8: m_pInfoB->setText( dirB.prettyAbsPath() ); joachim99@8: joachim99@8: if ( dirC.absFilePath()==dirDest.absFilePath() ) joachim99@8: { joachim99@51: m_pC->setText( i18n("C (Dest): ") ); bHideDest=true; joachim99@8: } joachim99@8: else joachim99@8: m_pC->setText( "C: " ); joachim99@8: m_pInfoC->setText( dirC.prettyAbsPath() ); joachim99@8: joachim99@51: m_pDest->setText( i18n("Dest: ") ); m_pInfoDest->setText( dirDest.prettyAbsPath() ); joachim99@8: joachim99@8: if (!dirC.isValid()) { m_pC->hide(); m_pInfoC->hide(); } joachim99@8: else { m_pC->show(); m_pInfoC->show(); } joachim99@8: joachim99@8: if (!dirDest.isValid()||bHideDest) { m_pDest->hide(); m_pInfoDest->hide(); } joachim99@8: else { m_pDest->show(); m_pInfoDest->show(); } joachim99@8: joachim99@8: m_pInfoList->clear(); joachim99@8: addListViewItem( m_pInfoList, "A", dirA.prettyAbsPath(), mfi.m_fileInfoA ); joachim99@8: addListViewItem( m_pInfoList, "B", dirB.prettyAbsPath(), mfi.m_fileInfoB ); joachim99@8: addListViewItem( m_pInfoList, "C", dirC.prettyAbsPath(), mfi.m_fileInfoC ); joachim99@8: if (!bHideDest) joachim99@8: { joachim99@8: FileAccess fiDest( dirDest.prettyAbsPath() + "/" + mfi.m_subPath, true ); joachim99@51: addListViewItem( m_pInfoList, i18n("Dest"), dirDest.prettyAbsPath(), fiDest ); joachim99@8: } joachim99@8: } joachim99@8: joachim99@51: joachim99@51: void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac ) joachim99@51: { joachim99@51: #include "xpm/startmerge.xpm" joachim99@51: DirectoryMergeWindow* p = this; joachim99@51: joachim99@51: dirStartOperation = new KAction(i18n("Start/Continue Directory Merge"), Key_F7, p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); joachim99@51: dirRunOperationForCurrentItem = new KAction(i18n("Run Operation for Current Item"), Key_F6, p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); joachim99@51: dirCompareCurrent = new KAction(i18n("Compare Selected File"), 0, p, SLOT(compareCurrentFile()), ac, "dir_compare_current"); joachim99@51: dirMergeCurrent = new KAction(i18n("Merge Current File"), QIconSet(QPixmap(startmerge)), 0, pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current"); joachim99@51: dirFoldAll = new KAction(i18n("Fold All Subdirs"), 0, p, SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); joachim99@51: dirUnfoldAll = new KAction(i18n("Unfold All Subdirs"), 0, p, SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); joachim99@53: dirRescan = new KAction(i18n("Rescan"), SHIFT+Key_F5, p, SLOT(reload()), ac, "dir_rescan"); joachim99@51: dirChooseAEverywhere = new KAction(i18n("Choose A for All Items"), 0, p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); joachim99@51: dirChooseBEverywhere = new KAction(i18n("Choose B for All Items"), 0, p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); joachim99@51: dirChooseCEverywhere = new KAction(i18n("Choose C for All Items"), 0, p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); joachim99@51: dirAutoChoiceEverywhere = new KAction(i18n("Auto-Choose Operation for All Items"), 0, p, SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); joachim99@51: dirDoNothingEverywhere = new KAction(i18n("No Operation for All Items"), 0, p, SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); joachim99@51: joachim99@51: dirCurrentDoNothing = new KAction(i18n("Do Nothing"), 0, p, SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); joachim99@51: dirCurrentChooseA = new KAction(i18n("A"), 0, p, SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); joachim99@51: dirCurrentChooseB = new KAction(i18n("B"), 0, p, SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); joachim99@51: dirCurrentChooseC = new KAction(i18n("C"), 0, p, SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); joachim99@51: dirCurrentMerge = new KAction(i18n("Merge"), 0, p, SLOT(slotCurrentMerge()), ac, "dir_current_merge"); joachim99@51: dirCurrentDelete = new KAction(i18n("Delete (If Exists)"), 0, p, SLOT(slotCurrentDelete()), ac, "dir_current_delete"); joachim99@51: joachim99@51: dirCurrentSyncDoNothing = new KAction(i18n("Do Nothing"), 0, p, SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); joachim99@51: dirCurrentSyncCopyAToB = new KAction(i18n("Copy A to B"), 0, p, SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); joachim99@51: dirCurrentSyncCopyBToA = new KAction(i18n("Copy B to A"), 0, p, SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); joachim99@51: dirCurrentSyncDeleteA = new KAction(i18n("Delete A"), 0, p, SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); joachim99@51: dirCurrentSyncDeleteB = new KAction(i18n("Delete B"), 0, p, SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); joachim99@51: dirCurrentSyncDeleteAAndB = new KAction(i18n("Delete A and B"), 0, p, SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); joachim99@51: dirCurrentSyncMergeToA = new KAction(i18n("Merge to A"), 0, p, SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); joachim99@51: dirCurrentSyncMergeToB = new KAction(i18n("Merge to B"), 0, p, SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); joachim99@51: dirCurrentSyncMergeToAAndB = new KAction(i18n("Merge to A and B"), 0, p, SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); joachim99@51: } joachim99@51: joachim99@51: joachim99@53: void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible, joachim99@53: KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC ) joachim99@51: { joachim99@51: dirStartOperation->setEnabled( bDirCompare ); joachim99@51: dirRunOperationForCurrentItem->setEnabled( bDirCompare ); joachim99@51: dirFoldAll->setEnabled( bDirCompare ); joachim99@51: dirUnfoldAll->setEnabled( bDirCompare ); joachim99@51: joachim99@51: dirCompareCurrent->setEnabled( bDirCompare && isVisible() && isFileSelected() ); joachim99@51: joachim99@51: dirMergeCurrent->setEnabled( bDirCompare && isVisible() && isFileSelected() joachim99@51: || bDiffWindowVisible ); joachim99@51: joachim99@51: dirRescan->setEnabled( bDirCompare ); joachim99@51: joachim99@51: dirAutoChoiceEverywhere->setEnabled( bDirCompare && isVisible() ); joachim99@51: dirDoNothingEverywhere->setEnabled( bDirCompare && isVisible() ); joachim99@51: dirChooseAEverywhere->setEnabled( bDirCompare && isVisible() ); joachim99@51: dirChooseBEverywhere->setEnabled( bDirCompare && isVisible() ); joachim99@51: dirChooseCEverywhere->setEnabled( bDirCompare && isVisible() ); joachim99@51: joachim99@51: bool bThreeDirs = m_dirC.isValid(); joachim99@51: joachim99@51: QListViewItem* lvi = currentItem(); joachim99@51: DirMergeItem* pDMI = lvi==0 ? 0 : static_cast(lvi); joachim99@51: MergeFileInfos* pMFI = pDMI==0 ? 0 : pDMI->m_pMFI; joachim99@51: joachim99@51: bool bItemActive = bDirCompare && isVisible() && pMFI!=0;// && hasFocus(); joachim99@51: bool bMergeMode = bThreeDirs || !m_bSyncMode; joachim99@51: bool bFTConflict = pMFI==0 ? false : conflictingFileTypes(*pMFI); joachim99@51: joachim99@53: bool bDirWindowHasFocus = isVisible() && hasFocus(); joachim99@53: joachim99@51: dirCurrentDoNothing->setEnabled( bItemActive && bMergeMode ); joachim99@51: dirCurrentChooseA->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInA ); joachim99@51: dirCurrentChooseB->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInB ); joachim99@51: dirCurrentChooseC->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInC ); joachim99@51: dirCurrentMerge->setEnabled( bItemActive && bMergeMode && !bFTConflict ); joachim99@51: dirCurrentDelete->setEnabled( bItemActive && bMergeMode ); joachim99@53: if ( bDirWindowHasFocus ) joachim99@53: { joachim99@53: chooseA->setEnabled( bItemActive && pMFI->m_bExistsInA ); joachim99@53: chooseB->setEnabled( bItemActive && pMFI->m_bExistsInB ); joachim99@53: chooseC->setEnabled( bItemActive && pMFI->m_bExistsInC ); joachim99@53: chooseA->setChecked( false ); joachim99@53: chooseB->setChecked( false ); joachim99@53: chooseC->setChecked( false ); joachim99@53: } joachim99@53: joachim99@51: dirCurrentSyncDoNothing->setEnabled( bItemActive && !bMergeMode ); joachim99@51: dirCurrentSyncCopyAToB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA ); joachim99@51: dirCurrentSyncCopyBToA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB ); joachim99@51: dirCurrentSyncDeleteA->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInA ); joachim99@51: dirCurrentSyncDeleteB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB ); joachim99@51: dirCurrentSyncDeleteAAndB->setEnabled( bItemActive && !bMergeMode && pMFI->m_bExistsInB && pMFI->m_bExistsInB ); joachim99@51: dirCurrentSyncMergeToA->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); joachim99@51: dirCurrentSyncMergeToB->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); joachim99@51: dirCurrentSyncMergeToAAndB->setEnabled( bItemActive && !bMergeMode && !bFTConflict ); joachim99@51: } joachim99@51: joachim99@51: joachim99@8: #include "directorymergewindow.moc"