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