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