joachim99@8
|
1 /***************************************************************************
|
joachim99@58
|
2 pdiff.cpp - Implementation for class KDiff3App
|
joachim99@58
|
3 ---------------
|
joachim99@69
|
4 begin : Mon March 18 20:04:50 CET 2002
|
joachim99@77
|
5 copyright : (C) 2002-2007 by Joachim Eibl
|
joachim99@69
|
6 email : joachim.eibl at gmx.de
|
joachim99@8
|
7 ***************************************************************************/
|
joachim99@8
|
8
|
joachim99@8
|
9 /***************************************************************************
|
joachim99@8
|
10 * *
|
joachim99@8
|
11 * This program is free software; you can redistribute it and/or modify *
|
joachim99@8
|
12 * it under the terms of the GNU General Public License as published by *
|
joachim99@8
|
13 * the Free Software Foundation; either version 2 of the License, or *
|
joachim99@8
|
14 * (at your option) any later version. *
|
joachim99@8
|
15 * *
|
joachim99@8
|
16 ***************************************************************************/
|
joachim99@8
|
17
|
joachim99@69
|
18 #include "difftextwindow.h"
|
joachim99@69
|
19 #include "mergeresultwindow.h"
|
joachim99@8
|
20 #include "directorymergewindow.h"
|
joachim99@69
|
21 #include "smalldialogs.h"
|
joachim99@8
|
22
|
joachim99@8
|
23 #include <iostream>
|
joachim99@8
|
24 #include <algorithm>
|
joachim99@8
|
25 #include <ctype.h>
|
joachim99@8
|
26
|
joachim99@8
|
27 #include <qclipboard.h>
|
joachim99@8
|
28 #include <qscrollbar.h>
|
joachim99@8
|
29 #include <qlayout.h>
|
joachim99@69
|
30 #include <qcheckbox.h>
|
joachim99@8
|
31 #include <qsplitter.h>
|
joachim99@8
|
32 #include <qdir.h>
|
joachim99@8
|
33 #include <qfile.h>
|
joachim99@69
|
34 #include <qlineedit.h>
|
joachim99@69
|
35 #include <qcombobox.h>
|
joachim99@75
|
36 #include <QDropEvent>
|
joachim99@75
|
37 #include <QUrl>
|
joachim99@75
|
38 #include <QProcess>
|
joachim99@75
|
39
|
joachim99@75
|
40 #include <klocale.h>
|
joachim99@75
|
41 #include <kmessagebox.h>
|
joachim99@75
|
42 #include <kfontdialog.h>
|
joachim99@75
|
43 #include <kstatusbar.h>
|
joachim99@75
|
44 #include <kkeydialog.h>
|
joachim99@75
|
45
|
joachim99@75
|
46
|
joachim99@8
|
47 #include <assert.h>
|
joachim99@8
|
48
|
joachim99@8
|
49 #include "kdiff3.h"
|
joachim99@8
|
50 #include "optiondialog.h"
|
joachim99@8
|
51 #include "fileaccess.h"
|
joachim99@8
|
52 #ifdef _WIN32
|
joachim99@8
|
53 #include <windows.h>
|
joachim99@8
|
54 #else
|
joachim99@8
|
55 #include <unistd.h>
|
joachim99@8
|
56 #endif
|
joachim99@8
|
57
|
joachim99@51
|
58 #include "gnudiff_diff.h"
|
joachim99@51
|
59
|
joachim99@8
|
60 bool g_bIgnoreWhiteSpace = true;
|
joachim99@8
|
61 bool g_bIgnoreTrivialMatches = true;
|
joachim99@8
|
62
|
joachim99@8
|
63
|
joachim99@58
|
64 bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList )
|
joachim99@8
|
65 {
|
joachim99@66
|
66 ProgressProxy pp;
|
joachim99@68
|
67 static GnuDiff gnuDiff; // All values are initialized with zeros.
|
joachim99@68
|
68
|
joachim99@66
|
69 pp.setCurrent(0);
|
joachim99@51
|
70
|
joachim99@8
|
71 diffList.clear();
|
joachim99@69
|
72 if ( p1[0].pLine==0 || p2[0].pLine==0 || size1==0 || size2==0 )
|
joachim99@51
|
73 {
|
joachim99@51
|
74 Diff d( 0,0,0);
|
joachim99@51
|
75 if ( p1[0].pLine==0 && p2[0].pLine==0 && size1 == size2 )
|
joachim99@51
|
76 d.nofEquals = size1;
|
joachim99@69
|
77 else
|
joachim99@53
|
78 {
|
joachim99@53
|
79 d.diff1=size1;
|
joachim99@53
|
80 d.diff2=size2;
|
joachim99@53
|
81 }
|
joachim99@51
|
82
|
joachim99@51
|
83 diffList.push_back(d);
|
joachim99@51
|
84 }
|
joachim99@53
|
85 else
|
joachim99@68
|
86 {
|
joachim99@53
|
87 GnuDiff::comparison comparisonInput;
|
joachim99@53
|
88 memset( &comparisonInput, 0, sizeof(comparisonInput) );
|
joachim99@53
|
89 comparisonInput.parent = 0;
|
joachim99@69
|
90 comparisonInput.file[0].buffer = p1[0].pLine;//ptr to buffer
|
joachim99@68
|
91 comparisonInput.file[0].buffered = (p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size); // size of buffer
|
joachim99@69
|
92 comparisonInput.file[1].buffer = p2[0].pLine;//ptr to buffer
|
joachim99@68
|
93 comparisonInput.file[1].buffered = (p2[size2-1].pLine-p2[0].pLine+p2[size2-1].size); // size of buffer
|
joachim99@68
|
94
|
joachim99@53
|
95 gnuDiff.ignore_white_space = GnuDiff::IGNORE_ALL_SPACE; // I think nobody needs anything else ...
|
joachim99@53
|
96 gnuDiff.bIgnoreWhiteSpace = true;
|
joachim99@53
|
97 gnuDiff.bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers;
|
joachim99@53
|
98 gnuDiff.minimal = m_pOptionDialog->m_bTryHard;
|
joachim99@66
|
99 gnuDiff.ignore_case = false;
|
joachim99@53
|
100 GnuDiff::change* script = gnuDiff.diff_2_files( &comparisonInput );
|
joachim99@68
|
101
|
joachim99@53
|
102 int equalLinesAtStart = comparisonInput.file[0].prefix_lines;
|
joachim99@53
|
103 int currentLine1 = 0;
|
joachim99@53
|
104 int currentLine2 = 0;
|
joachim99@53
|
105 GnuDiff::change* p=0;
|
joachim99@53
|
106 for (GnuDiff::change* e = script; e; e = p)
|
joachim99@51
|
107 {
|
joachim99@53
|
108 Diff d(0,0,0);
|
joachim99@53
|
109 d.nofEquals = e->line0 - currentLine1;
|
joachim99@53
|
110 assert( d.nofEquals == e->line1 - currentLine2 );
|
joachim99@53
|
111 d.diff1 = e->deleted;
|
joachim99@53
|
112 d.diff2 = e->inserted;
|
joachim99@53
|
113 currentLine1 += d.nofEquals + d.diff1;
|
joachim99@53
|
114 currentLine2 += d.nofEquals + d.diff2;
|
joachim99@53
|
115 diffList.push_back(d);
|
joachim99@68
|
116
|
joachim99@53
|
117 p = e->link;
|
joachim99@53
|
118 free (e);
|
joachim99@51
|
119 }
|
joachim99@68
|
120
|
joachim99@66
|
121 if ( diffList.empty() )
|
joachim99@51
|
122 {
|
joachim99@66
|
123 Diff d(0,0,0);
|
joachim99@66
|
124 d.nofEquals = min2(size1,size2);
|
joachim99@66
|
125 d.diff1 = size1 - d.nofEquals;
|
joachim99@66
|
126 d.diff2 = size2 - d.nofEquals;
|
joachim99@66
|
127 diffList.push_back(d);
|
joachim99@66
|
128 /* Diff d(0,0,0);
|
joachim99@66
|
129 d.nofEquals = equalLinesAtStart;
|
joachim99@66
|
130 if ( gnuDiff.files[0].missing_newline != gnuDiff.files[1].missing_newline )
|
joachim99@66
|
131 {
|
joachim99@66
|
132 d.diff1 = gnuDiff.files[0].missing_newline ? 0 : 1;
|
joachim99@66
|
133 d.diff2 = gnuDiff.files[1].missing_newline ? 0 : 1;
|
joachim99@66
|
134 ++d.nofEquals;
|
joachim99@66
|
135 }
|
joachim99@66
|
136 else if ( !gnuDiff.files[0].missing_newline )
|
joachim99@66
|
137 {
|
joachim99@66
|
138 ++d.nofEquals;
|
joachim99@68
|
139 }
|
joachim99@66
|
140 diffList.push_back(d);
|
joachim99@66
|
141 */
|
joachim99@66
|
142 }
|
joachim99@66
|
143 else
|
joachim99@66
|
144 {
|
joachim99@66
|
145 diffList.front().nofEquals += equalLinesAtStart;
|
joachim99@53
|
146 currentLine1 += equalLinesAtStart;
|
joachim99@53
|
147 currentLine2 += equalLinesAtStart;
|
joachim99@68
|
148
|
joachim99@53
|
149 int nofEquals = min2(size1-currentLine1,size2-currentLine2);
|
joachim99@53
|
150 if ( nofEquals==0 )
|
joachim99@53
|
151 {
|
joachim99@53
|
152 diffList.back().diff1 += size1-currentLine1;
|
joachim99@53
|
153 diffList.back().diff2 += size2-currentLine2;
|
joachim99@53
|
154 }
|
joachim99@53
|
155 else
|
joachim99@53
|
156 {
|
joachim99@53
|
157 Diff d( nofEquals,size1-currentLine1-nofEquals,size2-currentLine2-nofEquals);
|
joachim99@53
|
158 diffList.push_back(d);
|
joachim99@53
|
159 }
|
joachim99@68
|
160
|
joachim99@66
|
161 /*
|
joachim99@66
|
162 if ( gnuDiff.files[0].missing_newline != gnuDiff.files[1].missing_newline )
|
joachim99@66
|
163 {
|
joachim99@66
|
164 diffList.back().diff1 += gnuDiff.files[0].missing_newline ? 0 : 1;
|
joachim99@66
|
165 diffList.back().diff2 += gnuDiff.files[1].missing_newline ? 0 : 1;
|
joachim99@66
|
166 }
|
joachim99@66
|
167 else if ( !gnuDiff.files[0].missing_newline )
|
joachim99@66
|
168 {
|
joachim99@66
|
169 ++ diffList.back().nofEquals;
|
joachim99@66
|
170 }
|
joachim99@66
|
171 */
|
joachim99@53
|
172 }
|
joachim99@51
|
173 }
|
joachim99@68
|
174
|
joachim99@51
|
175 #ifndef NDEBUG
|
joachim99@51
|
176 // Verify difflist
|
joachim99@51
|
177 {
|
joachim99@51
|
178 int l1=0;
|
joachim99@51
|
179 int l2=0;
|
joachim99@51
|
180 DiffList::iterator i;
|
joachim99@51
|
181 for( i = diffList.begin(); i!=diffList.end(); ++i )
|
joachim99@51
|
182 {
|
joachim99@51
|
183 l1+= i->nofEquals + i->diff1;
|
joachim99@51
|
184 l2+= i->nofEquals + i->diff2;
|
joachim99@51
|
185 }
|
joachim99@51
|
186
|
joachim99@51
|
187 //if( l1!=p1-p1start || l2!=p2-p2start )
|
joachim99@51
|
188 if( l1!=size1 || l2!=size2 )
|
joachim99@51
|
189 assert( false );
|
joachim99@51
|
190 }
|
joachim99@51
|
191 #endif
|
joachim99@51
|
192
|
joachim99@66
|
193 pp.setCurrent(1.0);
|
joachim99@51
|
194
|
joachim99@51
|
195 return true;
|
joachim99@8
|
196 }
|
joachim99@8
|
197
|
joachim99@69
|
198 bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList,
|
joachim99@69
|
199 int winIdx1, int winIdx2 )
|
joachim99@69
|
200 {
|
joachim99@69
|
201 diffList.clear();
|
joachim99@69
|
202 DiffList diffList2;
|
joachim99@8
|
203
|
joachim99@69
|
204 int l1begin = 0;
|
joachim99@69
|
205 int l2begin = 0;
|
joachim99@69
|
206 ManualDiffHelpList::const_iterator i;
|
joachim99@69
|
207 for( i = m_manualDiffHelpList.begin(); i!=m_manualDiffHelpList.end(); ++i )
|
joachim99@69
|
208 {
|
joachim99@69
|
209 const ManualDiffHelpEntry& mdhe = *i;
|
joachim99@69
|
210
|
joachim99@69
|
211 int l1end = winIdx1 == 1 ? mdhe.lineA1 : winIdx1==2 ? mdhe.lineB1 : mdhe.lineC1 ;
|
joachim99@69
|
212 int l2end = winIdx2 == 1 ? mdhe.lineA1 : winIdx2==2 ? mdhe.lineB1 : mdhe.lineC1 ;
|
joachim99@69
|
213
|
joachim99@69
|
214 if ( l1end>=0 && l2end>=0 )
|
joachim99@69
|
215 {
|
joachim99@69
|
216 runDiff( p1+l1begin, l1end-l1begin, p2+l2begin, l2end-l2begin, diffList2 );
|
joachim99@69
|
217 diffList.splice( diffList.end(), diffList2 );
|
joachim99@69
|
218 l1begin = l1end;
|
joachim99@69
|
219 l2begin = l2end;
|
joachim99@69
|
220
|
joachim99@69
|
221 l1end = winIdx1 == 1 ? mdhe.lineA2 : winIdx1==2 ? mdhe.lineB2 : mdhe.lineC2 ;
|
joachim99@69
|
222 l2end = winIdx2 == 1 ? mdhe.lineA2 : winIdx2==2 ? mdhe.lineB2 : mdhe.lineC2 ;
|
joachim99@69
|
223
|
joachim99@69
|
224 if ( l1end>=0 && l2end>=0 )
|
joachim99@69
|
225 {
|
joachim99@69
|
226 ++l1end; // point to line after last selected line
|
joachim99@69
|
227 ++l2end;
|
joachim99@69
|
228 runDiff( p1+l1begin, l1end-l1begin, p2+l2begin, l2end-l2begin, diffList2 );
|
joachim99@69
|
229 diffList.splice( diffList.end(), diffList2 );
|
joachim99@69
|
230 l1begin = l1end;
|
joachim99@69
|
231 l2begin = l2end;
|
joachim99@69
|
232 }
|
joachim99@69
|
233 }
|
joachim99@69
|
234 }
|
joachim99@69
|
235 runDiff( p1+l1begin, size1-l1begin, p2+l2begin, size2-l2begin, diffList2 );
|
joachim99@69
|
236 diffList.splice( diffList.end(), diffList2 );
|
joachim99@69
|
237 return true;
|
joachim99@69
|
238 }
|
joachim99@69
|
239
|
joachim99@69
|
240 void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles )
|
joachim99@8
|
241 {
|
joachim99@66
|
242 ProgressProxy pp;
|
joachim99@66
|
243 // When doing a full analysis in the directory-comparison, then the statistics-results
|
joachim99@66
|
244 // will be stored in the given TotalDiffStatus. Otherwise it will be 0.
|
joachim99@66
|
245 bool bGUI = pTotalDiffStatus == 0;
|
joachim99@66
|
246 if (pTotalDiffStatus==0)
|
joachim99@66
|
247 pTotalDiffStatus = &m_totalDiffStatus;
|
joachim99@66
|
248
|
joachim99@8
|
249 bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn;
|
joachim99@8
|
250
|
joachim99@8
|
251 bool bVisibleMergeResultWindow = ! m_outputFilename.isEmpty();
|
joachim99@66
|
252 if ( bVisibleMergeResultWindow && bGUI )
|
joachim99@8
|
253 {
|
joachim99@8
|
254 bPreserveCarriageReturn = false;
|
joachim99@69
|
255
|
joachim99@58
|
256 QString msg;
|
joachim99@69
|
257
|
joachim99@58
|
258 if ( !m_pOptionDialog->m_PreProcessorCmd.isEmpty() )
|
joachim99@58
|
259 {
|
joachim99@58
|
260 msg += "- " + i18n("PreprocessorCmd: ") + m_pOptionDialog->m_PreProcessorCmd + "\n";
|
joachim99@58
|
261 }
|
joachim99@58
|
262 if ( !msg.isEmpty() )
|
joachim99@58
|
263 {
|
joachim99@58
|
264 int result = KMessageBox::warningYesNo( this,
|
joachim99@58
|
265 i18n("The following option(s) you selected might change data:\n") + msg +
|
joachim99@58
|
266 i18n("\nMost likely this is not wanted during a merge.\n"
|
joachim99@58
|
267 "Do you want to disable these settings or continue with these settings active?"),
|
joachim99@68
|
268 i18n("Option Unsafe for Merging"),
|
joachim99@68
|
269 i18n("Use These Options During Merge"), i18n("Disable Unsafe Options")
|
joachim99@58
|
270 );
|
joachim99@69
|
271
|
joachim99@58
|
272 if (result == KMessageBox::No )
|
joachim99@58
|
273 {
|
joachim99@58
|
274 m_pOptionDialog->m_PreProcessorCmd = "";
|
joachim99@58
|
275 }
|
joachim99@58
|
276 }
|
joachim99@8
|
277 }
|
joachim99@8
|
278
|
joachim99@58
|
279 // Because of the progressdialog paintevents can occur, but data is invalid,
|
joachim99@58
|
280 // so painting must be suppressed.
|
joachim99@8
|
281 if (m_pDiffTextWindow1) m_pDiffTextWindow1->setPaintingAllowed( false );
|
joachim99@8
|
282 if (m_pDiffTextWindow2) m_pDiffTextWindow2->setPaintingAllowed( false );
|
joachim99@8
|
283 if (m_pDiffTextWindow3) m_pDiffTextWindow3->setPaintingAllowed( false );
|
joachim99@8
|
284 if (m_pOverview) m_pOverview->setPaintingAllowed( false );
|
joachim99@58
|
285 if (m_pMergeResultWindow) m_pMergeResultWindow->setPaintingAllowed( false );
|
joachim99@8
|
286
|
joachim99@69
|
287 m_diff3LineList.clear();
|
joachim99@8
|
288
|
joachim99@69
|
289 if ( bLoadFiles )
|
joachim99@69
|
290 {
|
joachim99@69
|
291 m_manualDiffHelpList.clear();
|
joachim99@69
|
292
|
joachim99@69
|
293 if( m_sd3.isEmpty() )
|
joachim99@69
|
294 pp.setMaxNofSteps( 4 ); // Read 2 files, 1 comparison, 1 finediff
|
joachim99@69
|
295 else
|
joachim99@69
|
296 pp.setMaxNofSteps( 9 ); // Read 3 files, 3 comparisons, 3 finediffs
|
joachim99@69
|
297
|
joachim99@69
|
298 // First get all input data.
|
joachim99@69
|
299 pp.setInformation(i18n("Loading A"));
|
joachim99@75
|
300 m_sd1.readAndPreprocess(m_pOptionDialog->m_pEncodingA, m_pOptionDialog->m_bAutoDetectUnicodeA );
|
joachim99@69
|
301 pp.step();
|
joachim99@69
|
302
|
joachim99@69
|
303 pp.setInformation(i18n("Loading B"));
|
joachim99@75
|
304 m_sd2.readAndPreprocess(m_pOptionDialog->m_pEncodingB, m_pOptionDialog->m_bAutoDetectUnicodeB );
|
joachim99@69
|
305 pp.step();
|
joachim99@69
|
306 }
|
joachim99@8
|
307 else
|
joachim99@69
|
308 {
|
joachim99@69
|
309 if( m_sd3.isEmpty() )
|
joachim99@69
|
310 pp.setMaxNofSteps( 2 ); // 1 comparison, 1 finediff
|
joachim99@69
|
311 else
|
joachim99@69
|
312 pp.setMaxNofSteps( 6 ); // 3 comparisons, 3 finediffs
|
joachim99@69
|
313 }
|
joachim99@8
|
314
|
joachim99@66
|
315 pTotalDiffStatus->reset();
|
joachim99@8
|
316 // Run the diff.
|
joachim99@8
|
317 if ( m_sd3.isEmpty() )
|
joachim99@8
|
318 {
|
joachim99@66
|
319 pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
|
joachim99@66
|
320 pp.setInformation(i18n("Diff: A <-> B"));
|
joachim99@69
|
321
|
joachim99@69
|
322 runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
|
joachim99@8
|
323
|
joachim99@66
|
324 pp.step();
|
joachim99@8
|
325
|
joachim99@66
|
326 pp.setInformation(i18n("Linediff: A <-> B"));
|
joachim99@8
|
327 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
|
joachim99@66
|
328 fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
|
joachim99@66
|
329 if ( m_sd1.getSizeBytes()==0 ) pTotalDiffStatus->bTextAEqB=false;
|
joachim99@8
|
330
|
joachim99@66
|
331 pp.step();
|
joachim99@8
|
332 }
|
joachim99@8
|
333 else
|
joachim99@8
|
334 {
|
joachim99@69
|
335 if (bLoadFiles)
|
joachim99@69
|
336 {
|
joachim99@69
|
337 pp.setInformation(i18n("Loading C"));
|
joachim99@75
|
338 m_sd3.readAndPreprocess(m_pOptionDialog->m_pEncodingC, m_pOptionDialog->m_bAutoDetectUnicodeC );
|
joachim99@69
|
339 pp.step();
|
joachim99@69
|
340 }
|
joachim99@8
|
341
|
joachim99@66
|
342 pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
|
joachim99@66
|
343 pTotalDiffStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 );
|
joachim99@66
|
344 pTotalDiffStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 );
|
joachim99@8
|
345
|
joachim99@66
|
346 pp.setInformation(i18n("Diff: A <-> B"));
|
joachim99@69
|
347 runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
|
joachim99@66
|
348 pp.step();
|
joachim99@66
|
349 pp.setInformation(i18n("Diff: B <-> C"));
|
joachim99@69
|
350 runDiff( m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_sd3.getLineDataForDiff(), m_sd3.getSizeLines(), m_diffList23,2,3 );
|
joachim99@66
|
351 pp.step();
|
joachim99@66
|
352 pp.setInformation(i18n("Diff: A <-> C"));
|
joachim99@69
|
353 runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd3.getLineDataForDiff(), m_sd3.getSizeLines(), m_diffList13,1,3 );
|
joachim99@66
|
354 pp.step();
|
joachim99@8
|
355
|
joachim99@8
|
356 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
|
joachim99@8
|
357 calcDiff3LineListUsingAC( &m_diffList13, m_diff3LineList );
|
joachim99@69
|
358 correctManualDiffAlignment( m_diff3LineList, &m_manualDiffHelpList );
|
joachim99@69
|
359 calcDiff3LineListTrim( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff(), &m_manualDiffHelpList );
|
joachim99@8
|
360
|
joachim99@8
|
361 calcDiff3LineListUsingBC( &m_diffList23, m_diff3LineList );
|
joachim99@69
|
362 correctManualDiffAlignment( m_diff3LineList, &m_manualDiffHelpList );
|
joachim99@69
|
363 calcDiff3LineListTrim( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff(), &m_manualDiffHelpList );
|
joachim99@58
|
364 debugLineCheck( m_diff3LineList, m_sd1.getSizeLines(), 1 );
|
joachim99@58
|
365 debugLineCheck( m_diff3LineList, m_sd2.getSizeLines(), 2 );
|
joachim99@58
|
366 debugLineCheck( m_diff3LineList, m_sd3.getSizeLines(), 3 );
|
joachim99@8
|
367
|
joachim99@66
|
368 pp.setInformation(i18n("Linediff: A <-> B"));
|
joachim99@66
|
369 fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
|
joachim99@66
|
370 pp.step();
|
joachim99@66
|
371 pp.setInformation(i18n("Linediff: B <-> C"));
|
joachim99@66
|
372 fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDiffStatus->bTextBEqC );
|
joachim99@66
|
373 pp.step();
|
joachim99@66
|
374 pp.setInformation(i18n("Linediff: A <-> C"));
|
joachim99@66
|
375 fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqC );
|
joachim99@66
|
376 pp.step();
|
joachim99@66
|
377 if ( m_sd1.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextAEqC=false; }
|
joachim99@66
|
378 if ( m_sd2.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextBEqC=false; }
|
joachim99@8
|
379 }
|
joachim99@69
|
380 m_diffBufferInfo.init( &m_diff3LineList, &m_diff3LineVector,
|
joachim99@69
|
381 m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(),
|
joachim99@69
|
382 m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(),
|
joachim99@69
|
383 m_sd3.getLineDataForDiff(), m_sd3.getSizeLines() );
|
joachim99@58
|
384 calcWhiteDiff3Lines( m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff() );
|
joachim99@8
|
385 calcDiff3LineVector( m_diff3LineList, m_diff3LineVector );
|
joachim99@8
|
386
|
joachim99@8
|
387 // Calc needed lines for display
|
joachim99@8
|
388 m_neededLines = m_diff3LineList.size();
|
joachim99@8
|
389
|
joachim99@8
|
390 m_pDirectoryMergeWindow->allowResizeEvents(false);
|
joachim99@75
|
391
|
joachim99@75
|
392 QList<int> oldHeights;
|
joachim99@75
|
393 if ( m_pDirectoryMergeSplitter->isVisible() )
|
joachim99@75
|
394 oldHeights = m_pMainSplitter->sizes();
|
joachim99@75
|
395
|
joachim99@8
|
396 initView();
|
joachim99@75
|
397
|
joachim99@75
|
398 if ( m_pDirectoryMergeSplitter->isVisible() )
|
joachim99@66
|
399 {
|
joachim99@75
|
400 if (oldHeights.count() < 2)
|
joachim99@75
|
401 oldHeights.append(0);
|
joachim99@75
|
402 if (oldHeights[1]==0) // Distribute the available space evenly between the two widgets.
|
joachim99@75
|
403 {
|
joachim99@75
|
404 oldHeights[1] = oldHeights[0]/2;
|
joachim99@75
|
405 oldHeights[0] -= oldHeights[1];
|
joachim99@75
|
406 }
|
joachim99@75
|
407 m_pMainSplitter->setSizes( oldHeights );
|
joachim99@66
|
408 }
|
joachim99@75
|
409
|
joachim99@75
|
410 m_pMainWidget->setVisible( bGUI );
|
joachim99@8
|
411 m_pDirectoryMergeWindow->allowResizeEvents(true);
|
joachim99@8
|
412
|
joachim99@8
|
413 m_bTripleDiff = ! m_sd3.isEmpty();
|
joachim99@8
|
414
|
joachim99@75
|
415 m_pMergeResultWindowTitle->setEncodings( m_sd1.getEncoding(), m_sd2.getEncoding(), m_sd3.getEncoding() );
|
joachim99@75
|
416 if ( ! m_pOptionDialog->m_bAutoSelectOutEncoding )
|
joachim99@75
|
417 m_pMergeResultWindowTitle->setEncoding( m_pOptionDialog->m_pEncodingOut );
|
joachim99@75
|
418
|
joachim99@66
|
419 if ( bGUI )
|
joachim99@66
|
420 {
|
joachim99@69
|
421 const ManualDiffHelpList* pMDHL = &m_manualDiffHelpList;
|
joachim99@66
|
422 m_pDiffTextWindow1->init( m_sd1.getAliasName(),
|
joachim99@69
|
423 m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff );
|
joachim99@66
|
424 m_pDiffTextWindow2->init( m_sd2.getAliasName(),
|
joachim99@69
|
425 m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff );
|
joachim99@66
|
426 m_pDiffTextWindow3->init( m_sd3.getAliasName(),
|
joachim99@69
|
427 m_sd3.getLineDataForDisplay(), m_sd3.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff );
|
joachim99@69
|
428
|
joachim99@75
|
429 m_pDiffTextWindowFrame3->setVisible(m_bTripleDiff);
|
joachim99@66
|
430 }
|
joachim99@8
|
431
|
joachim99@8
|
432 m_bOutputModified = bVisibleMergeResultWindow;
|
joachim99@8
|
433
|
joachim99@8
|
434 m_pMergeResultWindow->init(
|
joachim99@69
|
435 m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(),
|
joachim99@69
|
436 m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(),
|
joachim99@69
|
437 m_bTripleDiff ? m_sd3.getLineDataForDisplay() : 0, m_sd3.getSizeLines(),
|
joachim99@8
|
438 &m_diff3LineList,
|
joachim99@75
|
439 pTotalDiffStatus
|
joachim99@8
|
440 );
|
joachim99@75
|
441 m_pMergeResultWindowTitle->setFileName( m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename );
|
joachim99@69
|
442
|
joachim99@66
|
443 if ( !bGUI )
|
joachim99@66
|
444 {
|
joachim99@66
|
445 // We now have all needed information. The rest below is only for GUI-activation.
|
joachim99@69
|
446 m_sd1.reset();
|
joachim99@69
|
447 m_sd2.reset();
|
joachim99@69
|
448 m_sd3.reset();
|
joachim99@66
|
449 return;
|
joachim99@66
|
450 }
|
joachim99@69
|
451
|
joachim99@8
|
452 m_pOverview->init(&m_diff3LineList, m_bTripleDiff );
|
joachim99@8
|
453 m_pDiffVScrollBar->setValue( 0 );
|
joachim99@8
|
454 m_pHScrollBar->setValue( 0 );
|
joachim99@66
|
455 m_pMergeVScrollBar->setValue( 0 );
|
joachim99@8
|
456
|
joachim99@8
|
457 m_pDiffTextWindow1->setPaintingAllowed( true );
|
joachim99@8
|
458 m_pDiffTextWindow2->setPaintingAllowed( true );
|
joachim99@8
|
459 m_pDiffTextWindow3->setPaintingAllowed( true );
|
joachim99@8
|
460 m_pOverview->setPaintingAllowed( true );
|
joachim99@58
|
461 m_pMergeResultWindow->setPaintingAllowed( true );
|
joachim99@58
|
462
|
joachim99@8
|
463
|
joachim99@8
|
464 if ( !bVisibleMergeResultWindow )
|
joachim99@8
|
465 m_pMergeWindowFrame->hide();
|
joachim99@8
|
466 else
|
joachim99@8
|
467 m_pMergeWindowFrame->show();
|
joachim99@8
|
468
|
joachim99@8
|
469 // Calc max width for display
|
joachim99@8
|
470 m_maxWidth = max2( m_pDiffTextWindow1->getNofColumns(), m_pDiffTextWindow2->getNofColumns() );
|
joachim99@8
|
471 m_maxWidth = max2( m_maxWidth, m_pDiffTextWindow3->getNofColumns() );
|
joachim99@8
|
472 m_maxWidth += 5;
|
joachim99@8
|
473
|
joachim99@66
|
474 // Try to create a meaningful but not too long caption
|
joachim99@66
|
475 if ( !isPart() )
|
joachim99@66
|
476 {
|
joachim99@66
|
477 // 1. If the filenames are equal then show only one filename
|
joachim99@66
|
478 QString caption;
|
joachim99@66
|
479 QString a1 = m_sd1.getAliasName();
|
joachim99@66
|
480 QString a2 = m_sd2.getAliasName();
|
joachim99@66
|
481 QString a3 = m_sd3.getAliasName();
|
joachim99@66
|
482 QString f1, f2, f3;
|
joachim99@66
|
483 int p1,p2,p3;
|
joachim99@75
|
484 if ( !a1.isEmpty() && (p1=a1.lastIndexOf('/'))>=0 )
|
joachim99@66
|
485 f1 = a1.mid( p1+1 );
|
joachim99@75
|
486 if ( !a2.isEmpty() && (p2=a2.lastIndexOf('/'))>=0 )
|
joachim99@66
|
487 f2 = a2.mid( p2+1 );
|
joachim99@75
|
488 if ( !a3.isEmpty() && (p3=a3.lastIndexOf('/'))>=0 )
|
joachim99@66
|
489 f3 = a3.mid( p3+1 );
|
joachim99@66
|
490 if ( !f1.isEmpty() )
|
joachim99@66
|
491 {
|
joachim99@66
|
492 if ( ( f2.isEmpty() && f3.isEmpty() ) ||
|
joachim99@66
|
493 (f2.isEmpty() && f1==f3) || ( f3.isEmpty() && f1==f2 ) || (f1==f2 && f1==f3))
|
joachim99@66
|
494 caption = ".../"+f1;
|
joachim99@66
|
495 }
|
joachim99@66
|
496 else if ( ! f2.isEmpty() )
|
joachim99@66
|
497 {
|
joachim99@66
|
498 if ( f3.isEmpty() || f2==f3 )
|
joachim99@66
|
499 caption = ".../"+f2;
|
joachim99@66
|
500 }
|
joachim99@66
|
501 else if ( ! f3.isEmpty() )
|
joachim99@66
|
502 caption = ".../"+f3;
|
joachim99@69
|
503
|
joachim99@66
|
504 // 2. If the files don't have the same name then show all names
|
joachim99@66
|
505 if ( caption.isEmpty() && (!f1.isEmpty() || !f2.isEmpty() || !f3.isEmpty()) )
|
joachim99@66
|
506 {
|
joachim99@68
|
507 caption = ( f1.isEmpty()? QString("") : QString(".../")+f1 );
|
joachim99@68
|
508 caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? QString("") : QString(".../")+f2 );
|
joachim99@68
|
509 caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? QString("") : QString(".../")+f3 ) ;
|
joachim99@69
|
510 }
|
joachim99@69
|
511
|
joachim99@75
|
512 m_pKDiff3Shell->setWindowTitle( caption.isEmpty() ? QString("KDiff3") : caption+QString(" - KDiff3"));
|
joachim99@66
|
513 }
|
joachim99@69
|
514
|
joachim99@69
|
515 if ( bLoadFiles )
|
joachim99@8
|
516 {
|
joachim99@69
|
517 if ( bVisibleMergeResultWindow && !bAuto )
|
joachim99@69
|
518 m_pMergeResultWindow->showNrOfConflicts();
|
joachim99@69
|
519 else if ( !bAuto &&
|
joachim99@69
|
520 // Avoid showing this message during startup without parameters.
|
joachim99@69
|
521 !( m_sd1.getAliasName().isEmpty() && m_sd2.getAliasName().isEmpty() && m_sd3.getAliasName().isEmpty() ) &&
|
joachim99@69
|
522 ( m_sd1.isValid() && m_sd2.isValid() && m_sd3.isValid() )
|
joachim99@69
|
523 )
|
joachim99@69
|
524 {
|
joachim99@69
|
525 QString totalInfo;
|
joachim99@69
|
526 if ( pTotalDiffStatus->bBinaryAEqB && pTotalDiffStatus->bBinaryAEqC )
|
joachim99@69
|
527 totalInfo += i18n("All input files are binary equal.");
|
joachim99@69
|
528 else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC )
|
joachim99@69
|
529 totalInfo += i18n("All input files contain the same text, but are not binary equal.");
|
joachim99@69
|
530 else {
|
joachim99@69
|
531 if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("A").arg("B");
|
joachim99@69
|
532 else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("B");
|
joachim99@69
|
533 if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("A").arg("C");
|
joachim99@69
|
534 else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("C");
|
joachim99@69
|
535 if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("B").arg("C");
|
joachim99@69
|
536 else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("B").arg("C");
|
joachim99@69
|
537 }
|
joachim99@69
|
538
|
joachim99@69
|
539 if ( !totalInfo.isEmpty() )
|
joachim99@69
|
540 KMessageBox::information( this, totalInfo );
|
joachim99@8
|
541 }
|
joachim99@8
|
542
|
joachim99@69
|
543 if ( bVisibleMergeResultWindow && (!m_sd1.isText() || !m_sd2.isText() || !m_sd3.isText()) )
|
joachim99@8
|
544 {
|
joachim99@69
|
545 KMessageBox::information( this, i18n(
|
joachim99@69
|
546 "Some inputfiles don't seem to be pure textfiles.\n"
|
joachim99@69
|
547 "Note that the KDiff3-merge was not meant for binary data.\n"
|
joachim99@69
|
548 "Continue at your own risk.") );
|
joachim99@69
|
549 }
|
joachim99@8
|
550 }
|
joachim99@8
|
551
|
joachim99@8
|
552 QTimer::singleShot( 10, this, SLOT(slotAfterFirstPaint()) );
|
joachim99@69
|
553
|
joachim99@53
|
554 if ( bVisibleMergeResultWindow && m_pMergeResultWindow )
|
joachim99@53
|
555 {
|
joachim99@53
|
556 m_pMergeResultWindow->setFocus();
|
joachim99@53
|
557 }
|
joachim99@53
|
558 else if(m_pDiffTextWindow1)
|
joachim99@53
|
559 {
|
joachim99@53
|
560 m_pDiffTextWindow1->setFocus();
|
joachim99@53
|
561 }
|
joachim99@8
|
562 }
|
joachim99@8
|
563
|
joachim99@8
|
564
|
joachim99@8
|
565 void KDiff3App::resizeDiffTextWindow(int newWidth, int newHeight)
|
joachim99@8
|
566 {
|
joachim99@69
|
567 m_DTWHeight = newHeight;
|
joachim99@69
|
568
|
joachim99@66
|
569 recalcWordWrap();
|
joachim99@66
|
570
|
joachim99@8
|
571 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
|
joachim99@8
|
572 m_pDiffVScrollBar->setPageStep( newHeight );
|
joachim99@8
|
573 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
|
joachim99@8
|
574
|
joachim99@8
|
575 // The second window has a somewhat inverse width
|
joachim99@8
|
576
|
joachim99@8
|
577 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
|
joachim99@8
|
578 m_pHScrollBar->setPageStep( newWidth );
|
joachim99@8
|
579 }
|
joachim99@8
|
580
|
joachim99@8
|
581 void KDiff3App::resizeMergeResultWindow()
|
joachim99@8
|
582 {
|
joachim99@8
|
583 MergeResultWindow* p = m_pMergeResultWindow;
|
joachim99@8
|
584 m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) );
|
joachim99@8
|
585 m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() );
|
joachim99@8
|
586
|
joachim99@8
|
587 // The second window has a somewhat inverse width
|
joachim99@8
|
588 // m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
|
joachim99@8
|
589 // m_pHScrollBar->setPageStep( newWidth );
|
joachim99@8
|
590 }
|
joachim99@8
|
591
|
joachim99@8
|
592 void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY )
|
joachim99@8
|
593 {
|
joachim99@8
|
594 if ( deltaY!= 0 )
|
joachim99@8
|
595 {
|
joachim99@8
|
596 m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->value() + deltaY );
|
joachim99@8
|
597 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
|
joachim99@8
|
598 }
|
joachim99@8
|
599 if ( deltaX!= 0)
|
joachim99@69
|
600 m_pHScrollBar->QScrollBar::setValue( m_pHScrollBar->value() + deltaX );
|
joachim99@8
|
601 }
|
joachim99@8
|
602
|
joachim99@8
|
603 void KDiff3App::scrollMergeResultWindow( int deltaX, int deltaY )
|
joachim99@8
|
604 {
|
joachim99@8
|
605 if ( deltaY!= 0 )
|
joachim99@8
|
606 m_pMergeVScrollBar->setValue( m_pMergeVScrollBar->value() + deltaY );
|
joachim99@8
|
607 if ( deltaX!= 0)
|
joachim99@8
|
608 m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX );
|
joachim99@8
|
609 }
|
joachim99@8
|
610
|
joachim99@8
|
611 void KDiff3App::setDiff3Line( int line )
|
joachim99@8
|
612 {
|
joachim99@8
|
613 m_pDiffVScrollBar->setValue( line );
|
joachim99@8
|
614 }
|
joachim99@8
|
615
|
joachim99@8
|
616 void KDiff3App::sourceMask( int srcMask, int enabledMask )
|
joachim99@8
|
617 {
|
joachim99@8
|
618 chooseA->setChecked( (srcMask & 1) != 0 );
|
joachim99@8
|
619 chooseB->setChecked( (srcMask & 2) != 0 );
|
joachim99@8
|
620 chooseC->setChecked( (srcMask & 4) != 0 );
|
joachim99@8
|
621 chooseA->setEnabled( (enabledMask & 1) != 0 );
|
joachim99@8
|
622 chooseB->setEnabled( (enabledMask & 2) != 0 );
|
joachim99@8
|
623 chooseC->setEnabled( (enabledMask & 4) != 0 );
|
joachim99@8
|
624 }
|
joachim99@8
|
625
|
joachim99@8
|
626
|
joachim99@8
|
627
|
joachim99@8
|
628 // Function uses setMinSize( sizeHint ) before adding the widget.
|
joachim99@8
|
629 // void addWidget(QBoxLayout* layout, QWidget* widget);
|
joachim99@8
|
630 template <class W, class L>
|
joachim99@8
|
631 void addWidget( L* layout, W* widget)
|
joachim99@8
|
632 {
|
joachim99@8
|
633 QSize s = widget->sizeHint();
|
joachim99@8
|
634 widget->setMinimumSize( QSize(max2(s.width(),0),max2(s.height(),0) ) );
|
joachim99@8
|
635 layout->addWidget( widget );
|
joachim99@8
|
636 }
|
joachim99@8
|
637
|
joachim99@8
|
638 void KDiff3App::initView()
|
joachim99@8
|
639 {
|
joachim99@8
|
640 // set the main widget here
|
joachim99@8
|
641 if ( m_pMainWidget != 0 )
|
joachim99@8
|
642 {
|
joachim99@8
|
643 return;
|
joachim99@8
|
644 //delete m_pMainWidget;
|
joachim99@8
|
645 }
|
joachim99@75
|
646 m_pMainWidget = new QWidget(m_pMainSplitter); // Contains vertical splitter and horiz scrollbar
|
joachim99@75
|
647 QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget);
|
joachim99@75
|
648 pVLayout->setMargin(0);
|
joachim99@75
|
649 pVLayout->setSpacing(0);
|
joachim99@8
|
650
|
joachim99@75
|
651 QSplitter* pVSplitter = new QSplitter();
|
joachim99@75
|
652 pVSplitter->setOpaqueResize(false);
|
joachim99@69
|
653 pVSplitter->setOrientation( Qt::Vertical );
|
joachim99@8
|
654 pVLayout->addWidget( pVSplitter );
|
joachim99@75
|
655 pVSplitter->show();
|
joachim99@8
|
656
|
joachim99@75
|
657 QWidget* pDiffWindowFrame = new QWidget( pVSplitter ); // Contains diff windows, overview and vert scrollbar
|
joachim99@75
|
658 QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame );
|
joachim99@75
|
659 pDiffHLayout->setMargin(0);
|
joachim99@75
|
660 pDiffHLayout->setSpacing(0);
|
joachim99@75
|
661 pDiffWindowFrame->show();
|
joachim99@75
|
662 m_pDiffWindowSplitter = new QSplitter();
|
joachim99@75
|
663 m_pDiffWindowSplitter->setOpaqueResize(false);
|
joachim99@8
|
664
|
joachim99@69
|
665 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
|
joachim99@8
|
666 pDiffHLayout->addWidget( m_pDiffWindowSplitter );
|
joachim99@75
|
667 m_pDiffWindowSplitter->show();
|
joachim99@8
|
668
|
joachim99@75
|
669 m_pOverview = new Overview( m_pOptionDialog );
|
joachim99@8
|
670 pDiffHLayout->addWidget(m_pOverview);
|
joachim99@8
|
671 connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) );
|
joachim99@8
|
672 //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint()));
|
joachim99@8
|
673
|
joachim99@69
|
674 m_pDiffVScrollBar = new QScrollBar( Qt::Vertical, pDiffWindowFrame );
|
joachim99@8
|
675 pDiffHLayout->addWidget( m_pDiffVScrollBar );
|
joachim99@8
|
676
|
joachim99@69
|
677 m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 );
|
joachim99@75
|
678 m_pDiffTextWindowFrame1->show();
|
joachim99@69
|
679 m_pDiffTextWindowFrame2 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 2 );
|
joachim99@75
|
680 m_pDiffTextWindowFrame2->show();
|
joachim99@69
|
681 m_pDiffTextWindowFrame3 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 3 );
|
joachim99@69
|
682 m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow();
|
joachim99@69
|
683 m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow();
|
joachim99@69
|
684 m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow();
|
joachim99@69
|
685 connect(m_pDiffTextWindowFrame1, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int)));
|
joachim99@69
|
686 connect(m_pDiffTextWindowFrame2, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int)));
|
joachim99@69
|
687 connect(m_pDiffTextWindowFrame3, SIGNAL(fileNameChanged(const QString&,int)), this, SLOT(slotFileNameChanged(const QString&,int)));
|
joachim99@8
|
688
|
joachim99@8
|
689 // Merge window
|
joachim99@69
|
690 m_pMergeWindowFrame = new QWidget( pVSplitter );
|
joachim99@75
|
691 QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame );
|
joachim99@75
|
692 pMergeHLayout->setMargin(0);
|
joachim99@75
|
693 pMergeHLayout->setSpacing(0);
|
joachim99@75
|
694 QVBoxLayout* pMergeVLayout = new QVBoxLayout();
|
joachim99@75
|
695 pMergeHLayout->addLayout( pMergeVLayout, 1 );
|
joachim99@75
|
696
|
joachim99@75
|
697 m_pMergeResultWindowTitle = new WindowTitleWidget(m_pOptionDialog);
|
joachim99@75
|
698 pMergeVLayout->addWidget( m_pMergeResultWindowTitle );
|
joachim99@8
|
699
|
joachim99@66
|
700 m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() );
|
joachim99@75
|
701 pMergeVLayout->addWidget( m_pMergeResultWindow, 1 );
|
joachim99@8
|
702
|
joachim99@69
|
703 m_pMergeVScrollBar = new QScrollBar( Qt::Vertical, m_pMergeWindowFrame );
|
joachim99@8
|
704 pMergeHLayout->addWidget( m_pMergeVScrollBar );
|
joachim99@8
|
705
|
joachim99@8
|
706 autoAdvance->setEnabled(true);
|
joachim99@8
|
707
|
joachim99@75
|
708 QList<int> sizes = pVSplitter->sizes();
|
joachim99@8
|
709 int total = sizes[0] + sizes[1];
|
joachim99@8
|
710 sizes[0]=total/2; sizes[1]=total/2;
|
joachim99@8
|
711 pVSplitter->setSizes( sizes );
|
joachim99@8
|
712
|
joachim99@8
|
713 m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts
|
joachim99@75
|
714 m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking
|
joachim99@8
|
715
|
joachim99@75
|
716 QHBoxLayout* pHScrollBarLayout = new QHBoxLayout();
|
joachim99@75
|
717 pVLayout->addLayout( pHScrollBarLayout );
|
joachim99@75
|
718 m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, &m_pOptionDialog->m_bRightToLeftLanguage );
|
joachim99@8
|
719 pHScrollBarLayout->addWidget( m_pHScrollBar );
|
joachim99@8
|
720 m_pCornerWidget = new QWidget( m_pMainWidget );
|
joachim99@8
|
721 pHScrollBarLayout->addWidget( m_pCornerWidget );
|
joachim99@8
|
722
|
joachim99@8
|
723
|
joachim99@8
|
724 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pOverview, SLOT(setFirstLine(int)));
|
joachim99@8
|
725 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int)));
|
joachim99@68
|
726 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, SLOT(setFirstColumn(int)));
|
joachim99@8
|
727 connect( m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
|
joachim99@8
|
728 connect( m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
|
joachim99@8
|
729 connect( m_pDiffTextWindow1, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
|
joachim99@8
|
730 m_pDiffTextWindow1->installEventFilter( this );
|
joachim99@8
|
731
|
joachim99@8
|
732 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int)));
|
joachim99@68
|
733 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, SLOT(setFirstColumn(int)));
|
joachim99@8
|
734 connect( m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
|
joachim99@8
|
735 connect( m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
|
joachim99@8
|
736 connect( m_pDiffTextWindow2, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
|
joachim99@8
|
737 m_pDiffTextWindow2->installEventFilter( this );
|
joachim99@8
|
738
|
joachim99@8
|
739 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int)));
|
joachim99@68
|
740 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, SLOT(setFirstColumn(int)));
|
joachim99@8
|
741 connect( m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
|
joachim99@8
|
742 connect( m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
|
joachim99@8
|
743 connect( m_pDiffTextWindow3, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
|
joachim99@8
|
744 m_pDiffTextWindow3->installEventFilter( this );
|
joachim99@8
|
745
|
joachim99@69
|
746
|
joachim99@8
|
747 MergeResultWindow* p = m_pMergeResultWindow;
|
joachim99@8
|
748 connect( m_pMergeVScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstLine(int)));
|
joachim99@8
|
749
|
joachim99@68
|
750 connect( m_pHScrollBar, SIGNAL(valueChanged2(int)), p, SLOT(setFirstColumn(int)));
|
joachim99@8
|
751 connect( p, SIGNAL(scroll(int,int)), this, SLOT(scrollMergeResultWindow(int,int)));
|
joachim99@8
|
752 connect( p, SIGNAL(sourceMask(int,int)), this, SLOT(sourceMask(int,int)));
|
joachim99@8
|
753 connect( p, SIGNAL( resizeSignal() ),this, SLOT(resizeMergeResultWindow()));
|
joachim99@8
|
754 connect( p, SIGNAL( selectionEnd() ), this, SLOT( slotSelectionEnd() ) );
|
joachim99@8
|
755 connect( p, SIGNAL( newSelection() ), this, SLOT( slotSelectionStart() ) );
|
joachim99@75
|
756 connect( p, SIGNAL( modifiedChanged(bool) ), this, SLOT( slotOutputModified(bool) ) );
|
joachim99@75
|
757 connect( p, SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, SLOT( slotSetModified(bool) ) );
|
joachim99@8
|
758 connect( p, SIGNAL( updateAvailabilities() ), this, SLOT( slotUpdateAvailabilities() ) );
|
joachim99@8
|
759 connect( p, SIGNAL( showPopupMenu(const QPoint&) ), this, SLOT(showPopupMenu(const QPoint&)));
|
joachim99@69
|
760 connect( p, SIGNAL( noRelevantChangesDetected() ), this, SLOT(slotNoRelevantChangesDetected()));
|
joachim99@8
|
761 sourceMask(0,0);
|
joachim99@8
|
762
|
joachim99@8
|
763
|
joachim99@8
|
764 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, SLOT(setFastSelectorRange(int,int)));
|
joachim99@8
|
765 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, SLOT(setFastSelectorRange(int,int)));
|
joachim99@8
|
766 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, SLOT(setFastSelectorRange(int,int)));
|
joachim99@8
|
767 connect(m_pDiffTextWindow1, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
|
joachim99@8
|
768 connect(m_pDiffTextWindow2, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
|
joachim99@8
|
769 connect(m_pDiffTextWindow3, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
|
joachim99@66
|
770 connect(m_pDiffTextWindow1, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
|
joachim99@66
|
771 connect(m_pDiffTextWindow2, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
|
joachim99@66
|
772 connect(m_pDiffTextWindow3, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
|
joachim99@66
|
773 connect(m_pDirectoryMergeInfo, SIGNAL(gotFocus()), p, SLOT(updateSourceMask()));
|
joachim99@8
|
774
|
joachim99@8
|
775 connect( m_pDiffTextWindow1, SIGNAL( resizeSignal(int,int) ),this, SLOT(resizeDiffTextWindow(int,int)));
|
joachim99@66
|
776 // The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one.
|
joachim99@69
|
777 connect( m_pDiffTextWindow2, SIGNAL( resizeSignal(int,int) ),this, SLOT(slotRecalcWordWrap()));
|
joachim99@69
|
778 connect( m_pDiffTextWindow3, SIGNAL( resizeSignal(int,int) ),this, SLOT(slotRecalcWordWrap()));
|
joachim99@8
|
779
|
joachim99@8
|
780 m_pDiffTextWindow1->setFocus();
|
joachim99@8
|
781 m_pMainWidget->setMinimumSize(50,50);
|
joachim99@8
|
782 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
|
joachim99@8
|
783 showWindowA->setChecked( true );
|
joachim99@8
|
784 showWindowB->setChecked( true );
|
joachim99@8
|
785 showWindowC->setChecked( true );
|
joachim99@8
|
786 }
|
joachim99@8
|
787
|
joachim99@69
|
788 static int calcManualDiffFirstDiff3LineIdx( const Diff3LineVector& d3lv, const ManualDiffHelpEntry& mdhe )
|
joachim99@69
|
789 {
|
joachim99@69
|
790 unsigned int i;
|
joachim99@69
|
791 for( i = 0; i<d3lv.size(); ++i )
|
joachim99@69
|
792 {
|
joachim99@69
|
793 const Diff3Line& d3l = *d3lv[i];
|
joachim99@69
|
794 if ( mdhe.lineA1>=0 && mdhe.lineA1==d3l.lineA ||
|
joachim99@69
|
795 mdhe.lineB1>=0 && mdhe.lineB1==d3l.lineB ||
|
joachim99@69
|
796 mdhe.lineC1>=0 && mdhe.lineC1==d3l.lineC )
|
joachim99@69
|
797 return i;
|
joachim99@69
|
798 }
|
joachim99@69
|
799 return -1;
|
joachim99@69
|
800 }
|
joachim99@69
|
801
|
joachim99@8
|
802 void KDiff3App::slotAfterFirstPaint()
|
joachim99@8
|
803 {
|
joachim99@8
|
804 int newHeight = m_pDiffTextWindow1->getNofVisibleLines();
|
joachim99@8
|
805 int newWidth = m_pDiffTextWindow1->getNofVisibleColumns();
|
joachim99@8
|
806 m_DTWHeight = newHeight;
|
joachim99@69
|
807
|
joachim99@69
|
808 recalcWordWrap();
|
joachim99@69
|
809
|
joachim99@8
|
810 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
|
joachim99@8
|
811 m_pDiffVScrollBar->setPageStep( newHeight );
|
joachim99@8
|
812 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
|
joachim99@8
|
813
|
joachim99@8
|
814 // The second window has a somewhat inverse width
|
joachim99@8
|
815 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
|
joachim99@8
|
816 m_pHScrollBar->setPageStep( newWidth );
|
joachim99@8
|
817
|
joachim99@69
|
818 int d3l=-1;
|
joachim99@69
|
819 if ( ! m_manualDiffHelpList.empty() )
|
joachim99@69
|
820 d3l = calcManualDiffFirstDiff3LineIdx( m_diff3LineVector, m_manualDiffHelpList.front() );
|
joachim99@69
|
821 if ( d3l>=0 && m_pDiffTextWindow1 )
|
joachim99@69
|
822 {
|
joachim99@69
|
823 int line = m_pDiffTextWindow1->convertDiff3LineIdxToLine( d3l );
|
joachim99@69
|
824 m_pDiffVScrollBar->setValue( max2(0,line-1) );
|
joachim99@69
|
825 }
|
joachim99@69
|
826 else
|
joachim99@69
|
827 {
|
joachim99@69
|
828 m_pMergeResultWindow->slotGoTop();
|
joachim99@77
|
829 if ( ! m_outputFilename.isEmpty() && ! m_pMergeResultWindow->isUnsolvedConflictAtCurrent() )
|
joachim99@77
|
830 m_pMergeResultWindow->slotGoNextUnsolvedConflict();
|
joachim99@69
|
831 }
|
joachim99@8
|
832
|
joachim99@8
|
833 if (m_pCornerWidget)
|
joachim99@8
|
834 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
|
joachim99@8
|
835
|
joachim99@8
|
836 slotUpdateAvailabilities();
|
joachim99@8
|
837 }
|
joachim99@8
|
838
|
joachim99@8
|
839 void KDiff3App::resizeEvent(QResizeEvent* e)
|
joachim99@8
|
840 {
|
joachim99@8
|
841 QSplitter::resizeEvent(e);
|
joachim99@8
|
842 if (m_pCornerWidget)
|
joachim99@8
|
843 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
|
joachim99@8
|
844 }
|
joachim99@8
|
845
|
joachim99@8
|
846
|
joachim99@8
|
847 bool KDiff3App::eventFilter( QObject* o, QEvent* e )
|
joachim99@8
|
848 {
|
joachim99@8
|
849 if( o == m_pMergeResultWindow )
|
joachim99@8
|
850 {
|
joachim99@8
|
851 if ( e->type() == QEvent::KeyPress )
|
joachim99@8
|
852 { // key press
|
joachim99@8
|
853 QKeyEvent *k = (QKeyEvent*)e;
|
joachim99@75
|
854 if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ControlModifier)!=0 )
|
joachim99@8
|
855 {
|
joachim99@8
|
856 slotEditCopy();
|
joachim99@8
|
857 return true;
|
joachim99@8
|
858 }
|
joachim99@75
|
859 if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 )
|
joachim99@8
|
860 {
|
joachim99@8
|
861 slotEditPaste();
|
joachim99@8
|
862 return true;
|
joachim99@8
|
863 }
|
joachim99@75
|
864 if (k->key()==Qt::Key_Delete && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 )
|
joachim99@8
|
865 {
|
joachim99@8
|
866 slotEditCut();
|
joachim99@8
|
867 return true;
|
joachim99@8
|
868 }
|
joachim99@8
|
869 }
|
joachim99@8
|
870 return QSplitter::eventFilter( o, e ); // standard event processing
|
joachim99@8
|
871 }
|
joachim99@8
|
872
|
joachim99@8
|
873 if ( e->type() == QEvent::KeyPress ) // key press
|
joachim99@8
|
874 {
|
joachim99@8
|
875 QKeyEvent *k = (QKeyEvent*)e;
|
joachim99@8
|
876
|
joachim99@75
|
877 bool bCtrl = (k->QInputEvent::modifiers() & Qt::ControlModifier) != 0;
|
joachim99@8
|
878 if (k->key()==Qt::Key_Insert && bCtrl )
|
joachim99@8
|
879 {
|
joachim99@8
|
880 slotEditCopy();
|
joachim99@8
|
881 return true;
|
joachim99@8
|
882 }
|
joachim99@75
|
883 if (k->key()==Qt::Key_Insert && (k->QInputEvent::modifiers() & Qt::ShiftModifier)!=0 )
|
joachim99@8
|
884 {
|
joachim99@8
|
885 slotEditPaste();
|
joachim99@8
|
886 return true;
|
joachim99@8
|
887 }
|
joachim99@8
|
888 int deltaX=0;
|
joachim99@8
|
889 int deltaY=0;
|
joachim99@8
|
890 int pageSize = m_DTWHeight;
|
joachim99@8
|
891 switch( k->key() )
|
joachim99@8
|
892 {
|
joachim99@69
|
893 case Qt::Key_Down: if (!bCtrl) ++deltaY; break;
|
joachim99@69
|
894 case Qt::Key_Up: if (!bCtrl) --deltaY; break;
|
joachim99@69
|
895 case Qt::Key_PageDown: if (!bCtrl) deltaY+=pageSize; break;
|
joachim99@69
|
896 case Qt::Key_PageUp: if (!bCtrl) deltaY-=pageSize; break;
|
joachim99@69
|
897 case Qt::Key_Left: if (!bCtrl) --deltaX; break;
|
joachim99@69
|
898 case Qt::Key_Right: if (!bCtrl) ++deltaX; break;
|
joachim99@69
|
899 case Qt::Key_Home: if ( bCtrl ) m_pDiffVScrollBar->setValue( 0 );
|
joachim99@8
|
900 else m_pHScrollBar->setValue( 0 );
|
joachim99@8
|
901 break;
|
joachim99@75
|
902 case Qt::Key_End: if ( bCtrl ) m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->maximum() );
|
joachim99@75
|
903 else m_pHScrollBar->setValue( m_pHScrollBar->maximum() );
|
joachim99@8
|
904 break;
|
joachim99@8
|
905 default: break;
|
joachim99@8
|
906 }
|
joachim99@8
|
907
|
joachim99@8
|
908 scrollDiffTextWindow( deltaX, deltaY );
|
joachim99@8
|
909
|
joachim99@8
|
910 return true; // eat event
|
joachim99@8
|
911 }
|
joachim99@58
|
912 else if (e->type() == QEvent::Wheel ) // wheel event
|
joachim99@58
|
913 {
|
joachim99@8
|
914 QWheelEvent *w = (QWheelEvent*)e;
|
joachim99@8
|
915 w->accept();
|
joachim99@8
|
916
|
joachim99@8
|
917 int deltaX=0;
|
joachim99@8
|
918
|
joachim99@8
|
919 int d=w->delta();
|
joachim99@8
|
920 int deltaY = -d/120 * QApplication::wheelScrollLines();
|
joachim99@8
|
921
|
joachim99@8
|
922 scrollDiffTextWindow( deltaX, deltaY );
|
joachim99@8
|
923 return true;
|
joachim99@8
|
924 }
|
joachim99@8
|
925 else if (e->type() == QEvent::Drop )
|
joachim99@8
|
926 {
|
joachim99@8
|
927 QDropEvent* pDropEvent = static_cast<QDropEvent*>(e);
|
joachim99@8
|
928 pDropEvent->accept();
|
joachim99@8
|
929
|
joachim99@75
|
930 if ( pDropEvent->mimeData()->hasUrls() )
|
joachim99@8
|
931 {
|
joachim99@8
|
932 #ifdef KREPLACEMENTS_H
|
joachim99@75
|
933 QList<QUrl> urlList = pDropEvent->mimeData()->urls();
|
joachim99@75
|
934 if ( canContinue() && !urlList.isEmpty() )
|
joachim99@8
|
935 {
|
joachim99@8
|
936 raise();
|
joachim99@75
|
937 QString filename = urlList.first().toLocalFile();
|
joachim99@8
|
938 if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename );
|
joachim99@8
|
939 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename );
|
joachim99@8
|
940 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename );
|
joachim99@8
|
941 init();
|
joachim99@8
|
942 }
|
joachim99@8
|
943 #else
|
joachim99@8
|
944 KURL::List urlList;
|
joachim99@8
|
945 KURLDrag::decode( pDropEvent, urlList );
|
joachim99@8
|
946 if ( canContinue() && !urlList.isEmpty() )
|
joachim99@8
|
947 {
|
joachim99@8
|
948 raise();
|
joachim99@8
|
949 FileAccess fa( urlList.first().url() );
|
joachim99@8
|
950 if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa );
|
joachim99@8
|
951 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa );
|
joachim99@8
|
952 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa );
|
joachim99@8
|
953 init();
|
joachim99@8
|
954 }
|
joachim99@8
|
955 #endif
|
joachim99@8
|
956 }
|
joachim99@75
|
957 else if ( pDropEvent->mimeData()->hasText() )
|
joachim99@8
|
958 {
|
joachim99@75
|
959 QString text = pDropEvent->mimeData()->text();
|
joachim99@75
|
960 if ( canContinue() )
|
joachim99@8
|
961 {
|
joachim99@8
|
962 raise();
|
joachim99@58
|
963 if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text);
|
joachim99@58
|
964 else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text);
|
joachim99@58
|
965 else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text);
|
joachim99@8
|
966 init();
|
joachim99@8
|
967 }
|
joachim99@8
|
968 }
|
joachim99@8
|
969
|
joachim99@8
|
970 return true;
|
joachim99@8
|
971 }
|
joachim99@8
|
972 return QSplitter::eventFilter( o, e ); // standard event processing
|
joachim99@8
|
973 }
|
joachim99@8
|
974
|
joachim99@8
|
975
|
joachim99@8
|
976
|
joachim99@8
|
977
|
joachim99@8
|
978 void KDiff3App::slotFileOpen()
|
joachim99@8
|
979 {
|
joachim99@8
|
980 if ( !canContinue() ) return;
|
joachim99@8
|
981
|
joachim99@8
|
982 if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() )
|
joachim99@8
|
983 {
|
joachim99@8
|
984 int result = KMessageBox::warningYesNo(this,
|
joachim99@8
|
985 i18n("You are currently doing a directory merge. Are you sure, you want to abort?"),
|
joachim99@51
|
986 i18n("Warning"), i18n("Abort"), i18n("Continue Merging") );
|
joachim99@8
|
987 if ( result!=KMessageBox::Yes )
|
joachim99@8
|
988 return;
|
joachim99@8
|
989 }
|
joachim99@8
|
990
|
joachim99@8
|
991
|
joachim99@8
|
992 slotStatusMsg(i18n("Opening files..."));
|
joachim99@8
|
993
|
joachim99@8
|
994 for(;;)
|
joachim99@8
|
995 {
|
joachim99@8
|
996 OpenDialog d(this,
|
joachim99@75
|
997 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameA() : m_sd1.isFromBuffer() ? QString("") : m_sd1.getAliasName() ),
|
joachim99@75
|
998 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameB() : m_sd2.isFromBuffer() ? QString("") : m_sd2.getAliasName() ),
|
joachim99@75
|
999 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? QString("") : m_sd3.getAliasName() ),
|
joachim99@75
|
1000 m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(),
|
joachim99@75
|
1001 QDir::toNativeSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? QString("") : m_outputFilename ),
|
joachim99@8
|
1002 SLOT(slotConfigure()), m_pOptionDialog );
|
joachim99@8
|
1003 int status = d.exec();
|
joachim99@8
|
1004 if ( status == QDialog::Accepted )
|
joachim99@8
|
1005 {
|
joachim99@69
|
1006 m_sd1.setFilename( d.m_pLineA->currentText() );
|
joachim99@69
|
1007 m_sd2.setFilename( d.m_pLineB->currentText() );
|
joachim99@69
|
1008 m_sd3.setFilename( d.m_pLineC->currentText() );
|
joachim99@8
|
1009
|
joachim99@8
|
1010 if( d.m_pMerge->isChecked() )
|
joachim99@8
|
1011 {
|
joachim99@69
|
1012 if ( d.m_pLineOut->currentText().isEmpty() )
|
joachim99@8
|
1013 {
|
joachim99@8
|
1014 m_outputFilename = "unnamed.txt";
|
joachim99@8
|
1015 m_bDefaultFilename = true;
|
joachim99@8
|
1016 }
|
joachim99@8
|
1017 else
|
joachim99@8
|
1018 {
|
joachim99@69
|
1019 m_outputFilename = d.m_pLineOut->currentText();
|
joachim99@8
|
1020 m_bDefaultFilename = false;
|
joachim99@8
|
1021 }
|
joachim99@8
|
1022 }
|
joachim99@8
|
1023 else
|
joachim99@8
|
1024 m_outputFilename = "";
|
joachim99@8
|
1025
|
joachim99@69
|
1026 bool bSuccess = improveFilenames(false);
|
joachim99@66
|
1027 if ( !bSuccess )
|
joachim99@66
|
1028 continue;
|
joachim99@69
|
1029
|
joachim99@8
|
1030 if ( m_bDirCompare )
|
joachim99@8
|
1031 {
|
joachim99@8
|
1032 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1033 if ( m_pMainWidget!=0 )
|
joachim99@8
|
1034 {
|
joachim99@8
|
1035 m_pMainWidget->hide();
|
joachim99@8
|
1036 }
|
joachim99@8
|
1037 break;
|
joachim99@8
|
1038 }
|
joachim99@8
|
1039 else
|
joachim99@8
|
1040 {
|
joachim99@8
|
1041 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1042 init();
|
joachim99@8
|
1043
|
joachim99@58
|
1044 if ( ! m_sd1.isEmpty() && !m_sd1.hasData() ||
|
joachim99@58
|
1045 ! m_sd2.isEmpty() && !m_sd2.hasData() ||
|
joachim99@58
|
1046 ! m_sd3.isEmpty() && !m_sd3.hasData() )
|
joachim99@8
|
1047 {
|
joachim99@8
|
1048 QString text( i18n("Opening of these files failed:") );
|
joachim99@8
|
1049 text += "\n\n";
|
joachim99@58
|
1050 if ( ! m_sd1.isEmpty() && !m_sd1.hasData() )
|
joachim99@8
|
1051 text += " - " + m_sd1.getAliasName() + "\n";
|
joachim99@58
|
1052 if ( ! m_sd2.isEmpty() && !m_sd2.hasData() )
|
joachim99@8
|
1053 text += " - " + m_sd2.getAliasName() + "\n";
|
joachim99@58
|
1054 if ( ! m_sd3.isEmpty() && !m_sd3.hasData() )
|
joachim99@8
|
1055 text += " - " + m_sd3.getAliasName() + "\n";
|
joachim99@8
|
1056
|
joachim99@8
|
1057 KMessageBox::sorry( this, text, i18n("File open error") );
|
joachim99@8
|
1058 continue;
|
joachim99@8
|
1059 }
|
joachim99@8
|
1060 }
|
joachim99@8
|
1061 }
|
joachim99@8
|
1062 break;
|
joachim99@8
|
1063 }
|
joachim99@8
|
1064
|
joachim99@8
|
1065 slotUpdateAvailabilities();
|
joachim99@8
|
1066 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1067 }
|
joachim99@8
|
1068
|
joachim99@8
|
1069 void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
|
joachim99@66
|
1070 QString an1, QString an2, QString an3, TotalDiffStatus* pTotalDiffStatus )
|
joachim99@8
|
1071 {
|
joachim99@8
|
1072 if ( !canContinue() ) return;
|
joachim99@8
|
1073
|
joachim99@68
|
1074 if(fn1=="" && fn2=="" && fn3=="" && ofn=="" && m_pMainWidget!=0 )
|
joachim99@68
|
1075 {
|
joachim99@68
|
1076 m_pMainWidget->hide();
|
joachim99@68
|
1077 return;
|
joachim99@68
|
1078 }
|
joachim99@68
|
1079
|
joachim99@8
|
1080 slotStatusMsg(i18n("Opening files..."));
|
joachim99@8
|
1081
|
joachim99@8
|
1082 m_sd1.setFilename( fn1 );
|
joachim99@8
|
1083 m_sd2.setFilename( fn2 );
|
joachim99@8
|
1084 m_sd3.setFilename( fn3 );
|
joachim99@8
|
1085
|
joachim99@8
|
1086 m_sd1.setAliasName( an1 );
|
joachim99@8
|
1087 m_sd2.setAliasName( an2 );
|
joachim99@8
|
1088 m_sd3.setAliasName( an3 );
|
joachim99@8
|
1089
|
joachim99@8
|
1090 if ( ! ofn.isEmpty() )
|
joachim99@8
|
1091 {
|
joachim99@8
|
1092 m_outputFilename = ofn;
|
joachim99@8
|
1093 m_bDefaultFilename = false;
|
joachim99@8
|
1094 }
|
joachim99@8
|
1095 else
|
joachim99@8
|
1096 {
|
joachim99@8
|
1097 m_outputFilename = "";
|
joachim99@8
|
1098 m_bDefaultFilename = true;
|
joachim99@8
|
1099 }
|
joachim99@8
|
1100
|
joachim99@66
|
1101 bool bDirCompare = m_bDirCompare;
|
joachim99@69
|
1102 improveFilenames(true); // Create new window for KDiff3 for directory comparison.
|
joachim99@68
|
1103
|
joachim99@66
|
1104 if( m_bDirCompare )
|
joachim99@8
|
1105 {
|
joachim99@8
|
1106 }
|
joachim99@8
|
1107 else
|
joachim99@8
|
1108 {
|
joachim99@66
|
1109 m_bDirCompare = bDirCompare; // Don't allow this to change here.
|
joachim99@66
|
1110 init( false, pTotalDiffStatus );
|
joachim99@8
|
1111
|
joachim99@66
|
1112 if ( pTotalDiffStatus!=0 )
|
joachim99@66
|
1113 return;
|
joachim99@69
|
1114
|
joachim99@58
|
1115 if ( ! m_sd1.isEmpty() && ! m_sd1.hasData() ||
|
joachim99@58
|
1116 ! m_sd2.isEmpty() && ! m_sd2.hasData() ||
|
joachim99@58
|
1117 ! m_sd3.isEmpty() && ! m_sd3.hasData() )
|
joachim99@8
|
1118 {
|
joachim99@8
|
1119 QString text( i18n("Opening of these files failed:") );
|
joachim99@8
|
1120 text += "\n\n";
|
joachim99@58
|
1121 if ( ! m_sd1.isEmpty() && !m_sd1.hasData() )
|
joachim99@8
|
1122 text += " - " + m_sd1.getAliasName() + "\n";
|
joachim99@58
|
1123 if ( ! m_sd2.isEmpty() && !m_sd2.hasData() )
|
joachim99@8
|
1124 text += " - " + m_sd2.getAliasName() + "\n";
|
joachim99@58
|
1125 if ( ! m_sd3.isEmpty() && !m_sd3.hasData() )
|
joachim99@8
|
1126 text += " - " + m_sd3.getAliasName() + "\n";
|
joachim99@8
|
1127
|
joachim99@8
|
1128 KMessageBox::sorry( this, text, i18n("File open error") );
|
joachim99@8
|
1129 }
|
joachim99@8
|
1130 else
|
joachim99@8
|
1131 {
|
joachim99@8
|
1132 if ( m_pDirectoryMergeWindow!=0 && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1133 {
|
joachim99@8
|
1134 slotDirViewToggle();
|
joachim99@8
|
1135 }
|
joachim99@8
|
1136 }
|
joachim99@8
|
1137 }
|
joachim99@8
|
1138 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1139 }
|
joachim99@8
|
1140
|
joachim99@69
|
1141
|
joachim99@69
|
1142 void KDiff3App::slotFileNameChanged(const QString& fileName, int winIdx)
|
joachim99@69
|
1143 {
|
joachim99@69
|
1144 QString fn1 = m_sd1.getFilename();
|
joachim99@69
|
1145 QString an1 = m_sd1.getAliasName();
|
joachim99@69
|
1146 QString fn2 = m_sd2.getFilename();
|
joachim99@69
|
1147 QString an2 = m_sd2.getAliasName();
|
joachim99@69
|
1148 QString fn3 = m_sd3.getFilename();
|
joachim99@69
|
1149 QString an3 = m_sd3.getAliasName();
|
joachim99@69
|
1150 if (winIdx==1) { fn1 = fileName; an1 = ""; }
|
joachim99@69
|
1151 if (winIdx==2) { fn2 = fileName; an2 = ""; }
|
joachim99@69
|
1152 if (winIdx==3) { fn3 = fileName; an3 = ""; }
|
joachim99@69
|
1153
|
joachim99@69
|
1154 slotFileOpen2( fn1, fn2, fn3, m_outputFilename, an1, an2, an3, 0 );
|
joachim99@69
|
1155 }
|
joachim99@69
|
1156
|
joachim99@69
|
1157
|
joachim99@8
|
1158 void KDiff3App::slotEditCut()
|
joachim99@8
|
1159 {
|
joachim99@8
|
1160 slotStatusMsg(i18n("Cutting selection..."));
|
joachim99@8
|
1161
|
joachim99@8
|
1162 QString s;
|
joachim99@8
|
1163 if ( m_pMergeResultWindow!=0 )
|
joachim99@8
|
1164 {
|
joachim99@8
|
1165 s = m_pMergeResultWindow->getSelection();
|
joachim99@8
|
1166 m_pMergeResultWindow->deleteSelection();
|
joachim99@8
|
1167
|
joachim99@8
|
1168 m_pMergeResultWindow->update();
|
joachim99@8
|
1169 }
|
joachim99@8
|
1170
|
joachim99@8
|
1171 if ( !s.isNull() )
|
joachim99@8
|
1172 {
|
joachim99@58
|
1173 QApplication::clipboard()->setText( s, QClipboard::Clipboard );
|
joachim99@8
|
1174 }
|
joachim99@8
|
1175
|
joachim99@8
|
1176 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1177 }
|
joachim99@8
|
1178
|
joachim99@8
|
1179 void KDiff3App::slotEditCopy()
|
joachim99@8
|
1180 {
|
joachim99@8
|
1181 slotStatusMsg(i18n("Copying selection to clipboard..."));
|
joachim99@8
|
1182 QString s;
|
joachim99@8
|
1183 if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection();
|
joachim99@8
|
1184 if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection();
|
joachim99@8
|
1185 if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection();
|
joachim99@8
|
1186 if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
|
joachim99@8
|
1187 if ( !s.isNull() )
|
joachim99@8
|
1188 {
|
joachim99@58
|
1189 QApplication::clipboard()->setText( s, QClipboard::Clipboard );
|
joachim99@8
|
1190 }
|
joachim99@8
|
1191
|
joachim99@8
|
1192 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1193 }
|
joachim99@8
|
1194
|
joachim99@8
|
1195 void KDiff3App::slotEditPaste()
|
joachim99@8
|
1196 {
|
joachim99@8
|
1197 slotStatusMsg(i18n("Inserting clipboard contents..."));
|
joachim99@8
|
1198
|
joachim99@8
|
1199 if ( m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() )
|
joachim99@8
|
1200 {
|
joachim99@66
|
1201 m_pMergeResultWindow->pasteClipboard(false);
|
joachim99@8
|
1202 }
|
joachim99@8
|
1203 else if ( canContinue() )
|
joachim99@8
|
1204 {
|
joachim99@8
|
1205 if ( m_pDiffTextWindow1->hasFocus() )
|
joachim99@8
|
1206 {
|
joachim99@66
|
1207 m_sd1.setData( QApplication::clipboard()->text(QClipboard::Clipboard) );
|
joachim99@8
|
1208 init();
|
joachim99@8
|
1209 }
|
joachim99@8
|
1210 else if ( m_pDiffTextWindow2->hasFocus() )
|
joachim99@8
|
1211 {
|
joachim99@66
|
1212 m_sd2.setData( QApplication::clipboard()->text(QClipboard::Clipboard) );
|
joachim99@8
|
1213 init();
|
joachim99@8
|
1214 }
|
joachim99@8
|
1215 else if ( m_pDiffTextWindow3->hasFocus() )
|
joachim99@8
|
1216 {
|
joachim99@66
|
1217 m_sd3.setData( QApplication::clipboard()->text(QClipboard::Clipboard) );
|
joachim99@8
|
1218 init();
|
joachim99@8
|
1219 }
|
joachim99@8
|
1220 }
|
joachim99@8
|
1221
|
joachim99@8
|
1222 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1223 }
|
joachim99@8
|
1224
|
joachim99@69
|
1225 void KDiff3App::slotEditSelectAll()
|
joachim99@69
|
1226 {
|
joachim99@69
|
1227 int l=0,p=0; // needed as dummy return values
|
joachim99@69
|
1228 if ( m_pMergeResultWindow && m_pMergeResultWindow->hasFocus() ) { m_pMergeResultWindow->setSelection( 0,0,m_pMergeResultWindow->getNofLines(),0); }
|
joachim99@69
|
1229 else if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->hasFocus() ) { m_pDiffTextWindow1 ->setSelection( 0,0,m_pDiffTextWindow1->getNofLines(),0,l,p); }
|
joachim99@69
|
1230 else if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->hasFocus() ) { m_pDiffTextWindow2 ->setSelection( 0,0,m_pDiffTextWindow2->getNofLines(),0,l,p); }
|
joachim99@69
|
1231 else if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->hasFocus() ) { m_pDiffTextWindow3 ->setSelection( 0,0,m_pDiffTextWindow3->getNofLines(),0,l,p); }
|
joachim99@69
|
1232
|
joachim99@69
|
1233 slotStatusMsg(i18n("Ready."));
|
joachim99@69
|
1234 }
|
joachim99@8
|
1235
|
joachim99@8
|
1236 void KDiff3App::slotGoCurrent()
|
joachim99@8
|
1237 {
|
joachim99@8
|
1238 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoCurrent();
|
joachim99@8
|
1239 }
|
joachim99@8
|
1240 void KDiff3App::slotGoTop()
|
joachim99@8
|
1241 {
|
joachim99@8
|
1242 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoTop();
|
joachim99@8
|
1243 }
|
joachim99@8
|
1244 void KDiff3App::slotGoBottom()
|
joachim99@8
|
1245 {
|
joachim99@8
|
1246 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoBottom();
|
joachim99@8
|
1247 }
|
joachim99@8
|
1248 void KDiff3App::slotGoPrevUnsolvedConflict()
|
joachim99@8
|
1249 {
|
joachim99@8
|
1250 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevUnsolvedConflict();
|
joachim99@8
|
1251 }
|
joachim99@8
|
1252 void KDiff3App::slotGoNextUnsolvedConflict()
|
joachim99@8
|
1253 {
|
joachim99@8
|
1254 m_bTimerBlock = false;
|
joachim99@8
|
1255 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextUnsolvedConflict();
|
joachim99@8
|
1256 }
|
joachim99@8
|
1257 void KDiff3App::slotGoPrevConflict()
|
joachim99@8
|
1258 {
|
joachim99@8
|
1259 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevConflict();
|
joachim99@8
|
1260 }
|
joachim99@8
|
1261 void KDiff3App::slotGoNextConflict()
|
joachim99@8
|
1262 {
|
joachim99@8
|
1263 m_bTimerBlock = false;
|
joachim99@8
|
1264 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextConflict();
|
joachim99@8
|
1265 }
|
joachim99@8
|
1266 void KDiff3App::slotGoPrevDelta()
|
joachim99@8
|
1267 {
|
joachim99@8
|
1268 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevDelta();
|
joachim99@8
|
1269 }
|
joachim99@8
|
1270 void KDiff3App::slotGoNextDelta()
|
joachim99@8
|
1271 {
|
joachim99@8
|
1272 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextDelta();
|
joachim99@8
|
1273 }
|
joachim99@51
|
1274
|
joachim99@53
|
1275 void KDiff3App::choose( int choice )
|
joachim99@8
|
1276 {
|
joachim99@53
|
1277 if (!m_bTimerBlock )
|
joachim99@8
|
1278 {
|
joachim99@53
|
1279 if ( m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->hasFocus() )
|
joachim99@8
|
1280 {
|
joachim99@53
|
1281 if (choice==A) m_pDirectoryMergeWindow->slotCurrentChooseA();
|
joachim99@53
|
1282 if (choice==B) m_pDirectoryMergeWindow->slotCurrentChooseB();
|
joachim99@53
|
1283 if (choice==C) m_pDirectoryMergeWindow->slotCurrentChooseC();
|
joachim99@53
|
1284
|
joachim99@53
|
1285 chooseA->setChecked(false);
|
joachim99@53
|
1286 chooseB->setChecked(false);
|
joachim99@53
|
1287 chooseC->setChecked(false);
|
joachim99@53
|
1288 }
|
joachim99@53
|
1289 else if ( m_pMergeResultWindow )
|
joachim99@53
|
1290 {
|
joachim99@53
|
1291 m_pMergeResultWindow->choose( choice );
|
joachim99@53
|
1292 if ( autoAdvance->isChecked() )
|
joachim99@53
|
1293 {
|
joachim99@53
|
1294 m_bTimerBlock = true;
|
joachim99@53
|
1295 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
|
joachim99@53
|
1296 }
|
joachim99@8
|
1297 }
|
joachim99@8
|
1298 }
|
joachim99@8
|
1299 }
|
joachim99@53
|
1300
|
joachim99@53
|
1301 void KDiff3App::slotChooseA() { choose( A ); }
|
joachim99@53
|
1302 void KDiff3App::slotChooseB() { choose( B ); }
|
joachim99@53
|
1303 void KDiff3App::slotChooseC() { choose( C ); }
|
joachim99@51
|
1304
|
joachim99@51
|
1305 // bConflictsOnly automatically choose for conflicts only (true) or for everywhere
|
joachim99@68
|
1306 static void mergeChooseGlobal( MergeResultWindow* pMRW, int selector, bool bConflictsOnly, bool bWhiteSpaceOnly )
|
joachim99@8
|
1307 {
|
joachim99@51
|
1308 if ( pMRW )
|
joachim99@8
|
1309 {
|
joachim99@51
|
1310 pMRW->chooseGlobal(selector, bConflictsOnly, bWhiteSpaceOnly );
|
joachim99@8
|
1311 }
|
joachim99@8
|
1312 }
|
joachim99@8
|
1313
|
joachim99@68
|
1314 void KDiff3App::slotChooseAEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, A, false, false ); }
|
joachim99@68
|
1315 void KDiff3App::slotChooseBEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, B, false, false ); }
|
joachim99@68
|
1316 void KDiff3App::slotChooseCEverywhere() { mergeChooseGlobal( m_pMergeResultWindow, C, false, false ); }
|
joachim99@68
|
1317 void KDiff3App::slotChooseAForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, A, true, false ); }
|
joachim99@68
|
1318 void KDiff3App::slotChooseBForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, B, true, false ); }
|
joachim99@68
|
1319 void KDiff3App::slotChooseCForUnsolvedConflicts() { mergeChooseGlobal( m_pMergeResultWindow, C, true, false ); }
|
joachim99@68
|
1320 void KDiff3App::slotChooseAForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, A, true, true ); }
|
joachim99@68
|
1321 void KDiff3App::slotChooseBForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, B, true, true ); }
|
joachim99@68
|
1322 void KDiff3App::slotChooseCForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( m_pMergeResultWindow, C, true, true ); }
|
joachim99@51
|
1323
|
joachim99@8
|
1324
|
joachim99@8
|
1325 void KDiff3App::slotAutoSolve()
|
joachim99@8
|
1326 {
|
joachim99@8
|
1327 if (m_pMergeResultWindow )
|
joachim99@8
|
1328 {
|
joachim99@8
|
1329 m_pMergeResultWindow->slotAutoSolve();
|
joachim99@8
|
1330 // m_pMergeWindowFrame->show(); incompatible with bPreserveCarriageReturn
|
joachim99@8
|
1331 m_pMergeResultWindow->showNrOfConflicts();
|
joachim99@8
|
1332 slotUpdateAvailabilities();
|
joachim99@8
|
1333 }
|
joachim99@8
|
1334 }
|
joachim99@8
|
1335
|
joachim99@8
|
1336 void KDiff3App::slotUnsolve()
|
joachim99@8
|
1337 {
|
joachim99@8
|
1338 if (m_pMergeResultWindow )
|
joachim99@8
|
1339 {
|
joachim99@8
|
1340 m_pMergeResultWindow->slotUnsolve();
|
joachim99@8
|
1341 }
|
joachim99@8
|
1342 }
|
joachim99@8
|
1343
|
joachim99@69
|
1344 void KDiff3App::slotMergeHistory()
|
joachim99@69
|
1345 {
|
joachim99@69
|
1346 if (m_pMergeResultWindow )
|
joachim99@69
|
1347 {
|
joachim99@69
|
1348 m_pMergeResultWindow->slotMergeHistory();
|
joachim99@69
|
1349 }
|
joachim99@69
|
1350 }
|
joachim99@69
|
1351
|
joachim99@69
|
1352 void KDiff3App::slotRegExpAutoMerge()
|
joachim99@69
|
1353 {
|
joachim99@69
|
1354 if (m_pMergeResultWindow )
|
joachim99@69
|
1355 {
|
joachim99@69
|
1356 m_pMergeResultWindow->slotRegExpAutoMerge();
|
joachim99@69
|
1357 }
|
joachim99@69
|
1358 }
|
joachim99@69
|
1359
|
joachim99@69
|
1360 void KDiff3App::slotSplitDiff()
|
joachim99@69
|
1361 {
|
joachim99@69
|
1362 int firstLine = -1;
|
joachim99@69
|
1363 int lastLine = -1;
|
joachim99@69
|
1364 DiffTextWindow* pDTW=0;
|
joachim99@69
|
1365 if ( m_pDiffTextWindow1 ) { pDTW=m_pDiffTextWindow1; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
|
joachim99@69
|
1366 if ( firstLine<0 && m_pDiffTextWindow2 ) { pDTW=m_pDiffTextWindow2; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
|
joachim99@69
|
1367 if ( firstLine<0 && m_pDiffTextWindow3 ) { pDTW=m_pDiffTextWindow3; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
|
joachim99@69
|
1368 if ( pDTW && firstLine>=0 && m_pMergeResultWindow)
|
joachim99@69
|
1369 {
|
joachim99@69
|
1370 pDTW->resetSelection();
|
joachim99@69
|
1371
|
joachim99@69
|
1372 m_pMergeResultWindow->slotSplitDiff( firstLine, lastLine );
|
joachim99@69
|
1373 }
|
joachim99@69
|
1374 }
|
joachim99@69
|
1375
|
joachim99@69
|
1376 void KDiff3App::slotJoinDiffs()
|
joachim99@69
|
1377 {
|
joachim99@69
|
1378 int firstLine = -1;
|
joachim99@69
|
1379 int lastLine = -1;
|
joachim99@69
|
1380 DiffTextWindow* pDTW=0;
|
joachim99@69
|
1381 if ( m_pDiffTextWindow1 ) { pDTW=m_pDiffTextWindow1; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
|
joachim99@69
|
1382 if ( firstLine<0 && m_pDiffTextWindow2 ) { pDTW=m_pDiffTextWindow2; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
|
joachim99@69
|
1383 if ( firstLine<0 && m_pDiffTextWindow3 ) { pDTW=m_pDiffTextWindow3; pDTW->getSelectionRange(&firstLine, &lastLine, eD3LLineCoords); }
|
joachim99@69
|
1384 if ( pDTW && firstLine>=0 && m_pMergeResultWindow)
|
joachim99@69
|
1385 {
|
joachim99@69
|
1386 pDTW->resetSelection();
|
joachim99@69
|
1387
|
joachim99@69
|
1388 m_pMergeResultWindow->slotJoinDiffs( firstLine, lastLine );
|
joachim99@69
|
1389 }
|
joachim99@69
|
1390 }
|
joachim99@8
|
1391
|
joachim99@8
|
1392 void KDiff3App::slotConfigure()
|
joachim99@8
|
1393 {
|
joachim99@8
|
1394 m_pOptionDialog->setState();
|
joachim99@8
|
1395 m_pOptionDialog->incInitialSize ( QSize(0,40) );
|
joachim99@8
|
1396 m_pOptionDialog->exec();
|
joachim99@8
|
1397 slotRefresh();
|
joachim99@8
|
1398 }
|
joachim99@8
|
1399
|
joachim99@8
|
1400 void KDiff3App::slotConfigureKeys()
|
joachim99@8
|
1401 {
|
joachim99@8
|
1402 KKeyDialog::configure(actionCollection(), this);
|
joachim99@8
|
1403 }
|
joachim99@8
|
1404
|
joachim99@8
|
1405 void KDiff3App::slotRefresh()
|
joachim99@8
|
1406 {
|
joachim99@51
|
1407 if (m_pDiffTextWindow1!=0)
|
joachim99@51
|
1408 {
|
joachim99@51
|
1409 m_pDiffTextWindow1->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1410 m_pDiffTextWindow1->update();
|
joachim99@28
|
1411 }
|
joachim99@28
|
1412 if (m_pDiffTextWindow2!=0)
|
joachim99@51
|
1413 {
|
joachim99@51
|
1414 m_pDiffTextWindow2->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1415 m_pDiffTextWindow2->update();
|
joachim99@28
|
1416 }
|
joachim99@28
|
1417 if (m_pDiffTextWindow3!=0)
|
joachim99@51
|
1418 {
|
joachim99@51
|
1419 m_pDiffTextWindow3->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1420 m_pDiffTextWindow3->update();
|
joachim99@28
|
1421 }
|
joachim99@28
|
1422 if (m_pMergeResultWindow!=0)
|
joachim99@51
|
1423 {
|
joachim99@51
|
1424 m_pMergeResultWindow->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1425 m_pMergeResultWindow->update();
|
joachim99@28
|
1426 }
|
joachim99@68
|
1427 if (m_pHScrollBar!=0)
|
joachim99@68
|
1428 {
|
joachim99@68
|
1429 m_pHScrollBar->setAgain();
|
joachim99@68
|
1430 }
|
joachim99@8
|
1431 if ( m_pDiffWindowSplitter!=0 )
|
joachim99@8
|
1432 {
|
joachim99@69
|
1433 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
|
joachim99@69
|
1434 }
|
joachim99@69
|
1435 if ( m_pDirectoryMergeWindow )
|
joachim99@69
|
1436 {
|
joachim99@69
|
1437 m_pDirectoryMergeWindow->updateFileVisibilities();
|
joachim99@8
|
1438 }
|
joachim99@8
|
1439 }
|
joachim99@8
|
1440
|
joachim99@8
|
1441 void KDiff3App::slotSelectionStart()
|
joachim99@8
|
1442 {
|
joachim99@8
|
1443 //editCopy->setEnabled( false );
|
joachim99@8
|
1444 //editCut->setEnabled( false );
|
joachim99@8
|
1445
|
joachim99@8
|
1446 const QObject* s = sender();
|
joachim99@8
|
1447 if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection();
|
joachim99@8
|
1448 if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection();
|
joachim99@8
|
1449 if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection();
|
joachim99@8
|
1450 if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection();
|
joachim99@8
|
1451 }
|
joachim99@8
|
1452
|
joachim99@8
|
1453 void KDiff3App::slotSelectionEnd()
|
joachim99@8
|
1454 {
|
joachim99@8
|
1455 //const QObject* s = sender();
|
joachim99@8
|
1456 //editCopy->setEnabled(true);
|
joachim99@8
|
1457 //editCut->setEnabled( s==m_pMergeResultWindow );
|
joachim99@8
|
1458 if ( m_pOptionDialog->m_bAutoCopySelection )
|
joachim99@8
|
1459 {
|
joachim99@8
|
1460 slotEditCopy();
|
joachim99@8
|
1461 }
|
joachim99@58
|
1462 else
|
joachim99@58
|
1463 {
|
joachim99@58
|
1464 QClipboard *clipBoard = QApplication::clipboard();
|
joachim99@58
|
1465
|
joachim99@58
|
1466 if (clipBoard->supportsSelection ())
|
joachim99@69
|
1467 {
|
joachim99@58
|
1468 QString s;
|
joachim99@58
|
1469 if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection();
|
joachim99@58
|
1470 if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection();
|
joachim99@58
|
1471 if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection();
|
joachim99@58
|
1472 if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
|
joachim99@58
|
1473 if ( !s.isNull() )
|
joachim99@58
|
1474 {
|
joachim99@58
|
1475 clipBoard->setText( s, QClipboard::Selection );
|
joachim99@58
|
1476 }
|
joachim99@58
|
1477 }
|
joachim99@58
|
1478 }
|
joachim99@8
|
1479 }
|
joachim99@8
|
1480
|
joachim99@8
|
1481 void KDiff3App::slotClipboardChanged()
|
joachim99@8
|
1482 {
|
joachim99@8
|
1483 QString s = QApplication::clipboard()->text();
|
joachim99@8
|
1484 //editPaste->setEnabled(!s.isEmpty());
|
joachim99@8
|
1485 }
|
joachim99@8
|
1486
|
joachim99@75
|
1487 void KDiff3App::slotOutputModified(bool bModified)
|
joachim99@8
|
1488 {
|
joachim99@75
|
1489 if ( bModified && !m_bOutputModified )
|
joachim99@8
|
1490 {
|
joachim99@8
|
1491 m_bOutputModified=true;
|
joachim99@8
|
1492 slotUpdateAvailabilities();
|
joachim99@8
|
1493 }
|
joachim99@8
|
1494 }
|
joachim99@8
|
1495
|
joachim99@8
|
1496 void KDiff3App::slotAutoAdvanceToggled()
|
joachim99@8
|
1497 {
|
joachim99@8
|
1498 m_pOptionDialog->m_bAutoAdvance = autoAdvance->isChecked();
|
joachim99@8
|
1499 }
|
joachim99@8
|
1500
|
joachim99@66
|
1501 void KDiff3App::slotWordWrapToggled()
|
joachim99@66
|
1502 {
|
joachim99@66
|
1503 m_pOptionDialog->m_bWordWrap = wordWrap->isChecked();
|
joachim99@66
|
1504 recalcWordWrap();
|
joachim99@66
|
1505 }
|
joachim99@66
|
1506
|
joachim99@69
|
1507 void KDiff3App::slotRecalcWordWrap()
|
joachim99@66
|
1508 {
|
joachim99@69
|
1509 recalcWordWrap();
|
joachim99@69
|
1510 }
|
joachim99@69
|
1511
|
joachim99@69
|
1512 void KDiff3App::recalcWordWrap(int nofVisibleColumns) // nofVisibleColumns is >=0 only for printing, otherwise the really visible width is used
|
joachim99@69
|
1513 {
|
joachim99@69
|
1514 bool bPrinting = nofVisibleColumns>=0;
|
joachim99@66
|
1515 int firstD3LIdx = 0;
|
joachim99@66
|
1516 if( m_pDiffTextWindow1 )
|
joachim99@66
|
1517 firstD3LIdx = m_pDiffTextWindow1->convertLineToDiff3LineIdx( m_pDiffTextWindow1->getFirstLine() );
|
joachim99@66
|
1518
|
joachim99@66
|
1519 // Convert selection to D3L-coords (converting back happens in DiffTextWindow::recalcWordWrap()
|
joachim99@66
|
1520 if ( m_pDiffTextWindow1 )
|
joachim99@66
|
1521 m_pDiffTextWindow1->convertSelectionToD3LCoords();
|
joachim99@66
|
1522 if ( m_pDiffTextWindow2 )
|
joachim99@66
|
1523 m_pDiffTextWindow2->convertSelectionToD3LCoords();
|
joachim99@66
|
1524 if ( m_pDiffTextWindow3 )
|
joachim99@66
|
1525 m_pDiffTextWindow3->convertSelectionToD3LCoords();
|
joachim99@69
|
1526
|
joachim99@69
|
1527
|
joachim99@66
|
1528 if ( !m_diff3LineList.empty() && m_pOptionDialog->m_bWordWrap )
|
joachim99@69
|
1529 {
|
joachim99@66
|
1530 Diff3LineList::iterator i;
|
joachim99@66
|
1531 int sumOfLines=0;
|
joachim99@66
|
1532 for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i )
|
joachim99@66
|
1533 {
|
joachim99@66
|
1534 Diff3Line& d3l = *i;
|
joachim99@66
|
1535 d3l.linesNeededForDisplay = 1;
|
joachim99@66
|
1536 d3l.sumLinesNeededForDisplay = sumOfLines;
|
joachim99@66
|
1537 sumOfLines += d3l.linesNeededForDisplay;
|
joachim99@66
|
1538 }
|
joachim99@69
|
1539
|
joachim99@66
|
1540 // Let every window calc how many lines will be needed.
|
joachim99@66
|
1541 if ( m_pDiffTextWindow1 )
|
joachim99@69
|
1542 m_pDiffTextWindow1->recalcWordWrap(true,0,nofVisibleColumns);
|
joachim99@66
|
1543 if ( m_pDiffTextWindow2 )
|
joachim99@69
|
1544 m_pDiffTextWindow2->recalcWordWrap(true,0,nofVisibleColumns);
|
joachim99@66
|
1545 if ( m_pDiffTextWindow3 )
|
joachim99@69
|
1546 m_pDiffTextWindow3->recalcWordWrap(true,0,nofVisibleColumns);
|
joachim99@69
|
1547
|
joachim99@66
|
1548 sumOfLines=0;
|
joachim99@66
|
1549 for ( i=m_diff3LineList.begin(); i!=m_diff3LineList.end(); ++i )
|
joachim99@66
|
1550 {
|
joachim99@66
|
1551 Diff3Line& d3l = *i;
|
joachim99@66
|
1552 d3l.sumLinesNeededForDisplay = sumOfLines;
|
joachim99@66
|
1553 sumOfLines += d3l.linesNeededForDisplay;
|
joachim99@66
|
1554 }
|
joachim99@69
|
1555
|
joachim99@66
|
1556 // Finish the initialisation:
|
joachim99@66
|
1557 if ( m_pDiffTextWindow1 )
|
joachim99@69
|
1558 m_pDiffTextWindow1->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
|
joachim99@66
|
1559 if ( m_pDiffTextWindow2 )
|
joachim99@69
|
1560 m_pDiffTextWindow2->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
|
joachim99@66
|
1561 if ( m_pDiffTextWindow3 )
|
joachim99@69
|
1562 m_pDiffTextWindow3->recalcWordWrap(true,sumOfLines,nofVisibleColumns);
|
joachim99@66
|
1563
|
joachim99@66
|
1564 m_neededLines = sumOfLines;
|
joachim99@66
|
1565 }
|
joachim99@66
|
1566 else
|
joachim99@66
|
1567 {
|
joachim99@66
|
1568 m_neededLines = m_diff3LineVector.size();
|
joachim99@66
|
1569 if ( m_pDiffTextWindow1 )
|
joachim99@69
|
1570 m_pDiffTextWindow1->recalcWordWrap(false,0,0);
|
joachim99@66
|
1571 if ( m_pDiffTextWindow2 )
|
joachim99@69
|
1572 m_pDiffTextWindow2->recalcWordWrap(false,0,0);
|
joachim99@66
|
1573 if ( m_pDiffTextWindow3 )
|
joachim99@69
|
1574 m_pDiffTextWindow3->recalcWordWrap(false,0,0);
|
joachim99@66
|
1575 }
|
joachim99@69
|
1576 if (bPrinting)
|
joachim99@69
|
1577 return;
|
joachim99@69
|
1578
|
joachim99@66
|
1579 m_pOverview->slotRedraw();
|
joachim99@66
|
1580 if ( m_pDiffTextWindow1 )
|
joachim99@66
|
1581 {
|
joachim99@66
|
1582 m_pDiffTextWindow1->setFirstLine( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) );
|
joachim99@66
|
1583 m_pDiffTextWindow1->update();
|
joachim99@66
|
1584 }
|
joachim99@66
|
1585 if ( m_pDiffTextWindow2 )
|
joachim99@66
|
1586 {
|
joachim99@66
|
1587 m_pDiffTextWindow2->setFirstLine( m_pDiffTextWindow2->convertDiff3LineIdxToLine( firstD3LIdx ) );
|
joachim99@66
|
1588 m_pDiffTextWindow2->update();
|
joachim99@66
|
1589 }
|
joachim99@66
|
1590 if ( m_pDiffTextWindow3 )
|
joachim99@66
|
1591 {
|
joachim99@66
|
1592 m_pDiffTextWindow3->setFirstLine( m_pDiffTextWindow3->convertDiff3LineIdxToLine( firstD3LIdx ) );
|
joachim99@66
|
1593 m_pDiffTextWindow3->update();
|
joachim99@66
|
1594 }
|
joachim99@66
|
1595
|
joachim99@66
|
1596 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - m_DTWHeight) );
|
joachim99@66
|
1597 if ( m_pDiffTextWindow1 )
|
joachim99@66
|
1598 {
|
joachim99@66
|
1599 m_pDiffVScrollBar->setValue( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) );
|
joachim99@69
|
1600
|
joachim99@66
|
1601 m_maxWidth = max3( m_pDiffTextWindow1->getNofColumns(),
|
joachim99@66
|
1602 m_pDiffTextWindow2->getNofColumns(),
|
joachim99@66
|
1603 m_pDiffTextWindow3->getNofColumns() ) + (m_pOptionDialog->m_bWordWrap ? 0 : 5);
|
joachim99@69
|
1604
|
joachim99@66
|
1605 m_pHScrollBar->setRange(0, max2( 0, m_maxWidth - m_pDiffTextWindow1->getNofVisibleColumns() ) );
|
joachim99@66
|
1606 m_pHScrollBar->setPageStep( m_pDiffTextWindow1->getNofVisibleColumns() );
|
joachim99@66
|
1607 m_pHScrollBar->setValue(0);
|
joachim99@66
|
1608 }
|
joachim99@66
|
1609 }
|
joachim99@66
|
1610
|
joachim99@8
|
1611 void KDiff3App::slotShowWhiteSpaceToggled()
|
joachim99@8
|
1612 {
|
joachim99@51
|
1613 m_pOptionDialog->m_bShowWhiteSpaceCharacters = showWhiteSpaceCharacters->isChecked();
|
joachim99@8
|
1614 m_pOptionDialog->m_bShowWhiteSpace = showWhiteSpace->isChecked();
|
joachim99@51
|
1615 showWhiteSpaceCharacters->setEnabled( showWhiteSpace->isChecked() );
|
joachim99@8
|
1616 if ( m_pDiffTextWindow1!=0 )
|
joachim99@8
|
1617 m_pDiffTextWindow1->update();
|
joachim99@8
|
1618 if ( m_pDiffTextWindow2!=0 )
|
joachim99@8
|
1619 m_pDiffTextWindow2->update();
|
joachim99@8
|
1620 if ( m_pDiffTextWindow3!=0 )
|
joachim99@8
|
1621 m_pDiffTextWindow3->update();
|
joachim99@51
|
1622 if ( m_pOverview!=0 )
|
joachim99@51
|
1623 m_pOverview->slotRedraw();
|
joachim99@8
|
1624 }
|
joachim99@8
|
1625
|
joachim99@8
|
1626 void KDiff3App::slotShowLineNumbersToggled()
|
joachim99@8
|
1627 {
|
joachim99@8
|
1628 m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked();
|
joachim99@8
|
1629 if ( m_pDiffTextWindow1!=0 )
|
joachim99@8
|
1630 m_pDiffTextWindow1->update();
|
joachim99@8
|
1631 if ( m_pDiffTextWindow2!=0 )
|
joachim99@8
|
1632 m_pDiffTextWindow2->update();
|
joachim99@8
|
1633 if ( m_pDiffTextWindow3!=0 )
|
joachim99@8
|
1634 m_pDiffTextWindow3->update();
|
joachim99@8
|
1635 }
|
joachim99@8
|
1636
|
joachim99@66
|
1637 /// Return true for success, else false
|
joachim99@69
|
1638 bool KDiff3App::improveFilenames( bool bCreateNewInstance )
|
joachim99@8
|
1639 {
|
joachim99@66
|
1640 m_bDirCompare = false;
|
joachim99@69
|
1641
|
joachim99@8
|
1642 FileAccess f1(m_sd1.getFilename());
|
joachim99@8
|
1643 FileAccess f2(m_sd2.getFilename());
|
joachim99@8
|
1644 FileAccess f3(m_sd3.getFilename());
|
joachim99@8
|
1645 FileAccess f4(m_outputFilename);
|
joachim99@8
|
1646
|
joachim99@8
|
1647 if ( f1.isFile() && f1.exists() )
|
joachim99@8
|
1648 {
|
joachim99@8
|
1649 if ( f2.isDir() )
|
joachim99@8
|
1650 {
|
joachim99@8
|
1651 f2.addPath( f1.fileName() );
|
joachim99@8
|
1652 if ( f2.isFile() && f2.exists() )
|
joachim99@8
|
1653 m_sd2.setFileAccess( f2 );
|
joachim99@8
|
1654 }
|
joachim99@8
|
1655 if ( f3.isDir() )
|
joachim99@8
|
1656 {
|
joachim99@8
|
1657 f3.addPath( f1.fileName() );
|
joachim99@8
|
1658 if ( f3.isFile() && f3.exists() )
|
joachim99@8
|
1659 m_sd3.setFileAccess( f3 );
|
joachim99@8
|
1660 }
|
joachim99@8
|
1661 if ( f4.isDir() )
|
joachim99@8
|
1662 {
|
joachim99@8
|
1663 f4.addPath( f1.fileName() );
|
joachim99@8
|
1664 if ( f4.isFile() && f4.exists() )
|
joachim99@8
|
1665 m_outputFilename = f4.absFilePath();
|
joachim99@8
|
1666 }
|
joachim99@8
|
1667 }
|
joachim99@8
|
1668 else if ( f1.isDir() )
|
joachim99@8
|
1669 {
|
joachim99@66
|
1670 m_bDirCompare = true;
|
joachim99@69
|
1671 if (bCreateNewInstance)
|
joachim99@69
|
1672 {
|
joachim99@69
|
1673 emit createNewInstance( f1.absFilePath(), f2.absFilePath(), f3.absFilePath() );
|
joachim99@69
|
1674 }
|
joachim99@69
|
1675 else
|
joachim99@69
|
1676 {
|
joachim99@69
|
1677 FileAccess destDir;
|
joachim99@69
|
1678 if (!m_bDefaultFilename) destDir = f4;
|
joachim99@69
|
1679 m_pDirectoryMergeSplitter->show();
|
joachim99@69
|
1680 if (m_pMainWidget!=0) m_pMainWidget->hide();
|
joachim99@69
|
1681
|
joachim99@69
|
1682 bool bSuccess = m_pDirectoryMergeWindow->init(
|
joachim99@69
|
1683 f1, f2, f3,
|
joachim99@69
|
1684 destDir, // Destdirname
|
joachim99@69
|
1685 !m_outputFilename.isEmpty()
|
joachim99@69
|
1686 );
|
joachim99@66
|
1687
|
joachim99@75
|
1688 m_bDirCompare = true; // This seems redundant but it might have been reset during full analysis.
|
joachim99@69
|
1689
|
joachim99@69
|
1690 if (bSuccess)
|
joachim99@69
|
1691 {
|
joachim99@69
|
1692 m_sd1.reset();
|
joachim99@69
|
1693 if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,0,0,0,false);
|
joachim99@69
|
1694 m_sd2.reset();
|
joachim99@69
|
1695 if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,0,0,0,false);
|
joachim99@69
|
1696 m_sd3.reset();
|
joachim99@69
|
1697 if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,0,0,0,false);
|
joachim99@69
|
1698 }
|
joachim99@69
|
1699 slotUpdateAvailabilities();
|
joachim99@69
|
1700 return bSuccess;
|
joachim99@66
|
1701 }
|
joachim99@8
|
1702 }
|
joachim99@66
|
1703 return true;
|
joachim99@8
|
1704 }
|
joachim99@8
|
1705
|
joachim99@8
|
1706 void KDiff3App::slotReload()
|
joachim99@8
|
1707 {
|
joachim99@8
|
1708 if ( !canContinue() ) return;
|
joachim99@8
|
1709
|
joachim99@8
|
1710 init();
|
joachim99@8
|
1711 }
|
joachim99@8
|
1712
|
joachim99@8
|
1713 bool KDiff3App::canContinue()
|
joachim99@8
|
1714 {
|
joachim99@8
|
1715 // First test if anything must be saved.
|
joachim99@8
|
1716 if(m_bOutputModified)
|
joachim99@8
|
1717 {
|
joachim99@8
|
1718 int result = KMessageBox::warningYesNoCancel(this,
|
joachim99@8
|
1719 i18n("The merge result hasn't been saved."),
|
joachim99@51
|
1720 i18n("Warning"), i18n("Save && Continue"), i18n("Continue Without Saving") );
|
joachim99@8
|
1721 if ( result==KMessageBox::Cancel )
|
joachim99@8
|
1722 return false;
|
joachim99@8
|
1723 else if ( result==KMessageBox::Yes )
|
joachim99@8
|
1724 {
|
joachim99@8
|
1725 slotFileSave();
|
joachim99@8
|
1726 if ( m_bOutputModified )
|
joachim99@8
|
1727 {
|
joachim99@8
|
1728 KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") );
|
joachim99@8
|
1729 return false;
|
joachim99@8
|
1730 }
|
joachim99@8
|
1731 }
|
joachim99@8
|
1732 }
|
joachim99@8
|
1733
|
joachim99@8
|
1734 m_bOutputModified = false;
|
joachim99@8
|
1735 return true;
|
joachim99@8
|
1736 }
|
joachim99@8
|
1737
|
joachim99@8
|
1738 void KDiff3App::slotCheckIfCanContinue( bool* pbContinue )
|
joachim99@8
|
1739 {
|
joachim99@8
|
1740 if (pbContinue!=0) *pbContinue = canContinue();
|
joachim99@8
|
1741 }
|
joachim99@8
|
1742
|
joachim99@8
|
1743
|
joachim99@8
|
1744 void KDiff3App::slotDirShowBoth()
|
joachim99@8
|
1745 {
|
joachim99@8
|
1746 if( dirShowBoth->isChecked() )
|
joachim99@8
|
1747 {
|
joachim99@8
|
1748 if ( m_bDirCompare )
|
joachim99@8
|
1749 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1750 else
|
joachim99@8
|
1751 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1752
|
joachim99@8
|
1753 if ( m_pMainWidget!=0 )
|
joachim99@8
|
1754 m_pMainWidget->show();
|
joachim99@8
|
1755 }
|
joachim99@8
|
1756 else
|
joachim99@8
|
1757 {
|
joachim99@8
|
1758 if ( m_pMainWidget!=0 )
|
joachim99@8
|
1759 {
|
joachim99@8
|
1760 m_pMainWidget->show();
|
joachim99@8
|
1761 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1762 }
|
joachim99@8
|
1763 else if ( m_bDirCompare )
|
joachim99@8
|
1764 {
|
joachim99@8
|
1765 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1766 }
|
joachim99@8
|
1767 }
|
joachim99@8
|
1768
|
joachim99@8
|
1769 slotUpdateAvailabilities();
|
joachim99@8
|
1770 }
|
joachim99@8
|
1771
|
joachim99@8
|
1772
|
joachim99@8
|
1773 void KDiff3App::slotDirViewToggle()
|
joachim99@8
|
1774 {
|
joachim99@8
|
1775 if ( m_bDirCompare )
|
joachim99@8
|
1776 {
|
joachim99@8
|
1777 if( ! m_pDirectoryMergeSplitter->isVisible() )
|
joachim99@8
|
1778 {
|
joachim99@8
|
1779 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1780 if (m_pMainWidget!=0)
|
joachim99@8
|
1781 m_pMainWidget->hide();
|
joachim99@8
|
1782 }
|
joachim99@8
|
1783 else
|
joachim99@8
|
1784 {
|
joachim99@8
|
1785 if (m_pMainWidget!=0)
|
joachim99@8
|
1786 {
|
joachim99@8
|
1787 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1788 m_pMainWidget->show();
|
joachim99@8
|
1789 }
|
joachim99@8
|
1790 }
|
joachim99@8
|
1791 }
|
joachim99@8
|
1792 slotUpdateAvailabilities();
|
joachim99@8
|
1793 }
|
joachim99@8
|
1794
|
joachim99@8
|
1795 void KDiff3App::slotShowWindowAToggled()
|
joachim99@8
|
1796 {
|
joachim99@8
|
1797 if ( m_pDiffTextWindow1!=0 )
|
joachim99@8
|
1798 {
|
joachim99@75
|
1799 m_pDiffTextWindowFrame1->setVisible( showWindowA->isChecked() );
|
joachim99@8
|
1800 slotUpdateAvailabilities();
|
joachim99@8
|
1801 }
|
joachim99@8
|
1802 }
|
joachim99@8
|
1803
|
joachim99@8
|
1804 void KDiff3App::slotShowWindowBToggled()
|
joachim99@8
|
1805 {
|
joachim99@8
|
1806 if ( m_pDiffTextWindow2!=0 )
|
joachim99@8
|
1807 {
|
joachim99@75
|
1808 m_pDiffTextWindowFrame2->setVisible( showWindowB->isChecked() );
|
joachim99@8
|
1809 slotUpdateAvailabilities();
|
joachim99@8
|
1810 }
|
joachim99@8
|
1811 }
|
joachim99@8
|
1812
|
joachim99@8
|
1813 void KDiff3App::slotShowWindowCToggled()
|
joachim99@8
|
1814 {
|
joachim99@8
|
1815 if ( m_pDiffTextWindow3!=0 )
|
joachim99@8
|
1816 {
|
joachim99@75
|
1817 m_pDiffTextWindowFrame3->setVisible( showWindowC->isChecked() );
|
joachim99@8
|
1818 slotUpdateAvailabilities();
|
joachim99@8
|
1819 }
|
joachim99@8
|
1820 }
|
joachim99@8
|
1821
|
joachim99@8
|
1822 void KDiff3App::slotEditFind()
|
joachim99@8
|
1823 {
|
joachim99@8
|
1824 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1825 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1826 m_pFindDialog->currentWindow = 1;
|
joachim99@8
|
1827
|
joachim99@8
|
1828 if ( QDialog::Accepted == m_pFindDialog->exec() )
|
joachim99@8
|
1829 {
|
joachim99@8
|
1830 slotEditFindNext();
|
joachim99@8
|
1831 }
|
joachim99@8
|
1832 }
|
joachim99@8
|
1833
|
joachim99@8
|
1834 void KDiff3App::slotEditFindNext()
|
joachim99@8
|
1835 {
|
joachim99@68
|
1836 QString s = m_pFindDialog->m_pSearchString->text();
|
joachim99@8
|
1837 if ( s.isEmpty() )
|
joachim99@8
|
1838 {
|
joachim99@8
|
1839 slotEditFind();
|
joachim99@8
|
1840 return;
|
joachim99@8
|
1841 }
|
joachim99@8
|
1842
|
joachim99@8
|
1843 bool bDirDown = true;
|
joachim99@8
|
1844 bool bCaseSensitive = m_pFindDialog->m_pCaseSensitive->isChecked();
|
joachim99@8
|
1845
|
joachim99@8
|
1846 int d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1847 int posInLine = m_pFindDialog->currentPos;
|
joachim99@66
|
1848 int l=0;
|
joachim99@66
|
1849 int p=0;
|
joachim99@8
|
1850 if ( m_pFindDialog->currentWindow == 1 )
|
joachim99@8
|
1851 {
|
joachim99@8
|
1852 if ( m_pFindDialog->m_pSearchInA->isChecked() && m_pDiffTextWindow1!=0 &&
|
joachim99@8
|
1853 m_pDiffTextWindow1->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1854 {
|
joachim99@66
|
1855 m_pDiffTextWindow1->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(), l, p );
|
joachim99@66
|
1856 m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2);
|
joachim99@66
|
1857 m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1858 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1859 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1860 return;
|
joachim99@8
|
1861 }
|
joachim99@8
|
1862 m_pFindDialog->currentWindow = 2;
|
joachim99@8
|
1863 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1864 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1865 }
|
joachim99@8
|
1866
|
joachim99@8
|
1867 d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1868 posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1869 if ( m_pFindDialog->currentWindow == 2 )
|
joachim99@8
|
1870 {
|
joachim99@8
|
1871 if ( m_pFindDialog->m_pSearchInB->isChecked() && m_pDiffTextWindow2!=0 &&
|
joachim99@8
|
1872 m_pDiffTextWindow2->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1873 {
|
joachim99@66
|
1874 m_pDiffTextWindow2->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(),l,p );
|
joachim99@66
|
1875 m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2);
|
joachim99@66
|
1876 m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1877 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1878 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1879 return;
|
joachim99@8
|
1880 }
|
joachim99@8
|
1881 m_pFindDialog->currentWindow = 3;
|
joachim99@8
|
1882 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1883 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1884 }
|
joachim99@8
|
1885
|
joachim99@8
|
1886 d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1887 posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1888 if ( m_pFindDialog->currentWindow == 3 )
|
joachim99@8
|
1889 {
|
joachim99@8
|
1890 if ( m_pFindDialog->m_pSearchInC->isChecked() && m_pDiffTextWindow3!=0 &&
|
joachim99@8
|
1891 m_pDiffTextWindow3->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1892 {
|
joachim99@66
|
1893 m_pDiffTextWindow3->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length(),l,p );
|
joachim99@66
|
1894 m_pDiffVScrollBar->setValue(l-m_pDiffVScrollBar->pageStep()/2);
|
joachim99@66
|
1895 m_pHScrollBar->setValue( max2( 0, p+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1896 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1897 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1898 return;
|
joachim99@8
|
1899 }
|
joachim99@8
|
1900 m_pFindDialog->currentWindow = 4;
|
joachim99@8
|
1901 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1902 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1903 }
|
joachim99@8
|
1904
|
joachim99@8
|
1905 d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1906 posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1907 if ( m_pFindDialog->currentWindow == 4 )
|
joachim99@8
|
1908 {
|
joachim99@8
|
1909 if ( m_pFindDialog->m_pSearchInOutput->isChecked() && m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() &&
|
joachim99@8
|
1910 m_pMergeResultWindow->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1911 {
|
joachim99@8
|
1912 m_pMergeResultWindow->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
|
joachim99@8
|
1913 m_pMergeVScrollBar->setValue(d3vLine - m_pMergeVScrollBar->pageStep()/2);
|
joachim99@8
|
1914 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1915 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1916 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1917 return;
|
joachim99@8
|
1918 }
|
joachim99@8
|
1919 m_pFindDialog->currentWindow = 5;
|
joachim99@8
|
1920 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1921 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1922 }
|
joachim99@8
|
1923
|
joachim99@51
|
1924 KMessageBox::information(this,i18n("Search complete."),i18n("Search Complete"));
|
joachim99@8
|
1925 m_pFindDialog->currentWindow = 1;
|
joachim99@8
|
1926 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1927 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1928 }
|
joachim99@8
|
1929
|
joachim99@8
|
1930 void KDiff3App::slotMergeCurrentFile()
|
joachim99@8
|
1931 {
|
joachim99@8
|
1932 if ( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() )
|
joachim99@8
|
1933 {
|
joachim99@8
|
1934 m_pDirectoryMergeWindow->mergeCurrentFile();
|
joachim99@8
|
1935 }
|
joachim99@8
|
1936 else if ( m_pMainWidget != 0 && m_pMainWidget->isVisible() )
|
joachim99@8
|
1937 {
|
joachim99@8
|
1938 if ( !canContinue() ) return;
|
joachim99@8
|
1939 if ( m_outputFilename.isEmpty() )
|
joachim99@8
|
1940 {
|
joachim99@58
|
1941 if ( !m_sd3.isEmpty() && !m_sd3.isFromBuffer() )
|
joachim99@8
|
1942 {
|
joachim99@8
|
1943 m_outputFilename = m_sd3.getFilename();
|
joachim99@8
|
1944 }
|
joachim99@58
|
1945 else if ( !m_sd2.isEmpty() && !m_sd2.isFromBuffer() )
|
joachim99@8
|
1946 {
|
joachim99@8
|
1947 m_outputFilename = m_sd2.getFilename();
|
joachim99@8
|
1948 }
|
joachim99@58
|
1949 else if ( !m_sd1.isEmpty() && !m_sd1.isFromBuffer() )
|
joachim99@8
|
1950 {
|
joachim99@8
|
1951 m_outputFilename = m_sd1.getFilename();
|
joachim99@8
|
1952 }
|
joachim99@8
|
1953 else
|
joachim99@8
|
1954 {
|
joachim99@8
|
1955 m_outputFilename = "unnamed.txt";
|
joachim99@8
|
1956 m_bDefaultFilename = true;
|
joachim99@8
|
1957 }
|
joachim99@8
|
1958 }
|
joachim99@8
|
1959 init();
|
joachim99@8
|
1960 }
|
joachim99@8
|
1961 }
|
joachim99@8
|
1962
|
joachim99@8
|
1963 void KDiff3App::slotWinFocusNext()
|
joachim99@8
|
1964 {
|
joachim99@8
|
1965 QWidget* focus = qApp->focusWidget();
|
joachim99@8
|
1966 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1967 {
|
joachim99@8
|
1968 slotDirViewToggle();
|
joachim99@8
|
1969 }
|
joachim99@8
|
1970
|
joachim99@8
|
1971 std::list<QWidget*> visibleWidgetList;
|
joachim99@66
|
1972 if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
|
joachim99@66
|
1973 if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
|
joachim99@66
|
1974 if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
|
joachim99@66
|
1975 if ( m_pMergeResultWindow && m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
|
joachim99@8
|
1976 if ( m_bDirCompare /*m_pDirectoryMergeWindow->isVisible()*/ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
|
joachim99@8
|
1977 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
|
joachim99@8
|
1978
|
joachim99@8
|
1979 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
|
joachim99@8
|
1980 ++i;
|
joachim99@66
|
1981 if ( i==visibleWidgetList.end() )
|
joachim99@66
|
1982 i = visibleWidgetList.begin();
|
joachim99@8
|
1983 if ( i!=visibleWidgetList.end() )
|
joachim99@8
|
1984 {
|
joachim99@8
|
1985 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1986 {
|
joachim99@8
|
1987 slotDirViewToggle();
|
joachim99@8
|
1988 }
|
joachim99@8
|
1989 (*i)->setFocus();
|
joachim99@8
|
1990 }
|
joachim99@8
|
1991 }
|
joachim99@8
|
1992
|
joachim99@8
|
1993 void KDiff3App::slotWinFocusPrev()
|
joachim99@8
|
1994 {
|
joachim99@8
|
1995 QWidget* focus = qApp->focusWidget();
|
joachim99@8
|
1996 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1997 {
|
joachim99@8
|
1998 slotDirViewToggle();
|
joachim99@8
|
1999 }
|
joachim99@8
|
2000
|
joachim99@8
|
2001 std::list<QWidget*> visibleWidgetList;
|
joachim99@66
|
2002 if ( m_pDiffTextWindow1 && m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
|
joachim99@66
|
2003 if ( m_pDiffTextWindow2 && m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
|
joachim99@66
|
2004 if ( m_pDiffTextWindow3 && m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
|
joachim99@66
|
2005 if ( m_pMergeResultWindow && m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
|
joachim99@8
|
2006 if (m_bDirCompare /* m_pDirectoryMergeWindow->isVisible() */ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
|
joachim99@8
|
2007 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
|
joachim99@8
|
2008
|
joachim99@8
|
2009 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
|
joachim99@73
|
2010 if ( i==visibleWidgetList.begin() )
|
joachim99@73
|
2011 i=visibleWidgetList.end();
|
joachim99@8
|
2012 --i;
|
joachim99@8
|
2013 if ( i!=visibleWidgetList.end() )
|
joachim99@8
|
2014 {
|
joachim99@8
|
2015 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
|
joachim99@8
|
2016 {
|
joachim99@8
|
2017 slotDirViewToggle();
|
joachim99@8
|
2018 }
|
joachim99@8
|
2019 (*i)->setFocus();
|
joachim99@8
|
2020 }
|
joachim99@8
|
2021 }
|
joachim99@8
|
2022
|
joachim99@8
|
2023 void KDiff3App::slotWinToggleSplitterOrientation()
|
joachim99@8
|
2024 {
|
joachim99@8
|
2025 if ( m_pDiffWindowSplitter!=0 )
|
joachim99@8
|
2026 {
|
joachim99@8
|
2027 m_pDiffWindowSplitter->setOrientation(
|
joachim99@69
|
2028 m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical
|
joachim99@8
|
2029 );
|
joachim99@51
|
2030
|
joachim99@69
|
2031 m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal;
|
joachim99@8
|
2032 }
|
joachim99@8
|
2033 }
|
joachim99@8
|
2034
|
joachim99@66
|
2035 void KDiff3App::slotOverviewNormal()
|
joachim99@69
|
2036 {
|
joachim99@66
|
2037 m_pOverview->setOverviewMode( Overview::eOMNormal );
|
joachim99@69
|
2038 m_pMergeResultWindow->setOverviewMode( Overview::eOMNormal );
|
joachim99@66
|
2039 slotUpdateAvailabilities();
|
joachim99@66
|
2040 }
|
joachim99@66
|
2041
|
joachim99@66
|
2042 void KDiff3App::slotOverviewAB()
|
joachim99@66
|
2043 {
|
joachim99@66
|
2044 m_pOverview->setOverviewMode( Overview::eOMAvsB );
|
joachim99@69
|
2045 m_pMergeResultWindow->setOverviewMode( Overview::eOMAvsB );
|
joachim99@66
|
2046 slotUpdateAvailabilities();
|
joachim99@66
|
2047 }
|
joachim99@66
|
2048
|
joachim99@66
|
2049 void KDiff3App::slotOverviewAC()
|
joachim99@66
|
2050 {
|
joachim99@66
|
2051 m_pOverview->setOverviewMode( Overview::eOMAvsC );
|
joachim99@69
|
2052 m_pMergeResultWindow->setOverviewMode( Overview::eOMAvsC );
|
joachim99@66
|
2053 slotUpdateAvailabilities();
|
joachim99@66
|
2054 }
|
joachim99@66
|
2055
|
joachim99@66
|
2056 void KDiff3App::slotOverviewBC()
|
joachim99@66
|
2057 {
|
joachim99@66
|
2058 m_pOverview->setOverviewMode( Overview::eOMBvsC );
|
joachim99@69
|
2059 m_pMergeResultWindow->setOverviewMode( Overview::eOMBvsC );
|
joachim99@66
|
2060 slotUpdateAvailabilities();
|
joachim99@66
|
2061 }
|
joachim99@69
|
2062
|
joachim99@69
|
2063 void KDiff3App::slotNoRelevantChangesDetected()
|
joachim99@69
|
2064 {
|
joachim99@69
|
2065 if ( m_bTripleDiff && ! m_outputFilename.isEmpty() )
|
joachim99@69
|
2066 {
|
joachim99@69
|
2067 //KMessageBox::information( this, "No relevant changes detected", "KDiff3" );
|
joachim99@69
|
2068 if (!m_pOptionDialog->m_IrrelevantMergeCmd.isEmpty())
|
joachim99@69
|
2069 {
|
joachim99@69
|
2070 QString cmd = m_pOptionDialog->m_IrrelevantMergeCmd + " \"" + m_sd1.getAliasName()+ "\" \"" + m_sd2.getAliasName() + "\" \"" + m_sd3.getAliasName();
|
joachim99@75
|
2071 QProcess process;
|
joachim99@75
|
2072 process.start( cmd );
|
joachim99@75
|
2073 process.waitForFinished(-1);
|
joachim99@75
|
2074 //::system( cmd.local8Bit() );
|
joachim99@69
|
2075 }
|
joachim99@69
|
2076 }
|
joachim99@69
|
2077 }
|
joachim99@69
|
2078
|
joachim99@69
|
2079 static void insertManualDiffHelp( ManualDiffHelpList* pManualDiffHelpList, int winIdx, int firstLine, int lastLine )
|
joachim99@69
|
2080 {
|
joachim99@69
|
2081 // The manual diff help list must be sorted and compact.
|
joachim99@69
|
2082 // "Compact" means that upper items can't be empty if lower items contain data.
|
joachim99@69
|
2083
|
joachim99@69
|
2084 // First insert the new item without regarding compactness.
|
joachim99@69
|
2085 // If the new item overlaps with previous items then the previous items will be removed.
|
joachim99@69
|
2086
|
joachim99@69
|
2087 ManualDiffHelpEntry mdhe;
|
joachim99@69
|
2088 mdhe.firstLine( winIdx ) = firstLine;
|
joachim99@69
|
2089 mdhe.lastLine( winIdx ) = lastLine;
|
joachim99@69
|
2090
|
joachim99@69
|
2091 ManualDiffHelpList::iterator i;
|
joachim99@69
|
2092 for( i=pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i )
|
joachim99@69
|
2093 {
|
joachim99@69
|
2094 int& l1 = i->firstLine( winIdx );
|
joachim99@69
|
2095 int& l2 = i->lastLine( winIdx );
|
joachim99@69
|
2096 if (l1>=0 && l2>=0)
|
joachim99@69
|
2097 {
|
joachim99@69
|
2098 if ( firstLine<=l1 && lastLine>=l1 || firstLine <=l2 && lastLine>=l2 )
|
joachim99@69
|
2099 {
|
joachim99@69
|
2100 // overlap
|
joachim99@69
|
2101 l1 = -1;
|
joachim99@69
|
2102 l2 = -1;
|
joachim99@69
|
2103 }
|
joachim99@69
|
2104 if ( firstLine<l1 && lastLine<l1 )
|
joachim99@69
|
2105 {
|
joachim99@69
|
2106 // insert before this position
|
joachim99@69
|
2107 pManualDiffHelpList->insert( i, mdhe );
|
joachim99@69
|
2108 break;
|
joachim99@69
|
2109 }
|
joachim99@69
|
2110 }
|
joachim99@69
|
2111 }
|
joachim99@69
|
2112 if ( i == pManualDiffHelpList->end() )
|
joachim99@69
|
2113 {
|
joachim99@69
|
2114 pManualDiffHelpList->insert( i, mdhe );
|
joachim99@69
|
2115 }
|
joachim99@69
|
2116
|
joachim99@69
|
2117 // Now make the list compact
|
joachim99@69
|
2118 for( int wIdx=1; wIdx<=3; ++wIdx )
|
joachim99@69
|
2119 {
|
joachim99@69
|
2120 ManualDiffHelpList::iterator iEmpty = pManualDiffHelpList->begin();
|
joachim99@69
|
2121 for( i=pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i )
|
joachim99@69
|
2122 {
|
joachim99@69
|
2123 if ( iEmpty->firstLine(wIdx) >= 0 )
|
joachim99@69
|
2124 {
|
joachim99@69
|
2125 ++iEmpty;
|
joachim99@69
|
2126 continue;
|
joachim99@69
|
2127 }
|
joachim99@69
|
2128 if ( i->firstLine(wIdx)>=0 ) // Current item is not empty -> move it to the empty place
|
joachim99@69
|
2129 {
|
joachim99@69
|
2130 iEmpty->firstLine(wIdx) = i->firstLine(wIdx);
|
joachim99@69
|
2131 iEmpty->lastLine(wIdx) = i->lastLine(wIdx);
|
joachim99@69
|
2132 i->firstLine(wIdx) = -1;
|
joachim99@69
|
2133 i->lastLine(wIdx) = -1;
|
joachim99@69
|
2134 ++iEmpty;
|
joachim99@69
|
2135 }
|
joachim99@69
|
2136 }
|
joachim99@69
|
2137 }
|
joachim99@69
|
2138 pManualDiffHelpList->remove( ManualDiffHelpEntry() ); // Remove all completely empty items.
|
joachim99@69
|
2139 }
|
joachim99@69
|
2140
|
joachim99@69
|
2141 void KDiff3App::slotAddManualDiffHelp()
|
joachim99@69
|
2142 {
|
joachim99@69
|
2143 int firstLine = -1;
|
joachim99@69
|
2144 int lastLine = -1;
|
joachim99@69
|
2145 int winIdx = -1;
|
joachim99@69
|
2146 if ( m_pDiffTextWindow1 ) { m_pDiffTextWindow1->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=1; }
|
joachim99@69
|
2147 if ( firstLine<0 && m_pDiffTextWindow2 ) { m_pDiffTextWindow2->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=2; }
|
joachim99@69
|
2148 if ( firstLine<0 && m_pDiffTextWindow3 ) { m_pDiffTextWindow3->getSelectionRange(&firstLine, &lastLine, eFileCoords); winIdx=3; }
|
joachim99@69
|
2149
|
joachim99@69
|
2150 if ( firstLine<0 || lastLine <0 || lastLine<firstLine )
|
joachim99@69
|
2151 KMessageBox::information( this, i18n("Nothing is selected in either diff input window."), i18n("Error while adding manual diff range") );
|
joachim99@69
|
2152 else
|
joachim99@69
|
2153 {
|
joachim99@69
|
2154 /*
|
joachim99@69
|
2155 ManualDiffHelpEntry mdhe;
|
joachim99@69
|
2156 if (!m_manualDiffHelpList.empty()) mdhe = m_manualDiffHelpList.front();
|
joachim99@69
|
2157 if ( winIdx==1 ) { mdhe.lineA1 = firstLine; mdhe.lineA2 = lastLine; }
|
joachim99@69
|
2158 if ( winIdx==2 ) { mdhe.lineB1 = firstLine; mdhe.lineB2 = lastLine; }
|
joachim99@69
|
2159 if ( winIdx==3 ) { mdhe.lineC1 = firstLine; mdhe.lineC2 = lastLine; }
|
joachim99@69
|
2160 m_manualDiffHelpList.clear();
|
joachim99@69
|
2161 m_manualDiffHelpList.push_back( mdhe );
|
joachim99@69
|
2162 */
|
joachim99@69
|
2163
|
joachim99@69
|
2164 insertManualDiffHelp( &m_manualDiffHelpList, winIdx, firstLine, lastLine );
|
joachim99@69
|
2165
|
joachim99@69
|
2166 init( false, 0, false ); // Init without reload
|
joachim99@69
|
2167 slotRefresh();
|
joachim99@69
|
2168 }
|
joachim99@69
|
2169 }
|
joachim99@69
|
2170
|
joachim99@69
|
2171 void KDiff3App::slotClearManualDiffHelpList()
|
joachim99@69
|
2172 {
|
joachim99@69
|
2173 m_manualDiffHelpList.clear();
|
joachim99@69
|
2174 init( false, 0, false ); // Init without reload
|
joachim99@69
|
2175 slotRefresh();
|
joachim99@69
|
2176 }
|
joachim99@69
|
2177
|
joachim99@8
|
2178 void KDiff3App::slotUpdateAvailabilities()
|
joachim99@8
|
2179 {
|
joachim99@58
|
2180 bool bTextDataAvailable = ( m_sd1.hasData() || m_sd2.hasData() || m_sd3.hasData() );
|
joachim99@69
|
2181
|
joachim99@8
|
2182 if( dirShowBoth->isChecked() )
|
joachim99@8
|
2183 {
|
joachim99@8
|
2184 if ( m_bDirCompare )
|
joachim99@8
|
2185 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
2186 else
|
joachim99@8
|
2187 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
2188
|
joachim99@8
|
2189 if ( m_pMainWidget!=0 && !m_pMainWidget->isVisible() &&
|
joachim99@66
|
2190 bTextDataAvailable && !m_pDirectoryMergeWindow->isScanning()
|
joachim99@8
|
2191 )
|
joachim99@8
|
2192 m_pMainWidget->show();
|
joachim99@8
|
2193 }
|
joachim99@69
|
2194
|
joachim99@8
|
2195
|
joachim99@8
|
2196 bool bDiffWindowVisible = m_pMainWidget != 0 && m_pMainWidget->isVisible();
|
joachim99@8
|
2197 bool bMergeEditorVisible = m_pMergeWindowFrame !=0 && m_pMergeWindowFrame->isVisible();
|
joachim99@8
|
2198
|
joachim99@53
|
2199 m_pDirectoryMergeWindow->updateAvailabilities( m_bDirCompare, bDiffWindowVisible, chooseA, chooseB, chooseC );
|
joachim99@8
|
2200
|
joachim99@8
|
2201 dirShowBoth->setEnabled( m_bDirCompare );
|
joachim99@8
|
2202 dirViewToggle->setEnabled(
|
joachim99@8
|
2203 m_bDirCompare &&
|
joachim99@8
|
2204 (!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && m_pMainWidget->isVisible() ||
|
joachim99@8
|
2205 m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && !m_pMainWidget->isVisible() && bTextDataAvailable )
|
joachim99@8
|
2206 );
|
joachim99@69
|
2207
|
joachim99@53
|
2208 bool bDirWindowHasFocus = m_pDirectoryMergeSplitter->isVisible() && m_pDirectoryMergeWindow->hasFocus();
|
joachim99@8
|
2209
|
joachim99@51
|
2210 showWhiteSpaceCharacters->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2211 autoAdvance->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2212 autoSolve->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@8
|
2213 unsolve->setEnabled( bMergeEditorVisible );
|
joachim99@53
|
2214 if ( !bDirWindowHasFocus )
|
joachim99@53
|
2215 {
|
joachim99@53
|
2216 chooseA->setEnabled( bMergeEditorVisible );
|
joachim99@53
|
2217 chooseB->setEnabled( bMergeEditorVisible );
|
joachim99@53
|
2218 chooseC->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@53
|
2219 }
|
joachim99@8
|
2220 chooseAEverywhere->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2221 chooseBEverywhere->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2222 chooseCEverywhere->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@51
|
2223 chooseAForUnsolvedConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2224 chooseBForUnsolvedConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2225 chooseCForUnsolvedConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@51
|
2226 chooseAForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2227 chooseBForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2228 chooseCForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@69
|
2229 mergeHistory->setEnabled( bMergeEditorVisible );
|
joachim99@69
|
2230 mergeRegExp->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2231 showWindowA->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow2->isVisible() || m_pDiffTextWindow3->isVisible() ) );
|
joachim99@8
|
2232 showWindowB->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow3->isVisible() ));
|
joachim99@8
|
2233 showWindowC->setEnabled( bDiffWindowVisible && m_bTripleDiff && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow2->isVisible() ) );
|
joachim99@8
|
2234 editFind->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2235 editFindNext->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2236 m_pFindDialog->m_pSearchInC->setEnabled( m_bTripleDiff );
|
joachim99@8
|
2237 m_pFindDialog->m_pSearchInOutput->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2238
|
joachim99@8
|
2239 bool bSavable = bMergeEditorVisible && m_pMergeResultWindow->getNrOfUnsolvedConflicts()==0;
|
joachim99@8
|
2240 fileSave->setEnabled( m_bOutputModified && bSavable );
|
joachim99@8
|
2241 fileSaveAs->setEnabled( bSavable );
|
joachim99@8
|
2242
|
joachim99@8
|
2243 goTop->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
|
joachim99@8
|
2244 goBottom->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
|
joachim99@8
|
2245 goCurrent->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2246 goPrevUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictAboveCurrent() );
|
joachim99@8
|
2247 goNextUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictBelowCurrent() );
|
joachim99@8
|
2248 goPrevConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictAboveCurrent() );
|
joachim99@8
|
2249 goNextConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictBelowCurrent() );
|
joachim99@8
|
2250 goPrevDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
|
joachim99@8
|
2251 goNextDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
|
joachim99@69
|
2252
|
joachim99@66
|
2253 overviewModeNormal->setEnabled( m_bTripleDiff && bDiffWindowVisible );
|
joachim99@66
|
2254 overviewModeAB->setEnabled( m_bTripleDiff && bDiffWindowVisible );
|
joachim99@66
|
2255 overviewModeAC->setEnabled( m_bTripleDiff && bDiffWindowVisible );
|
joachim99@66
|
2256 overviewModeBC->setEnabled( m_bTripleDiff && bDiffWindowVisible );
|
joachim99@66
|
2257 Overview::e_OverviewMode overviewMode = m_pOverview==0 ? Overview::eOMNormal : m_pOverview->getOverviewMode();
|
joachim99@66
|
2258 overviewModeNormal->setChecked( overviewMode == Overview::eOMNormal );
|
joachim99@66
|
2259 overviewModeAB->setChecked( overviewMode == Overview::eOMAvsB );
|
joachim99@66
|
2260 overviewModeAC->setChecked( overviewMode == Overview::eOMAvsC );
|
joachim99@66
|
2261 overviewModeBC->setChecked( overviewMode == Overview::eOMBvsC );
|
joachim99@8
|
2262
|
joachim99@8
|
2263 winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=0 );
|
joachim99@8
|
2264 }
|