joachim99@8
|
1 /***************************************************************************
|
joachim99@8
|
2 kdiff.cpp - description
|
joachim99@8
|
3 -------------------
|
joachim99@8
|
4 begin : Mon Mär 18 20:04:50 CET 2002
|
joachim99@8
|
5 copyright : (C) 2002 by Joachim Eibl
|
joachim99@8
|
6 email : joachim.eibl@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@8
|
18 #include "diff.h"
|
joachim99@8
|
19 #include "directorymergewindow.h"
|
joachim99@8
|
20
|
joachim99@8
|
21 #include <iostream>
|
joachim99@8
|
22 #include <algorithm>
|
joachim99@8
|
23 #include <ctype.h>
|
joachim99@8
|
24 #include <qaccel.h>
|
joachim99@8
|
25
|
joachim99@8
|
26 #include <kfiledialog.h>
|
joachim99@8
|
27 #include <klocale.h>
|
joachim99@8
|
28 #include <kmessagebox.h>
|
joachim99@8
|
29 #include <kfontdialog.h>
|
joachim99@8
|
30 #include <kstatusbar.h>
|
joachim99@8
|
31 #include <kkeydialog.h>
|
joachim99@8
|
32
|
joachim99@8
|
33 #include <qclipboard.h>
|
joachim99@8
|
34 #include <qscrollbar.h>
|
joachim99@8
|
35 #include <qlayout.h>
|
joachim99@8
|
36 #include <qsplitter.h>
|
joachim99@8
|
37 #include <qlabel.h>
|
joachim99@8
|
38 #include <qpushbutton.h>
|
joachim99@8
|
39 #include <qlineedit.h>
|
joachim99@8
|
40 #include <qcheckbox.h>
|
joachim99@8
|
41 #include <qcombobox.h>
|
joachim99@8
|
42 #include <qdir.h>
|
joachim99@8
|
43 #include <qfile.h>
|
joachim99@8
|
44 #include <qvbuttongroup.h>
|
joachim99@8
|
45 #include <qradiobutton.h>
|
joachim99@8
|
46 #include <qdragobject.h>
|
joachim99@8
|
47 #include <assert.h>
|
joachim99@8
|
48
|
joachim99@8
|
49 #include "kdiff3.h"
|
joachim99@8
|
50 #include "optiondialog.h"
|
joachim99@8
|
51 #include "fileaccess.h"
|
joachim99@8
|
52 #ifdef _WIN32
|
joachim99@8
|
53 #include <windows.h>
|
joachim99@8
|
54 #else
|
joachim99@8
|
55 #include <unistd.h>
|
joachim99@8
|
56 #endif
|
joachim99@8
|
57
|
joachim99@51
|
58 #include "gnudiff_diff.h"
|
joachim99@51
|
59
|
joachim99@8
|
60 //using namespace std;
|
joachim99@8
|
61
|
joachim99@8
|
62 int g_tabSize = 8;
|
joachim99@8
|
63 bool g_bIgnoreWhiteSpace = true;
|
joachim99@8
|
64 bool g_bIgnoreTrivialMatches = true;
|
joachim99@8
|
65
|
joachim99@8
|
66
|
joachim99@8
|
67 QString createTempFile( const LineData* p, int size, bool bIgnoreWhiteSpace, bool bIgnoreNumbers )
|
joachim99@8
|
68 {
|
joachim99@8
|
69 QString fileName = FileAccess::tempFileName();
|
joachim99@8
|
70
|
joachim99@8
|
71 QFile file( fileName );
|
joachim99@8
|
72 bool bSuccess = file.open( IO_WriteOnly );
|
joachim99@8
|
73 if ( !bSuccess ) return "";
|
joachim99@8
|
74 for (int l=0; l<size; ++l)
|
joachim99@8
|
75 {
|
joachim99@8
|
76 // We don't want any white space in the diff output
|
joachim99@8
|
77 QCString s( p[l].size+1 );
|
joachim99@8
|
78 int is=0;
|
joachim99@8
|
79 for(int j=0; j<p[l].size; ++j )
|
joachim99@8
|
80 {
|
joachim99@8
|
81 char c = p[l].pLine[j];
|
joachim99@8
|
82 if ( !( bIgnoreWhiteSpace && isWhite( c ) ||
|
joachim99@8
|
83 bIgnoreNumbers && (isdigit( c ) || c=='-' || c=='.' )
|
joachim99@8
|
84 )
|
joachim99@8
|
85 )
|
joachim99@8
|
86 {
|
joachim99@8
|
87 if ( c=='\0' ) // Replace zeros with something else.
|
joachim99@8
|
88 s[is]=(char)0xFF;
|
joachim99@8
|
89 else
|
joachim99@8
|
90 s[is]=c;
|
joachim99@8
|
91 ++is;
|
joachim99@8
|
92 }
|
joachim99@8
|
93 }
|
joachim99@8
|
94 s[is]='\n';
|
joachim99@8
|
95 ++is;
|
joachim99@8
|
96 if( is != file.writeBlock( &s[0], is ) )
|
joachim99@8
|
97 return "";
|
joachim99@8
|
98 }
|
joachim99@8
|
99 return fileName;
|
joachim99@8
|
100 }
|
joachim99@8
|
101
|
joachim99@8
|
102 bool KDiff3App::runDiff( LineData* p1, int size1, LineData* p2, int size2, DiffList& diffList )
|
joachim99@8
|
103 {
|
joachim99@51
|
104 g_pProgressDialog->setSubCurrent(0);
|
joachim99@51
|
105
|
joachim99@8
|
106 diffList.clear();
|
joachim99@51
|
107 if ( p1[0].pLine==0 || p2[0].pLine==0 )
|
joachim99@51
|
108 {
|
joachim99@51
|
109 Diff d( 0,0,0);
|
joachim99@51
|
110 if ( p1[0].pLine==0 && p2[0].pLine==0 && size1 == size2 )
|
joachim99@51
|
111 d.nofEquals = size1;
|
joachim99@51
|
112 else if (p1[0].pLine!=0) d.diff1=size1;
|
joachim99@51
|
113 else if (p2[0].pLine!=0) d.diff2=size2;
|
joachim99@51
|
114
|
joachim99@51
|
115 diffList.push_back(d);
|
joachim99@51
|
116 return true;
|
joachim99@51
|
117 }
|
joachim99@51
|
118
|
joachim99@51
|
119 GnuDiff::comparison comparisonInput;
|
joachim99@51
|
120 memset( &comparisonInput, 0, sizeof(comparisonInput) );
|
joachim99@51
|
121 comparisonInput.parent = 0;
|
joachim99@51
|
122 comparisonInput.file[0].buffer = (word*)p1[0].pLine;//ptr to buffer
|
joachim99@51
|
123 comparisonInput.file[0].buffered = p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size; // size of buffer
|
joachim99@51
|
124 comparisonInput.file[1].buffer = (word*)p2[0].pLine;//ptr to buffer
|
joachim99@51
|
125 comparisonInput.file[1].buffered = p2[size2-1].pLine-p2[0].pLine+p2[size2-1].size; // size of buffer
|
joachim99@51
|
126
|
joachim99@51
|
127 GnuDiff::ignore_white_space = GnuDiff::IGNORE_ALL_SPACE; // I think nobody needs anything else ...
|
joachim99@51
|
128 GnuDiff::bIgnoreWhiteSpace = true;
|
joachim99@51
|
129 GnuDiff::bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers;
|
joachim99@51
|
130 GnuDiff::minimal = m_pOptionDialog->m_bTryHard;
|
joachim99@51
|
131 GnuDiff::ignore_case = false; // m_pOptionDialog->m_bUpCase is applied while reading.
|
joachim99@51
|
132 GnuDiff::change* script = GnuDiff::diff_2_files( &comparisonInput );
|
joachim99@51
|
133
|
joachim99@51
|
134 int equalLinesAtStart = comparisonInput.file[0].prefix_lines;
|
joachim99@51
|
135 int currentLine1 = 0;
|
joachim99@51
|
136 int currentLine2 = 0;
|
joachim99@51
|
137 GnuDiff::change* p=0;
|
joachim99@51
|
138 for (GnuDiff::change* e = script; e; e = p)
|
joachim99@51
|
139 {
|
joachim99@51
|
140 Diff d(0,0,0);
|
joachim99@51
|
141 d.nofEquals = e->line0 - currentLine1;
|
joachim99@51
|
142 assert( d.nofEquals == e->line1 - currentLine2 );
|
joachim99@51
|
143 d.diff1 = e->deleted;
|
joachim99@51
|
144 d.diff2 = e->inserted;
|
joachim99@51
|
145 currentLine1 += d.nofEquals + d.diff1;
|
joachim99@51
|
146 currentLine2 += d.nofEquals + d.diff2;
|
joachim99@51
|
147 diffList.push_back(d);
|
joachim99@51
|
148
|
joachim99@51
|
149 p = e->link;
|
joachim99@51
|
150 free (e);
|
joachim99@51
|
151 }
|
joachim99@51
|
152
|
joachim99@51
|
153 if ( !diffList.empty() )
|
joachim99@51
|
154 {
|
joachim99@51
|
155 diffList.front().nofEquals += equalLinesAtStart;
|
joachim99@51
|
156 currentLine1 += equalLinesAtStart;
|
joachim99@51
|
157 currentLine2 += equalLinesAtStart;
|
joachim99@51
|
158 }
|
joachim99@51
|
159
|
joachim99@51
|
160 if (size1-currentLine1==size2-currentLine2 )
|
joachim99@51
|
161 {
|
joachim99@51
|
162 Diff d( size1-currentLine1,0,0);
|
joachim99@51
|
163 diffList.push_back(d);
|
joachim99@51
|
164 }
|
joachim99@51
|
165 else if ( !diffList.empty() )
|
joachim99@51
|
166 { // Only necessary for a files that end with a newline
|
joachim99@51
|
167 int nofEquals = min2(size1-currentLine1,size2-currentLine2);
|
joachim99@51
|
168 if ( nofEquals==0 )
|
joachim99@51
|
169 {
|
joachim99@51
|
170 diffList.back().diff1 += size1-currentLine1;
|
joachim99@51
|
171 diffList.back().diff2 += size2-currentLine2;
|
joachim99@51
|
172 }
|
joachim99@51
|
173 else
|
joachim99@51
|
174 {
|
joachim99@51
|
175 Diff d( nofEquals,size1-currentLine1-nofEquals,size2-currentLine2-nofEquals);
|
joachim99@51
|
176 diffList.push_back(d);
|
joachim99@51
|
177 }
|
joachim99@51
|
178 }
|
joachim99@51
|
179
|
joachim99@51
|
180 #ifndef NDEBUG
|
joachim99@51
|
181 // Verify difflist
|
joachim99@51
|
182 {
|
joachim99@51
|
183 int l1=0;
|
joachim99@51
|
184 int l2=0;
|
joachim99@51
|
185 DiffList::iterator i;
|
joachim99@51
|
186 for( i = diffList.begin(); i!=diffList.end(); ++i )
|
joachim99@51
|
187 {
|
joachim99@51
|
188 l1+= i->nofEquals + i->diff1;
|
joachim99@51
|
189 l2+= i->nofEquals + i->diff2;
|
joachim99@51
|
190 }
|
joachim99@51
|
191
|
joachim99@51
|
192 //if( l1!=p1-p1start || l2!=p2-p2start )
|
joachim99@51
|
193 if( l1!=size1 || l2!=size2 )
|
joachim99@51
|
194 assert( false );
|
joachim99@51
|
195 }
|
joachim99@51
|
196 #endif
|
joachim99@51
|
197
|
joachim99@51
|
198 g_pProgressDialog->setSubCurrent(1.0);
|
joachim99@51
|
199
|
joachim99@51
|
200 return true;
|
joachim99@51
|
201 #if 0
|
joachim99@8
|
202
|
joachim99@8
|
203 if ( m_pOptionDialog->m_bUseExternalDiff )
|
joachim99@8
|
204 {
|
joachim99@8
|
205 bool bSuccess=false;
|
joachim99@8
|
206
|
joachim99@8
|
207 bool bIgnoreWhiteSpace = m_pOptionDialog->m_bIgnoreWhiteSpace;
|
joachim99@8
|
208 bool bIgnoreNumbers = m_pOptionDialog->m_bIgnoreNumbers;
|
joachim99@8
|
209
|
joachim99@8
|
210 // Create two temp files (Remove all white spaces and carriage returns here)
|
joachim99@8
|
211 // (Make sure that no existing files are overwritten.)
|
joachim99@8
|
212 g_pProgressDialog->setSubCurrent(0);
|
joachim99@8
|
213 QString fileName1 = createTempFile( p1, size1, bIgnoreWhiteSpace, bIgnoreNumbers );
|
joachim99@8
|
214 g_pProgressDialog->setSubCurrent(0.25);
|
joachim99@8
|
215 QString fileName2 = createTempFile( p2, size2, bIgnoreWhiteSpace, bIgnoreNumbers );
|
joachim99@8
|
216 g_pProgressDialog->setSubCurrent(0.5);
|
joachim99@8
|
217 QString fileNameOut = FileAccess::tempFileName();
|
joachim99@8
|
218
|
joachim99@8
|
219 if ( !fileName1.isEmpty() && !fileName2.isEmpty() )
|
joachim99@8
|
220 {
|
joachim99@8
|
221 QString cmd;
|
joachim99@8
|
222 #ifdef _WIN32
|
joachim99@8
|
223 // Under Windows it's better to search for diff.exe
|
joachim99@8
|
224 char buf[200];
|
joachim99@8
|
225 int r= SearchPathA( 0, "diff.exe", 0, sizeof(buf), buf, 0 );
|
joachim99@8
|
226
|
joachim99@8
|
227 if (r!=0) { cmd = buf; }
|
joachim99@8
|
228 #else
|
joachim99@8
|
229 // under Un*x I assume that a diff command is in the PATH
|
joachim99@8
|
230 cmd = "diff";
|
joachim99@8
|
231 #endif
|
joachim99@8
|
232 if ( !cmd.isEmpty() )
|
joachim99@8
|
233 {
|
joachim99@8
|
234 cmd += " -a "; // -a = treat all files as text
|
joachim99@8
|
235 if ( m_pOptionDialog->m_bTryHard )
|
joachim99@8
|
236 cmd += "--minimal ";
|
joachim99@8
|
237 //if ( m_pOptionDialog->m_bIgnoreWhiteSpace ) This I do myself, see below
|
joachim99@8
|
238 // cmd += "--ignore-all-space ";
|
joachim99@8
|
239 cmd += fileName1+" "+fileName2+" >"+fileNameOut;
|
joachim99@8
|
240 // Run diff
|
joachim99@8
|
241 //int status1 = ::system( 0 ); // ==0 if shell not found
|
joachim99@8
|
242 int status = ::system( cmd.ascii() );
|
joachim99@8
|
243 #ifdef WEXITSTATUS
|
joachim99@8
|
244 status = WEXITSTATUS(status);
|
joachim99@8
|
245 #endif
|
joachim99@8
|
246 //if (status<0)
|
joachim99@8
|
247 //{
|
joachim99@8
|
248 // errorString = strerror( errno );
|
joachim99@8
|
249 //}
|
joachim99@8
|
250 bSuccess = status>=0 && status!=127;
|
joachim99@8
|
251 }
|
joachim99@8
|
252 }
|
joachim99@8
|
253
|
joachim99@8
|
254 g_pProgressDialog->setSubCurrent(0.75);
|
joachim99@8
|
255
|
joachim99@8
|
256 int currentLine1 = 0;
|
joachim99@8
|
257 int currentLine2 = 0;
|
joachim99@8
|
258 if ( bSuccess )
|
joachim99@8
|
259 {
|
joachim99@8
|
260 // Parse the output and create the difflist
|
joachim99@8
|
261 QFile f( fileNameOut );
|
joachim99@8
|
262 bSuccess = f.open(IO_ReadOnly);
|
joachim99@8
|
263 if (bSuccess)
|
joachim99@8
|
264 {
|
joachim99@8
|
265 const QByteArray buf = f.readAll();
|
joachim99@8
|
266 unsigned int bufSize=buf.size();
|
joachim99@8
|
267 unsigned int pos=0;
|
joachim99@8
|
268 for(pos=0;pos<bufSize;++pos)
|
joachim99@8
|
269 {
|
joachim99@8
|
270 unsigned int lineStart = pos;
|
joachim99@8
|
271 // Find end of line
|
joachim99@8
|
272 while( buf.at(pos)!='\n' && pos<bufSize )
|
joachim99@8
|
273 ++pos;
|
joachim99@8
|
274
|
joachim99@8
|
275 // parse it
|
joachim99@8
|
276 char c = buf.at(lineStart);
|
joachim99@8
|
277 if ( c == '>' || c == '-' || c=='<' )
|
joachim99@8
|
278 continue; // Not interested in the data
|
joachim99@8
|
279 else
|
joachim99@8
|
280 {
|
joachim99@8
|
281 QCString line( &buf.at(lineStart), pos-lineStart+1 );
|
joachim99@8
|
282 int pa = line.find('a'); // add
|
joachim99@8
|
283 int pc = line.find('c'); // change
|
joachim99@8
|
284 int pd = line.find('d'); // delete
|
joachim99@8
|
285 int p = pa>0 ? pa : (pc > 0 ? pc : pd);
|
joachim99@8
|
286 if (p<0) break; // Unexpected error
|
joachim99@8
|
287 QCString left = line.left(p);
|
joachim99@8
|
288 QCString right = line.mid(p+1);
|
joachim99@8
|
289 int pcommaleft = left.find(',');
|
joachim99@8
|
290 int pcommaright = right.find(',');
|
joachim99@8
|
291 int l1top=-1, l1bottom=-1, l2top=-1, l2bottom=-1;
|
joachim99@8
|
292 if (pcommaleft>0)
|
joachim99@8
|
293 {
|
joachim99@8
|
294 l1top = left.left(pcommaleft).toInt();
|
joachim99@8
|
295 l1bottom = left.mid(pcommaleft+1).toInt();
|
joachim99@8
|
296 }
|
joachim99@8
|
297 else
|
joachim99@8
|
298 {
|
joachim99@8
|
299 l1top = left.toInt();
|
joachim99@8
|
300 l1bottom = l1top;
|
joachim99@8
|
301 }
|
joachim99@8
|
302 if (pcommaright>0)
|
joachim99@8
|
303 {
|
joachim99@8
|
304 l2top = right.left(pcommaright).toInt();
|
joachim99@8
|
305 l2bottom = right.mid(pcommaright+1).toInt();
|
joachim99@8
|
306 }
|
joachim99@8
|
307 else
|
joachim99@8
|
308 {
|
joachim99@8
|
309 l2top = right.toInt();
|
joachim99@8
|
310 l2bottom = l2top;
|
joachim99@8
|
311 }
|
joachim99@8
|
312
|
joachim99@8
|
313 Diff d(0,0,0);
|
joachim99@8
|
314
|
joachim99@8
|
315 if ( pa>0 )
|
joachim99@8
|
316 {
|
joachim99@8
|
317 d.nofEquals = l1top - currentLine1;
|
joachim99@8
|
318 d.diff1 = 0;
|
joachim99@8
|
319 d.diff2 = l2bottom - l2top + 1;
|
joachim99@8
|
320 assert( d.nofEquals == l2top - 1 - currentLine2 );
|
joachim99@8
|
321 }
|
joachim99@8
|
322 else if ( pd>0 )
|
joachim99@8
|
323 {
|
joachim99@8
|
324 d.nofEquals = l2top - currentLine2;
|
joachim99@8
|
325 d.diff1 = l1bottom - l1top + 1;
|
joachim99@8
|
326 d.diff2 = 0;
|
joachim99@8
|
327 assert( d.nofEquals == l1top - 1 - currentLine1 );
|
joachim99@8
|
328 }
|
joachim99@8
|
329 else if ( pc>0 )
|
joachim99@8
|
330 {
|
joachim99@8
|
331 d.nofEquals = l1top - 1 - currentLine1;
|
joachim99@8
|
332 d.diff1 = l1bottom - l1top + 1;
|
joachim99@8
|
333 d.diff2 = l2bottom - l2top + 1;
|
joachim99@8
|
334 assert( d.nofEquals == l2top - 1 - currentLine2 );
|
joachim99@8
|
335 }
|
joachim99@8
|
336 else
|
joachim99@8
|
337 assert(false);
|
joachim99@8
|
338
|
joachim99@8
|
339 currentLine1 += d.nofEquals + d.diff1;
|
joachim99@8
|
340 currentLine2 += d.nofEquals + d.diff2;
|
joachim99@8
|
341 diffList.push_back(d);
|
joachim99@8
|
342 }
|
joachim99@8
|
343 }
|
joachim99@8
|
344 if (size1-currentLine1==size2-currentLine2 )
|
joachim99@8
|
345 {
|
joachim99@8
|
346 Diff d( size1-currentLine1,0,0);
|
joachim99@8
|
347 diffList.push_back(d);
|
joachim99@8
|
348 currentLine1=size1;
|
joachim99@8
|
349 currentLine2=size2;
|
joachim99@8
|
350 }
|
joachim99@8
|
351
|
joachim99@8
|
352 if ( currentLine1 == size1 && currentLine2 == size2 )
|
joachim99@8
|
353 bSuccess = true;
|
joachim99@8
|
354 }
|
joachim99@50
|
355 else
|
joachim99@50
|
356 {
|
joachim99@50
|
357 bSuccess = size1==size2;
|
joachim99@50
|
358 }
|
joachim99@8
|
359 }
|
joachim99@8
|
360 if ( currentLine1==0 && currentLine2==0 )
|
joachim99@8
|
361 {
|
joachim99@8
|
362 Diff d( 0, size1, size2 );
|
joachim99@8
|
363 diffList.push_back(d);
|
joachim99@8
|
364 }
|
joachim99@8
|
365
|
joachim99@8
|
366 g_pProgressDialog->setSubCurrent(1.0);
|
joachim99@8
|
367
|
joachim99@8
|
368 if ( !bSuccess )
|
joachim99@8
|
369 {
|
joachim99@8
|
370 KMessageBox::sorry(this,
|
joachim99@8
|
371 i18n("Running the external diff failed.\n"
|
joachim99@8
|
372 "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n"
|
joachim99@8
|
373 "The external diff option will be disabled now and the internal diff will be used."),
|
joachim99@51
|
374 i18n("Warning"));
|
joachim99@8
|
375 m_pOptionDialog->m_bUseExternalDiff = false;
|
joachim99@8
|
376 }
|
joachim99@51
|
377
|
joachim99@50
|
378 FileAccess::removeFile( fileName1 );
|
joachim99@50
|
379 FileAccess::removeFile( fileName2 );
|
joachim99@50
|
380 FileAccess::removeFile( fileNameOut );
|
joachim99@8
|
381 }
|
joachim99@8
|
382
|
joachim99@8
|
383 if ( ! m_pOptionDialog->m_bUseExternalDiff )
|
joachim99@8
|
384 {
|
joachim99@8
|
385 g_pProgressDialog->setSubCurrent(0.0);
|
joachim99@8
|
386 if ( size1>0 && p1!=0 && p1->occurances==0 )
|
joachim99@8
|
387 {
|
joachim99@8
|
388 prepareOccurances( p1, size1 );
|
joachim99@8
|
389 }
|
joachim99@8
|
390 g_pProgressDialog->setSubCurrent(0.25);
|
joachim99@8
|
391
|
joachim99@8
|
392 if ( size2>0 && p2!=0 && p2->occurances==0 )
|
joachim99@8
|
393 {
|
joachim99@8
|
394 prepareOccurances( p2, size2 );
|
joachim99@8
|
395 }
|
joachim99@8
|
396 g_pProgressDialog->setSubCurrent(0.5);
|
joachim99@8
|
397
|
joachim99@8
|
398 calcDiff( p1, size1, p2, size2, diffList, 2, m_pOptionDialog->m_maxSearchLength );
|
joachim99@8
|
399
|
joachim99@8
|
400 g_pProgressDialog->setSubCurrent(1.0);
|
joachim99@8
|
401 }
|
joachim99@8
|
402 return true;
|
joachim99@51
|
403 #endif
|
joachim99@8
|
404 }
|
joachim99@8
|
405
|
joachim99@8
|
406
|
joachim99@8
|
407 void KDiff3App::init( bool bAuto )
|
joachim99@8
|
408 {
|
joachim99@8
|
409 bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn;
|
joachim99@8
|
410
|
joachim99@8
|
411 bool bVisibleMergeResultWindow = ! m_outputFilename.isEmpty();
|
joachim99@8
|
412 if ( bVisibleMergeResultWindow )
|
joachim99@8
|
413 {
|
joachim99@8
|
414 bPreserveCarriageReturn = false;
|
joachim99@8
|
415 }
|
joachim99@8
|
416
|
joachim99@8
|
417 m_diff3LineList.clear();
|
joachim99@8
|
418
|
joachim99@51
|
419 bool bUseLineMatchingPP = !m_pOptionDialog->m_LineMatchingPreProcessorCmd.isEmpty() ||
|
joachim99@51
|
420 m_pOptionDialog->m_bIgnoreComments;
|
joachim99@8
|
421 bool bUpCase = m_pOptionDialog->m_bUpCase;
|
joachim99@8
|
422
|
joachim99@8
|
423 if (m_pDiffTextWindow1) m_pDiffTextWindow1->setPaintingAllowed( false );
|
joachim99@8
|
424 if (m_pDiffTextWindow2) m_pDiffTextWindow2->setPaintingAllowed( false );
|
joachim99@8
|
425 if (m_pDiffTextWindow3) m_pDiffTextWindow3->setPaintingAllowed( false );
|
joachim99@8
|
426 if (m_pOverview) m_pOverview->setPaintingAllowed( false );
|
joachim99@8
|
427
|
joachim99@8
|
428
|
joachim99@8
|
429 if( m_sd3.isEmpty() )
|
joachim99@8
|
430 g_pProgressDialog->setMaximum( 4 ); // Read 2 files, 1 comparison, 1 finediff
|
joachim99@8
|
431 else
|
joachim99@8
|
432 g_pProgressDialog->setMaximum( 9 ); // Read 3 files, 3 comparisons, 3 finediffs
|
joachim99@8
|
433
|
joachim99@8
|
434 g_pProgressDialog->start();
|
joachim99@8
|
435
|
joachim99@8
|
436 // First get all input data.
|
joachim99@8
|
437 g_pProgressDialog->setInformation(i18n("Loading A"));
|
joachim99@8
|
438 m_sd1.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase );
|
joachim99@51
|
439 m_sdlm1.readLMPPFile( &m_sd1, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase, m_pOptionDialog->m_bIgnoreComments );
|
joachim99@8
|
440 g_pProgressDialog->step();
|
joachim99@8
|
441
|
joachim99@8
|
442 g_pProgressDialog->setInformation(i18n("Loading B"));
|
joachim99@8
|
443 m_sd2.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase );
|
joachim99@51
|
444 m_sdlm2.readLMPPFile( &m_sd2, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase, m_pOptionDialog->m_bIgnoreComments );
|
joachim99@8
|
445 g_pProgressDialog->step();
|
joachim99@8
|
446
|
joachim99@8
|
447 m_sd3.m_bIsText = true;
|
joachim99@8
|
448 m_totalDiffStatus.reset();
|
joachim99@8
|
449 // Run the diff.
|
joachim99@8
|
450 if ( m_sd3.isEmpty() )
|
joachim99@8
|
451 {
|
joachim99@8
|
452 m_totalDiffStatus.bBinaryAEqB = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd2.m_size && memcmp(m_sd1.m_pBuf,m_sd2.m_pBuf,m_sd1.m_size)==0);
|
joachim99@8
|
453 g_pProgressDialog->setInformation(i18n("Diff: A <-> B"));
|
joachim99@8
|
454 if ( !bUseLineMatchingPP )
|
joachim99@8
|
455 runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd2.m_v[0], m_sd2.m_vSize, m_diffList12 );
|
joachim99@8
|
456 else
|
joachim99@8
|
457 runDiff( &m_sdlm1.m_v[0], m_sdlm1.m_vSize, &m_sdlm2.m_v[0], m_sdlm2.m_vSize, m_diffList12 );
|
joachim99@8
|
458
|
joachim99@8
|
459 g_pProgressDialog->step();
|
joachim99@8
|
460
|
joachim99@8
|
461 g_pProgressDialog->setInformation(i18n("Linediff: A <-> B"));
|
joachim99@8
|
462 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
|
joachim99@51
|
463 fineDiff( m_diff3LineList, 1, &m_sd1.m_v[0], &m_sd2.m_v[0], m_totalDiffStatus.bTextAEqB );
|
joachim99@8
|
464 if ( m_sd1.m_size==0 ) m_totalDiffStatus.bTextAEqB=false;
|
joachim99@8
|
465
|
joachim99@8
|
466 g_pProgressDialog->step();
|
joachim99@8
|
467 }
|
joachim99@8
|
468 else
|
joachim99@8
|
469 {
|
joachim99@8
|
470 g_pProgressDialog->setInformation(i18n("Loading C"));
|
joachim99@8
|
471 m_sd3.readPPFile( bPreserveCarriageReturn, m_pOptionDialog->m_PreProcessorCmd, bUpCase );
|
joachim99@51
|
472 m_sdlm3.readLMPPFile( &m_sd3, m_pOptionDialog->m_LineMatchingPreProcessorCmd, bUpCase, m_pOptionDialog->m_bIgnoreComments );
|
joachim99@8
|
473 g_pProgressDialog->step();
|
joachim99@8
|
474
|
joachim99@8
|
475 m_totalDiffStatus.bBinaryAEqB = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd2.m_size && memcmp(m_sd1.m_pBuf,m_sd2.m_pBuf,m_sd1.m_size)==0);
|
joachim99@8
|
476 m_totalDiffStatus.bBinaryAEqC = (m_sd1.m_size!=0 && m_sd1.m_size==m_sd3.m_size && memcmp(m_sd1.m_pBuf,m_sd3.m_pBuf,m_sd1.m_size)==0);
|
joachim99@8
|
477 m_totalDiffStatus.bBinaryBEqC = (m_sd3.m_size!=0 && m_sd3.m_size==m_sd2.m_size && memcmp(m_sd3.m_pBuf,m_sd2.m_pBuf,m_sd3.m_size)==0);
|
joachim99@8
|
478
|
joachim99@8
|
479 if ( !bUseLineMatchingPP )
|
joachim99@8
|
480 {
|
joachim99@8
|
481 g_pProgressDialog->setInformation(i18n("Diff: A <-> B"));
|
joachim99@8
|
482 runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd2.m_v[0], m_sd2.m_vSize, m_diffList12 );
|
joachim99@8
|
483 g_pProgressDialog->step();
|
joachim99@8
|
484 g_pProgressDialog->setInformation(i18n("Diff: B <-> C"));
|
joachim99@8
|
485 runDiff( &m_sd2.m_v[0], m_sd2.m_vSize, &m_sd3.m_v[0], m_sd3.m_vSize, m_diffList23 );
|
joachim99@8
|
486 g_pProgressDialog->step();
|
joachim99@8
|
487 g_pProgressDialog->setInformation(i18n("Diff: A <-> C"));
|
joachim99@8
|
488 runDiff( &m_sd1.m_v[0], m_sd1.m_vSize, &m_sd3.m_v[0], m_sd3.m_vSize, m_diffList13 );
|
joachim99@8
|
489 g_pProgressDialog->step();
|
joachim99@8
|
490 }
|
joachim99@8
|
491 else
|
joachim99@8
|
492 {
|
joachim99@8
|
493 g_pProgressDialog->setInformation(i18n("Diff: A <-> B"));
|
joachim99@8
|
494 runDiff( &m_sdlm1.m_v[0], m_sd1.m_vSize, &m_sdlm2.m_v[0], m_sd2.m_vSize, m_diffList12 );
|
joachim99@8
|
495 g_pProgressDialog->step();
|
joachim99@8
|
496 g_pProgressDialog->setInformation(i18n("Diff: B <-> C"));
|
joachim99@8
|
497 runDiff( &m_sdlm2.m_v[0], m_sd2.m_vSize, &m_sdlm3.m_v[0], m_sd3.m_vSize, m_diffList23 );
|
joachim99@8
|
498 g_pProgressDialog->step();
|
joachim99@8
|
499 g_pProgressDialog->setInformation(i18n("Diff: A <-> C"));
|
joachim99@8
|
500 runDiff( &m_sdlm1.m_v[0], m_sd1.m_vSize, &m_sdlm3.m_v[0], m_sd3.m_vSize, m_diffList13 );
|
joachim99@8
|
501 g_pProgressDialog->step();
|
joachim99@8
|
502 }
|
joachim99@8
|
503
|
joachim99@8
|
504 calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
|
joachim99@8
|
505 calcDiff3LineListUsingAC( &m_diffList13, m_diff3LineList );
|
joachim99@8
|
506 calcDiff3LineListTrim( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] );
|
joachim99@8
|
507
|
joachim99@8
|
508 calcDiff3LineListUsingBC( &m_diffList23, m_diff3LineList );
|
joachim99@8
|
509 calcDiff3LineListTrim( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] );
|
joachim99@8
|
510 debugLineCheck( m_diff3LineList, m_sd1.m_vSize, 1 );
|
joachim99@8
|
511 debugLineCheck( m_diff3LineList, m_sd2.m_vSize, 2 );
|
joachim99@8
|
512 debugLineCheck( m_diff3LineList, m_sd3.m_vSize, 3 );
|
joachim99@8
|
513
|
joachim99@8
|
514 g_pProgressDialog->setInformation(i18n("Linediff: A <-> B"));
|
joachim99@51
|
515 fineDiff( m_diff3LineList, 1, &m_sd1.m_v[0], &m_sd2.m_v[0], m_totalDiffStatus.bTextAEqB );
|
joachim99@8
|
516 g_pProgressDialog->step();
|
joachim99@8
|
517 g_pProgressDialog->setInformation(i18n("Linediff: B <-> C"));
|
joachim99@51
|
518 fineDiff( m_diff3LineList, 2, &m_sd2.m_v[0], &m_sd3.m_v[0], m_totalDiffStatus.bTextBEqC );
|
joachim99@8
|
519 g_pProgressDialog->step();
|
joachim99@8
|
520 g_pProgressDialog->setInformation(i18n("Linediff: A <-> C"));
|
joachim99@51
|
521 fineDiff( m_diff3LineList, 3, &m_sd3.m_v[0], &m_sd1.m_v[0], m_totalDiffStatus.bTextAEqC );
|
joachim99@8
|
522 g_pProgressDialog->step();
|
joachim99@8
|
523 if ( m_sd1.m_size==0 ) { m_totalDiffStatus.bTextAEqB=false; m_totalDiffStatus.bTextAEqC=false; }
|
joachim99@8
|
524 if ( m_sd2.m_size==0 ) { m_totalDiffStatus.bTextAEqB=false; m_totalDiffStatus.bTextBEqC=false; }
|
joachim99@8
|
525 }
|
joachim99@8
|
526 calcWhiteDiff3Lines( m_diff3LineList, &m_sd1.m_v[0], &m_sd2.m_v[0], &m_sd3.m_v[0] );
|
joachim99@8
|
527 calcDiff3LineVector( m_diff3LineList, m_diff3LineVector );
|
joachim99@8
|
528
|
joachim99@8
|
529 // Calc needed lines for display
|
joachim99@8
|
530 m_neededLines = m_diff3LineList.size();
|
joachim99@8
|
531
|
joachim99@8
|
532 m_pDirectoryMergeWindow->allowResizeEvents(false);
|
joachim99@8
|
533 initView();
|
joachim99@8
|
534 m_pDirectoryMergeWindow->allowResizeEvents(true);
|
joachim99@8
|
535
|
joachim99@8
|
536 m_bTripleDiff = ! m_sd3.isEmpty();
|
joachim99@8
|
537
|
joachim99@8
|
538 m_pDiffTextWindow1->init( m_sd1.getAliasName(),
|
joachim99@8
|
539 &m_sd1.m_v[0], m_sd1.m_vSize, &m_diff3LineVector, 1, m_bTripleDiff );
|
joachim99@8
|
540 m_pDiffTextWindow2->init( m_sd2.getAliasName(),
|
joachim99@8
|
541 &m_sd2.m_v[0], m_sd2.m_vSize, &m_diff3LineVector, 2, m_bTripleDiff );
|
joachim99@8
|
542 m_pDiffTextWindow3->init( m_sd3.getAliasName(),
|
joachim99@8
|
543 &m_sd3.m_v[0], m_sd3.m_vSize, &m_diff3LineVector, 3, m_bTripleDiff );
|
joachim99@8
|
544
|
joachim99@8
|
545 if (m_bTripleDiff) m_pDiffTextWindow3->show();
|
joachim99@8
|
546 else m_pDiffTextWindow3->hide();
|
joachim99@8
|
547
|
joachim99@8
|
548 m_bOutputModified = bVisibleMergeResultWindow;
|
joachim99@8
|
549
|
joachim99@8
|
550 m_pMergeResultWindow->init(
|
joachim99@8
|
551 &m_sd1.m_v[0],
|
joachim99@8
|
552 &m_sd2.m_v[0],
|
joachim99@8
|
553 m_bTripleDiff ? &m_sd3.m_v[0] : 0,
|
joachim99@8
|
554 &m_diff3LineList,
|
joachim99@8
|
555 &m_totalDiffStatus,
|
joachim99@8
|
556 m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename
|
joachim99@8
|
557 );
|
joachim99@8
|
558
|
joachim99@8
|
559 m_pOverview->init(&m_diff3LineList, m_bTripleDiff );
|
joachim99@8
|
560 m_pDiffVScrollBar->setValue( 0 );
|
joachim99@8
|
561 m_pHScrollBar->setValue( 0 );
|
joachim99@8
|
562
|
joachim99@8
|
563 g_pProgressDialog->hide();
|
joachim99@8
|
564 m_pDiffTextWindow1->setPaintingAllowed( true );
|
joachim99@8
|
565 m_pDiffTextWindow2->setPaintingAllowed( true );
|
joachim99@8
|
566 m_pDiffTextWindow3->setPaintingAllowed( true );
|
joachim99@8
|
567 m_pOverview->setPaintingAllowed( true );
|
joachim99@8
|
568
|
joachim99@8
|
569 if ( !bVisibleMergeResultWindow )
|
joachim99@8
|
570 m_pMergeWindowFrame->hide();
|
joachim99@8
|
571 else
|
joachim99@8
|
572 m_pMergeWindowFrame->show();
|
joachim99@8
|
573
|
joachim99@8
|
574 // Calc max width for display
|
joachim99@8
|
575 m_maxWidth = max2( m_pDiffTextWindow1->getNofColumns(), m_pDiffTextWindow2->getNofColumns() );
|
joachim99@8
|
576 m_maxWidth = max2( m_maxWidth, m_pDiffTextWindow3->getNofColumns() );
|
joachim99@8
|
577 m_maxWidth += 5;
|
joachim99@8
|
578
|
joachim99@8
|
579 if ( bVisibleMergeResultWindow && !bAuto )
|
joachim99@8
|
580 m_pMergeResultWindow->showNrOfConflicts();
|
joachim99@8
|
581 else if ( !bAuto )
|
joachim99@8
|
582 {
|
joachim99@8
|
583 QString totalInfo;
|
joachim99@8
|
584 if ( m_totalDiffStatus.bBinaryAEqB && m_totalDiffStatus.bBinaryAEqC )
|
joachim99@8
|
585 totalInfo += i18n("All input files are binary equal.");
|
joachim99@8
|
586 else if ( m_totalDiffStatus.bTextAEqB && m_totalDiffStatus.bTextAEqC )
|
joachim99@8
|
587 totalInfo += i18n("All input files contain the same text.");
|
joachim99@8
|
588 else {
|
joachim99@8
|
589 if ( m_totalDiffStatus.bBinaryAEqB ) totalInfo += i18n("Files A and B are binary equal.\n");
|
joachim99@8
|
590 else if ( m_totalDiffStatus.bTextAEqB ) totalInfo += i18n("Files A and B have equal text. \n");
|
joachim99@8
|
591 if ( m_totalDiffStatus.bBinaryAEqC ) totalInfo += i18n("Files A and C are binary equal.\n");
|
joachim99@8
|
592 else if ( m_totalDiffStatus.bTextAEqC ) totalInfo += i18n("Files A and C have equal text. \n");
|
joachim99@8
|
593 if ( m_totalDiffStatus.bBinaryBEqC ) totalInfo += i18n("Files B and C are binary equal.\n");
|
joachim99@8
|
594 else if ( m_totalDiffStatus.bTextBEqC ) totalInfo += i18n("Files B and C have equal text. \n");
|
joachim99@8
|
595 }
|
joachim99@8
|
596
|
joachim99@8
|
597 if ( !totalInfo.isEmpty() )
|
joachim99@8
|
598 KMessageBox::information( this, totalInfo );
|
joachim99@8
|
599 }
|
joachim99@8
|
600
|
joachim99@8
|
601 if ( bVisibleMergeResultWindow && (!m_sd1.m_bIsText || !m_sd2.m_bIsText || !m_sd3.m_bIsText) )
|
joachim99@8
|
602 {
|
joachim99@8
|
603 KMessageBox::information( this, i18n(
|
joachim99@8
|
604 "Some inputfiles don't seem to be pure textfiles.\n"
|
joachim99@8
|
605 "Note that the KDiff3-merge was not meant for binary data.\n"
|
joachim99@8
|
606 "Continue at your own risk.") );
|
joachim99@8
|
607 /* QDialog d(this);
|
joachim99@8
|
608 QVBoxLayout* l = new QVBoxLayout(&d);
|
joachim99@51
|
609 QVButtonGroup* bg = new QVButtonGroup(i18n("Some File(s) Don't Seem to be Text Files"),&d);
|
joachim99@8
|
610 l->addWidget(bg);
|
joachim99@8
|
611 new QRadioButton("A: " + m_sd1.getAliasName(), bg);
|
joachim99@8
|
612 new QRadioButton("B: " + m_sd2.getAliasName(), bg);
|
joachim99@8
|
613 if (!m_sd3.isEmpty()) new QRadioButton("C: " + m_sd3.getAliasName(), bg);
|
joachim99@8
|
614 bg->setButton(0);
|
joachim99@8
|
615 QHBoxLayout* hbl = new QHBoxLayout(l);
|
joachim99@8
|
616 QPushButton* pSaveButton = new QPushButton( i18n("Save Selection"), &d );
|
joachim99@8
|
617 connect( pSaveButton, SIGNAL(clicked()), &d, SLOT(accept()));
|
joachim99@8
|
618 hbl->addWidget( pSaveButton );
|
joachim99@51
|
619 QPushButton* pProceedButton = new QPushButton( i18n("Proceed with Text-Merge"), &d );
|
joachim99@8
|
620 connect( pProceedButton, SIGNAL(clicked()), &d, SLOT(reject()));
|
joachim99@8
|
621 hbl->addWidget( pProceedButton );
|
joachim99@8
|
622
|
joachim99@8
|
623 int result = d.exec();
|
joachim99@8
|
624 if( result == QDialog::Accepted )
|
joachim99@8
|
625 {
|
joachim99@8
|
626 if ( bg->find(0)->isOn() ) saveBuffer( m_sd1.m_pBuf, m_sd1.m_size, m_outputFilename );
|
joachim99@8
|
627 else if ( bg->find(1)->isOn() ) saveBuffer( m_sd2.m_pBuf, m_sd2.m_size, m_outputFilename );
|
joachim99@8
|
628 else saveBuffer( m_sd3.m_pBuf, m_sd3.m_size, m_outputFilename );
|
joachim99@8
|
629 }*/
|
joachim99@8
|
630 }
|
joachim99@8
|
631
|
joachim99@8
|
632 QTimer::singleShot( 10, this, SLOT(slotAfterFirstPaint()) );
|
joachim99@8
|
633 }
|
joachim99@8
|
634
|
joachim99@8
|
635
|
joachim99@8
|
636 void KDiff3App::resizeDiffTextWindow(int newWidth, int newHeight)
|
joachim99@8
|
637 {
|
joachim99@8
|
638 m_DTWHeight = newHeight;
|
joachim99@8
|
639 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
|
joachim99@8
|
640 m_pDiffVScrollBar->setPageStep( newHeight );
|
joachim99@8
|
641 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
|
joachim99@8
|
642
|
joachim99@8
|
643 // The second window has a somewhat inverse width
|
joachim99@8
|
644
|
joachim99@8
|
645 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
|
joachim99@8
|
646 m_pHScrollBar->setPageStep( newWidth );
|
joachim99@8
|
647 }
|
joachim99@8
|
648
|
joachim99@8
|
649 void KDiff3App::resizeMergeResultWindow()
|
joachim99@8
|
650 {
|
joachim99@8
|
651 MergeResultWindow* p = m_pMergeResultWindow;
|
joachim99@8
|
652 m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) );
|
joachim99@8
|
653 m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() );
|
joachim99@8
|
654
|
joachim99@8
|
655 // The second window has a somewhat inverse width
|
joachim99@8
|
656 // m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
|
joachim99@8
|
657 // m_pHScrollBar->setPageStep( newWidth );
|
joachim99@8
|
658 }
|
joachim99@8
|
659
|
joachim99@8
|
660 void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY )
|
joachim99@8
|
661 {
|
joachim99@8
|
662 if ( deltaY!= 0 )
|
joachim99@8
|
663 {
|
joachim99@8
|
664 m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->value() + deltaY );
|
joachim99@8
|
665 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
|
joachim99@8
|
666 }
|
joachim99@8
|
667 if ( deltaX!= 0)
|
joachim99@8
|
668 m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX );
|
joachim99@8
|
669 }
|
joachim99@8
|
670
|
joachim99@8
|
671 void KDiff3App::scrollMergeResultWindow( int deltaX, int deltaY )
|
joachim99@8
|
672 {
|
joachim99@8
|
673 if ( deltaY!= 0 )
|
joachim99@8
|
674 m_pMergeVScrollBar->setValue( m_pMergeVScrollBar->value() + deltaY );
|
joachim99@8
|
675 if ( deltaX!= 0)
|
joachim99@8
|
676 m_pHScrollBar->setValue( m_pHScrollBar->value() + deltaX );
|
joachim99@8
|
677 }
|
joachim99@8
|
678
|
joachim99@8
|
679 void KDiff3App::setDiff3Line( int line )
|
joachim99@8
|
680 {
|
joachim99@8
|
681 m_pDiffVScrollBar->setValue( line );
|
joachim99@8
|
682 }
|
joachim99@8
|
683
|
joachim99@8
|
684 void KDiff3App::sourceMask( int srcMask, int enabledMask )
|
joachim99@8
|
685 {
|
joachim99@8
|
686 chooseA->setChecked( (srcMask & 1) != 0 );
|
joachim99@8
|
687 chooseB->setChecked( (srcMask & 2) != 0 );
|
joachim99@8
|
688 chooseC->setChecked( (srcMask & 4) != 0 );
|
joachim99@8
|
689 chooseA->setEnabled( (enabledMask & 1) != 0 );
|
joachim99@8
|
690 chooseB->setEnabled( (enabledMask & 2) != 0 );
|
joachim99@8
|
691 chooseC->setEnabled( (enabledMask & 4) != 0 );
|
joachim99@8
|
692 }
|
joachim99@8
|
693
|
joachim99@8
|
694
|
joachim99@8
|
695
|
joachim99@8
|
696 // Function uses setMinSize( sizeHint ) before adding the widget.
|
joachim99@8
|
697 // void addWidget(QBoxLayout* layout, QWidget* widget);
|
joachim99@8
|
698 template <class W, class L>
|
joachim99@8
|
699 void addWidget( L* layout, W* widget)
|
joachim99@8
|
700 {
|
joachim99@8
|
701 QSize s = widget->sizeHint();
|
joachim99@8
|
702 widget->setMinimumSize( QSize(max2(s.width(),0),max2(s.height(),0) ) );
|
joachim99@8
|
703 layout->addWidget( widget );
|
joachim99@8
|
704 }
|
joachim99@8
|
705
|
joachim99@8
|
706 void KDiff3App::initView()
|
joachim99@8
|
707 {
|
joachim99@8
|
708 // set the main widget here
|
joachim99@8
|
709 QValueList<int> oldHeights;
|
joachim99@8
|
710 if ( m_pDirectoryMergeSplitter->isVisible() )
|
joachim99@8
|
711 {
|
joachim99@8
|
712 oldHeights = m_pMainSplitter->sizes();
|
joachim99@8
|
713 }
|
joachim99@8
|
714
|
joachim99@8
|
715 if ( m_pMainWidget != 0 )
|
joachim99@8
|
716 {
|
joachim99@8
|
717 return;
|
joachim99@8
|
718 //delete m_pMainWidget;
|
joachim99@8
|
719 }
|
joachim99@8
|
720 m_pMainWidget = new QFrame(m_pMainSplitter);
|
joachim99@8
|
721 m_pMainWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken );
|
joachim99@8
|
722 m_pMainWidget->setLineWidth(1);
|
joachim99@8
|
723
|
joachim99@8
|
724
|
joachim99@8
|
725 QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget);
|
joachim99@8
|
726
|
joachim99@8
|
727 QSplitter* pVSplitter = new QSplitter( m_pMainWidget );
|
joachim99@8
|
728 pVSplitter->setOrientation( Vertical );
|
joachim99@8
|
729 pVLayout->addWidget( pVSplitter );
|
joachim99@8
|
730
|
joachim99@8
|
731 QWidget* pDiffWindowFrame = new QFrame( pVSplitter );
|
joachim99@8
|
732 QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame );
|
joachim99@8
|
733
|
joachim99@8
|
734 m_pDiffWindowSplitter = new QSplitter( pDiffWindowFrame );
|
joachim99@8
|
735 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Horizontal : Vertical );
|
joachim99@8
|
736 pDiffHLayout->addWidget( m_pDiffWindowSplitter );
|
joachim99@8
|
737
|
joachim99@8
|
738 m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog );
|
joachim99@8
|
739 pDiffHLayout->addWidget(m_pOverview);
|
joachim99@8
|
740 connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) );
|
joachim99@8
|
741 //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint()));
|
joachim99@8
|
742
|
joachim99@8
|
743 m_pDiffVScrollBar = new QScrollBar( Vertical, pDiffWindowFrame );
|
joachim99@8
|
744 pDiffHLayout->addWidget( m_pDiffVScrollBar );
|
joachim99@8
|
745
|
joachim99@8
|
746 m_pDiffTextWindow1 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog );
|
joachim99@8
|
747 m_pDiffTextWindow2 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog );
|
joachim99@8
|
748 m_pDiffTextWindow3 = new DiffTextWindow( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog );
|
joachim99@8
|
749
|
joachim99@8
|
750 // Merge window
|
joachim99@8
|
751 m_pMergeWindowFrame = new QFrame( pVSplitter );
|
joachim99@8
|
752 QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame );
|
joachim99@8
|
753
|
joachim99@8
|
754 m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog );
|
joachim99@8
|
755 pMergeHLayout->addWidget( m_pMergeResultWindow );
|
joachim99@8
|
756
|
joachim99@8
|
757 m_pMergeVScrollBar = new QScrollBar( Vertical, m_pMergeWindowFrame );
|
joachim99@8
|
758 pMergeHLayout->addWidget( m_pMergeVScrollBar );
|
joachim99@8
|
759
|
joachim99@8
|
760 autoAdvance->setEnabled(true);
|
joachim99@8
|
761
|
joachim99@8
|
762 QValueList<int> sizes = pVSplitter->sizes();
|
joachim99@8
|
763 int total = sizes[0] + sizes[1];
|
joachim99@8
|
764 sizes[0]=total/2; sizes[1]=total/2;
|
joachim99@8
|
765 pVSplitter->setSizes( sizes );
|
joachim99@8
|
766
|
joachim99@8
|
767 m_pMergeResultWindow->installEventFilter( this ); // for Cut/Copy/Paste-shortcuts
|
joachim99@8
|
768
|
joachim99@8
|
769 QHBoxLayout* pHScrollBarLayout = new QHBoxLayout( pVLayout );
|
joachim99@8
|
770 m_pHScrollBar = new QScrollBar( Horizontal, m_pMainWidget );
|
joachim99@8
|
771 pHScrollBarLayout->addWidget( m_pHScrollBar );
|
joachim99@8
|
772 m_pCornerWidget = new QWidget( m_pMainWidget );
|
joachim99@8
|
773 pHScrollBarLayout->addWidget( m_pCornerWidget );
|
joachim99@8
|
774
|
joachim99@8
|
775
|
joachim99@8
|
776 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pOverview, SLOT(setFirstLine(int)));
|
joachim99@8
|
777 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int)));
|
joachim99@8
|
778 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstColumn(int)));
|
joachim99@8
|
779 connect( m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
|
joachim99@8
|
780 connect( m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
|
joachim99@8
|
781 connect( m_pDiffTextWindow1, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
|
joachim99@8
|
782 m_pDiffTextWindow1->installEventFilter( this );
|
joachim99@8
|
783
|
joachim99@8
|
784 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int)));
|
joachim99@8
|
785 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstColumn(int)));
|
joachim99@8
|
786 connect( m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
|
joachim99@8
|
787 connect( m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
|
joachim99@8
|
788 connect( m_pDiffTextWindow2, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
|
joachim99@8
|
789 m_pDiffTextWindow2->installEventFilter( this );
|
joachim99@8
|
790
|
joachim99@8
|
791 connect( m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int)));
|
joachim99@8
|
792 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstColumn(int)));
|
joachim99@8
|
793 connect( m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart()));
|
joachim99@8
|
794 connect( m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd()));
|
joachim99@8
|
795 connect( m_pDiffTextWindow3, SIGNAL(scroll(int,int)), this, SLOT(scrollDiffTextWindow(int,int)));
|
joachim99@8
|
796 m_pDiffTextWindow3->installEventFilter( this );
|
joachim99@8
|
797
|
joachim99@8
|
798 MergeResultWindow* p = m_pMergeResultWindow;
|
joachim99@8
|
799 connect( m_pMergeVScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstLine(int)));
|
joachim99@8
|
800
|
joachim99@8
|
801 connect( m_pHScrollBar, SIGNAL(valueChanged(int)), p, SLOT(setFirstColumn(int)));
|
joachim99@8
|
802 connect( p, SIGNAL(scroll(int,int)), this, SLOT(scrollMergeResultWindow(int,int)));
|
joachim99@8
|
803 connect( p, SIGNAL(sourceMask(int,int)), this, SLOT(sourceMask(int,int)));
|
joachim99@8
|
804 connect( p, SIGNAL( resizeSignal() ),this, SLOT(resizeMergeResultWindow()));
|
joachim99@8
|
805 connect( p, SIGNAL( selectionEnd() ), this, SLOT( slotSelectionEnd() ) );
|
joachim99@8
|
806 connect( p, SIGNAL( newSelection() ), this, SLOT( slotSelectionStart() ) );
|
joachim99@8
|
807 connect( p, SIGNAL( modified() ), this, SLOT( slotOutputModified() ) );
|
joachim99@8
|
808 connect( p, SIGNAL( updateAvailabilities() ), this, SLOT( slotUpdateAvailabilities() ) );
|
joachim99@8
|
809 connect( p, SIGNAL( showPopupMenu(const QPoint&) ), this, SLOT(showPopupMenu(const QPoint&)));
|
joachim99@8
|
810 sourceMask(0,0);
|
joachim99@8
|
811
|
joachim99@8
|
812
|
joachim99@8
|
813 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, SLOT(setFastSelectorRange(int,int)));
|
joachim99@8
|
814 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, SLOT(setFastSelectorRange(int,int)));
|
joachim99@8
|
815 connect( p, SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, SLOT(setFastSelectorRange(int,int)));
|
joachim99@8
|
816 connect(m_pDiffTextWindow1, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
|
joachim99@8
|
817 connect(m_pDiffTextWindow2, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
|
joachim99@8
|
818 connect(m_pDiffTextWindow3, SIGNAL(setFastSelectorLine(int)), p, SLOT(slotSetFastSelectorLine(int)));
|
joachim99@8
|
819
|
joachim99@8
|
820 connect( m_pDiffTextWindow1, SIGNAL( resizeSignal(int,int) ),this, SLOT(resizeDiffTextWindow(int,int)));
|
joachim99@8
|
821
|
joachim99@8
|
822 m_pDiffTextWindow1->setFocus();
|
joachim99@8
|
823 m_pMainWidget->setMinimumSize(50,50);
|
joachim99@8
|
824 if ( m_pDirectoryMergeSplitter->isVisible() )
|
joachim99@8
|
825 {
|
joachim99@8
|
826 if (oldHeights.count() < 2)
|
joachim99@8
|
827 oldHeights.append(0);
|
joachim99@8
|
828 if (oldHeights[1]==0) // Distribute the available space evenly between the two widgets.
|
joachim99@8
|
829 {
|
joachim99@8
|
830 oldHeights[1] = oldHeights[0]/2;
|
joachim99@8
|
831 oldHeights[0] -= oldHeights[1];
|
joachim99@8
|
832 }
|
joachim99@8
|
833 m_pMainSplitter->setSizes( oldHeights );
|
joachim99@8
|
834 }
|
joachim99@8
|
835 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
|
joachim99@8
|
836 //show();
|
joachim99@8
|
837 m_pMainWidget->show();
|
joachim99@8
|
838 showWindowA->setChecked( true );
|
joachim99@8
|
839 showWindowB->setChecked( true );
|
joachim99@8
|
840 showWindowC->setChecked( true );
|
joachim99@8
|
841 }
|
joachim99@8
|
842
|
joachim99@8
|
843 void KDiff3App::slotAfterFirstPaint()
|
joachim99@8
|
844 {
|
joachim99@8
|
845 int newHeight = m_pDiffTextWindow1->getNofVisibleLines();
|
joachim99@8
|
846 int newWidth = m_pDiffTextWindow1->getNofVisibleColumns();
|
joachim99@8
|
847 m_DTWHeight = newHeight;
|
joachim99@8
|
848 m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - newHeight) );
|
joachim99@8
|
849 m_pDiffVScrollBar->setPageStep( newHeight );
|
joachim99@8
|
850 m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() );
|
joachim99@8
|
851
|
joachim99@8
|
852 // The second window has a somewhat inverse width
|
joachim99@8
|
853 m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) );
|
joachim99@8
|
854 m_pHScrollBar->setPageStep( newWidth );
|
joachim99@8
|
855
|
joachim99@8
|
856 m_pMergeResultWindow->slotGoTop();
|
joachim99@8
|
857
|
joachim99@8
|
858 if (m_pCornerWidget)
|
joachim99@8
|
859 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
|
joachim99@8
|
860
|
joachim99@8
|
861 slotUpdateAvailabilities();
|
joachim99@8
|
862 }
|
joachim99@8
|
863
|
joachim99@8
|
864 void KDiff3App::resizeEvent(QResizeEvent* e)
|
joachim99@8
|
865 {
|
joachim99@8
|
866 QSplitter::resizeEvent(e);
|
joachim99@8
|
867 if (m_pCornerWidget)
|
joachim99@8
|
868 m_pCornerWidget->setFixedSize( m_pDiffVScrollBar->width(), m_pHScrollBar->height() );
|
joachim99@8
|
869 }
|
joachim99@8
|
870
|
joachim99@8
|
871
|
joachim99@8
|
872 bool KDiff3App::eventFilter( QObject* o, QEvent* e )
|
joachim99@8
|
873 {
|
joachim99@8
|
874 if( o == m_pMergeResultWindow )
|
joachim99@8
|
875 {
|
joachim99@8
|
876 if ( e->type() == QEvent::KeyPress )
|
joachim99@8
|
877 { // key press
|
joachim99@8
|
878 QKeyEvent *k = (QKeyEvent*)e;
|
joachim99@8
|
879 if (k->key()==Qt::Key_Insert && (k->state() & Qt::ControlButton)!=0 )
|
joachim99@8
|
880 {
|
joachim99@8
|
881 slotEditCopy();
|
joachim99@8
|
882 return true;
|
joachim99@8
|
883 }
|
joachim99@8
|
884 if (k->key()==Qt::Key_Insert && (k->state() & Qt::ShiftButton)!=0 )
|
joachim99@8
|
885 {
|
joachim99@8
|
886 slotEditPaste();
|
joachim99@8
|
887 return true;
|
joachim99@8
|
888 }
|
joachim99@8
|
889 if (k->key()==Qt::Key_Delete && (k->state() & Qt::ShiftButton)!=0 )
|
joachim99@8
|
890 {
|
joachim99@8
|
891 slotEditCut();
|
joachim99@8
|
892 return true;
|
joachim99@8
|
893 }
|
joachim99@8
|
894 }
|
joachim99@8
|
895 return QSplitter::eventFilter( o, e ); // standard event processing
|
joachim99@8
|
896 }
|
joachim99@8
|
897
|
joachim99@8
|
898 if ( e->type() == QEvent::KeyPress ) // key press
|
joachim99@8
|
899 {
|
joachim99@8
|
900 QKeyEvent *k = (QKeyEvent*)e;
|
joachim99@8
|
901
|
joachim99@8
|
902 bool bCtrl = (k->state() & Qt::ControlButton) != 0;
|
joachim99@8
|
903 if (k->key()==Qt::Key_Insert && bCtrl )
|
joachim99@8
|
904 {
|
joachim99@8
|
905 slotEditCopy();
|
joachim99@8
|
906 return true;
|
joachim99@8
|
907 }
|
joachim99@8
|
908 if (k->key()==Qt::Key_Insert && (k->state() & Qt::ShiftButton)!=0 )
|
joachim99@8
|
909 {
|
joachim99@8
|
910 slotEditPaste();
|
joachim99@8
|
911 return true;
|
joachim99@8
|
912 }
|
joachim99@8
|
913 int deltaX=0;
|
joachim99@8
|
914 int deltaY=0;
|
joachim99@8
|
915 int pageSize = m_DTWHeight;
|
joachim99@8
|
916 switch( k->key() )
|
joachim99@8
|
917 {
|
joachim99@8
|
918 case Key_Down: ++deltaY; break;
|
joachim99@8
|
919 case Key_Up: --deltaY; break;
|
joachim99@8
|
920 case Key_PageDown: if (!bCtrl) deltaY+=pageSize; break;
|
joachim99@8
|
921 case Key_PageUp: if (!bCtrl) deltaY-=pageSize; break;
|
joachim99@8
|
922 case Key_Left: --deltaX; break;
|
joachim99@8
|
923 case Key_Right: ++deltaX; break;
|
joachim99@8
|
924 case Key_Home: if ( bCtrl ) m_pDiffVScrollBar->setValue( 0 );
|
joachim99@8
|
925 else m_pHScrollBar->setValue( 0 );
|
joachim99@8
|
926 break;
|
joachim99@8
|
927 case Key_End: if ( bCtrl ) m_pDiffVScrollBar->setValue( m_pDiffVScrollBar->maxValue() );
|
joachim99@8
|
928 else m_pHScrollBar->setValue( m_pHScrollBar->maxValue() );
|
joachim99@8
|
929 break;
|
joachim99@8
|
930 default: break;
|
joachim99@8
|
931 }
|
joachim99@8
|
932
|
joachim99@8
|
933 scrollDiffTextWindow( deltaX, deltaY );
|
joachim99@8
|
934
|
joachim99@8
|
935 return true; // eat event
|
joachim99@8
|
936 }
|
joachim99@8
|
937 else if (e->type() == QEvent::Wheel ) { // wheel event
|
joachim99@8
|
938 QWheelEvent *w = (QWheelEvent*)e;
|
joachim99@8
|
939 w->accept();
|
joachim99@8
|
940
|
joachim99@8
|
941 int deltaX=0;
|
joachim99@8
|
942
|
joachim99@8
|
943 int d=w->delta();
|
joachim99@8
|
944 int deltaY = -d/120 * QApplication::wheelScrollLines();
|
joachim99@8
|
945
|
joachim99@8
|
946 scrollDiffTextWindow( deltaX, deltaY );
|
joachim99@8
|
947 return true;
|
joachim99@8
|
948 }
|
joachim99@8
|
949 else if (e->type() == QEvent::Drop )
|
joachim99@8
|
950 {
|
joachim99@8
|
951 QDropEvent* pDropEvent = static_cast<QDropEvent*>(e);
|
joachim99@8
|
952 pDropEvent->accept();
|
joachim99@8
|
953
|
joachim99@8
|
954 if ( QUriDrag::canDecode(pDropEvent) )
|
joachim99@8
|
955 {
|
joachim99@8
|
956 #ifdef KREPLACEMENTS_H
|
joachim99@8
|
957 QStringList stringList;
|
joachim99@8
|
958 QUriDrag::decodeLocalFiles( pDropEvent, stringList );
|
joachim99@8
|
959 if ( canContinue() && !stringList.isEmpty() )
|
joachim99@8
|
960 {
|
joachim99@8
|
961 raise();
|
joachim99@8
|
962 QString filename = stringList.first();
|
joachim99@8
|
963 if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename );
|
joachim99@8
|
964 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename );
|
joachim99@8
|
965 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename );
|
joachim99@8
|
966 init();
|
joachim99@8
|
967 }
|
joachim99@8
|
968 #else
|
joachim99@8
|
969 KURL::List urlList;
|
joachim99@8
|
970 KURLDrag::decode( pDropEvent, urlList );
|
joachim99@8
|
971 if ( canContinue() && !urlList.isEmpty() )
|
joachim99@8
|
972 {
|
joachim99@8
|
973 raise();
|
joachim99@8
|
974 FileAccess fa( urlList.first().url() );
|
joachim99@8
|
975 if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa );
|
joachim99@8
|
976 else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa );
|
joachim99@8
|
977 else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa );
|
joachim99@8
|
978 init();
|
joachim99@8
|
979 }
|
joachim99@8
|
980 #endif
|
joachim99@8
|
981 }
|
joachim99@8
|
982 else if ( QTextDrag::canDecode(pDropEvent) )
|
joachim99@8
|
983 {
|
joachim99@8
|
984 QString text;
|
joachim99@8
|
985 bool bDecodeSuccess = QTextDrag::decode( pDropEvent, text );
|
joachim99@8
|
986 if ( bDecodeSuccess && canContinue() )
|
joachim99@8
|
987 {
|
joachim99@8
|
988 raise();
|
joachim99@8
|
989 bool bUpCase = m_pOptionDialog->m_bUpCase;
|
joachim99@8
|
990 if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text, bUpCase);
|
joachim99@8
|
991 else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text, bUpCase);
|
joachim99@8
|
992 else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text, bUpCase);
|
joachim99@8
|
993 init();
|
joachim99@8
|
994 }
|
joachim99@8
|
995 }
|
joachim99@8
|
996
|
joachim99@8
|
997 return true;
|
joachim99@8
|
998 }
|
joachim99@8
|
999 return QSplitter::eventFilter( o, e ); // standard event processing
|
joachim99@8
|
1000 }
|
joachim99@8
|
1001
|
joachim99@8
|
1002
|
joachim99@8
|
1003
|
joachim99@8
|
1004 OpenDialog::OpenDialog(
|
joachim99@8
|
1005 QWidget* pParent, const QString& n1, const QString& n2, const QString& n3,
|
joachim99@8
|
1006 bool bMerge, const QString& outputName, const char* slotConfigure, OptionDialog* pOptions )
|
joachim99@8
|
1007 : QDialog( pParent, "OpenDialog", true /*modal*/ )
|
joachim99@8
|
1008 {
|
joachim99@8
|
1009 m_pOptions = pOptions;
|
joachim99@8
|
1010
|
joachim99@8
|
1011 QVBoxLayout* v = new QVBoxLayout( this, 5 );
|
joachim99@8
|
1012 QGridLayout* h = new QGridLayout( v, 5, 4, 5 );
|
joachim99@8
|
1013 h->setColStretch( 1, 10 );
|
joachim99@8
|
1014
|
joachim99@51
|
1015 QLabel* label = new QLabel( i18n("A (Base):"), this );
|
joachim99@8
|
1016
|
joachim99@8
|
1017 m_lineA = new QComboBox( true, this );
|
joachim99@8
|
1018 m_lineA->insertStringList( m_pOptions->m_recentAFiles );
|
joachim99@8
|
1019 m_lineA->setEditText( KURL(n1).prettyURL() );
|
joachim99@8
|
1020 m_lineA->setMinimumSize( 200, m_lineA->size().height() );
|
joachim99@51
|
1021 QPushButton * button = new QPushButton( i18n("File..."), this );
|
joachim99@8
|
1022 connect( button, SIGNAL(clicked()), this, SLOT( selectFileA() ) );
|
joachim99@51
|
1023 QPushButton * button2 = new QPushButton( i18n("Dir..."), this );
|
joachim99@8
|
1024 connect( button2, SIGNAL(clicked()), this, SLOT( selectDirA() ) );
|
joachim99@8
|
1025
|
joachim99@8
|
1026 h->addWidget( label, 0, 0 );
|
joachim99@8
|
1027 h->addWidget( m_lineA, 0, 1 );
|
joachim99@8
|
1028 h->addWidget( button, 0, 2 );
|
joachim99@8
|
1029 h->addWidget( button2, 0, 3 );
|
joachim99@8
|
1030
|
joachim99@8
|
1031 label = new QLabel( "B:", this );
|
joachim99@8
|
1032 m_lineB = new QComboBox( true, this );
|
joachim99@8
|
1033 m_lineB->insertStringList( m_pOptions->m_recentBFiles );
|
joachim99@8
|
1034 m_lineB->setEditText( KURL(n2).prettyURL() );
|
joachim99@8
|
1035 m_lineB->setMinimumSize( 200, m_lineB->size().height() );
|
joachim99@51
|
1036 button = new QPushButton( i18n("File..."), this );
|
joachim99@8
|
1037 connect( button, SIGNAL(clicked()), this, SLOT( selectFileB() ) );
|
joachim99@51
|
1038 button2 = new QPushButton( i18n("Dir..."), this );
|
joachim99@8
|
1039 connect( button2, SIGNAL(clicked()), this, SLOT( selectDirB() ) );
|
joachim99@8
|
1040
|
joachim99@8
|
1041 h->addWidget( label, 1, 0 );
|
joachim99@8
|
1042 h->addWidget( m_lineB, 1, 1 );
|
joachim99@8
|
1043 h->addWidget( button, 1, 2 );
|
joachim99@8
|
1044 h->addWidget( button2, 1, 3 );
|
joachim99@8
|
1045
|
joachim99@51
|
1046 label = new QLabel( i18n("C (Optional):"), this );
|
joachim99@8
|
1047 m_lineC= new QComboBox( true, this );
|
joachim99@8
|
1048 m_lineC->insertStringList( m_pOptions->m_recentCFiles );
|
joachim99@8
|
1049 m_lineC->setEditText( KURL(n3).prettyURL() );
|
joachim99@8
|
1050 m_lineC->setMinimumSize( 200, m_lineC->size().height() );
|
joachim99@51
|
1051 button = new QPushButton( i18n("File..."), this );
|
joachim99@8
|
1052 connect( button, SIGNAL(clicked()), this, SLOT( selectFileC() ) );
|
joachim99@51
|
1053 button2 = new QPushButton( i18n("Dir..."), this );
|
joachim99@8
|
1054 connect( button2, SIGNAL(clicked()), this, SLOT( selectDirC() ) );
|
joachim99@8
|
1055
|
joachim99@8
|
1056 h->addWidget( label, 2, 0 );
|
joachim99@8
|
1057 h->addWidget( m_lineC, 2, 1 );
|
joachim99@8
|
1058 h->addWidget( button, 2, 2 );
|
joachim99@8
|
1059 h->addWidget( button2, 2, 3 );
|
joachim99@8
|
1060
|
joachim99@51
|
1061 m_pMerge = new QCheckBox( i18n("Merge"), this );
|
joachim99@8
|
1062 h->addWidget( m_pMerge, 3, 0 );
|
joachim99@8
|
1063
|
joachim99@51
|
1064 label = new QLabel( i18n("Output (optional):"), this );
|
joachim99@8
|
1065 m_lineOut = new QComboBox( true, this );
|
joachim99@8
|
1066 m_lineOut->insertStringList( m_pOptions->m_recentOutputFiles );
|
joachim99@8
|
1067 m_lineOut->setEditText( KURL(outputName).prettyURL() );
|
joachim99@8
|
1068 m_lineOut->setMinimumSize( 200, m_lineOut->size().height() );
|
joachim99@51
|
1069 button = new QPushButton( i18n("File..."), this );
|
joachim99@8
|
1070 connect( button, SIGNAL(clicked()), this, SLOT( selectOutputName() ) );
|
joachim99@51
|
1071 button2 = new QPushButton( i18n("Dir..."), this );
|
joachim99@8
|
1072 connect( button2, SIGNAL(clicked()), this, SLOT( selectOutputDir() ) );
|
joachim99@8
|
1073 connect( m_pMerge, SIGNAL(stateChanged(int)), this, SLOT(internalSlot(int)) );
|
joachim99@8
|
1074 connect( this, SIGNAL(internalSignal(bool)), m_lineOut, SLOT(setEnabled(bool)) );
|
joachim99@8
|
1075 connect( this, SIGNAL(internalSignal(bool)), button, SLOT(setEnabled(bool)) );
|
joachim99@8
|
1076 connect( this, SIGNAL(internalSignal(bool)), button2, SLOT(setEnabled(bool)) );
|
joachim99@8
|
1077
|
joachim99@8
|
1078 m_pMerge->setChecked( !bMerge );
|
joachim99@8
|
1079 m_pMerge->setChecked( bMerge );
|
joachim99@8
|
1080 // m_lineOutput->setEnabled( bMerge );
|
joachim99@8
|
1081
|
joachim99@8
|
1082 // button->setEnabled( bMerge );
|
joachim99@8
|
1083
|
joachim99@8
|
1084 h->addWidget( label, 4, 0 );
|
joachim99@8
|
1085 h->addWidget( m_lineOut, 4, 1 );
|
joachim99@8
|
1086 h->addWidget( button, 4, 2 );
|
joachim99@8
|
1087 h->addWidget( button2, 4, 3 );
|
joachim99@8
|
1088
|
joachim99@8
|
1089 h->addColSpacing( 1, 200 );
|
joachim99@8
|
1090
|
joachim99@8
|
1091 QHBoxLayout* l = new QHBoxLayout( v, 5 );
|
joachim99@51
|
1092
|
joachim99@51
|
1093 button = new QPushButton( i18n("Configure..."), this );
|
joachim99@51
|
1094 connect( button, SIGNAL(clicked()), pParent, slotConfigure );
|
joachim99@51
|
1095 l->addWidget( button, 1 );
|
joachim99@51
|
1096
|
joachim99@51
|
1097 l->addStretch(1);
|
joachim99@51
|
1098
|
joachim99@51
|
1099 button = new QPushButton( i18n("&OK"), this );
|
joachim99@8
|
1100 button->setDefault( true );
|
joachim99@8
|
1101 connect( button, SIGNAL(clicked()), this, SLOT( accept() ) );
|
joachim99@51
|
1102 l->addWidget( button, 1 );
|
joachim99@8
|
1103
|
joachim99@51
|
1104 button = new QPushButton( i18n("&Cancel"), this );
|
joachim99@8
|
1105 connect( button, SIGNAL(clicked()), this, SLOT( reject() ) );
|
joachim99@51
|
1106 l->addWidget( button,1 );
|
joachim99@8
|
1107
|
joachim99@8
|
1108 QSize sh = sizeHint();
|
joachim99@8
|
1109 setFixedHeight( sh.height() );
|
joachim99@8
|
1110 }
|
joachim99@8
|
1111
|
joachim99@8
|
1112 void OpenDialog::selectURL( QComboBox* pLine, bool bDir, int i, bool bSave )
|
joachim99@8
|
1113 {
|
joachim99@8
|
1114 QString current = pLine->currentText();
|
joachim99@8
|
1115 if (current.isEmpty() && i>3 ){ current = m_lineC->currentText(); }
|
joachim99@8
|
1116 if (current.isEmpty() ){ current = m_lineB->currentText(); }
|
joachim99@8
|
1117 if (current.isEmpty() ){ current = m_lineA->currentText(); }
|
joachim99@8
|
1118 KURL newURL = bDir ? KFileDialog::getExistingURL( current, this)
|
joachim99@8
|
1119 : bSave ? KFileDialog::getSaveURL( current, 0, this)
|
joachim99@8
|
1120 : KFileDialog::getOpenURL( current, 0, this);
|
joachim99@8
|
1121 if ( !newURL.isEmpty() )
|
joachim99@8
|
1122 {
|
joachim99@8
|
1123 pLine->setEditText( newURL.url() );
|
joachim99@8
|
1124 }
|
joachim99@8
|
1125 // newURL won't be modified if nothing was selected.
|
joachim99@8
|
1126 }
|
joachim99@8
|
1127
|
joachim99@8
|
1128 void OpenDialog::selectFileA() { selectURL( m_lineA, false, 1, false ); }
|
joachim99@8
|
1129 void OpenDialog::selectFileB() { selectURL( m_lineB, false, 2, false ); }
|
joachim99@8
|
1130 void OpenDialog::selectFileC() { selectURL( m_lineC, false, 3, false ); }
|
joachim99@8
|
1131 void OpenDialog::selectOutputName(){ selectURL( m_lineOut, false, 4, true ); }
|
joachim99@8
|
1132 void OpenDialog::selectDirA() { selectURL( m_lineA, true, 1, false ); }
|
joachim99@8
|
1133 void OpenDialog::selectDirB() { selectURL( m_lineB, true, 2, false ); }
|
joachim99@8
|
1134 void OpenDialog::selectDirC() { selectURL( m_lineC, true, 3, false ); }
|
joachim99@8
|
1135 void OpenDialog::selectOutputDir() { selectURL( m_lineOut, true, 4, true ); }
|
joachim99@8
|
1136
|
joachim99@8
|
1137 void OpenDialog::internalSlot(int i)
|
joachim99@8
|
1138 {
|
joachim99@8
|
1139 emit internalSignal(i!=0);
|
joachim99@8
|
1140 }
|
joachim99@8
|
1141
|
joachim99@8
|
1142 void OpenDialog::accept()
|
joachim99@8
|
1143 {
|
joachim99@8
|
1144 unsigned int maxNofRecentFiles = 10;
|
joachim99@8
|
1145
|
joachim99@8
|
1146 QString s = m_lineA->currentText();
|
joachim99@8
|
1147 s = KURL::fromPathOrURL(s).prettyURL();
|
joachim99@8
|
1148 QStringList* sl = &m_pOptions->m_recentAFiles;
|
joachim99@8
|
1149 // If an item exist, remove it from the list and reinsert it at the beginning.
|
joachim99@8
|
1150 sl->remove(s);
|
joachim99@8
|
1151 if ( !s.isEmpty() ) sl->prepend( s );
|
joachim99@8
|
1152 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
|
joachim99@8
|
1153
|
joachim99@8
|
1154 s = m_lineB->currentText();
|
joachim99@8
|
1155 s = KURL::fromPathOrURL(s).prettyURL();
|
joachim99@8
|
1156 sl = &m_pOptions->m_recentBFiles;
|
joachim99@8
|
1157 sl->remove(s);
|
joachim99@8
|
1158 if ( !s.isEmpty() ) sl->prepend( s );
|
joachim99@8
|
1159 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
|
joachim99@8
|
1160
|
joachim99@8
|
1161 s = m_lineC->currentText();
|
joachim99@8
|
1162 s = KURL::fromPathOrURL(s).prettyURL();
|
joachim99@8
|
1163 sl = &m_pOptions->m_recentCFiles;
|
joachim99@8
|
1164 sl->remove(s);
|
joachim99@8
|
1165 if ( !s.isEmpty() ) sl->prepend( s );
|
joachim99@8
|
1166 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
|
joachim99@8
|
1167
|
joachim99@8
|
1168 s = m_lineOut->currentText();
|
joachim99@8
|
1169 s = KURL::fromPathOrURL(s).prettyURL();
|
joachim99@8
|
1170 sl = &m_pOptions->m_recentOutputFiles;
|
joachim99@8
|
1171 sl->remove(s);
|
joachim99@8
|
1172 if ( !s.isEmpty() ) sl->prepend( s );
|
joachim99@8
|
1173 if (sl->count()>maxNofRecentFiles) sl->erase( sl->at(maxNofRecentFiles), sl->end() );
|
joachim99@8
|
1174
|
joachim99@8
|
1175 QDialog::accept();
|
joachim99@8
|
1176 }
|
joachim99@8
|
1177
|
joachim99@8
|
1178 void KDiff3App::slotFileOpen()
|
joachim99@8
|
1179 {
|
joachim99@8
|
1180 if ( !canContinue() ) return;
|
joachim99@8
|
1181
|
joachim99@8
|
1182 if ( m_pDirectoryMergeWindow->isDirectoryMergeInProgress() )
|
joachim99@8
|
1183 {
|
joachim99@8
|
1184 int result = KMessageBox::warningYesNo(this,
|
joachim99@8
|
1185 i18n("You are currently doing a directory merge. Are you sure, you want to abort?"),
|
joachim99@51
|
1186 i18n("Warning"), i18n("Abort"), i18n("Continue Merging") );
|
joachim99@8
|
1187 if ( result!=KMessageBox::Yes )
|
joachim99@8
|
1188 return;
|
joachim99@8
|
1189 }
|
joachim99@8
|
1190
|
joachim99@8
|
1191
|
joachim99@8
|
1192 slotStatusMsg(i18n("Opening files..."));
|
joachim99@8
|
1193
|
joachim99@8
|
1194 for(;;)
|
joachim99@8
|
1195 {
|
joachim99@8
|
1196 OpenDialog d(this,
|
joachim99@8
|
1197 m_sd1.m_bPreserve ? QString("") : m_sd1.getAliasName(),
|
joachim99@8
|
1198 m_sd2.m_bPreserve ? QString("") : m_sd2.getAliasName(),
|
joachim99@8
|
1199 m_sd3.m_bPreserve ? QString("") : m_sd3.getAliasName(),
|
joachim99@8
|
1200 !m_outputFilename.isEmpty(),
|
joachim99@8
|
1201 m_bDefaultFilename ? QString("") : m_outputFilename,
|
joachim99@8
|
1202 SLOT(slotConfigure()), m_pOptionDialog );
|
joachim99@8
|
1203 int status = d.exec();
|
joachim99@8
|
1204 if ( status == QDialog::Accepted )
|
joachim99@8
|
1205 {
|
joachim99@8
|
1206 m_sd1.setFilename( d.m_lineA->currentText() );
|
joachim99@8
|
1207 m_sd2.setFilename( d.m_lineB->currentText() );
|
joachim99@8
|
1208 m_sd3.setFilename( d.m_lineC->currentText() );
|
joachim99@8
|
1209
|
joachim99@8
|
1210 if( d.m_pMerge->isChecked() )
|
joachim99@8
|
1211 {
|
joachim99@8
|
1212 if ( d.m_lineOut->currentText().isEmpty() )
|
joachim99@8
|
1213 {
|
joachim99@8
|
1214 m_outputFilename = "unnamed.txt";
|
joachim99@8
|
1215 m_bDefaultFilename = true;
|
joachim99@8
|
1216 }
|
joachim99@8
|
1217 else
|
joachim99@8
|
1218 {
|
joachim99@8
|
1219 m_outputFilename = d.m_lineOut->currentText();
|
joachim99@8
|
1220 m_bDefaultFilename = false;
|
joachim99@8
|
1221 }
|
joachim99@8
|
1222 }
|
joachim99@8
|
1223 else
|
joachim99@8
|
1224 m_outputFilename = "";
|
joachim99@8
|
1225
|
joachim99@8
|
1226 m_bDirCompare = improveFilenames();
|
joachim99@8
|
1227 if ( m_bDirCompare )
|
joachim99@8
|
1228 {
|
joachim99@8
|
1229 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1230 if ( m_pMainWidget!=0 )
|
joachim99@8
|
1231 {
|
joachim99@8
|
1232 m_pMainWidget->hide();
|
joachim99@8
|
1233 }
|
joachim99@8
|
1234 break;
|
joachim99@8
|
1235 }
|
joachim99@8
|
1236 else
|
joachim99@8
|
1237 {
|
joachim99@8
|
1238 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1239 init();
|
joachim99@8
|
1240
|
joachim99@8
|
1241 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 ||
|
joachim99@8
|
1242 ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 ||
|
joachim99@8
|
1243 ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
|
joachim99@8
|
1244 {
|
joachim99@8
|
1245 QString text( i18n("Opening of these files failed:") );
|
joachim99@8
|
1246 text += "\n\n";
|
joachim99@8
|
1247 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 )
|
joachim99@8
|
1248 text += " - " + m_sd1.getAliasName() + "\n";
|
joachim99@8
|
1249 if ( ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 )
|
joachim99@8
|
1250 text += " - " + m_sd2.getAliasName() + "\n";
|
joachim99@8
|
1251 if ( ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
|
joachim99@8
|
1252 text += " - " + m_sd3.getAliasName() + "\n";
|
joachim99@8
|
1253
|
joachim99@8
|
1254 KMessageBox::sorry( this, text, i18n("File open error") );
|
joachim99@8
|
1255 continue;
|
joachim99@8
|
1256 }
|
joachim99@8
|
1257 }
|
joachim99@8
|
1258 }
|
joachim99@8
|
1259 break;
|
joachim99@8
|
1260 }
|
joachim99@8
|
1261
|
joachim99@8
|
1262 slotUpdateAvailabilities();
|
joachim99@8
|
1263 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1264 }
|
joachim99@8
|
1265
|
joachim99@8
|
1266 void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
|
joachim99@8
|
1267 QString an1, QString an2, QString an3 )
|
joachim99@8
|
1268 {
|
joachim99@8
|
1269 if ( !canContinue() ) return;
|
joachim99@8
|
1270
|
joachim99@8
|
1271 slotStatusMsg(i18n("Opening files..."));
|
joachim99@8
|
1272
|
joachim99@8
|
1273 m_sd1.setFilename( fn1 );
|
joachim99@8
|
1274 m_sd2.setFilename( fn2 );
|
joachim99@8
|
1275 m_sd3.setFilename( fn3 );
|
joachim99@8
|
1276
|
joachim99@8
|
1277 m_sd1.setAliasName( an1 );
|
joachim99@8
|
1278 m_sd2.setAliasName( an2 );
|
joachim99@8
|
1279 m_sd3.setAliasName( an3 );
|
joachim99@8
|
1280
|
joachim99@8
|
1281 if ( ! ofn.isEmpty() )
|
joachim99@8
|
1282 {
|
joachim99@8
|
1283 m_outputFilename = ofn;
|
joachim99@8
|
1284 m_bDefaultFilename = false;
|
joachim99@8
|
1285 }
|
joachim99@8
|
1286 else
|
joachim99@8
|
1287 {
|
joachim99@8
|
1288 m_outputFilename = "";
|
joachim99@8
|
1289 m_bDefaultFilename = true;
|
joachim99@8
|
1290 }
|
joachim99@8
|
1291
|
joachim99@8
|
1292 bool bDirCompare = improveFilenames(); // Using local bDirCompare is intended, because
|
joachim99@8
|
1293 // this method is called from the directory-merge-window.
|
joachim99@8
|
1294
|
joachim99@8
|
1295 if( bDirCompare )
|
joachim99@8
|
1296 {
|
joachim99@8
|
1297 }
|
joachim99@8
|
1298 else
|
joachim99@8
|
1299 {
|
joachim99@8
|
1300 init();
|
joachim99@8
|
1301
|
joachim99@8
|
1302 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 ||
|
joachim99@8
|
1303 ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 ||
|
joachim99@8
|
1304 ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
|
joachim99@8
|
1305 {
|
joachim99@8
|
1306 QString text( i18n("Opening of these files failed:") );
|
joachim99@8
|
1307 text += "\n\n";
|
joachim99@8
|
1308 if ( ! m_sd1.isEmpty() && m_sd1.m_pBuf==0 )
|
joachim99@8
|
1309 text += " - " + m_sd1.getAliasName() + "\n";
|
joachim99@8
|
1310 if ( ! m_sd2.isEmpty() && m_sd2.m_pBuf==0 )
|
joachim99@8
|
1311 text += " - " + m_sd2.getAliasName() + "\n";
|
joachim99@8
|
1312 if ( ! m_sd3.isEmpty() && m_sd3.m_pBuf==0 )
|
joachim99@8
|
1313 text += " - " + m_sd3.getAliasName() + "\n";
|
joachim99@8
|
1314
|
joachim99@8
|
1315 KMessageBox::sorry( this, text, i18n("File open error") );
|
joachim99@8
|
1316 }
|
joachim99@8
|
1317 else
|
joachim99@8
|
1318 {
|
joachim99@8
|
1319 if ( m_pDirectoryMergeWindow!=0 && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1320 {
|
joachim99@8
|
1321 slotDirViewToggle();
|
joachim99@8
|
1322 }
|
joachim99@8
|
1323 }
|
joachim99@8
|
1324 }
|
joachim99@8
|
1325 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1326 }
|
joachim99@8
|
1327
|
joachim99@8
|
1328 void KDiff3App::slotEditCut()
|
joachim99@8
|
1329 {
|
joachim99@8
|
1330 slotStatusMsg(i18n("Cutting selection..."));
|
joachim99@8
|
1331
|
joachim99@8
|
1332 QString s;
|
joachim99@8
|
1333 if ( m_pMergeResultWindow!=0 )
|
joachim99@8
|
1334 {
|
joachim99@8
|
1335 s = m_pMergeResultWindow->getSelection();
|
joachim99@8
|
1336 m_pMergeResultWindow->deleteSelection();
|
joachim99@8
|
1337
|
joachim99@8
|
1338 m_pMergeResultWindow->update();
|
joachim99@8
|
1339 }
|
joachim99@8
|
1340
|
joachim99@8
|
1341 if ( !s.isNull() )
|
joachim99@8
|
1342 {
|
joachim99@8
|
1343 QApplication::clipboard()->setText( s );
|
joachim99@8
|
1344 }
|
joachim99@8
|
1345
|
joachim99@8
|
1346 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1347 }
|
joachim99@8
|
1348
|
joachim99@8
|
1349 void KDiff3App::slotEditCopy()
|
joachim99@8
|
1350 {
|
joachim99@8
|
1351 slotStatusMsg(i18n("Copying selection to clipboard..."));
|
joachim99@8
|
1352 QString s;
|
joachim99@8
|
1353 if ( m_pDiffTextWindow1!=0 ) s = m_pDiffTextWindow1->getSelection();
|
joachim99@8
|
1354 if ( s.isNull() && m_pDiffTextWindow2!=0 ) s = m_pDiffTextWindow2->getSelection();
|
joachim99@8
|
1355 if ( s.isNull() && m_pDiffTextWindow3!=0 ) s = m_pDiffTextWindow3->getSelection();
|
joachim99@8
|
1356 if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
|
joachim99@8
|
1357 if ( !s.isNull() )
|
joachim99@8
|
1358 {
|
joachim99@8
|
1359 QApplication::clipboard()->setText( s );
|
joachim99@8
|
1360 }
|
joachim99@8
|
1361
|
joachim99@8
|
1362 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1363 }
|
joachim99@8
|
1364
|
joachim99@8
|
1365 void KDiff3App::slotEditPaste()
|
joachim99@8
|
1366 {
|
joachim99@8
|
1367 slotStatusMsg(i18n("Inserting clipboard contents..."));
|
joachim99@8
|
1368
|
joachim99@8
|
1369 if ( m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() )
|
joachim99@8
|
1370 {
|
joachim99@8
|
1371 m_pMergeResultWindow->pasteClipboard();
|
joachim99@8
|
1372 }
|
joachim99@8
|
1373 else if ( canContinue() )
|
joachim99@8
|
1374 {
|
joachim99@8
|
1375 bool bUpCase = m_pOptionDialog->m_bUpCase;
|
joachim99@8
|
1376 if ( m_pDiffTextWindow1->hasFocus() )
|
joachim99@8
|
1377 {
|
joachim99@8
|
1378 m_sd1.setData( QApplication::clipboard()->text(), bUpCase );
|
joachim99@8
|
1379 init();
|
joachim99@8
|
1380 }
|
joachim99@8
|
1381 else if ( m_pDiffTextWindow2->hasFocus() )
|
joachim99@8
|
1382 {
|
joachim99@8
|
1383 m_sd2.setData( QApplication::clipboard()->text(), bUpCase );
|
joachim99@8
|
1384 init();
|
joachim99@8
|
1385 }
|
joachim99@8
|
1386 else if ( m_pDiffTextWindow3->hasFocus() )
|
joachim99@8
|
1387 {
|
joachim99@8
|
1388 m_sd3.setData( QApplication::clipboard()->text(), bUpCase );
|
joachim99@8
|
1389 init();
|
joachim99@8
|
1390 }
|
joachim99@8
|
1391 }
|
joachim99@8
|
1392
|
joachim99@8
|
1393 slotStatusMsg(i18n("Ready."));
|
joachim99@8
|
1394 }
|
joachim99@8
|
1395
|
joachim99@8
|
1396
|
joachim99@8
|
1397 void KDiff3App::slotGoCurrent()
|
joachim99@8
|
1398 {
|
joachim99@8
|
1399 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoCurrent();
|
joachim99@8
|
1400 }
|
joachim99@8
|
1401 void KDiff3App::slotGoTop()
|
joachim99@8
|
1402 {
|
joachim99@8
|
1403 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoTop();
|
joachim99@8
|
1404 }
|
joachim99@8
|
1405 void KDiff3App::slotGoBottom()
|
joachim99@8
|
1406 {
|
joachim99@8
|
1407 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoBottom();
|
joachim99@8
|
1408 }
|
joachim99@8
|
1409 void KDiff3App::slotGoPrevUnsolvedConflict()
|
joachim99@8
|
1410 {
|
joachim99@8
|
1411 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevUnsolvedConflict();
|
joachim99@8
|
1412 }
|
joachim99@8
|
1413 void KDiff3App::slotGoNextUnsolvedConflict()
|
joachim99@8
|
1414 {
|
joachim99@8
|
1415 m_bTimerBlock = false;
|
joachim99@8
|
1416 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextUnsolvedConflict();
|
joachim99@8
|
1417 }
|
joachim99@8
|
1418 void KDiff3App::slotGoPrevConflict()
|
joachim99@8
|
1419 {
|
joachim99@8
|
1420 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevConflict();
|
joachim99@8
|
1421 }
|
joachim99@8
|
1422 void KDiff3App::slotGoNextConflict()
|
joachim99@8
|
1423 {
|
joachim99@8
|
1424 m_bTimerBlock = false;
|
joachim99@8
|
1425 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextConflict();
|
joachim99@8
|
1426 }
|
joachim99@8
|
1427 void KDiff3App::slotGoPrevDelta()
|
joachim99@8
|
1428 {
|
joachim99@8
|
1429 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoPrevDelta();
|
joachim99@8
|
1430 }
|
joachim99@8
|
1431 void KDiff3App::slotGoNextDelta()
|
joachim99@8
|
1432 {
|
joachim99@8
|
1433 if (m_pMergeResultWindow) m_pMergeResultWindow->slotGoNextDelta();
|
joachim99@8
|
1434 }
|
joachim99@51
|
1435
|
joachim99@51
|
1436
|
joachim99@8
|
1437 void KDiff3App::slotChooseA()
|
joachim99@8
|
1438 {
|
joachim99@51
|
1439 if (m_pMergeResultWindow && ! m_bTimerBlock )
|
joachim99@8
|
1440 {
|
joachim99@51
|
1441 m_pMergeResultWindow->choose(A);
|
joachim99@8
|
1442 if ( autoAdvance->isChecked() )
|
joachim99@8
|
1443 {
|
joachim99@51
|
1444 m_bTimerBlock = true;
|
joachim99@8
|
1445 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
|
joachim99@8
|
1446 }
|
joachim99@8
|
1447 }
|
joachim99@8
|
1448 }
|
joachim99@8
|
1449 void KDiff3App::slotChooseB()
|
joachim99@8
|
1450 {
|
joachim99@8
|
1451 if ( m_pMergeResultWindow && ! m_bTimerBlock )
|
joachim99@8
|
1452 {
|
joachim99@51
|
1453 m_pMergeResultWindow->choose(B);
|
joachim99@8
|
1454 if ( autoAdvance->isChecked() )
|
joachim99@8
|
1455 {
|
joachim99@8
|
1456 m_bTimerBlock = true;
|
joachim99@8
|
1457 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
|
joachim99@8
|
1458 }
|
joachim99@8
|
1459 }
|
joachim99@8
|
1460 }
|
joachim99@8
|
1461 void KDiff3App::slotChooseC()
|
joachim99@8
|
1462 {
|
joachim99@51
|
1463 if ( m_pMergeResultWindow && ! m_bTimerBlock )
|
joachim99@8
|
1464 {
|
joachim99@51
|
1465 m_pMergeResultWindow->choose(C);
|
joachim99@8
|
1466 if ( autoAdvance->isChecked() )
|
joachim99@8
|
1467 {
|
joachim99@8
|
1468 m_bTimerBlock = true;
|
joachim99@8
|
1469 QTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, SLOT( slotGoNextUnsolvedConflict() ) );
|
joachim99@8
|
1470 }
|
joachim99@8
|
1471 }
|
joachim99@8
|
1472 }
|
joachim99@51
|
1473
|
joachim99@51
|
1474 // bConflictsOnly automatically choose for conflicts only (true) or for everywhere
|
joachim99@51
|
1475 static void mergeChooseGlobal( KDiff3App* pThis, MergeResultWindow* pMRW, int selector, bool bConflictsOnly, bool bWhiteSpaceOnly )
|
joachim99@8
|
1476 {
|
joachim99@51
|
1477 if ( pMRW )
|
joachim99@8
|
1478 {
|
joachim99@51
|
1479 pThis->slotGoTop();
|
joachim99@51
|
1480 pMRW->chooseGlobal(selector, bConflictsOnly, bWhiteSpaceOnly );
|
joachim99@8
|
1481 }
|
joachim99@8
|
1482 }
|
joachim99@8
|
1483
|
joachim99@51
|
1484 void KDiff3App::slotChooseAEverywhere() { mergeChooseGlobal( this, m_pMergeResultWindow, A, false, false ); }
|
joachim99@51
|
1485 void KDiff3App::slotChooseBEverywhere() { mergeChooseGlobal( this, m_pMergeResultWindow, B, false, false ); }
|
joachim99@51
|
1486 void KDiff3App::slotChooseCEverywhere() { mergeChooseGlobal( this, m_pMergeResultWindow, C, false, false ); }
|
joachim99@51
|
1487 void KDiff3App::slotChooseAForUnsolvedConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, A, true, false ); }
|
joachim99@51
|
1488 void KDiff3App::slotChooseBForUnsolvedConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, B, true, false ); }
|
joachim99@51
|
1489 void KDiff3App::slotChooseCForUnsolvedConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, C, true, false ); }
|
joachim99@51
|
1490 void KDiff3App::slotChooseAForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, A, true, true ); }
|
joachim99@51
|
1491 void KDiff3App::slotChooseBForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, B, true, true ); }
|
joachim99@51
|
1492 void KDiff3App::slotChooseCForUnsolvedWhiteSpaceConflicts() { mergeChooseGlobal( this, m_pMergeResultWindow, C, true, true ); }
|
joachim99@51
|
1493
|
joachim99@8
|
1494
|
joachim99@8
|
1495 void KDiff3App::slotAutoSolve()
|
joachim99@8
|
1496 {
|
joachim99@8
|
1497 if (m_pMergeResultWindow )
|
joachim99@8
|
1498 {
|
joachim99@8
|
1499 slotGoTop();
|
joachim99@8
|
1500 m_pMergeResultWindow->slotAutoSolve();
|
joachim99@8
|
1501 // m_pMergeWindowFrame->show(); incompatible with bPreserveCarriageReturn
|
joachim99@8
|
1502 m_pMergeResultWindow->showNrOfConflicts();
|
joachim99@8
|
1503 slotUpdateAvailabilities();
|
joachim99@8
|
1504 }
|
joachim99@8
|
1505 }
|
joachim99@8
|
1506
|
joachim99@8
|
1507 void KDiff3App::slotUnsolve()
|
joachim99@8
|
1508 {
|
joachim99@8
|
1509 if (m_pMergeResultWindow )
|
joachim99@8
|
1510 {
|
joachim99@8
|
1511 slotGoTop();
|
joachim99@8
|
1512 m_pMergeResultWindow->slotUnsolve();
|
joachim99@8
|
1513 }
|
joachim99@8
|
1514 }
|
joachim99@8
|
1515
|
joachim99@8
|
1516
|
joachim99@8
|
1517 void KDiff3App::slotConfigure()
|
joachim99@8
|
1518 {
|
joachim99@8
|
1519 m_pOptionDialog->setState();
|
joachim99@8
|
1520 m_pOptionDialog->incInitialSize ( QSize(0,40) );
|
joachim99@8
|
1521 m_pOptionDialog->exec();
|
joachim99@8
|
1522 slotRefresh();
|
joachim99@8
|
1523 }
|
joachim99@8
|
1524
|
joachim99@8
|
1525 void KDiff3App::slotConfigureKeys()
|
joachim99@8
|
1526 {
|
joachim99@8
|
1527 KKeyDialog::configure(actionCollection(), this);
|
joachim99@8
|
1528 }
|
joachim99@8
|
1529
|
joachim99@8
|
1530 void KDiff3App::slotRefresh()
|
joachim99@8
|
1531 {
|
joachim99@8
|
1532 g_tabSize = m_pOptionDialog->m_tabSize;
|
joachim99@51
|
1533 if (m_pDiffTextWindow1!=0)
|
joachim99@51
|
1534 {
|
joachim99@51
|
1535 m_pDiffTextWindow1->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1536 m_pDiffTextWindow1->update();
|
joachim99@28
|
1537 }
|
joachim99@28
|
1538 if (m_pDiffTextWindow2!=0)
|
joachim99@51
|
1539 {
|
joachim99@51
|
1540 m_pDiffTextWindow2->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1541 m_pDiffTextWindow2->update();
|
joachim99@28
|
1542 }
|
joachim99@28
|
1543 if (m_pDiffTextWindow3!=0)
|
joachim99@51
|
1544 {
|
joachim99@51
|
1545 m_pDiffTextWindow3->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1546 m_pDiffTextWindow3->update();
|
joachim99@28
|
1547 }
|
joachim99@28
|
1548 if (m_pMergeResultWindow!=0)
|
joachim99@51
|
1549 {
|
joachim99@51
|
1550 m_pMergeResultWindow->setFont(m_pOptionDialog->m_font);
|
joachim99@51
|
1551 m_pMergeResultWindow->update();
|
joachim99@28
|
1552 }
|
joachim99@28
|
1553
|
joachim99@8
|
1554 if ( m_pDiffWindowSplitter!=0 )
|
joachim99@8
|
1555 {
|
joachim99@8
|
1556 m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Horizontal : Vertical );
|
joachim99@8
|
1557 }
|
joachim99@8
|
1558 }
|
joachim99@8
|
1559
|
joachim99@8
|
1560 void KDiff3App::slotSelectionStart()
|
joachim99@8
|
1561 {
|
joachim99@8
|
1562 //editCopy->setEnabled( false );
|
joachim99@8
|
1563 //editCut->setEnabled( false );
|
joachim99@8
|
1564
|
joachim99@8
|
1565 const QObject* s = sender();
|
joachim99@8
|
1566 if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection();
|
joachim99@8
|
1567 if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection();
|
joachim99@8
|
1568 if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection();
|
joachim99@8
|
1569 if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection();
|
joachim99@8
|
1570 }
|
joachim99@8
|
1571
|
joachim99@8
|
1572 void KDiff3App::slotSelectionEnd()
|
joachim99@8
|
1573 {
|
joachim99@8
|
1574 //const QObject* s = sender();
|
joachim99@8
|
1575 //editCopy->setEnabled(true);
|
joachim99@8
|
1576 //editCut->setEnabled( s==m_pMergeResultWindow );
|
joachim99@8
|
1577 if ( m_pOptionDialog->m_bAutoCopySelection )
|
joachim99@8
|
1578 {
|
joachim99@8
|
1579 slotEditCopy();
|
joachim99@8
|
1580 }
|
joachim99@8
|
1581 }
|
joachim99@8
|
1582
|
joachim99@8
|
1583 void KDiff3App::slotClipboardChanged()
|
joachim99@8
|
1584 {
|
joachim99@8
|
1585 QString s = QApplication::clipboard()->text();
|
joachim99@8
|
1586 //editPaste->setEnabled(!s.isEmpty());
|
joachim99@8
|
1587 }
|
joachim99@8
|
1588
|
joachim99@8
|
1589 void KDiff3App::slotOutputModified()
|
joachim99@8
|
1590 {
|
joachim99@8
|
1591 if ( !m_bOutputModified )
|
joachim99@8
|
1592 {
|
joachim99@8
|
1593 m_bOutputModified=true;
|
joachim99@8
|
1594 slotUpdateAvailabilities();
|
joachim99@8
|
1595 }
|
joachim99@8
|
1596 }
|
joachim99@8
|
1597
|
joachim99@8
|
1598 void KDiff3App::slotAutoAdvanceToggled()
|
joachim99@8
|
1599 {
|
joachim99@8
|
1600 m_pOptionDialog->m_bAutoAdvance = autoAdvance->isChecked();
|
joachim99@8
|
1601 }
|
joachim99@8
|
1602
|
joachim99@8
|
1603 void KDiff3App::slotShowWhiteSpaceToggled()
|
joachim99@8
|
1604 {
|
joachim99@51
|
1605 m_pOptionDialog->m_bShowWhiteSpaceCharacters = showWhiteSpaceCharacters->isChecked();
|
joachim99@8
|
1606 m_pOptionDialog->m_bShowWhiteSpace = showWhiteSpace->isChecked();
|
joachim99@51
|
1607 showWhiteSpaceCharacters->setEnabled( showWhiteSpace->isChecked() );
|
joachim99@8
|
1608 if ( m_pDiffTextWindow1!=0 )
|
joachim99@8
|
1609 m_pDiffTextWindow1->update();
|
joachim99@8
|
1610 if ( m_pDiffTextWindow2!=0 )
|
joachim99@8
|
1611 m_pDiffTextWindow2->update();
|
joachim99@8
|
1612 if ( m_pDiffTextWindow3!=0 )
|
joachim99@8
|
1613 m_pDiffTextWindow3->update();
|
joachim99@51
|
1614 if ( m_pOverview!=0 )
|
joachim99@51
|
1615 m_pOverview->slotRedraw();
|
joachim99@8
|
1616 }
|
joachim99@8
|
1617
|
joachim99@8
|
1618 void KDiff3App::slotShowLineNumbersToggled()
|
joachim99@8
|
1619 {
|
joachim99@8
|
1620 m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked();
|
joachim99@8
|
1621 if ( m_pDiffTextWindow1!=0 )
|
joachim99@8
|
1622 m_pDiffTextWindow1->update();
|
joachim99@8
|
1623 if ( m_pDiffTextWindow2!=0 )
|
joachim99@8
|
1624 m_pDiffTextWindow2->update();
|
joachim99@8
|
1625 if ( m_pDiffTextWindow3!=0 )
|
joachim99@8
|
1626 m_pDiffTextWindow3->update();
|
joachim99@8
|
1627 }
|
joachim99@8
|
1628
|
joachim99@8
|
1629 /// Return true for directory compare, else false
|
joachim99@8
|
1630 bool KDiff3App::improveFilenames()
|
joachim99@8
|
1631 {
|
joachim99@8
|
1632 FileAccess f1(m_sd1.getFilename());
|
joachim99@8
|
1633 FileAccess f2(m_sd2.getFilename());
|
joachim99@8
|
1634 FileAccess f3(m_sd3.getFilename());
|
joachim99@8
|
1635 FileAccess f4(m_outputFilename);
|
joachim99@8
|
1636
|
joachim99@8
|
1637 if ( f1.isFile() && f1.exists() )
|
joachim99@8
|
1638 {
|
joachim99@8
|
1639 if ( f2.isDir() )
|
joachim99@8
|
1640 {
|
joachim99@8
|
1641 f2.addPath( f1.fileName() );
|
joachim99@8
|
1642 if ( f2.isFile() && f2.exists() )
|
joachim99@8
|
1643 m_sd2.setFileAccess( f2 );
|
joachim99@8
|
1644 }
|
joachim99@8
|
1645 if ( f3.isDir() )
|
joachim99@8
|
1646 {
|
joachim99@8
|
1647 f3.addPath( f1.fileName() );
|
joachim99@8
|
1648 if ( f3.isFile() && f3.exists() )
|
joachim99@8
|
1649 m_sd3.setFileAccess( f3 );
|
joachim99@8
|
1650 }
|
joachim99@8
|
1651 if ( f4.isDir() )
|
joachim99@8
|
1652 {
|
joachim99@8
|
1653 f4.addPath( f1.fileName() );
|
joachim99@8
|
1654 if ( f4.isFile() && f4.exists() )
|
joachim99@8
|
1655 m_outputFilename = f4.absFilePath();
|
joachim99@8
|
1656 }
|
joachim99@8
|
1657 }
|
joachim99@8
|
1658 else if ( f1.isDir() )
|
joachim99@8
|
1659 {
|
joachim99@8
|
1660 FileAccess destDir;
|
joachim99@8
|
1661 if (!m_bDefaultFilename) destDir = f4;
|
joachim99@8
|
1662 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1663 m_pDirectoryMergeWindow->init(
|
joachim99@8
|
1664 f1, f2, f3,
|
joachim99@8
|
1665 destDir, // Destdirname
|
joachim99@8
|
1666 !m_outputFilename.isEmpty()
|
joachim99@8
|
1667 );
|
joachim99@8
|
1668
|
joachim99@8
|
1669 if (m_pMainWidget!=0) m_pMainWidget->hide();
|
joachim99@8
|
1670 m_sd1.reset();
|
joachim99@8
|
1671 if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,0,0,1,false);
|
joachim99@8
|
1672 m_sd2.reset();
|
joachim99@8
|
1673 if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,0,0,2,false);
|
joachim99@8
|
1674 m_sd3.reset();
|
joachim99@8
|
1675 if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,0,0,3,false);
|
joachim99@8
|
1676 slotUpdateAvailabilities();
|
joachim99@8
|
1677 return true;
|
joachim99@8
|
1678 }
|
joachim99@8
|
1679 return false;
|
joachim99@8
|
1680 }
|
joachim99@8
|
1681
|
joachim99@8
|
1682 void KDiff3App::slotReload()
|
joachim99@8
|
1683 {
|
joachim99@8
|
1684 if ( !canContinue() ) return;
|
joachim99@8
|
1685
|
joachim99@8
|
1686 init();
|
joachim99@8
|
1687 }
|
joachim99@8
|
1688
|
joachim99@8
|
1689 bool KDiff3App::canContinue()
|
joachim99@8
|
1690 {
|
joachim99@8
|
1691 // First test if anything must be saved.
|
joachim99@8
|
1692 if(m_bOutputModified)
|
joachim99@8
|
1693 {
|
joachim99@8
|
1694 int result = KMessageBox::warningYesNoCancel(this,
|
joachim99@8
|
1695 i18n("The merge result hasn't been saved."),
|
joachim99@51
|
1696 i18n("Warning"), i18n("Save && Continue"), i18n("Continue Without Saving") );
|
joachim99@8
|
1697 if ( result==KMessageBox::Cancel )
|
joachim99@8
|
1698 return false;
|
joachim99@8
|
1699 else if ( result==KMessageBox::Yes )
|
joachim99@8
|
1700 {
|
joachim99@8
|
1701 slotFileSave();
|
joachim99@8
|
1702 if ( m_bOutputModified )
|
joachim99@8
|
1703 {
|
joachim99@8
|
1704 KMessageBox::sorry(this, i18n("Saving the merge result failed."), i18n("Warning") );
|
joachim99@8
|
1705 return false;
|
joachim99@8
|
1706 }
|
joachim99@8
|
1707 }
|
joachim99@8
|
1708 }
|
joachim99@8
|
1709
|
joachim99@8
|
1710 m_bOutputModified = false;
|
joachim99@8
|
1711 return true;
|
joachim99@8
|
1712 }
|
joachim99@8
|
1713
|
joachim99@8
|
1714 void KDiff3App::slotCheckIfCanContinue( bool* pbContinue )
|
joachim99@8
|
1715 {
|
joachim99@8
|
1716 if (pbContinue!=0) *pbContinue = canContinue();
|
joachim99@8
|
1717 }
|
joachim99@8
|
1718
|
joachim99@8
|
1719
|
joachim99@8
|
1720 void KDiff3App::slotDirShowBoth()
|
joachim99@8
|
1721 {
|
joachim99@8
|
1722 if( dirShowBoth->isChecked() )
|
joachim99@8
|
1723 {
|
joachim99@8
|
1724 if ( m_bDirCompare )
|
joachim99@8
|
1725 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1726 else
|
joachim99@8
|
1727 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1728
|
joachim99@8
|
1729 if ( m_pMainWidget!=0 )
|
joachim99@8
|
1730 m_pMainWidget->show();
|
joachim99@8
|
1731 }
|
joachim99@8
|
1732 else
|
joachim99@8
|
1733 {
|
joachim99@8
|
1734 if ( m_pMainWidget!=0 )
|
joachim99@8
|
1735 {
|
joachim99@8
|
1736 m_pMainWidget->show();
|
joachim99@8
|
1737 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1738 }
|
joachim99@8
|
1739 else if ( m_bDirCompare )
|
joachim99@8
|
1740 {
|
joachim99@8
|
1741 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1742 }
|
joachim99@8
|
1743 }
|
joachim99@8
|
1744
|
joachim99@8
|
1745 slotUpdateAvailabilities();
|
joachim99@8
|
1746 }
|
joachim99@8
|
1747
|
joachim99@8
|
1748
|
joachim99@8
|
1749 void KDiff3App::slotDirViewToggle()
|
joachim99@8
|
1750 {
|
joachim99@8
|
1751 if ( m_bDirCompare )
|
joachim99@8
|
1752 {
|
joachim99@8
|
1753 if( ! m_pDirectoryMergeSplitter->isVisible() )
|
joachim99@8
|
1754 {
|
joachim99@8
|
1755 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
1756 if (m_pMainWidget!=0)
|
joachim99@8
|
1757 m_pMainWidget->hide();
|
joachim99@8
|
1758 }
|
joachim99@8
|
1759 else
|
joachim99@8
|
1760 {
|
joachim99@8
|
1761 if (m_pMainWidget!=0)
|
joachim99@8
|
1762 {
|
joachim99@8
|
1763 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
1764 m_pMainWidget->show();
|
joachim99@8
|
1765 }
|
joachim99@8
|
1766 }
|
joachim99@8
|
1767 }
|
joachim99@8
|
1768 slotUpdateAvailabilities();
|
joachim99@8
|
1769 }
|
joachim99@8
|
1770
|
joachim99@8
|
1771 void KDiff3App::slotShowWindowAToggled()
|
joachim99@8
|
1772 {
|
joachim99@8
|
1773 if ( m_pDiffTextWindow1!=0 )
|
joachim99@8
|
1774 {
|
joachim99@8
|
1775 if ( showWindowA->isChecked() ) m_pDiffTextWindow1->show();
|
joachim99@8
|
1776 else m_pDiffTextWindow1->hide();
|
joachim99@8
|
1777 slotUpdateAvailabilities();
|
joachim99@8
|
1778 }
|
joachim99@8
|
1779 }
|
joachim99@8
|
1780
|
joachim99@8
|
1781 void KDiff3App::slotShowWindowBToggled()
|
joachim99@8
|
1782 {
|
joachim99@8
|
1783 if ( m_pDiffTextWindow2!=0 )
|
joachim99@8
|
1784 {
|
joachim99@8
|
1785 if ( showWindowB->isChecked() ) m_pDiffTextWindow2->show();
|
joachim99@8
|
1786 else m_pDiffTextWindow2->hide();
|
joachim99@8
|
1787 slotUpdateAvailabilities();
|
joachim99@8
|
1788 }
|
joachim99@8
|
1789 }
|
joachim99@8
|
1790
|
joachim99@8
|
1791 void KDiff3App::slotShowWindowCToggled()
|
joachim99@8
|
1792 {
|
joachim99@8
|
1793 if ( m_pDiffTextWindow3!=0 )
|
joachim99@8
|
1794 {
|
joachim99@8
|
1795 if ( showWindowC->isChecked() ) m_pDiffTextWindow3->show();
|
joachim99@8
|
1796 else m_pDiffTextWindow3->hide();
|
joachim99@8
|
1797 slotUpdateAvailabilities();
|
joachim99@8
|
1798 }
|
joachim99@8
|
1799 }
|
joachim99@8
|
1800
|
joachim99@8
|
1801 void KDiff3App::slotEditFind()
|
joachim99@8
|
1802 {
|
joachim99@8
|
1803 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1804 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1805 m_pFindDialog->currentWindow = 1;
|
joachim99@8
|
1806
|
joachim99@8
|
1807 if ( QDialog::Accepted == m_pFindDialog->exec() )
|
joachim99@8
|
1808 {
|
joachim99@8
|
1809 slotEditFindNext();
|
joachim99@8
|
1810 }
|
joachim99@8
|
1811 }
|
joachim99@8
|
1812
|
joachim99@8
|
1813 void KDiff3App::slotEditFindNext()
|
joachim99@8
|
1814 {
|
joachim99@8
|
1815 QCString s = m_pFindDialog->m_pSearchString->text().utf8();
|
joachim99@8
|
1816 if ( s.isEmpty() )
|
joachim99@8
|
1817 {
|
joachim99@8
|
1818 slotEditFind();
|
joachim99@8
|
1819 return;
|
joachim99@8
|
1820 }
|
joachim99@8
|
1821
|
joachim99@8
|
1822 bool bDirDown = true;
|
joachim99@8
|
1823 bool bCaseSensitive = m_pFindDialog->m_pCaseSensitive->isChecked();
|
joachim99@8
|
1824
|
joachim99@8
|
1825 int d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1826 int posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1827 if ( m_pFindDialog->currentWindow == 1 )
|
joachim99@8
|
1828 {
|
joachim99@8
|
1829 if ( m_pFindDialog->m_pSearchInA->isChecked() && m_pDiffTextWindow1!=0 &&
|
joachim99@8
|
1830 m_pDiffTextWindow1->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1831 {
|
joachim99@8
|
1832 m_pDiffTextWindow1->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
|
joachim99@8
|
1833 m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2);
|
joachim99@8
|
1834 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1835 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1836 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1837 return;
|
joachim99@8
|
1838 }
|
joachim99@8
|
1839 m_pFindDialog->currentWindow = 2;
|
joachim99@8
|
1840 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1841 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1842 }
|
joachim99@8
|
1843
|
joachim99@8
|
1844 d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1845 posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1846 if ( m_pFindDialog->currentWindow == 2 )
|
joachim99@8
|
1847 {
|
joachim99@8
|
1848 if ( m_pFindDialog->m_pSearchInB->isChecked() && m_pDiffTextWindow2!=0 &&
|
joachim99@8
|
1849 m_pDiffTextWindow2->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1850 {
|
joachim99@8
|
1851 m_pDiffTextWindow2->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
|
joachim99@8
|
1852 m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2);
|
joachim99@8
|
1853 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1854 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1855 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1856 return;
|
joachim99@8
|
1857 }
|
joachim99@8
|
1858 m_pFindDialog->currentWindow = 3;
|
joachim99@8
|
1859 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1860 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1861 }
|
joachim99@8
|
1862
|
joachim99@8
|
1863 d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1864 posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1865 if ( m_pFindDialog->currentWindow == 3 )
|
joachim99@8
|
1866 {
|
joachim99@8
|
1867 if ( m_pFindDialog->m_pSearchInC->isChecked() && m_pDiffTextWindow3!=0 &&
|
joachim99@8
|
1868 m_pDiffTextWindow3->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1869 {
|
joachim99@8
|
1870 m_pDiffTextWindow3->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
|
joachim99@8
|
1871 m_pDiffVScrollBar->setValue(d3vLine-m_pDiffVScrollBar->pageStep()/2);
|
joachim99@8
|
1872 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1873 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1874 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1875 return;
|
joachim99@8
|
1876 }
|
joachim99@8
|
1877 m_pFindDialog->currentWindow = 4;
|
joachim99@8
|
1878 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1879 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1880 }
|
joachim99@8
|
1881
|
joachim99@8
|
1882 d3vLine = m_pFindDialog->currentLine;
|
joachim99@8
|
1883 posInLine = m_pFindDialog->currentPos;
|
joachim99@8
|
1884 if ( m_pFindDialog->currentWindow == 4 )
|
joachim99@8
|
1885 {
|
joachim99@8
|
1886 if ( m_pFindDialog->m_pSearchInOutput->isChecked() && m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() &&
|
joachim99@8
|
1887 m_pMergeResultWindow->findString( s, d3vLine, posInLine, bDirDown, bCaseSensitive ) )
|
joachim99@8
|
1888 {
|
joachim99@8
|
1889 m_pMergeResultWindow->setSelection( d3vLine, posInLine, d3vLine, posInLine+s.length() );
|
joachim99@8
|
1890 m_pMergeVScrollBar->setValue(d3vLine - m_pMergeVScrollBar->pageStep()/2);
|
joachim99@8
|
1891 m_pHScrollBar->setValue( max2( 0, posInLine+(int)s.length()-m_pHScrollBar->pageStep()) );
|
joachim99@8
|
1892 m_pFindDialog->currentLine = d3vLine;
|
joachim99@8
|
1893 m_pFindDialog->currentPos = posInLine + 1;
|
joachim99@8
|
1894 return;
|
joachim99@8
|
1895 }
|
joachim99@8
|
1896 m_pFindDialog->currentWindow = 5;
|
joachim99@8
|
1897 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1898 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1899 }
|
joachim99@8
|
1900
|
joachim99@51
|
1901 KMessageBox::information(this,i18n("Search complete."),i18n("Search Complete"));
|
joachim99@8
|
1902 m_pFindDialog->currentWindow = 1;
|
joachim99@8
|
1903 m_pFindDialog->currentLine = 0;
|
joachim99@8
|
1904 m_pFindDialog->currentPos = 0;
|
joachim99@8
|
1905 }
|
joachim99@8
|
1906
|
joachim99@8
|
1907 void KDiff3App::slotMergeCurrentFile()
|
joachim99@8
|
1908 {
|
joachim99@8
|
1909 if ( m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected() )
|
joachim99@8
|
1910 {
|
joachim99@8
|
1911 m_pDirectoryMergeWindow->mergeCurrentFile();
|
joachim99@8
|
1912 }
|
joachim99@8
|
1913 else if ( m_pMainWidget != 0 && m_pMainWidget->isVisible() )
|
joachim99@8
|
1914 {
|
joachim99@8
|
1915 if ( !canContinue() ) return;
|
joachim99@8
|
1916 if ( m_outputFilename.isEmpty() )
|
joachim99@8
|
1917 {
|
joachim99@8
|
1918 if ( !m_sd3.isEmpty() && !m_sd3.m_bPreserve )
|
joachim99@8
|
1919 {
|
joachim99@8
|
1920 m_outputFilename = m_sd3.getFilename();
|
joachim99@8
|
1921 }
|
joachim99@8
|
1922 else if ( !m_sd2.isEmpty() && !m_sd2.m_bPreserve )
|
joachim99@8
|
1923 {
|
joachim99@8
|
1924 m_outputFilename = m_sd2.getFilename();
|
joachim99@8
|
1925 }
|
joachim99@8
|
1926 else if ( !m_sd1.isEmpty() && !m_sd1.m_bPreserve )
|
joachim99@8
|
1927 {
|
joachim99@8
|
1928 m_outputFilename = m_sd1.getFilename();
|
joachim99@8
|
1929 }
|
joachim99@8
|
1930 else
|
joachim99@8
|
1931 {
|
joachim99@8
|
1932 m_outputFilename = "unnamed.txt";
|
joachim99@8
|
1933 m_bDefaultFilename = true;
|
joachim99@8
|
1934 }
|
joachim99@8
|
1935 }
|
joachim99@8
|
1936 init();
|
joachim99@8
|
1937 }
|
joachim99@8
|
1938 }
|
joachim99@8
|
1939
|
joachim99@8
|
1940 void KDiff3App::slotWinFocusNext()
|
joachim99@8
|
1941 {
|
joachim99@8
|
1942 QWidget* focus = qApp->focusWidget();
|
joachim99@8
|
1943 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1944 {
|
joachim99@8
|
1945 slotDirViewToggle();
|
joachim99@8
|
1946 }
|
joachim99@8
|
1947
|
joachim99@8
|
1948 std::list<QWidget*> visibleWidgetList;
|
joachim99@8
|
1949 if ( m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
|
joachim99@8
|
1950 if ( m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
|
joachim99@8
|
1951 if ( m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
|
joachim99@8
|
1952 if ( m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
|
joachim99@8
|
1953 if ( m_bDirCompare /*m_pDirectoryMergeWindow->isVisible()*/ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
|
joachim99@8
|
1954 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
|
joachim99@8
|
1955
|
joachim99@8
|
1956 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
|
joachim99@8
|
1957 ++i;
|
joachim99@8
|
1958 if ( i==visibleWidgetList.end() ) ++i; // if at end goto begin of list
|
joachim99@8
|
1959 if ( i!=visibleWidgetList.end() )
|
joachim99@8
|
1960 {
|
joachim99@8
|
1961 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1962 {
|
joachim99@8
|
1963 slotDirViewToggle();
|
joachim99@8
|
1964 }
|
joachim99@8
|
1965 (*i)->setFocus();
|
joachim99@8
|
1966 }
|
joachim99@8
|
1967 }
|
joachim99@8
|
1968
|
joachim99@8
|
1969 void KDiff3App::slotWinFocusPrev()
|
joachim99@8
|
1970 {
|
joachim99@8
|
1971 QWidget* focus = qApp->focusWidget();
|
joachim99@8
|
1972 if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1973 {
|
joachim99@8
|
1974 slotDirViewToggle();
|
joachim99@8
|
1975 }
|
joachim99@8
|
1976
|
joachim99@8
|
1977 std::list<QWidget*> visibleWidgetList;
|
joachim99@8
|
1978 if ( m_pDiffTextWindow1->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow1);
|
joachim99@8
|
1979 if ( m_pDiffTextWindow2->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow2);
|
joachim99@8
|
1980 if ( m_pDiffTextWindow3->isVisible() ) visibleWidgetList.push_back(m_pDiffTextWindow3);
|
joachim99@8
|
1981 if ( m_pMergeResultWindow->isVisible() ) visibleWidgetList.push_back(m_pMergeResultWindow);
|
joachim99@8
|
1982 if (m_bDirCompare /* m_pDirectoryMergeWindow->isVisible() */ ) visibleWidgetList.push_back(m_pDirectoryMergeWindow);
|
joachim99@8
|
1983 //if ( m_pDirectoryMergeInfo->isVisible() ) visibleWidgetList.push_back(m_pDirectoryMergeInfo->getInfoList());
|
joachim99@8
|
1984
|
joachim99@8
|
1985 std::list<QWidget*>::iterator i = std::find( visibleWidgetList.begin(), visibleWidgetList.end(), focus);
|
joachim99@8
|
1986 --i;
|
joachim99@8
|
1987 if ( i==visibleWidgetList.end() ) --i;
|
joachim99@8
|
1988 if ( i!=visibleWidgetList.end() )
|
joachim99@8
|
1989 {
|
joachim99@8
|
1990 if ( *i == m_pDirectoryMergeWindow && ! dirShowBoth->isChecked() )
|
joachim99@8
|
1991 {
|
joachim99@8
|
1992 slotDirViewToggle();
|
joachim99@8
|
1993 }
|
joachim99@8
|
1994 (*i)->setFocus();
|
joachim99@8
|
1995 }
|
joachim99@8
|
1996 }
|
joachim99@8
|
1997
|
joachim99@8
|
1998 void KDiff3App::slotWinToggleSplitterOrientation()
|
joachim99@8
|
1999 {
|
joachim99@8
|
2000 if ( m_pDiffWindowSplitter!=0 )
|
joachim99@8
|
2001 {
|
joachim99@8
|
2002 m_pDiffWindowSplitter->setOrientation(
|
joachim99@8
|
2003 m_pDiffWindowSplitter->orientation()==Vertical ? Horizontal : Vertical
|
joachim99@8
|
2004 );
|
joachim99@51
|
2005
|
joachim99@51
|
2006 m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Horizontal;
|
joachim99@8
|
2007 }
|
joachim99@8
|
2008 }
|
joachim99@8
|
2009
|
joachim99@8
|
2010 void KDiff3App::slotUpdateAvailabilities()
|
joachim99@8
|
2011 {
|
joachim99@8
|
2012 bool bTextDataAvailable = (m_sd1.m_pBuf != 0 || m_sd2.m_pBuf != 0 || m_sd3.m_pBuf != 0 );
|
joachim99@8
|
2013 if( dirShowBoth->isChecked() )
|
joachim99@8
|
2014 {
|
joachim99@8
|
2015 if ( m_bDirCompare )
|
joachim99@8
|
2016 m_pDirectoryMergeSplitter->show();
|
joachim99@8
|
2017 else
|
joachim99@8
|
2018 m_pDirectoryMergeSplitter->hide();
|
joachim99@8
|
2019
|
joachim99@8
|
2020 if ( m_pMainWidget!=0 && !m_pMainWidget->isVisible() &&
|
joachim99@8
|
2021 bTextDataAvailable
|
joachim99@8
|
2022 )
|
joachim99@8
|
2023 m_pMainWidget->show();
|
joachim99@8
|
2024 }
|
joachim99@8
|
2025
|
joachim99@8
|
2026 bool bDiffWindowVisible = m_pMainWidget != 0 && m_pMainWidget->isVisible();
|
joachim99@8
|
2027 bool bMergeEditorVisible = m_pMergeWindowFrame !=0 && m_pMergeWindowFrame->isVisible();
|
joachim99@8
|
2028
|
joachim99@51
|
2029 m_pDirectoryMergeWindow->updateAvailabilities( m_bDirCompare, bDiffWindowVisible );
|
joachim99@8
|
2030
|
joachim99@8
|
2031 dirShowBoth->setEnabled( m_bDirCompare );
|
joachim99@8
|
2032 dirViewToggle->setEnabled(
|
joachim99@8
|
2033 m_bDirCompare &&
|
joachim99@8
|
2034 (!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && m_pMainWidget->isVisible() ||
|
joachim99@8
|
2035 m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=0 && !m_pMainWidget->isVisible() && bTextDataAvailable )
|
joachim99@8
|
2036 );
|
joachim99@8
|
2037
|
joachim99@51
|
2038 showWhiteSpaceCharacters->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2039 autoAdvance->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2040 autoSolve->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@8
|
2041 unsolve->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2042 chooseA->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2043 chooseB->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2044 chooseC->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@8
|
2045 chooseAEverywhere->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2046 chooseBEverywhere->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2047 chooseCEverywhere->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@51
|
2048 chooseAForUnsolvedConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2049 chooseBForUnsolvedConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2050 chooseCForUnsolvedConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@51
|
2051 chooseAForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2052 chooseBForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible );
|
joachim99@51
|
2053 chooseCForUnsolvedWhiteSpaceConflicts->setEnabled( bMergeEditorVisible && m_bTripleDiff );
|
joachim99@8
|
2054 showWindowA->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow2->isVisible() || m_pDiffTextWindow3->isVisible() ) );
|
joachim99@8
|
2055 showWindowB->setEnabled( bDiffWindowVisible && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow3->isVisible() ));
|
joachim99@8
|
2056 showWindowC->setEnabled( bDiffWindowVisible && m_bTripleDiff && ( m_pDiffTextWindow1->isVisible() || m_pDiffTextWindow2->isVisible() ) );
|
joachim99@8
|
2057 editFind->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2058 editFindNext->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2059 m_pFindDialog->m_pSearchInC->setEnabled( m_bTripleDiff );
|
joachim99@8
|
2060 m_pFindDialog->m_pSearchInOutput->setEnabled( bMergeEditorVisible );
|
joachim99@8
|
2061
|
joachim99@8
|
2062 bool bSavable = bMergeEditorVisible && m_pMergeResultWindow->getNrOfUnsolvedConflicts()==0;
|
joachim99@8
|
2063 fileSave->setEnabled( m_bOutputModified && bSavable );
|
joachim99@8
|
2064 fileSaveAs->setEnabled( bSavable );
|
joachim99@8
|
2065
|
joachim99@8
|
2066 goTop->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
|
joachim99@8
|
2067 goBottom->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
|
joachim99@8
|
2068 goCurrent->setEnabled( bDiffWindowVisible );
|
joachim99@8
|
2069 goPrevUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictAboveCurrent() );
|
joachim99@8
|
2070 goNextUnsolvedConflict->setEnabled( bMergeEditorVisible && m_pMergeResultWindow->isUnsolvedConflictBelowCurrent() );
|
joachim99@8
|
2071 goPrevConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictAboveCurrent() );
|
joachim99@8
|
2072 goNextConflict->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isConflictBelowCurrent() );
|
joachim99@8
|
2073 goPrevDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaAboveCurrent() );
|
joachim99@8
|
2074 goNextDelta->setEnabled( bDiffWindowVisible && m_pMergeResultWindow->isDeltaBelowCurrent() );
|
joachim99@8
|
2075
|
joachim99@8
|
2076 winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=0 );
|
joachim99@8
|
2077 }
|