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