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