joachim99@8: /*************************************************************************** joachim99@8: kdiff.cpp - description joachim99@8: ------------------- joachim99@8: begin : Mon Mär 18 20:04:50 CET 2002 joachim99@8: copyright : (C) 2002 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 "diff.h" joachim99@8: #include "directorymergewindow.h" joachim99@8: joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: #include joachim99@8: 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: #include joachim99@8: #include joachim99@8: #include joachim99@8: joachim99@8: #include "kdiff3.h" joachim99@8: #include "optiondialog.h" joachim99@8: #include "fileaccess.h" joachim99@8: #ifdef _WIN32 joachim99@8: #include joachim99@8: #else joachim99@8: #include joachim99@8: #endif joachim99@8: joachim99@51: #include "gnudiff_diff.h" joachim99@51: joachim99@8: //using namespace std; joachim99@8: joachim99@8: int g_tabSize = 8; joachim99@8: bool g_bIgnoreWhiteSpace = true; joachim99@8: bool g_bIgnoreTrivialMatches = true; joachim99@8: joachim99@8: joachim99@8: QString createTempFile( const LineData* p, int size, bool bIgnoreWhiteSpace, bool bIgnoreNumbers ) joachim99@8: { joachim99@8: QString fileName = FileAccess::tempFileName(); joachim99@8: joachim99@8: QFile file( fileName ); joachim99@8: bool bSuccess = file.open( IO_WriteOnly ); joachim99@8: if ( !bSuccess ) return ""; joachim99@8: for (int l=0; lsetSubCurrent(0); joachim99@51: joachim99@8: diffList.clear(); joachim99@51: if ( p1[0].pLine==0 || p2[0].pLine==0 ) joachim99@51: { joachim99@51: Diff d( 0,0,0); joachim99@51: if ( p1[0].pLine==0 && p2[0].pLine==0 && size1 == size2 ) joachim99@51: d.nofEquals = size1; joachim99@53: else joachim99@53: { joachim99@53: d.diff1=size1; joachim99@53: d.diff2=size2; joachim99@53: } joachim99@51: joachim99@51: diffList.push_back(d); joachim99@51: } joachim99@53: else joachim99@53: { joachim99@53: GnuDiff::comparison comparisonInput; joachim99@53: memset( &comparisonInput, 0, sizeof(comparisonInput) ); joachim99@53: comparisonInput.parent = 0; joachim99@53: comparisonInput.file[0].buffer = (word*)p1[0].pLine;//ptr to buffer joachim99@53: comparisonInput.file[0].buffered = p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size; // size of buffer joachim99@53: comparisonInput.file[1].buffer = (word*)p2[0].pLine;//ptr to buffer joachim99@53: comparisonInput.file[1].buffered = p2[size2-1].pLine-p2[0].pLine+p2[size2-1].size; // size of buffer joachim99@53: joachim99@53: gnuDiff.ignore_white_space = GnuDiff::IGNORE_ALL_SPACE; // I think nobody needs anything else ... joachim99@53: gnuDiff.bIgnoreWhiteSpace = true; joachim99@53: gnuDiff.bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers; joachim99@53: gnuDiff.minimal = m_pOptionDialog->m_bTryHard; joachim99@53: gnuDiff.ignore_case = false; // m_pOptionDialog->m_bUpCase is applied while reading. joachim99@53: GnuDiff::change* script = gnuDiff.diff_2_files( &comparisonInput ); joachim99@53: joachim99@53: int equalLinesAtStart = comparisonInput.file[0].prefix_lines; joachim99@53: int currentLine1 = 0; joachim99@53: int currentLine2 = 0; joachim99@53: GnuDiff::change* p=0; joachim99@53: for (GnuDiff::change* e = script; e; e = p) joachim99@51: { joachim99@53: Diff d(0,0,0); joachim99@53: d.nofEquals = e->line0 - currentLine1; joachim99@53: assert( d.nofEquals == e->line1 - currentLine2 ); joachim99@53: d.diff1 = e->deleted; joachim99@53: d.diff2 = e->inserted; joachim99@53: currentLine1 += d.nofEquals + d.diff1; joachim99@53: currentLine2 += d.nofEquals + d.diff2; joachim99@53: diffList.push_back(d); joachim99@53: joachim99@53: p = e->link; joachim99@53: free (e); joachim99@51: } joachim99@53: joachim99@53: if ( !diffList.empty() ) joachim99@51: { joachim99@53: diffList.front().nofEquals += equalLinesAtStart; joachim99@53: currentLine1 += equalLinesAtStart; joachim99@53: currentLine2 += equalLinesAtStart; joachim99@53: } joachim99@53: joachim99@53: if (size1-currentLine1==size2-currentLine2 ) joachim99@53: { joachim99@53: Diff d( size1-currentLine1,0,0); joachim99@51: diffList.push_back(d); joachim99@51: } joachim99@53: else if ( !diffList.empty() ) joachim99@53: { // Only necessary for a files that end with a newline joachim99@53: int nofEquals = min2(size1-currentLine1,size2-currentLine2); joachim99@53: if ( nofEquals==0 ) joachim99@53: { joachim99@53: diffList.back().diff1 += size1-currentLine1; joachim99@53: diffList.back().diff2 += size2-currentLine2; joachim99@53: } joachim99@53: else joachim99@53: { joachim99@53: Diff d( nofEquals,size1-currentLine1-nofEquals,size2-currentLine2-nofEquals); joachim99@53: diffList.push_back(d); joachim99@53: } joachim99@53: } joachim99@51: } joachim99@53: joachim99@51: #ifndef NDEBUG joachim99@51: // Verify difflist joachim99@51: { joachim99@51: int l1=0; joachim99@51: int l2=0; joachim99@51: DiffList::iterator i; joachim99@51: for( i = diffList.begin(); i!=diffList.end(); ++i ) joachim99@51: { joachim99@51: l1+= i->nofEquals + i->diff1; joachim99@51: l2+= i->nofEquals + i->diff2; joachim99@51: } joachim99@51: joachim99@51: //if( l1!=p1-p1start || l2!=p2-p2start ) joachim99@51: if( l1!=size1 || l2!=size2 ) joachim99@51: assert( false ); joachim99@51: } joachim99@51: #endif joachim99@51: joachim99@51: g_pProgressDialog->setSubCurrent(1.0); joachim99@51: joachim99@51: return true; joachim99@51: #if 0 joachim99@8: joachim99@8: if ( m_pOptionDialog->m_bUseExternalDiff ) joachim99@8: { joachim99@8: bool bSuccess=false; joachim99@8: joachim99@8: bool bIgnoreWhiteSpace = m_pOptionDialog->m_bIgnoreWhiteSpace; joachim99@8: bool bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers; joachim99@8: joachim99@8: // Create two temp files (Remove all white spaces and carriage returns here) joachim99@8: // (Make sure that no existing files are overwritten.) joachim99@8: g_pProgressDialog->setSubCurrent(0); joachim99@8: QString fileName1 = createTempFile( p1, size1, bIgnoreWhiteSpace, bIgnoreNumbers ); joachim99@8: g_pProgressDialog->setSubCurrent(0.25); joachim99@8: QString fileName2 = createTempFile( p2, size2, bIgnoreWhiteSpace, bIgnoreNumbers ); joachim99@8: g_pProgressDialog->setSubCurrent(0.5); joachim99@8: QString fileNameOut = FileAccess::tempFileName(); joachim99@8: joachim99@8: if ( !fileName1.isEmpty() && !fileName2.isEmpty() ) joachim99@8: { joachim99@8: QString cmd; joachim99@8: #ifdef _WIN32 joachim99@8: // Under Windows it's better to search for diff.exe joachim99@8: char buf[200]; joachim99@8: int r= SearchPathA( 0, "diff.exe", 0, sizeof(buf), buf, 0 ); joachim99@8: joachim99@8: if (r!=0) { cmd = buf; } joachim99@8: #else joachim99@8: // under Un*x I assume that a diff command is in the PATH joachim99@8: cmd = "diff"; joachim99@8: #endif joachim99@8: if ( !cmd.isEmpty() ) joachim99@8: { joachim99@8: cmd += " -a "; // -a = treat all files as text joachim99@8: if ( m_pOptionDialog->m_bTryHard ) joachim99@8: cmd += "--minimal "; joachim99@8: //if ( m_pOptionDialog->m_bIgnoreWhiteSpace ) This I do myself, see below joachim99@8: // cmd += "--ignore-all-space "; joachim99@8: cmd += fileName1+" "+fileName2+" >"+fileNameOut; joachim99@8: // Run diff joachim99@8: //int status1 = ::system( 0 ); // ==0 if shell not found joachim99@8: int status = ::system( cmd.ascii() ); joachim99@8: #ifdef WEXITSTATUS joachim99@8: status = WEXITSTATUS(status); joachim99@8: #endif joachim99@8: //if (status<0) joachim99@8: //{ joachim99@8: // errorString = strerror( errno ); joachim99@8: //} joachim99@8: bSuccess = status>=0 && status!=127; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: g_pProgressDialog->setSubCurrent(0.75); joachim99@8: joachim99@8: int currentLine1 = 0; joachim99@8: int currentLine2 = 0; joachim99@8: if ( bSuccess ) joachim99@8: { joachim99@8: // Parse the output and create the difflist joachim99@8: QFile f( fileNameOut ); joachim99@8: bSuccess = f.open(IO_ReadOnly); joachim99@8: if (bSuccess) joachim99@8: { joachim99@8: const QByteArray buf = f.readAll(); joachim99@8: unsigned int bufSize=buf.size(); joachim99@8: unsigned int pos=0; joachim99@8: for(pos=0;pos' || c == '-' || c=='<' ) joachim99@8: continue; // Not interested in the data joachim99@8: else joachim99@8: { joachim99@8: QCString line( &buf.at(lineStart), pos-lineStart+1 ); joachim99@8: int pa = line.find('a'); // add joachim99@8: int pc = line.find('c'); // change joachim99@8: int pd = line.find('d'); // delete joachim99@8: int p = pa>0 ? pa : (pc > 0 ? pc : pd); joachim99@8: if (p<0) break; // Unexpected error joachim99@8: QCString left = line.left(p); joachim99@8: QCString right = line.mid(p+1); joachim99@8: int pcommaleft = left.find(','); joachim99@8: int pcommaright = right.find(','); joachim99@8: int l1top=-1, l1bottom=-1, l2top=-1, l2bottom=-1; joachim99@8: if (pcommaleft>0) joachim99@8: { joachim99@8: l1top = left.left(pcommaleft).toInt(); joachim99@8: l1bottom = left.mid(pcommaleft+1).toInt(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: l1top = left.toInt(); joachim99@8: l1bottom = l1top; joachim99@8: } joachim99@8: if (pcommaright>0) joachim99@8: { joachim99@8: l2top = right.left(pcommaright).toInt(); joachim99@8: l2bottom = right.mid(pcommaright+1).toInt(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: l2top = right.toInt(); joachim99@8: l2bottom = l2top; joachim99@8: } joachim99@8: joachim99@8: Diff d(0,0,0); joachim99@8: joachim99@8: if ( pa>0 ) joachim99@8: { joachim99@8: d.nofEquals = l1top - currentLine1; joachim99@8: d.diff1 = 0; joachim99@8: d.diff2 = l2bottom - l2top + 1; joachim99@8: assert( d.nofEquals == l2top - 1 - currentLine2 ); joachim99@8: } joachim99@8: else if ( pd>0 ) joachim99@8: { joachim99@8: d.nofEquals = l2top - currentLine2; joachim99@8: d.diff1 = l1bottom - l1top + 1; joachim99@8: d.diff2 = 0; joachim99@8: assert( d.nofEquals == l1top - 1 - currentLine1 ); joachim99@8: } joachim99@8: else if ( pc>0 ) joachim99@8: { joachim99@8: d.nofEquals = l1top - 1 - currentLine1; joachim99@8: d.diff1 = l1bottom - l1top + 1; joachim99@8: d.diff2 = l2bottom - l2top + 1; joachim99@8: assert( d.nofEquals == l2top - 1 - currentLine2 ); joachim99@8: } joachim99@8: else joachim99@8: assert(false); joachim99@8: joachim99@8: currentLine1 += d.nofEquals + d.diff1; joachim99@8: currentLine2 += d.nofEquals + d.diff2; joachim99@8: diffList.push_back(d); joachim99@8: } joachim99@8: } joachim99@8: if (size1-currentLine1==size2-currentLine2 ) joachim99@8: { joachim99@8: Diff d( size1-currentLine1,0,0); joachim99@8: diffList.push_back(d); joachim99@8: currentLine1=size1; joachim99@8: currentLine2=size2; joachim99@8: } joachim99@8: joachim99@8: if ( currentLine1 == size1 && currentLine2 == size2 ) joachim99@8: bSuccess = true; joachim99@8: } joachim99@50: else joachim99@50: { joachim99@50: bSuccess = size1==size2; joachim99@50: } joachim99@8: } joachim99@8: if ( currentLine1==0 && currentLine2==0 ) joachim99@8: { joachim99@8: Diff d( 0, size1, size2 ); joachim99@8: diffList.push_back(d); joachim99@8: } joachim99@8: joachim99@8: g_pProgressDialog->setSubCurrent(1.0); joachim99@8: joachim99@8: if ( !bSuccess ) joachim99@8: { joachim99@8: KMessageBox::sorry(this, joachim99@8: i18n("Running the external diff failed.\n" joachim99@8: "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n" joachim99@8: "The external diff option will be disabled now and the internal diff will be used."), joachim99@51: i18n("Warning")); joachim99@8: m_pOptionDialog->m_bUseExternalDiff = false; joachim99@8: } joachim99@51: joachim99@50: FileAccess::removeFile( fileName1 ); joachim99@50: FileAccess::removeFile( fileName2 ); joachim99@50: FileAccess::removeFile( fileNameOut ); joachim99@8: } joachim99@8: joachim99@8: if ( ! m_pOptionDialog->m_bUseExternalDiff ) joachim99@8: { joachim99@8: g_pProgressDialog->setSubCurrent(0.0); joachim99@8: if ( size1>0 && p1!=0 && p1->occurances==0 ) joachim99@8: { joachim99@8: prepareOccurances( p1, size1 ); joachim99@8: } joachim99@8: g_pProgressDialog->setSubCurrent(0.25); joachim99@8: joachim99@8: if ( size2>0 && p2!=0 && p2->occurances==0 ) joachim99@8: { joachim99@8: prepareOccurances( p2, size2 ); joachim99@8: } joachim99@8: g_pProgressDialog->setSubCurrent(0.5); joachim99@8: joachim99@8: calcDiff( p1, size1, p2, size2, diffList, 2, m_pOptionDialog->m_maxSearchLength ); joachim99@8: joachim99@8: g_pProgressDialog->setSubCurrent(1.0); joachim99@8: } joachim99@8: return true; joachim99@51: #endif joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void KDiff3App::init( bool bAuto ) joachim99@8: { joachim99@8: bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn; joachim99@8: joachim99@8: bool bVisibleMergeResultWindow = ! m_outputFilename.isEmpty(); joachim99@8: if ( bVisibleMergeResultWindow ) joachim99@8: { joachim99@8: bPreserveCarriageReturn = false; joachim99@8: } joachim99@8: joachim99@8: m_diff3LineList.clear(); joachim99@8: joachim99@51: bool bUseLineMatchingPP = !m_pOptionDialog->m_LineMatchingPreProcessorCmd.isEmpty() || joachim99@51: m_pOptionDialog->m_bIgnoreComments; joachim99@8: bool bUpCase = m_pOptionDialog->m_bUpCase; joachim99@8: joachim99@8: if (m_pDiffTextWindow1) m_pDiffTextWindow1->setPaintingAllowed( false ); joachim99@8: if (m_pDiffTextWindow2) m_pDiffTextWindow2->setPaintingAllowed( false ); joachim99@8: if (m_pDiffTextWindow3) m_pDiffTextWindow3->setPaintingAllowed( false ); joachim99@8: if (m_pOverview) m_pOverview->setPaintingAllowed( false ); joachim99@8: joachim99@8: joachim99@8: if( m_sd3.isEmpty() ) joachim99@8: g_pProgressDialog->setMaximum( 4 ); // Read 2 files, 1 comparison, 1 finediff joachim99@8: else joachim99@8: g_pProgressDialog->setMaximum( 9 ); // Read 3 files, 3 comparisons, 3 finediffs joachim99@8: joachim99@8: g_pProgressDialog->start(); joachim99@8: joachim99@8: // First get all input data. joachim99@8: g_pProgressDialog->setInformation(i18n("Loading A")); joachim99@8: m_sd1.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase ); joachim99@51: m_sdlm1.readLMPPFile( &m_sd1, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase, m_pOptionDialog->m_bIgnoreComments ); joachim99@8: g_pProgressDialog->step(); joachim99@8: joachim99@8: g_pProgressDialog->setInformation(i18n("Loading B")); joachim99@8: m_sd2.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase ); joachim99@51: m_sdlm2.readLMPPFile( &m_sd2, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase, m_pOptionDialog->m_bIgnoreComments ); joachim99@8: g_pProgressDialog->step(); joachim99@8: joachim99@8: m_sd3.m_bIsText = true; joachim99@8: m_totalDiffStatus.reset(); joachim99@8: // Run the diff. joachim99@8: if ( m_sd3.isEmpty() ) joachim99@8: { joachim99@8: m_totalDiffStatus.bBinaryAEqB = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd2.m_size && memcmp(m_sd1.m_pBuf,m_sd2.m_pBuf,m_sd1.m_size)==0); joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: A <-> B")); joachim99@8: if ( !bUseLineMatchingPP ) joachim99@8: runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd2.m_v[0], m_sd2.m_vSize, m_diffList12 ); joachim99@8: else joachim99@8: runDiff( &m_sdlm1.m_v[0], m_sdlm1.m_vSize, &m_sdlm2.m_v[0], m_sdlm2.m_vSize, m_diffList12 ); joachim99@8: joachim99@8: g_pProgressDialog->step(); joachim99@8: joachim99@8: g_pProgressDialog->setInformation(i18n("Linediff: A <-> B")); joachim99@8: calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList ); joachim99@51: fineDiff( m_diff3LineList, 1, &m_sd1.m_v[0], &m_sd2.m_v[0], m_totalDiffStatus.bTextAEqB ); joachim99@8: if ( m_sd1.m_size==0 ) m_totalDiffStatus.bTextAEqB=false; joachim99@8: joachim99@8: g_pProgressDialog->step(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: g_pProgressDialog->setInformation(i18n("Loading C")); joachim99@8: m_sd3.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase ); joachim99@51: m_sdlm3.readLMPPFile( &m_sd3, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase, m_pOptionDialog->m_bIgnoreComments ); joachim99@8: g_pProgressDialog->step(); joachim99@8: joachim99@8: m_totalDiffStatus.bBinaryAEqB = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd2.m_size && memcmp(m_sd1.m_pBuf,m_sd2.m_pBuf,m_sd1.m_size)==0); joachim99@8: m_totalDiffStatus.bBinaryAEqC = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd3.m_size && memcmp(m_sd1.m_pBuf,m_sd3.m_pBuf,m_sd1.m_size)==0); joachim99@8: m_totalDiffStatus.bBinaryBEqC = (m_sd3.m_size!=0 && m_sd3.m_size==m_sd2.m_size && memcmp(m_sd3.m_pBuf,m_sd2.m_pBuf,m_sd3.m_size)==0); joachim99@8: joachim99@8: if ( !bUseLineMatchingPP ) joachim99@8: { joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: A <-> B")); joachim99@8: runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd2.m_v[0], m_sd2.m_vSize, m_diffList12 ); joachim99@8: g_pProgressDialog->step(); joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: B <-> C")); joachim99@8: runDiff( &m_sd2.m_v[0], m_sd2.m_vSize, &m_sd3.m_v[0], m_sd3.m_vSize, m_diffList23 ); joachim99@8: g_pProgressDialog->step(); joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: A <-> C")); joachim99@8: runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd3.m_v[0], m_sd3.m_vSize, m_diffList13 ); joachim99@8: g_pProgressDialog->step(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: A <-> B")); joachim99@8: runDiff( &m_sdlm1.m_v[0], m_sd1.m_vSize, &m_sdlm2.m_v[0], m_sd2.m_vSize, m_diffList12 ); joachim99@8: g_pProgressDialog->step(); joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: B <-> C")); joachim99@8: runDiff( &m_sdlm2.m_v[0], m_sd2.m_vSize, &m_sdlm3.m_v[0], m_sd3.m_vSize, m_diffList23 ); joachim99@8: g_pProgressDialog->step(); joachim99@8: g_pProgressDialog->setInformation(i18n("Diff: A <-> C")); joachim99@8: runDiff( &m_sdlm1.m_v[0], m_sd1.m_vSize, &m_sdlm3.m_v[0], m_sd3.m_vSize, m_diffList13 ); joachim99@8: g_pProgressDialog->step(); joachim99@8: } joachim99@8: joachim99@8: calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList ); joachim99@8: calcDiff3LineListUsingAC( &m_diffList13, m_diff3LineList ); joachim99@8: calcDiff3LineListTrim( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] ); joachim99@8: joachim99@8: calcDiff3LineListUsingBC( &m_diffList23, m_diff3LineList ); joachim99@8: calcDiff3LineListTrim( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] ); joachim99@8: debugLineCheck( m_diff3LineList, m_sd1.m_vSize, 1 ); joachim99@8: debugLineCheck( m_diff3LineList, m_sd2.m_vSize, 2 ); joachim99@8: debugLineCheck( m_diff3LineList, m_sd3.m_vSize, 3 ); joachim99@8: joachim99@8: g_pProgressDialog->setInformation(i18n("Linediff: A <-> B")); joachim99@51: fineDiff( m_diff3LineList, 1, &m_sd1.m_v[0], &m_sd2.m_v[0], m_totalDiffStatus.bTextAEqB ); joachim99@8: g_pProgressDialog->step(); joachim99@8: g_pProgressDialog->setInformation(i18n("Linediff: B <-> C")); joachim99@51: fineDiff( m_diff3LineList, 2, &m_sd2.m_v[0], &m_sd3.m_v[0], m_totalDiffStatus.bTextBEqC ); joachim99@8: g_pProgressDialog->step(); joachim99@8: g_pProgressDialog->setInformation(i18n("Linediff: A <-> C")); joachim99@51: fineDiff( m_diff3LineList, 3, &m_sd3.m_v[0], &m_sd1.m_v[0], m_totalDiffStatus.bTextAEqC ); joachim99@8: g_pProgressDialog->step(); joachim99@8: if ( m_sd1.m_size==0 ) { m_totalDiffStatus.bTextAEqB=false; m_totalDiffStatus.bTextAEqC=false; } joachim99@8: if ( m_sd2.m_size==0 ) { m_totalDiffStatus.bTextAEqB=false; m_totalDiffStatus.bTextBEqC=false; } joachim99@8: } joachim99@8: calcWhiteDiff3Lines( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] ); joachim99@8: calcDiff3LineVector( m_diff3LineList, m_diff3LineVector ); joachim99@8: joachim99@8: // Calc needed lines for display joachim99@8: m_neededLines = m_diff3LineList.size(); joachim99@8: joachim99@8: m_pDirectoryMergeWindow->allowResizeEvents(false); joachim99@8: initView(); joachim99@8: m_pDirectoryMergeWindow->allowResizeEvents(true); joachim99@8: joachim99@8: m_bTripleDiff = ! m_sd3.isEmpty(); joachim99@8: joachim99@8: m_pDiffTextWindow1->init( m_sd1.getAliasName(), joachim99@8: &m_sd1.m_v[0], m_sd1.m_vSize, &m_diff3LineVector, 1, m_bTripleDiff ); joachim99@8: m_pDiffTextWindow2->init( m_sd2.getAliasName(), joachim99@8: &m_sd2.m_v[0], m_sd2.m_vSize, &m_diff3LineVector, 2, m_bTripleDiff ); joachim99@8: m_pDiffTextWindow3->init( m_sd3.getAliasName(), joachim99@8: &m_sd3.m_v[0], m_sd3.m_vSize, &m_diff3LineVector, 3, m_bTripleDiff ); joachim99@8: joachim99@8: if (m_bTripleDiff) m_pDiffTextWindow3->show(); joachim99@8: else m_pDiffTextWindow3->hide(); joachim99@8: joachim99@8: m_bOutputModified = bVisibleMergeResultWindow; joachim99@8: joachim99@8: m_pMergeResultWindow->init( joachim99@8: &m_sd1.m_v[0], joachim99@8: &m_sd2.m_v[0], joachim99@8: m_bTripleDiff ? &m_sd3.m_v[0] : 0, joachim99@8: &m_diff3LineList, joachim99@8: &m_totalDiffStatus, joachim99@8: m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename joachim99@8: ); joachim99@8: joachim99@8: m_pOverview->init(&m_diff3LineList, m_bTripleDiff ); joachim99@8: m_pDiffVScrollBar->setValue( 0 ); joachim99@8: m_pHScrollBar->setValue( 0 ); joachim99@8: joachim99@8: g_pProgressDialog->hide(); joachim99@8: m_pDiffTextWindow1->setPaintingAllowed( true ); joachim99@8: m_pDiffTextWindow2->setPaintingAllowed( true ); joachim99@8: m_pDiffTextWindow3->setPaintingAllowed( true ); joachim99@8: m_pOverview->setPaintingAllowed( true ); joachim99@8: joachim99@8: if ( !bVisibleMergeResultWindow ) joachim99@8: m_pMergeWindowFrame->hide(); joachim99@8: else joachim99@8: m_pMergeWindowFrame->show(); joachim99@8: joachim99@8: // Calc max width for display joachim99@8: m_maxWidth = max2( m_pDiffTextWindow1->getNofColumns(), m_pDiffTextWindow2->getNofColumns() ); joachim99@8: m_maxWidth = max2( m_maxWidth, m_pDiffTextWindow3->getNofColumns() ); joachim99@8: m_maxWidth += 5; joachim99@8: joachim99@8: if ( bVisibleMergeResultWindow && !bAuto ) joachim99@8: m_pMergeResultWindow->showNrOfConflicts(); joachim99@8: else if ( !bAuto ) joachim99@8: { joachim99@8: QString totalInfo; joachim99@8: if ( m_totalDiffStatus.bBinaryAEqB && m_totalDiffStatus.bBinaryAEqC ) joachim99@8: totalInfo += i18n("All input files are binary equal."); joachim99@8: else if ( m_totalDiffStatus.bTextAEqB && m_totalDiffStatus.bTextAEqC ) joachim99@8: totalInfo += i18n("All input files contain the same text."); joachim99@8: else { joachim99@8: if ( m_totalDiffStatus.bBinaryAEqB ) totalInfo += i18n("Files A and B are binary equal.\n"); joachim99@8: else if ( m_totalDiffStatus.bTextAEqB ) totalInfo += i18n("Files A and B have equal text. \n"); joachim99@8: if ( m_totalDiffStatus.bBinaryAEqC ) totalInfo += i18n("Files A and C are binary equal.\n"); joachim99@8: else if ( m_totalDiffStatus.bTextAEqC ) totalInfo += i18n("Files A and C have equal text. \n"); joachim99@8: if ( m_totalDiffStatus.bBinaryBEqC ) totalInfo += i18n("Files B and C are binary equal.\n"); joachim99@8: else if ( m_totalDiffStatus.bTextBEqC ) totalInfo += i18n("Files B and C have equal text. \n"); joachim99@8: } joachim99@8: joachim99@8: if ( !totalInfo.isEmpty() ) joachim99@8: KMessageBox::information( this, totalInfo ); joachim99@8: } joachim99@8: joachim99@8: if ( bVisibleMergeResultWindow && (!m_sd1.m_bIsText || !m_sd2.m_bIsText || !m_sd3.m_bIsText) ) joachim99@8: { joachim99@8: KMessageBox::information( this, i18n( joachim99@8: "Some inputfiles don't seem to be pure textfiles.\n" joachim99@8: "Note that the KDiff3-merge was not meant for binary data.\n" joachim99@8: "Continue at your own risk.") ); joachim99@8: /* QDialog d(this); joachim99@8: QVBoxLayout* l = new QVBoxLayout(&d); joachim99@51: QVButtonGroup* bg = new QVButtonGroup(i18n("Some File(s) Don't Seem to be Text Files"),&d); joachim99@8: l->addWidget(bg); joachim99@8: new QRadioButton("A: " + m_sd1.getAliasName(), bg); joachim99@8: new QRadioButton("B: " + m_sd2.getAliasName(), bg); joachim99@8: if (!m_sd3.isEmpty()) new QRadioButton("C: " + m_sd3.getAliasName(), bg); joachim99@8: bg->setButton(0); joachim99@8: QHBoxLayout* hbl = new QHBoxLayout(l); joachim99@8: QPushButton* pSaveButton = new QPushButton( i18n("Save Selection"), &d ); joachim99@8: connect( pSaveButton, SIGNAL(clicked()), &d, SLOT(accept())); joachim99@8: hbl->addWidget( pSaveButton ); joachim99@51: QPushButton* pProceedButton = new QPushButton( i18n("Proceed with Text-Merge"), &d ); joachim99@8: connect( pProceedButton, SIGNAL(clicked()), &d, SLOT(reject())); joachim99@8: hbl->addWidget( pProceedButton ); joachim99@8: joachim99@8: int result = d.exec(); joachim99@8: if( result == QDialog::Accepted ) joachim99@8: { joachim99@8: if ( bg->find(0)->isOn() ) saveBuffer( m_sd1.m_pBuf, m_sd1.m_size, m_outputFilename ); joachim99@8: else if ( bg->find(1)->isOn() ) saveBuffer( m_sd2.m_pBuf, m_sd2.m_size, m_outputFilename ); joachim99@8: else saveBuffer( m_sd3.m_pBuf, m_sd3.m_size, m_outputFilename ); joachim99@8: }*/ joachim99@8: } joachim99@8: joachim99@8: QTimer::singleShot( 10, this, SLOT(slotAfterFirstPaint()) ); joachim99@53: joachim99@53: if ( bVisibleMergeResultWindow && m_pMergeResultWindow ) joachim99@53: { joachim99@53: m_pMergeResultWindow->setFocus(); joachim99@53: } joachim99@53: else if(m_pDiffTextWindow1) joachim99@53: { joachim99@53: m_pDiffTextWindow1->setFocus(); joachim99@53: } joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void KDiff3App::resizeDiffTextWindow(int newWidth, int newHeight) joachim99@8: { joachim99@8: m_DTWHeight = newHeight; joachim99@8: m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) ); joachim99@8: m_pDiffVScrollBar->setPageStep( newHeight ); joachim99@8: m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); joachim99@8: joachim99@8: // The second window has a somewhat inverse width joachim99@8: joachim99@8: m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) ); joachim99@8: m_pHScrollBar->setPageStep( newWidth ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::resizeMergeResultWindow() joachim99@8: { joachim99@8: MergeResultWindow* p = m_pMergeResultWindow; joachim99@8: m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) ); joachim99@8: m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() ); joachim99@8: joachim99@8: // The second window has a somewhat inverse width joachim99@8: // m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) ); joachim99@8: // m_pHScrollBar->setPageStep( newWidth ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY ) joachim99@8: { joachim99@8: if ( deltaY!= 0 ) joachim99@8: { joachim99@8: m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->value() + deltaY ); joachim99@8: m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); joachim99@8: } joachim99@8: if ( deltaX!= 0) joachim99@8: m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::scrollMergeResultWindow( int deltaX, int deltaY ) joachim99@8: { joachim99@8: if ( deltaY!= 0 ) joachim99@8: m_pMergeVScrollBar->setValue( m_pMergeVScrollBar->value() + deltaY ); joachim99@8: if ( deltaX!= 0) joachim99@8: m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::setDiff3Line( int line ) joachim99@8: { joachim99@8: m_pDiffVScrollBar->setValue( line ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::sourceMask( int srcMask, int enabledMask ) joachim99@8: { joachim99@8: chooseA->setChecked( (srcMask & 1) != 0 ); joachim99@8: chooseB->setChecked( (srcMask & 2) != 0 ); joachim99@8: chooseC->setChecked( (srcMask & 4) != 0 ); joachim99@8: chooseA->setEnabled( (enabledMask & 1) != 0 ); joachim99@8: chooseB->setEnabled( (enabledMask & 2) != 0 ); joachim99@8: chooseC->setEnabled( (enabledMask & 4) != 0 ); joachim99@8: } joachim99@8: joachim99@8: joachim99@8: joachim99@8: // Function uses setMinSize( sizeHint ) before adding the widget. joachim99@8: // void addWidget(QBoxLayout* layout, QWidget* widget); joachim99@8: template joachim99@8: void addWidget( L* layout, W* widget) joachim99@8: { joachim99@8: QSize s = widget->sizeHint(); joachim99@8: widget->setMinimumSize( QSize(max2(s.width(),0),max2(s.height(),0) ) ); joachim99@8: layout->addWidget( widget ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::initView() joachim99@8: { joachim99@8: // set the main widget here joachim99@8: QValueList oldHeights; joachim99@8: if ( m_pDirectoryMergeSplitter->isVisible() ) joachim99@8: { joachim99@8: oldHeights = m_pMainSplitter->sizes(); joachim99@8: } joachim99@8: joachim99@8: if ( m_pMainWidget != 0 ) joachim99@8: { joachim99@8: return; joachim99@8: //delete m_pMainWidget; joachim99@8: } joachim99@8: m_pMainWidget = new QFrame(m_pMainSplitter); joachim99@8: m_pMainWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken ); joachim99@8: m_pMainWidget->setLineWidth(1); joachim99@8: joachim99@8: joachim99@8: QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget); joachim99@8: joachim99@8: QSplitter* pVSplitter = new QSplitter( m_pMainWidget ); joachim99@8: pVSplitter->setOrientation( Vertical ); joachim99@8: pVLayout->addWidget( pVSplitter ); joachim99@8: joachim99@8: QWidget* pDiffWindowFrame = new QFrame( pVSplitter ); joachim99@8: QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame ); joachim99@8: joachim99@8: m_pDiffWindowSplitter = new QSplitter( pDiffWindowFrame ); joachim99@8: m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Horizontal : Vertical ); joachim99@8: pDiffHLayout->addWidget( m_pDiffWindowSplitter ); joachim99@8: joachim99@8: m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog ); joachim99@8: pDiffHLayout->addWidget(m_pOverview); joachim99@8: connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) ); joachim99@8: //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint())); joachim99@8: joachim99@8: m_pDiffVScrollBar = new QScrollBar( Vertical, pDiffWindowFrame ); joachim99@8: pDiffHLayout->addWidget( m_pDiffVScrollBar ); joachim99@8: joachim99@8: m_pDiffTextWindow1 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog ); joachim99@8: m_pDiffTextWindow2 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog ); joachim99@8: m_pDiffTextWindow3 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog ); joachim99@8: joachim99@8: // Merge window joachim99@8: m_pMergeWindowFrame = new QFrame( pVSplitter ); joachim99@8: QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame ); joachim99@8: joachim99@8: m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog ); joachim99@8: pMergeHLayout->addWidget( m_pMergeResultWindow ); joachim99@8: joachim99@8: m_pMergeVScrollBar = new QScrollBar( Vertical, m_pMergeWindowFrame ); joachim99@8: pMergeHLayout->addWidget( m_pMergeVScrollBar ); joachim99@8: joachim99@8: autoAdvance->setEnabled(true); joachim99@8: joachim99@8: QValueList sizes = pVSplitter->sizes(); joachim99@8: int total = sizes[0] + sizes[1]; joachim99@8: sizes[0]=total/2; sizes[1]=total/2; joachim99@8: pVSplitter->setSizes( sizes ); joachim99@8: joachim99@8: m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts joachim99@8: joachim99@8: QHBoxLayout* pHScrollBarLayout = new QHBoxLayout( pVLayout ); joachim99@8: m_pHScrollBar = new QScrollBar( Horizontal, m_pMainWidget ); joachim99@8: pHScrollBarLayout->addWidget( m_pHScrollBar ); joachim99@8: m_pCornerWidget = new QWidget( m_pMainWidget ); joachim99@8: pHScrollBarLayout->addWidget( m_pCornerWidget ); joachim99@8: joachim99@8: joachim99@8: connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pOverview, SLOT(setFirstLine(int))); joachim99@8: connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int))); joachim99@8: connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstColumn(int))); joachim99@8: connect( m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); joachim99@8: connect( m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); joachim99@8: connect( m_pDiffTextWindow1, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int))); joachim99@8: m_pDiffTextWindow1->installEventFilter( this ); joachim99@8: joachim99@8: connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int))); joachim99@8: connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstColumn(int))); joachim99@8: connect( m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); joachim99@8: connect( m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); joachim99@8: connect( m_pDiffTextWindow2, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int))); joachim99@8: m_pDiffTextWindow2->installEventFilter( this ); joachim99@8: joachim99@8: connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int))); joachim99@8: connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstColumn(int))); joachim99@8: connect( m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); joachim99@8: connect( m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); joachim99@8: connect( m_pDiffTextWindow3, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int))); joachim99@8: m_pDiffTextWindow3->installEventFilter( this ); joachim99@8: joachim99@8: MergeResultWindow* p = m_pMergeResultWindow; joachim99@8: connect( m_pMergeVScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstLine(int))); joachim99@8: joachim99@8: connect( m_pHScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstColumn(int))); joachim99@8: connect( p, SIGNAL(scroll(int,int)), this, SLOT(scrollMergeResultWindow(int,int))); joachim99@8: connect( p, SIGNAL(sourceMask(int,int)), this, SLOT(sourceMask(int,int))); joachim99@8: connect( p, SIGNAL( resizeSignal() ),this, SLOT(resizeMergeResultWindow())); joachim99@8: connect( p, SIGNAL( selectionEnd() ), this, SLOT( slotSelectionEnd() ) ); joachim99@8: connect( p, SIGNAL( newSelection() ), this, SLOT( slotSelectionStart() ) ); joachim99@8: connect( p, SIGNAL( modified() ), this, SLOT( slotOutputModified() ) ); joachim99@8: connect( p, SIGNAL( updateAvailabilities() ), this, SLOT( slotUpdateAvailabilities() ) ); joachim99@8: connect( p, SIGNAL( showPopupMenu(const QPoint&) ), this, SLOT(showPopupMenu(const QPoint&))); joachim99@8: sourceMask(0,0); joachim99@8: joachim99@8: joachim99@8: connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, SLOT(setFastSelectorRange(int,int))); joachim99@8: connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, SLOT(setFastSelectorRange(int,int))); joachim99@8: connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, SLOT(setFastSelectorRange(int,int))); joachim99@8: connect(m_pDiffTextWindow1, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int))); joachim99@8: connect(m_pDiffTextWindow2, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int))); joachim99@8: connect(m_pDiffTextWindow3, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int))); joachim99@8: joachim99@8: connect( m_pDiffTextWindow1, SIGNAL( resizeSignal(int,int) ),this, SLOT(resizeDiffTextWindow(int,int))); joachim99@8: joachim99@8: m_pDiffTextWindow1->setFocus(); joachim99@8: m_pMainWidget->setMinimumSize(50,50); joachim99@8: if ( m_pDirectoryMergeSplitter->isVisible() ) joachim99@8: { joachim99@8: if (oldHeights.count() < 2) joachim99@8: oldHeights.append(0); joachim99@8: if (oldHeights[1]==0) // Distribute the available space evenly between the two widgets. joachim99@8: { joachim99@8: oldHeights[1] = oldHeights[0]/2; joachim99@8: oldHeights[0] -= oldHeights[1]; joachim99@8: } joachim99@8: m_pMainSplitter->setSizes( oldHeights ); joachim99@8: } joachim99@8: m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() ); joachim99@8: //show(); joachim99@8: m_pMainWidget->show(); joachim99@8: showWindowA->setChecked( true ); joachim99@8: showWindowB->setChecked( true ); joachim99@8: showWindowC->setChecked( true ); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotAfterFirstPaint() joachim99@8: { joachim99@8: int newHeight = m_pDiffTextWindow1->getNofVisibleLines(); joachim99@8: int newWidth = m_pDiffTextWindow1->getNofVisibleColumns(); joachim99@8: m_DTWHeight = newHeight; joachim99@8: m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) ); joachim99@8: m_pDiffVScrollBar->setPageStep( newHeight ); joachim99@8: m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); joachim99@8: joachim99@8: // The second window has a somewhat inverse width joachim99@8: m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) ); joachim99@8: m_pHScrollBar->setPageStep( newWidth ); joachim99@8: joachim99@8: m_pMergeResultWindow->slotGoTop(); joachim99@8: joachim99@8: if (m_pCornerWidget) joachim99@8: m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() ); joachim99@8: joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::resizeEvent(QResizeEvent* e) joachim99@8: { joachim99@8: QSplitter::resizeEvent(e); joachim99@8: if (m_pCornerWidget) joachim99@8: m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() ); joachim99@8: } joachim99@8: joachim99@8: joachim99@8: bool KDiff3App::eventFilter( QObject* o, QEvent* e ) joachim99@8: { joachim99@8: if( o == m_pMergeResultWindow ) joachim99@8: { joachim99@8: if ( e->type() == QEvent::KeyPress ) joachim99@8: { // key press joachim99@8: QKeyEvent *k = (QKeyEvent*)e; joachim99@8: if (k->key()==Qt::Key_Insert && (k->state() & Qt::ControlButton)!=0 ) joachim99@8: { joachim99@8: slotEditCopy(); joachim99@8: return true; joachim99@8: } joachim99@8: if (k->key()==Qt::Key_Insert && (k->state() & Qt::ShiftButton)!=0 ) joachim99@8: { joachim99@8: slotEditPaste(); joachim99@8: return true; joachim99@8: } joachim99@8: if (k->key()==Qt::Key_Delete && (k->state() & Qt::ShiftButton)!=0 ) joachim99@8: { joachim99@8: slotEditCut(); joachim99@8: return true; joachim99@8: } joachim99@8: } joachim99@8: return QSplitter::eventFilter( o, e ); // standard event processing joachim99@8: } joachim99@8: joachim99@8: if ( e->type() == QEvent::KeyPress ) // key press joachim99@8: { joachim99@8: QKeyEvent *k = (QKeyEvent*)e; joachim99@8: joachim99@8: bool bCtrl = (k->state() & Qt::ControlButton) != 0; joachim99@8: if (k->key()==Qt::Key_Insert && bCtrl ) joachim99@8: { joachim99@8: slotEditCopy(); joachim99@8: return true; joachim99@8: } joachim99@8: if (k->key()==Qt::Key_Insert && (k->state() & Qt::ShiftButton)!=0 ) joachim99@8: { joachim99@8: slotEditPaste(); joachim99@8: return true; joachim99@8: } joachim99@8: int deltaX=0; joachim99@8: int deltaY=0; joachim99@8: int pageSize = m_DTWHeight; joachim99@8: switch( k->key() ) joachim99@8: { joachim99@8: case Key_Down: ++deltaY; break; joachim99@8: case Key_Up: --deltaY; break; joachim99@8: case Key_PageDown: if (!bCtrl) deltaY+=pageSize; break; joachim99@8: case Key_PageUp: if (!bCtrl) deltaY-=pageSize; break; joachim99@8: case Key_Left: --deltaX; break; joachim99@8: case Key_Right: ++deltaX; break; joachim99@8: case Key_Home: if ( bCtrl ) m_pDiffVScrollBar->setValue( 0 ); joachim99@8: else m_pHScrollBar->setValue( 0 ); joachim99@8: break; joachim99@8: case Key_End: if ( bCtrl ) m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->maxValue() ); joachim99@8: else m_pHScrollBar->setValue( m_pHScrollBar->maxValue() ); joachim99@8: break; joachim99@8: default: break; joachim99@8: } joachim99@8: joachim99@8: scrollDiffTextWindow( deltaX, deltaY ); joachim99@8: joachim99@8: return true; // eat event joachim99@8: } joachim99@8: else if (e->type() == QEvent::Wheel ) { // wheel event joachim99@8: QWheelEvent *w = (QWheelEvent*)e; joachim99@8: w->accept(); joachim99@8: joachim99@8: int deltaX=0; joachim99@8: joachim99@8: int d=w->delta(); joachim99@8: int deltaY = -d/120 * QApplication::wheelScrollLines(); joachim99@8: joachim99@8: scrollDiffTextWindow( deltaX, deltaY ); joachim99@8: return true; joachim99@8: } joachim99@8: else if (e->type() == QEvent::Drop ) joachim99@8: { joachim99@8: QDropEvent* pDropEvent = static_cast(e); joachim99@8: pDropEvent->accept(); joachim99@8: joachim99@8: if ( QUriDrag::canDecode(pDropEvent) ) joachim99@8: { joachim99@8: #ifdef KREPLACEMENTS_H joachim99@8: QStringList stringList; joachim99@8: QUriDrag::decodeLocalFiles( pDropEvent, stringList ); joachim99@8: if ( canContinue() && !stringList.isEmpty() ) joachim99@8: { joachim99@8: raise(); joachim99@8: QString filename = stringList.first(); joachim99@8: if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename ); joachim99@8: else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename ); joachim99@8: else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename ); joachim99@8: init(); joachim99@8: } joachim99@8: #else joachim99@8: KURL::List urlList; joachim99@8: KURLDrag::decode( pDropEvent, urlList ); joachim99@8: if ( canContinue() && !urlList.isEmpty() ) joachim99@8: { joachim99@8: raise(); joachim99@8: FileAccess fa( urlList.first().url() ); joachim99@8: if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa ); joachim99@8: else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa ); joachim99@8: else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa ); joachim99@8: init(); joachim99@8: } joachim99@8: #endif joachim99@8: } joachim99@8: else if ( QTextDrag::canDecode(pDropEvent) ) joachim99@8: { joachim99@8: QString text; joachim99@8: bool bDecodeSuccess = QTextDrag::decode( pDropEvent, text ); joachim99@8: if ( bDecodeSuccess && canContinue() ) joachim99@8: { joachim99@8: raise(); joachim99@8: bool bUpCase = m_pOptionDialog->m_bUpCase; joachim99@8: if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text, bUpCase); joachim99@8: else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text, bUpCase); joachim99@8: else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text, bUpCase); joachim99@8: init(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: return true; joachim99@8: } joachim99@8: return QSplitter::eventFilter( o, e ); // standard event processing joachim99@8: } joachim99@8: joachim99@8: joachim99@8: joachim99@8: OpenDialog::OpenDialog( joachim99@8: QWidget* pParent, const QString& n1, const QString& n2, const QString& n3, joachim99@8: bool bMerge, const QString& outputName, const char* slotConfigure, OptionDialog* pOptions ) joachim99@8: : QDialog( pParent, "OpenDialog", true /*modal*/ ) joachim99@8: { joachim99@8: m_pOptions = pOptions; joachim99@8: joachim99@8: QVBoxLayout* v = new QVBoxLayout( this, 5 ); joachim99@8: QGridLayout* h = new QGridLayout( v, 5, 4, 5 ); joachim99@8: h->setColStretch( 1, 10 ); joachim99@8: joachim99@51: QLabel* label = new QLabel( i18n("A (Base):"), this ); joachim99@8: joachim99@8: m_lineA = new QComboBox( true, this ); joachim99@8: m_lineA->insertStringList( m_pOptions->m_recentAFiles ); joachim99@8: m_lineA->setEditText( KURL(n1).prettyURL() ); joachim99@8: m_lineA->setMinimumSize( 200, m_lineA->size().height() ); joachim99@51: QPushButton * button = new QPushButton( i18n("File..."), this ); joachim99@8: connect( button, SIGNAL(clicked()), this, SLOT( selectFileA() ) ); joachim99@51: QPushButton * button2 = new QPushButton( i18n("Dir..."), this ); joachim99@8: connect( button2, SIGNAL(clicked()), this, SLOT( selectDirA() ) ); joachim99@8: joachim99@8: h->addWidget( label, 0, 0 ); joachim99@8: h->addWidget( m_lineA, 0, 1 ); joachim99@8: h->addWidget( button, 0, 2 ); joachim99@8: h->addWidget( button2, 0, 3 ); joachim99@8: joachim99@8: label = new QLabel( "B:", this ); joachim99@8: m_lineB = new QComboBox( true, this ); joachim99@8: m_lineB->insertStringList( m_pOptions->m_recentBFiles ); joachim99@8: m_lineB->setEditText( KURL(n2).prettyURL() ); joachim99@8: m_lineB->setMinimumSize( 200, m_lineB->size().height() ); joachim99@51: button = new QPushButton( i18n("File..."), this ); joachim99@8: connect( button, SIGNAL(clicked()), this, SLOT( selectFileB() ) ); joachim99@51: button2 = new QPushButton( i18n("Dir..."), this ); joachim99@8: connect( button2, SIGNAL(clicked()), this, SLOT( selectDirB() ) ); joachim99@8: joachim99@8: h->addWidget( label, 1, 0 ); joachim99@8: h->addWidget( m_lineB, 1, 1 ); joachim99@8: h->addWidget( button, 1, 2 ); joachim99@8: h->addWidget( button2, 1, 3 ); joachim99@8: joachim99@51: label = new QLabel( i18n("C (Optional):"), this ); joachim99@8: m_lineC= new QComboBox( true, this ); joachim99@8: m_lineC->insertStringList( m_pOptions->m_recentCFiles ); joachim99@8: m_lineC->setEditText( KURL(n3).prettyURL() ); joachim99@8: m_lineC->setMinimumSize( 200, m_lineC->size().height() ); joachim99@51: button = new QPushButton( i18n("File..."), this ); joachim99@8: connect( button, SIGNAL(clicked()), this, SLOT( selectFileC() ) ); joachim99@51: button2 = new QPushButton( i18n("Dir..."), this ); joachim99@8: connect( button2, SIGNAL(clicked()), this, SLOT( selectDirC() ) ); joachim99@8: joachim99@8: h->addWidget( label, 2, 0 ); joachim99@8: h->addWidget( m_lineC, 2, 1 ); joachim99@8: h->addWidget( button, 2, 2 ); joachim99@8: h->addWidget( button2, 2, 3 ); joachim99@8: joachim99@51: m_pMerge = new QCheckBox( i18n("Merge"), this ); joachim99@8: h->addWidget( m_pMerge, 3, 0 ); joachim99@8: joachim99@51: label = new QLabel( i18n("Output (optional):"), this ); joachim99@8: m_lineOut = new QComboBox( true, this ); joachim99@8: m_lineOut->insertStringList( m_pOptions->m_recentOutputFiles ); joachim99@8: m_lineOut->setEditText( KURL(outputName).prettyURL() ); joachim99@8: m_lineOut->setMinimumSize( 200, m_lineOut->size().height() ); joachim99@51: button = new QPushButton( i18n("File..."), this ); joachim99@8: connect( button, SIGNAL(clicked()), this, SLOT( selectOutputName() ) ); joachim99@51: button2 = new QPushButton( i18n("Dir..."), this ); joachim99@8: connect( button2, SIGNAL(clicked()), this, SLOT( selectOutputDir() ) ); joachim99@8: connect( m_pMerge, SIGNAL(stateChanged(int)), this, SLOT(internalSlot(int)) ); joachim99@8: connect( this, SIGNAL(internalSignal(bool)), m_lineOut, SLOT(setEnabled(bool)) ); joachim99@8: connect( this, SIGNAL(internalSignal(bool)), button, SLOT(setEnabled(bool)) ); joachim99@8: connect( this, SIGNAL(internalSignal(bool)), button2, SLOT(setEnabled(bool)) ); joachim99@8: joachim99@8: m_pMerge->setChecked( !bMerge ); joachim99@8: m_pMerge->setChecked( bMerge ); joachim99@8: // m_lineOutput->setEnabled( bMerge ); joachim99@8: joachim99@8: // button->setEnabled( bMerge ); joachim99@8: joachim99@8: h->addWidget( label, 4, 0 ); joachim99@8: h->addWidget( m_lineOut, 4, 1 ); joachim99@8: h->addWidget( button, 4, 2 ); joachim99@8: h->addWidget( button2, 4, 3 ); joachim99@8: joachim99@8: h->addColSpacing( 1, 200 ); joachim99@8: joachim99@8: QHBoxLayout* l = new QHBoxLayout( v, 5 ); joachim99@51: joachim99@51: button = new QPushButton( i18n("Configure..."), this ); joachim99@51: connect( button, SIGNAL(clicked()), pParent, slotConfigure ); joachim99@51: l->addWidget( button, 1 ); joachim99@51: joachim99@51: l->addStretch(1); joachim99@51: joachim99@51: button = new QPushButton( i18n("&OK"), this ); joachim99@8: button->setDefault( true ); joachim99@8: connect( button, SIGNAL(clicked()), this, SLOT( accept() ) ); joachim99@51: l->addWidget( button, 1 ); joachim99@8: joachim99@51: button = new QPushButton( i18n("&Cancel"), this ); joachim99@8: connect( button, SIGNAL(clicked()), this, SLOT( reject() ) ); joachim99@51: l->addWidget( button,1 ); joachim99@8: joachim99@8: QSize sh = sizeHint(); joachim99@8: setFixedHeight( sh.height() ); joachim99@8: } joachim99@8: joachim99@8: void OpenDialog::selectURL( QComboBox* pLine, bool bDir, int i, bool bSave ) joachim99@8: { joachim99@8: QString current = pLine->currentText(); joachim99@8: if (current.isEmpty() && i>3 ){ current = m_lineC->currentText(); } joachim99@8: if (current.isEmpty() ){ current = m_lineB->currentText(); } joachim99@8: if (current.isEmpty() ){ current = m_lineA->currentText(); } joachim99@8: KURL newURL = bDir ? KFileDialog::getExistingURL( current, this) joachim99@8: : bSave ? KFileDialog::getSaveURL( current, 0, this) joachim99@8: : KFileDialog::getOpenURL( current, 0, this); joachim99@8: if ( !newURL.isEmpty() ) joachim99@8: { joachim99@8: pLine->setEditText( newURL.url() ); joachim99@8: } joachim99@8: // newURL won't be modified if nothing was selected. joachim99@8: } joachim99@8: joachim99@8: void OpenDialog::selectFileA() { selectURL( m_lineA, false, 1, false ); } joachim99@8: void OpenDialog::selectFileB() { selectURL( m_lineB, false, 2, false ); } joachim99@8: void OpenDialog::selectFileC() { selectURL( m_lineC, false, 3, false ); } joachim99@8: void OpenDialog::selectOutputName(){ selectURL( m_lineOut, false, 4, true ); } joachim99@8: void OpenDialog::selectDirA() { selectURL( m_lineA, true, 1, false ); } joachim99@8: void OpenDialog::selectDirB() { selectURL( m_lineB, true, 2, false ); } joachim99@8: void OpenDialog::selectDirC() { selectURL( m_lineC, true, 3, false ); } joachim99@8: void OpenDialog::selectOutputDir() { selectURL( m_lineOut, true, 4, true ); } joachim99@8: joachim99@8: void OpenDialog::internalSlot(int i) joachim99@8: { joachim99@8: emit internalSignal(i!=0); joachim99@8: } joachim99@8: joachim99@8: void OpenDialog::accept() joachim99@8: { joachim99@8: unsigned int maxNofRecentFiles = 10; joachim99@8: joachim99@8: QString s = m_lineA->currentText(); joachim99@8: s = KURL::fromPathOrURL(s).prettyURL(); joachim99@8: QStringList* sl = &m_pOptions->m_recentAFiles; joachim99@8: // If an item exist, remove it from the list and reinsert it at the beginning. joachim99@8: sl->remove(s); joachim99@8: if ( !s.isEmpty() ) sl->prepend( s ); joachim99@8: if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() ); joachim99@8: joachim99@8: s = m_lineB->currentText(); joachim99@8: s = KURL::fromPathOrURL(s).prettyURL(); joachim99@8: sl = &m_pOptions->m_recentBFiles; joachim99@8: sl->remove(s); joachim99@8: if ( !s.isEmpty() ) sl->prepend( s ); joachim99@8: if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() ); joachim99@8: joachim99@8: s = m_lineC->currentText(); joachim99@8: s = KURL::fromPathOrURL(s).prettyURL(); joachim99@8: sl = &m_pOptions->m_recentCFiles; joachim99@8: sl->remove(s); joachim99@8: if ( !s.isEmpty() ) sl->prepend( s ); joachim99@8: if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() ); joachim99@8: joachim99@8: s = m_lineOut->currentText(); joachim99@8: s = KURL::fromPathOrURL(s).prettyURL(); joachim99@8: sl = &m_pOptions->m_recentOutputFiles; joachim99@8: sl->remove(s); joachim99@8: if ( !s.isEmpty() ) sl->prepend( s ); joachim99@8: if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() ); joachim99@8: joachim99@8: QDialog::accept(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotFileOpen() joachim99@8: { joachim99@8: if ( !canContinue() ) return; joachim99@8: joachim99@8: if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() ) joachim99@8: { joachim99@8: int result = KMessageBox::warningYesNo(this, joachim99@8: i18n("You are currently doing a directory merge. Are you sure, you want to abort?"), joachim99@51: i18n("Warning"), i18n("Abort"), i18n("Continue Merging") ); joachim99@8: if ( result!=KMessageBox::Yes ) joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: joachim99@8: slotStatusMsg(i18n("Opening files...")); joachim99@8: joachim99@8: for(;;) joachim99@8: { joachim99@8: OpenDialog d(this, joachim99@8: m_sd1.m_bPreserve ? QString("") : m_sd1.getAliasName(), joachim99@8: m_sd2.m_bPreserve ? QString("") : m_sd2.getAliasName(), joachim99@8: m_sd3.m_bPreserve ? QString("") : m_sd3.getAliasName(), joachim99@8: !m_outputFilename.isEmpty(), joachim99@8: m_bDefaultFilename ? QString("") : m_outputFilename, joachim99@8: SLOT(slotConfigure()), m_pOptionDialog ); joachim99@8: int status = d.exec(); joachim99@8: if ( status == QDialog::Accepted ) joachim99@8: { joachim99@8: m_sd1.setFilename( d.m_lineA->currentText() ); joachim99@8: m_sd2.setFilename( d.m_lineB->currentText() ); joachim99@8: m_sd3.setFilename( d.m_lineC->currentText() ); joachim99@8: joachim99@8: if( d.m_pMerge->isChecked() ) joachim99@8: { joachim99@8: if ( d.m_lineOut->currentText().isEmpty() ) joachim99@8: { joachim99@8: m_outputFilename = "unnamed.txt"; joachim99@8: m_bDefaultFilename = true; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: m_outputFilename = d.m_lineOut->currentText(); joachim99@8: m_bDefaultFilename = false; joachim99@8: } joachim99@8: } joachim99@8: else joachim99@8: m_outputFilename = ""; joachim99@8: joachim99@8: m_bDirCompare = improveFilenames(); joachim99@8: if ( m_bDirCompare ) joachim99@8: { joachim99@8: m_pDirectoryMergeSplitter->show(); joachim99@8: if ( m_pMainWidget!=0 ) joachim99@8: { joachim99@8: m_pMainWidget->hide(); joachim99@8: } joachim99@8: break; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: m_pDirectoryMergeSplitter->hide(); joachim99@8: init(); joachim99@8: joachim99@8: if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 || joachim99@8: ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 || joachim99@8: ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 ) joachim99@8: { joachim99@8: QString text( i18n("Opening of these files failed:") ); joachim99@8: text += "\n\n"; joachim99@8: if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 ) joachim99@8: text += " - " + m_sd1.getAliasName() + "\n"; joachim99@8: if ( ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 ) joachim99@8: text += " - " + m_sd2.getAliasName() + "\n"; joachim99@8: if ( ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 ) joachim99@8: text += " - " + m_sd3.getAliasName() + "\n"; joachim99@8: joachim99@8: KMessageBox::sorry( this, text, i18n("File open error") ); joachim99@8: continue; joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: break; joachim99@8: } joachim99@8: joachim99@8: slotUpdateAvailabilities(); joachim99@8: slotStatusMsg(i18n("Ready.")); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn, joachim99@8: QString an1, QString an2, QString an3 ) joachim99@8: { joachim99@8: if ( !canContinue() ) return; joachim99@8: joachim99@8: slotStatusMsg(i18n("Opening files...")); joachim99@8: joachim99@8: m_sd1.setFilename( fn1 ); joachim99@8: m_sd2.setFilename( fn2 ); joachim99@8: m_sd3.setFilename( fn3 ); joachim99@8: joachim99@8: m_sd1.setAliasName( an1 ); joachim99@8: m_sd2.setAliasName( an2 ); joachim99@8: m_sd3.setAliasName( an3 ); joachim99@8: joachim99@8: if ( ! ofn.isEmpty() ) joachim99@8: { joachim99@8: m_outputFilename = ofn; joachim99@8: m_bDefaultFilename = false; joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: m_outputFilename = ""; joachim99@8: m_bDefaultFilename = true; joachim99@8: } joachim99@8: joachim99@8: bool bDirCompare = improveFilenames(); // Using local bDirCompare is intended, because joachim99@8: // this method is called from the directory-merge-window. joachim99@8: joachim99@8: if( bDirCompare ) joachim99@8: { joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: init(); joachim99@8: joachim99@8: if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 || joachim99@8: ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 || joachim99@8: ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 ) joachim99@8: { joachim99@8: QString text( i18n("Opening of these files failed:") ); joachim99@8: text += "\n\n"; joachim99@8: if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 ) joachim99@8: text += " - " + m_sd1.getAliasName() + "\n"; joachim99@8: if ( ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 ) joachim99@8: text += " - " + m_sd2.getAliasName() + "\n"; joachim99@8: if ( ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 ) joachim99@8: text += " - " + m_sd3.getAliasName() + "\n"; joachim99@8: joachim99@8: KMessageBox::sorry( this, text, i18n("File open error") ); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( m_pDirectoryMergeWindow!=0 && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: slotDirViewToggle(); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: slotStatusMsg(i18n("Ready.")); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotEditCut() joachim99@8: { joachim99@8: slotStatusMsg(i18n("Cutting selection...")); joachim99@8: joachim99@8: QString s; joachim99@8: if ( m_pMergeResultWindow!=0 ) joachim99@8: { joachim99@8: s = m_pMergeResultWindow->getSelection(); joachim99@8: m_pMergeResultWindow->deleteSelection(); joachim99@8: joachim99@8: m_pMergeResultWindow->update(); joachim99@8: } joachim99@8: joachim99@8: if ( !s.isNull() ) joachim99@8: { joachim99@8: QApplication::clipboard()->setText( s ); joachim99@8: } joachim99@8: joachim99@8: slotStatusMsg(i18n("Ready.")); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotEditCopy() joachim99@8: { joachim99@8: slotStatusMsg(i18n("Copying selection to clipboard...")); joachim99@8: QString s; joachim99@8: if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection(); joachim99@8: if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection(); joachim99@8: if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection(); joachim99@8: if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection(); joachim99@8: if ( !s.isNull() ) joachim99@8: { joachim99@8: QApplication::clipboard()->setText( s ); joachim99@8: } joachim99@8: joachim99@8: slotStatusMsg(i18n("Ready.")); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotEditPaste() joachim99@8: { joachim99@8: slotStatusMsg(i18n("Inserting clipboard contents...")); joachim99@8: joachim99@8: if ( m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() ) joachim99@8: { joachim99@8: m_pMergeResultWindow->pasteClipboard(); joachim99@8: } joachim99@8: else if ( canContinue() ) joachim99@8: { joachim99@8: bool bUpCase = m_pOptionDialog->m_bUpCase; joachim99@8: if ( m_pDiffTextWindow1->hasFocus() ) joachim99@8: { joachim99@8: m_sd1.setData( QApplication::clipboard()->text(), bUpCase ); joachim99@8: init(); joachim99@8: } joachim99@8: else if ( m_pDiffTextWindow2->hasFocus() ) joachim99@8: { joachim99@8: m_sd2.setData( QApplication::clipboard()->text(), bUpCase ); joachim99@8: init(); joachim99@8: } joachim99@8: else if ( m_pDiffTextWindow3->hasFocus() ) joachim99@8: { joachim99@8: m_sd3.setData( QApplication::clipboard()->text(), bUpCase ); joachim99@8: init(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: slotStatusMsg(i18n("Ready.")); joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void KDiff3App::slotGoCurrent() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoCurrent(); joachim99@8: } joachim99@8: void KDiff3App::slotGoTop() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoTop(); joachim99@8: } joachim99@8: void KDiff3App::slotGoBottom() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoBottom(); joachim99@8: } joachim99@8: void KDiff3App::slotGoPrevUnsolvedConflict() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevUnsolvedConflict(); joachim99@8: } joachim99@8: void KDiff3App::slotGoNextUnsolvedConflict() joachim99@8: { joachim99@8: m_bTimerBlock = false; joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextUnsolvedConflict(); joachim99@8: } joachim99@8: void KDiff3App::slotGoPrevConflict() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevConflict(); joachim99@8: } joachim99@8: void KDiff3App::slotGoNextConflict() joachim99@8: { joachim99@8: m_bTimerBlock = false; joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextConflict(); joachim99@8: } joachim99@8: void KDiff3App::slotGoPrevDelta() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevDelta(); joachim99@8: } joachim99@8: void KDiff3App::slotGoNextDelta() joachim99@8: { joachim99@8: if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextDelta(); joachim99@8: } joachim99@51: joachim99@53: void KDiff3App::choose( int choice ) joachim99@8: { joachim99@53: if (!m_bTimerBlock ) joachim99@8: { joachim99@53: if ( m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->hasFocus() ) joachim99@8: { joachim99@53: if (choice==A) m_pDirectoryMergeWindow->slotCurrentChooseA(); joachim99@53: if (choice==B) m_pDirectoryMergeWindow->slotCurrentChooseB(); joachim99@53: if (choice==C) m_pDirectoryMergeWindow->slotCurrentChooseC(); joachim99@53: joachim99@53: chooseA->setChecked(false); joachim99@53: chooseB->setChecked(false); joachim99@53: chooseC->setChecked(false); joachim99@53: } joachim99@53: else if ( m_pMergeResultWindow ) joachim99@53: { joachim99@53: m_pMergeResultWindow->choose( choice ); joachim99@53: if ( autoAdvance->isChecked() ) joachim99@53: { joachim99@53: m_bTimerBlock = true; joachim99@53: QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) ); joachim99@53: } joachim99@8: } joachim99@8: } joachim99@8: } joachim99@53: joachim99@53: void KDiff3App::slotChooseA() { choose( A ); } joachim99@53: void KDiff3App::slotChooseB() { choose( B ); } joachim99@53: void KDiff3App::slotChooseC() { choose( C ); } joachim99@51: joachim99@51: // bConflictsOnly automatically choose for conflicts only (true) or for everywhere joachim99@51: static void mergeChooseGlobal( KDiff3App* pThis, MergeResultWindow* pMRW, int selector, bool bConflictsOnly, bool bWhiteSpaceOnly ) joachim99@8: { joachim99@51: if ( pMRW ) joachim99@8: { joachim99@51: pThis->slotGoTop(); joachim99@51: pMRW->chooseGlobal(selector, bConflictsOnly, bWhiteSpaceOnly ); joachim99@8: } joachim99@8: } joachim99@8: joachim99@51: void KDiff3App::slotChooseAEverywhere() { mergeChooseGlobal( this, m_pMergeResultWindow, A, false, false ); } joachim99@51: void KDiff3App::slotChooseBEverywhere() { mergeChooseGlobal( this, m_pMergeResultWindow, B, false, false ); } joachim99@51: void KDiff3App::slotChooseCEverywhere() { mergeChooseGlobal( this, m_pMergeResultWindow, C, false, false ); } joachim99@51: void KDiff3App::slotChooseAForUnsolvedConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, A, true, false ); } joachim99@51: void KDiff3App::slotChooseBForUnsolvedConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, B, true, false ); } joachim99@51: void KDiff3App::slotChooseCForUnsolvedConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, C, true, false ); } joachim99@51: void KDiff3App::slotChooseAForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, A, true, true ); } joachim99@51: void KDiff3App::slotChooseBForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, B, true, true ); } joachim99@51: void KDiff3App::slotChooseCForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, C, true, true ); } joachim99@51: joachim99@8: joachim99@8: void KDiff3App::slotAutoSolve() joachim99@8: { joachim99@8: if (m_pMergeResultWindow ) joachim99@8: { joachim99@8: slotGoTop(); joachim99@8: m_pMergeResultWindow->slotAutoSolve(); joachim99@8: // m_pMergeWindowFrame->show(); incompatible with bPreserveCarriageReturn joachim99@8: m_pMergeResultWindow->showNrOfConflicts(); joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotUnsolve() joachim99@8: { joachim99@8: if (m_pMergeResultWindow ) joachim99@8: { joachim99@8: slotGoTop(); joachim99@8: m_pMergeResultWindow->slotUnsolve(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void KDiff3App::slotConfigure() joachim99@8: { joachim99@8: m_pOptionDialog->setState(); joachim99@8: m_pOptionDialog->incInitialSize ( QSize(0,40) ); joachim99@8: m_pOptionDialog->exec(); joachim99@8: slotRefresh(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotConfigureKeys() joachim99@8: { joachim99@8: KKeyDialog::configure(actionCollection(), this); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotRefresh() joachim99@8: { joachim99@8: g_tabSize = m_pOptionDialog->m_tabSize; joachim99@51: if (m_pDiffTextWindow1!=0) joachim99@51: { joachim99@51: m_pDiffTextWindow1->setFont(m_pOptionDialog->m_font); joachim99@51: m_pDiffTextWindow1->update(); joachim99@28: } joachim99@28: if (m_pDiffTextWindow2!=0) joachim99@51: { joachim99@51: m_pDiffTextWindow2->setFont(m_pOptionDialog->m_font); joachim99@51: m_pDiffTextWindow2->update(); joachim99@28: } joachim99@28: if (m_pDiffTextWindow3!=0) joachim99@51: { joachim99@51: m_pDiffTextWindow3->setFont(m_pOptionDialog->m_font); joachim99@51: m_pDiffTextWindow3->update(); joachim99@28: } joachim99@28: if (m_pMergeResultWindow!=0) joachim99@51: { joachim99@51: m_pMergeResultWindow->setFont(m_pOptionDialog->m_font); joachim99@51: m_pMergeResultWindow->update(); joachim99@28: } joachim99@28: joachim99@8: if ( m_pDiffWindowSplitter!=0 ) joachim99@8: { joachim99@8: m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Horizontal : Vertical ); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotSelectionStart() joachim99@8: { joachim99@8: //editCopy->setEnabled( false ); joachim99@8: //editCut->setEnabled( false ); joachim99@8: joachim99@8: const QObject* s = sender(); joachim99@8: if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection(); joachim99@8: if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection(); joachim99@8: if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection(); joachim99@8: if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotSelectionEnd() joachim99@8: { joachim99@8: //const QObject* s = sender(); joachim99@8: //editCopy->setEnabled(true); joachim99@8: //editCut->setEnabled( s==m_pMergeResultWindow ); joachim99@8: if ( m_pOptionDialog->m_bAutoCopySelection ) joachim99@8: { joachim99@8: slotEditCopy(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotClipboardChanged() joachim99@8: { joachim99@8: QString s = QApplication::clipboard()->text(); joachim99@8: //editPaste->setEnabled(!s.isEmpty()); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotOutputModified() joachim99@8: { joachim99@8: if ( !m_bOutputModified ) joachim99@8: { joachim99@8: m_bOutputModified=true; joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotAutoAdvanceToggled() joachim99@8: { joachim99@8: m_pOptionDialog->m_bAutoAdvance = autoAdvance->isChecked(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotShowWhiteSpaceToggled() joachim99@8: { joachim99@51: m_pOptionDialog->m_bShowWhiteSpaceCharacters = showWhiteSpaceCharacters->isChecked(); joachim99@8: m_pOptionDialog->m_bShowWhiteSpace = showWhiteSpace->isChecked(); joachim99@51: showWhiteSpaceCharacters->setEnabled( showWhiteSpace->isChecked() ); joachim99@8: if ( m_pDiffTextWindow1!=0 ) joachim99@8: m_pDiffTextWindow1->update(); joachim99@8: if ( m_pDiffTextWindow2!=0 ) joachim99@8: m_pDiffTextWindow2->update(); joachim99@8: if ( m_pDiffTextWindow3!=0 ) joachim99@8: m_pDiffTextWindow3->update(); joachim99@51: if ( m_pOverview!=0 ) joachim99@51: m_pOverview->slotRedraw(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotShowLineNumbersToggled() joachim99@8: { joachim99@8: m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked(); joachim99@8: if ( m_pDiffTextWindow1!=0 ) joachim99@8: m_pDiffTextWindow1->update(); joachim99@8: if ( m_pDiffTextWindow2!=0 ) joachim99@8: m_pDiffTextWindow2->update(); joachim99@8: if ( m_pDiffTextWindow3!=0 ) joachim99@8: m_pDiffTextWindow3->update(); joachim99@8: } joachim99@8: joachim99@8: /// Return true for directory compare, else false joachim99@8: bool KDiff3App::improveFilenames() joachim99@8: { joachim99@8: FileAccess f1(m_sd1.getFilename()); joachim99@8: FileAccess f2(m_sd2.getFilename()); joachim99@8: FileAccess f3(m_sd3.getFilename()); joachim99@8: FileAccess f4(m_outputFilename); joachim99@8: joachim99@8: if ( f1.isFile() && f1.exists() ) joachim99@8: { joachim99@8: if ( f2.isDir() ) joachim99@8: { joachim99@8: f2.addPath( f1.fileName() ); joachim99@8: if ( f2.isFile() && f2.exists() ) joachim99@8: m_sd2.setFileAccess( f2 ); joachim99@8: } joachim99@8: if ( f3.isDir() ) joachim99@8: { joachim99@8: f3.addPath( f1.fileName() ); joachim99@8: if ( f3.isFile() && f3.exists() ) joachim99@8: m_sd3.setFileAccess( f3 ); joachim99@8: } joachim99@8: if ( f4.isDir() ) joachim99@8: { joachim99@8: f4.addPath( f1.fileName() ); joachim99@8: if ( f4.isFile() && f4.exists() ) joachim99@8: m_outputFilename = f4.absFilePath(); joachim99@8: } joachim99@8: } joachim99@8: else if ( f1.isDir() ) joachim99@8: { joachim99@8: FileAccess destDir; joachim99@8: if (!m_bDefaultFilename) destDir = f4; joachim99@8: m_pDirectoryMergeSplitter->show(); joachim99@8: m_pDirectoryMergeWindow->init( joachim99@8: f1, f2, f3, joachim99@8: destDir, // Destdirname joachim99@8: !m_outputFilename.isEmpty() joachim99@8: ); joachim99@8: joachim99@8: if (m_pMainWidget!=0) m_pMainWidget->hide(); joachim99@8: m_sd1.reset(); joachim99@8: if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,0,0,1,false); joachim99@8: m_sd2.reset(); joachim99@8: if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,0,0,2,false); joachim99@8: m_sd3.reset(); joachim99@8: if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,0,0,3,false); joachim99@8: slotUpdateAvailabilities(); joachim99@8: return true; joachim99@8: } joachim99@8: return false; joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotReload() joachim99@8: { joachim99@8: if ( !canContinue() ) return; joachim99@8: joachim99@8: init(); joachim99@8: } joachim99@8: joachim99@8: bool KDiff3App::canContinue() joachim99@8: { joachim99@8: // First test if anything must be saved. joachim99@8: if(m_bOutputModified) joachim99@8: { joachim99@8: int result = KMessageBox::warningYesNoCancel(this, joachim99@8: i18n("The merge result hasn't been saved."), joachim99@51: i18n("Warning"), i18n("Save && Continue"), i18n("Continue Without Saving") ); joachim99@8: if ( result==KMessageBox::Cancel ) joachim99@8: return false; joachim99@8: else if ( result==KMessageBox::Yes ) joachim99@8: { joachim99@8: slotFileSave(); joachim99@8: if ( m_bOutputModified ) joachim99@8: { joachim99@8: KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") ); joachim99@8: return false; joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: m_bOutputModified = false; joachim99@8: return true; joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotCheckIfCanContinue( bool* pbContinue ) joachim99@8: { joachim99@8: if (pbContinue!=0) *pbContinue = canContinue(); joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void KDiff3App::slotDirShowBoth() joachim99@8: { joachim99@8: if( dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: if ( m_bDirCompare ) joachim99@8: m_pDirectoryMergeSplitter->show(); joachim99@8: else joachim99@8: m_pDirectoryMergeSplitter->hide(); joachim99@8: joachim99@8: if ( m_pMainWidget!=0 ) joachim99@8: m_pMainWidget->show(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if ( m_pMainWidget!=0 ) joachim99@8: { joachim99@8: m_pMainWidget->show(); joachim99@8: m_pDirectoryMergeSplitter->hide(); joachim99@8: } joachim99@8: else if ( m_bDirCompare ) joachim99@8: { joachim99@8: m_pDirectoryMergeSplitter->show(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: joachim99@8: joachim99@8: void KDiff3App::slotDirViewToggle() joachim99@8: { joachim99@8: if ( m_bDirCompare ) joachim99@8: { joachim99@8: if( ! m_pDirectoryMergeSplitter->isVisible() ) joachim99@8: { joachim99@8: m_pDirectoryMergeSplitter->show(); joachim99@8: if (m_pMainWidget!=0) joachim99@8: m_pMainWidget->hide(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: if (m_pMainWidget!=0) joachim99@8: { joachim99@8: m_pDirectoryMergeSplitter->hide(); joachim99@8: m_pMainWidget->show(); joachim99@8: } joachim99@8: } joachim99@8: } joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotShowWindowAToggled() joachim99@8: { joachim99@8: if ( m_pDiffTextWindow1!=0 ) joachim99@8: { joachim99@8: if ( showWindowA->isChecked() ) m_pDiffTextWindow1->show(); joachim99@8: else m_pDiffTextWindow1->hide(); joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotShowWindowBToggled() joachim99@8: { joachim99@8: if ( m_pDiffTextWindow2!=0 ) joachim99@8: { joachim99@8: if ( showWindowB->isChecked() ) m_pDiffTextWindow2->show(); joachim99@8: else m_pDiffTextWindow2->hide(); joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotShowWindowCToggled() joachim99@8: { joachim99@8: if ( m_pDiffTextWindow3!=0 ) joachim99@8: { joachim99@8: if ( showWindowC->isChecked() ) m_pDiffTextWindow3->show(); joachim99@8: else m_pDiffTextWindow3->hide(); joachim99@8: slotUpdateAvailabilities(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotEditFind() joachim99@8: { joachim99@8: m_pFindDialog->currentLine = 0; joachim99@8: m_pFindDialog->currentPos = 0; joachim99@8: m_pFindDialog->currentWindow = 1; joachim99@8: joachim99@8: if ( QDialog::Accepted == m_pFindDialog->exec() ) joachim99@8: { joachim99@8: slotEditFindNext(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotEditFindNext() joachim99@8: { joachim99@8: QCString s = m_pFindDialog->m_pSearchString->text().utf8(); joachim99@8: if ( s.isEmpty() ) joachim99@8: { joachim99@8: slotEditFind(); joachim99@8: return; joachim99@8: } joachim99@8: joachim99@8: bool bDirDown = true; joachim99@8: bool bCaseSensitive = m_pFindDialog->m_pCaseSensitive->isChecked(); joachim99@8: joachim99@8: int d3vLine = m_pFindDialog->currentLine; joachim99@8: int posInLine = m_pFindDialog->currentPos; joachim99@8: if ( m_pFindDialog->currentWindow == 1 ) joachim99@8: { joachim99@8: if ( m_pFindDialog->m_pSearchInA->isChecked() && m_pDiffTextWindow1!=0 && joachim99@8: m_pDiffTextWindow1->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) joachim99@8: { joachim99@8: m_pDiffTextWindow1->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() ); joachim99@8: m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2); joachim99@8: m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) ); joachim99@8: m_pFindDialog->currentLine = d3vLine; joachim99@8: m_pFindDialog->currentPos = posInLine + 1; joachim99@8: return; joachim99@8: } joachim99@8: m_pFindDialog->currentWindow = 2; joachim99@8: m_pFindDialog->currentLine = 0; joachim99@8: m_pFindDialog->currentPos = 0; joachim99@8: } joachim99@8: joachim99@8: d3vLine = m_pFindDialog->currentLine; joachim99@8: posInLine = m_pFindDialog->currentPos; joachim99@8: if ( m_pFindDialog->currentWindow == 2 ) joachim99@8: { joachim99@8: if ( m_pFindDialog->m_pSearchInB->isChecked() && m_pDiffTextWindow2!=0 && joachim99@8: m_pDiffTextWindow2->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) joachim99@8: { joachim99@8: m_pDiffTextWindow2->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() ); joachim99@8: m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2); joachim99@8: m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) ); joachim99@8: m_pFindDialog->currentLine = d3vLine; joachim99@8: m_pFindDialog->currentPos = posInLine + 1; joachim99@8: return; joachim99@8: } joachim99@8: m_pFindDialog->currentWindow = 3; joachim99@8: m_pFindDialog->currentLine = 0; joachim99@8: m_pFindDialog->currentPos = 0; joachim99@8: } joachim99@8: joachim99@8: d3vLine = m_pFindDialog->currentLine; joachim99@8: posInLine = m_pFindDialog->currentPos; joachim99@8: if ( m_pFindDialog->currentWindow == 3 ) joachim99@8: { joachim99@8: if ( m_pFindDialog->m_pSearchInC->isChecked() && m_pDiffTextWindow3!=0 && joachim99@8: m_pDiffTextWindow3->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) joachim99@8: { joachim99@8: m_pDiffTextWindow3->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() ); joachim99@8: m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2); joachim99@8: m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) ); joachim99@8: m_pFindDialog->currentLine = d3vLine; joachim99@8: m_pFindDialog->currentPos = posInLine + 1; joachim99@8: return; joachim99@8: } joachim99@8: m_pFindDialog->currentWindow = 4; joachim99@8: m_pFindDialog->currentLine = 0; joachim99@8: m_pFindDialog->currentPos = 0; joachim99@8: } joachim99@8: joachim99@8: d3vLine = m_pFindDialog->currentLine; joachim99@8: posInLine = m_pFindDialog->currentPos; joachim99@8: if ( m_pFindDialog->currentWindow == 4 ) joachim99@8: { joachim99@8: if ( m_pFindDialog->m_pSearchInOutput->isChecked() && m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() && joachim99@8: m_pMergeResultWindow->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) ) joachim99@8: { joachim99@8: m_pMergeResultWindow->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() ); joachim99@8: m_pMergeVScrollBar->setValue(d3vLine - m_pMergeVScrollBar->pageStep()/2); joachim99@8: m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) ); joachim99@8: m_pFindDialog->currentLine = d3vLine; joachim99@8: m_pFindDialog->currentPos = posInLine + 1; joachim99@8: return; joachim99@8: } joachim99@8: m_pFindDialog->currentWindow = 5; joachim99@8: m_pFindDialog->currentLine = 0; joachim99@8: m_pFindDialog->currentPos = 0; joachim99@8: } joachim99@8: joachim99@51: KMessageBox::information(this,i18n("Search complete."),i18n("Search Complete")); joachim99@8: m_pFindDialog->currentWindow = 1; joachim99@8: m_pFindDialog->currentLine = 0; joachim99@8: m_pFindDialog->currentPos = 0; joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotMergeCurrentFile() joachim99@8: { joachim99@8: if ( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() ) joachim99@8: { joachim99@8: m_pDirectoryMergeWindow->mergeCurrentFile(); joachim99@8: } joachim99@8: else if ( m_pMainWidget != 0 && m_pMainWidget->isVisible() ) joachim99@8: { joachim99@8: if ( !canContinue() ) return; joachim99@8: if ( m_outputFilename.isEmpty() ) joachim99@8: { joachim99@8: if ( !m_sd3.isEmpty() && !m_sd3.m_bPreserve ) joachim99@8: { joachim99@8: m_outputFilename = m_sd3.getFilename(); joachim99@8: } joachim99@8: else if ( !m_sd2.isEmpty() && !m_sd2.m_bPreserve ) joachim99@8: { joachim99@8: m_outputFilename = m_sd2.getFilename(); joachim99@8: } joachim99@8: else if ( !m_sd1.isEmpty() && !m_sd1.m_bPreserve ) joachim99@8: { joachim99@8: m_outputFilename = m_sd1.getFilename(); joachim99@8: } joachim99@8: else joachim99@8: { joachim99@8: m_outputFilename = "unnamed.txt"; joachim99@8: m_bDefaultFilename = true; joachim99@8: } joachim99@8: } joachim99@8: init(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotWinFocusNext() joachim99@8: { joachim99@8: QWidget* focus = qApp->focusWidget(); joachim99@8: if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: slotDirViewToggle(); joachim99@8: } joachim99@8: joachim99@8: std::list visibleWidgetList; joachim99@8: if ( m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1); joachim99@8: if ( m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2); joachim99@8: if ( m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3); joachim99@8: if ( m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow); joachim99@8: if ( m_bDirCompare /*m_pDirectoryMergeWindow->isVisible()*/ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow); joachim99@8: //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList()); joachim99@8: joachim99@8: std::list::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus); joachim99@8: ++i; joachim99@8: if ( i==visibleWidgetList.end() ) ++i; // if at end goto begin of list joachim99@8: if ( i!=visibleWidgetList.end() ) joachim99@8: { joachim99@8: if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: slotDirViewToggle(); joachim99@8: } joachim99@8: (*i)->setFocus(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotWinFocusPrev() joachim99@8: { joachim99@8: QWidget* focus = qApp->focusWidget(); joachim99@8: if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: slotDirViewToggle(); joachim99@8: } joachim99@8: joachim99@8: std::list visibleWidgetList; joachim99@8: if ( m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1); joachim99@8: if ( m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2); joachim99@8: if ( m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3); joachim99@8: if ( m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow); joachim99@8: if (m_bDirCompare /* m_pDirectoryMergeWindow->isVisible() */ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow); joachim99@8: //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList()); joachim99@8: joachim99@8: std::list::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus); joachim99@8: --i; joachim99@8: if ( i==visibleWidgetList.end() ) --i; joachim99@8: if ( i!=visibleWidgetList.end() ) joachim99@8: { joachim99@8: if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: slotDirViewToggle(); joachim99@8: } joachim99@8: (*i)->setFocus(); joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotWinToggleSplitterOrientation() joachim99@8: { joachim99@8: if ( m_pDiffWindowSplitter!=0 ) joachim99@8: { joachim99@8: m_pDiffWindowSplitter->setOrientation( joachim99@8: m_pDiffWindowSplitter->orientation()==Vertical ? Horizontal : Vertical joachim99@8: ); joachim99@51: joachim99@51: m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Horizontal; joachim99@8: } joachim99@8: } joachim99@8: joachim99@8: void KDiff3App::slotUpdateAvailabilities() joachim99@8: { joachim99@8: bool bTextDataAvailable = (m_sd1.m_pBuf != 0 || m_sd2.m_pBuf != 0 || m_sd3.m_pBuf != 0 ); joachim99@8: if( dirShowBoth->isChecked() ) joachim99@8: { joachim99@8: if ( m_bDirCompare ) joachim99@8: m_pDirectoryMergeSplitter->show(); joachim99@8: else joachim99@8: m_pDirectoryMergeSplitter->hide(); joachim99@8: joachim99@8: if ( m_pMainWidget!=0 && !m_pMainWidget->isVisible() && joachim99@8: bTextDataAvailable joachim99@8: ) joachim99@8: m_pMainWidget->show(); joachim99@8: } joachim99@8: joachim99@8: bool bDiffWindowVisible = m_pMainWidget != 0 && m_pMainWidget->isVisible(); joachim99@8: bool bMergeEditorVisible = m_pMergeWindowFrame !=0 && m_pMergeWindowFrame->isVisible(); joachim99@8: joachim99@53: m_pDirectoryMergeWindow->updateAvailabilities( m_bDirCompare, bDiffWindowVisible, chooseA, chooseB, chooseC ); joachim99@8: joachim99@8: dirShowBoth->setEnabled( m_bDirCompare ); joachim99@8: dirViewToggle->setEnabled( joachim99@8: m_bDirCompare && joachim99@8: (!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && m_pMainWidget->isVisible() || joachim99@8: m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && !m_pMainWidget->isVisible() && bTextDataAvailable ) joachim99@8: ); joachim99@53: joachim99@53: bool bDirWindowHasFocus = m_pDirectoryMergeSplitter->isVisible() && m_pDirectoryMergeWindow->hasFocus(); joachim99@8: joachim99@51: showWhiteSpaceCharacters->setEnabled( bDiffWindowVisible ); joachim99@8: autoAdvance->setEnabled( bMergeEditorVisible ); joachim99@8: autoSolve->setEnabled( bMergeEditorVisible && m_bTripleDiff ); joachim99@8: unsolve->setEnabled( bMergeEditorVisible ); joachim99@53: if ( !bDirWindowHasFocus ) joachim99@53: { joachim99@53: chooseA->setEnabled( bMergeEditorVisible ); joachim99@53: chooseB->setEnabled( bMergeEditorVisible ); joachim99@53: chooseC->setEnabled( bMergeEditorVisible && m_bTripleDiff ); joachim99@53: } joachim99@8: chooseAEverywhere->setEnabled( bMergeEditorVisible ); joachim99@8: chooseBEverywhere->setEnabled( bMergeEditorVisible ); joachim99@8: chooseCEverywhere->setEnabled( bMergeEditorVisible && m_bTripleDiff ); joachim99@51: chooseAForUnsolvedConflicts->setEnabled( bMergeEditorVisible ); joachim99@51: chooseBForUnsolvedConflicts->setEnabled( bMergeEditorVisible ); joachim99@51: chooseCForUnsolvedConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff ); joachim99@51: chooseAForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible ); joachim99@51: chooseBForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible ); joachim99@51: chooseCForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff ); joachim99@8: showWindowA->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow2->isVisible() || m_pDiffTextWindow3->isVisible() ) ); joachim99@8: showWindowB->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow3->isVisible() )); joachim99@8: showWindowC->setEnabled( bDiffWindowVisible && m_bTripleDiff && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow2->isVisible() ) ); joachim99@8: editFind->setEnabled( bDiffWindowVisible ); joachim99@8: editFindNext->setEnabled( bDiffWindowVisible ); joachim99@8: m_pFindDialog->m_pSearchInC->setEnabled( m_bTripleDiff ); joachim99@8: m_pFindDialog->m_pSearchInOutput->setEnabled( bMergeEditorVisible ); joachim99@8: joachim99@8: bool bSavable = bMergeEditorVisible && m_pMergeResultWindow->getNrOfUnsolvedConflicts()==0; joachim99@8: fileSave->setEnabled( m_bOutputModified && bSavable ); joachim99@8: fileSaveAs->setEnabled( bSavable ); joachim99@8: joachim99@8: goTop->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() ); joachim99@8: goBottom->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() ); joachim99@8: goCurrent->setEnabled( bDiffWindowVisible ); joachim99@8: goPrevUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictAboveCurrent() ); joachim99@8: goNextUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictBelowCurrent() ); joachim99@8: goPrevConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictAboveCurrent() ); joachim99@8: goNextConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictBelowCurrent() ); joachim99@8: goPrevDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() ); joachim99@8: goNextDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() ); joachim99@8: joachim99@8: winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=0 ); joachim99@8: }