joachim99@69
|
1 /***************************************************************************
|
joachim99@69
|
2 * Copyright (C) 2003-2006 Joachim Eibl <joachim.eibl at gmx.de> *
|
joachim99@69
|
3 * *
|
joachim99@69
|
4 * This program is free software; you can redistribute it and/or modify *
|
joachim99@69
|
5 * it under the terms of the GNU General Public License as published by *
|
joachim99@69
|
6 * the Free Software Foundation; either version 2 of the License, or *
|
joachim99@69
|
7 * (at your option) any later version. *
|
joachim99@69
|
8 * *
|
joachim99@69
|
9 * This program is distributed in the hope that it will be useful, *
|
joachim99@69
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
joachim99@69
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
joachim99@69
|
12 * GNU General Public License for more details. *
|
joachim99@69
|
13 * *
|
joachim99@69
|
14 * You should have received a copy of the GNU General Public License *
|
joachim99@69
|
15 * along with this program; if not, write to the *
|
joachim99@69
|
16 * Free Software Foundation, Inc., *
|
joachim99@69
|
17 * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. *
|
joachim99@69
|
18 ***************************************************************************/
|
joachim99@8
|
19
|
joachim99@8
|
20 #include "kdiff3_part.h"
|
joachim99@8
|
21
|
joachim99@8
|
22 #include <kinstance.h>
|
joachim99@8
|
23 #include <kaction.h>
|
joachim99@8
|
24 #include <kstdaction.h>
|
joachim99@8
|
25 #include <kfiledialog.h>
|
joachim99@8
|
26
|
joachim99@8
|
27 #include <qfile.h>
|
joachim99@8
|
28 #include <qtextstream.h>
|
joachim99@8
|
29 #include "kdiff3.h"
|
joachim99@8
|
30 #include "fileaccess.h"
|
joachim99@8
|
31
|
joachim99@8
|
32 #include <kmessagebox.h>
|
joachim99@8
|
33 #include <klocale.h>
|
joachim99@8
|
34 #include <iostream>
|
joachim99@66
|
35
|
joachim99@66
|
36 #include "version.h"
|
joachim99@66
|
37
|
joachim99@8
|
38 KDiff3Part::KDiff3Part( QWidget *parentWidget, const char *widgetName,
|
joachim99@8
|
39 QObject *parent, const char *name )
|
joachim99@8
|
40 : KParts::ReadOnlyPart(parent, name)
|
joachim99@8
|
41 {
|
joachim99@8
|
42 // we need an instance
|
joachim99@8
|
43 setInstance( KDiff3PartFactory::instance() );
|
joachim99@8
|
44
|
joachim99@8
|
45 // this should be your custom internal widget
|
joachim99@8
|
46 m_widget = new KDiff3App( parentWidget, widgetName, this );
|
joachim99@8
|
47
|
joachim99@8
|
48 // This hack is necessary to avoid a crash when the program terminates.
|
joachim99@8
|
49 m_bIsShell = dynamic_cast<KParts::MainWindow*>(parentWidget)!=0;
|
joachim99@8
|
50
|
joachim99@8
|
51 // notify the part that this is our internal widget
|
joachim99@8
|
52 setWidget(m_widget);
|
joachim99@8
|
53
|
joachim99@8
|
54 // create our actions
|
joachim99@8
|
55 //KStdAction::open(this, SLOT(fileOpen()), actionCollection());
|
joachim99@8
|
56 //KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection());
|
joachim99@8
|
57 //KStdAction::save(this, SLOT(save()), actionCollection());
|
joachim99@8
|
58
|
joachim99@8
|
59 setXMLFile("kdiff3_part.rc");
|
joachim99@8
|
60
|
joachim99@8
|
61 // we are read-write by default
|
joachim99@8
|
62 setReadWrite(true);
|
joachim99@8
|
63
|
joachim99@8
|
64 // we are not modified since we haven't done anything yet
|
joachim99@8
|
65 setModified(false);
|
joachim99@8
|
66 }
|
joachim99@8
|
67
|
joachim99@8
|
68 KDiff3Part::~KDiff3Part()
|
joachim99@8
|
69 {
|
joachim99@8
|
70 if ( m_widget!=0 && ! m_bIsShell )
|
joachim99@8
|
71 {
|
joachim99@8
|
72 m_widget->saveOptions( m_widget->isPart() ? instance()->config() : kapp->config() );
|
joachim99@8
|
73 }
|
joachim99@8
|
74 }
|
joachim99@8
|
75
|
joachim99@8
|
76 void KDiff3Part::setReadWrite(bool /*rw*/)
|
joachim99@8
|
77 {
|
joachim99@8
|
78 // ReadWritePart::setReadWrite(rw);
|
joachim99@8
|
79 }
|
joachim99@8
|
80
|
joachim99@8
|
81 void KDiff3Part::setModified(bool /*modified*/)
|
joachim99@8
|
82 {
|
joachim99@8
|
83 /*
|
joachim99@8
|
84 // get a handle on our Save action and make sure it is valid
|
joachim99@8
|
85 KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
|
joachim99@8
|
86 if (!save)
|
joachim99@8
|
87 return;
|
joachim99@8
|
88
|
joachim99@8
|
89 // if so, we either enable or disable it based on the current
|
joachim99@8
|
90 // state
|
joachim99@8
|
91 if (modified)
|
joachim99@8
|
92 save->setEnabled(true);
|
joachim99@8
|
93 else
|
joachim99@8
|
94 save->setEnabled(false);
|
joachim99@8
|
95
|
joachim99@8
|
96 // in any event, we want our parent to do it's thing
|
joachim99@8
|
97 ReadWritePart::setModified(modified);
|
joachim99@8
|
98 */
|
joachim99@8
|
99 }
|
joachim99@8
|
100
|
joachim99@68
|
101 static void getNameAndVersion( const QString& str, const QString& lineStart, QString& fileName, QString& version )
|
joachim99@68
|
102 {
|
joachim99@68
|
103 if ( str.left( lineStart.length() )==lineStart && fileName.isEmpty() )
|
joachim99@68
|
104 {
|
joachim99@68
|
105 unsigned int pos = lineStart.length();
|
joachim99@68
|
106 while ( pos<str.length() && (str[pos]==' ' || str[pos]=='\t') ) ++pos;
|
joachim99@68
|
107 unsigned int pos2 = str.length()-1;
|
joachim99@68
|
108 while ( pos2>pos )
|
joachim99@68
|
109 {
|
joachim99@68
|
110 while (pos2>pos && str[pos2]!=' ' && str[pos2]!='\t') --pos2;
|
joachim99@68
|
111 fileName = str.mid( pos, pos2-pos );
|
joachim99@68
|
112 std::cerr << "KDiff3: " << fileName.latin1() << std::endl;
|
joachim99@68
|
113 if ( FileAccess(fileName).exists() ) break;
|
joachim99@68
|
114 --pos2;
|
joachim99@68
|
115 }
|
joachim99@68
|
116
|
joachim99@68
|
117 int vpos = str.findRev("\t", -1);
|
joachim99@68
|
118 if ( vpos>0 && vpos>(int)pos2 )
|
joachim99@68
|
119 {
|
joachim99@68
|
120 version = str.mid( vpos+1 );
|
joachim99@68
|
121 while( !version.right(1)[0].isLetterOrNumber() )
|
joachim99@68
|
122 version.truncate( version.length()-1 );
|
joachim99@68
|
123 }
|
joachim99@68
|
124 }
|
joachim99@68
|
125 }
|
joachim99@68
|
126
|
joachim99@68
|
127
|
joachim99@8
|
128 bool KDiff3Part::openFile()
|
joachim99@8
|
129 {
|
joachim99@8
|
130 // m_file is always local so we can use QFile on it
|
joachim99@68
|
131 std::cerr << "KDiff3: " << m_file.latin1() << std::endl;
|
joachim99@8
|
132 QFile file(m_file);
|
joachim99@8
|
133 if (file.open(IO_ReadOnly) == false)
|
joachim99@8
|
134 return false;
|
joachim99@8
|
135
|
joachim99@8
|
136 // our example widget is text-based, so we use QTextStream instead
|
joachim99@8
|
137 // of a raw QDataStream
|
joachim99@8
|
138 QTextStream stream(&file);
|
joachim99@8
|
139 QString str;
|
joachim99@8
|
140 QString fileName1;
|
joachim99@8
|
141 QString fileName2;
|
joachim99@8
|
142 QString version1;
|
joachim99@8
|
143 QString version2;
|
joachim99@8
|
144 while (!stream.eof() && (fileName1.isEmpty() || fileName2.isEmpty()) )
|
joachim99@8
|
145 {
|
joachim99@8
|
146 str = stream.readLine() + "\n";
|
joachim99@68
|
147 getNameAndVersion( str, "---", fileName1, version1 );
|
joachim99@68
|
148 getNameAndVersion( str, "+++", fileName2, version2 );
|
joachim99@8
|
149 }
|
joachim99@8
|
150
|
joachim99@8
|
151 file.close();
|
joachim99@8
|
152
|
joachim99@8
|
153 if ( fileName1.isEmpty() && fileName2.isEmpty() )
|
joachim99@8
|
154 {
|
joachim99@8
|
155 KMessageBox::sorry(m_widget, i18n("Couldn't find files for comparison."));
|
joachim99@8
|
156 return false;
|
joachim99@8
|
157 }
|
joachim99@8
|
158
|
joachim99@8
|
159 FileAccess f1(fileName1);
|
joachim99@8
|
160 FileAccess f2(fileName2);
|
joachim99@8
|
161
|
joachim99@8
|
162 if ( f1.exists() && f2.exists() && fileName1!=fileName2 )
|
joachim99@8
|
163 {
|
joachim99@66
|
164 m_widget->slotFileOpen2( fileName1, fileName2, "", "", "", "", "", 0 );
|
joachim99@8
|
165 return true;
|
joachim99@8
|
166 }
|
joachim99@8
|
167 else if ( version1.isEmpty() && f1.exists() )
|
joachim99@8
|
168 {
|
joachim99@8
|
169 // Normal patch
|
joachim99@8
|
170 // patch -f -u --ignore-whitespace -i [inputfile] -o [outfile] [patchfile]
|
joachim99@8
|
171 QString tempFileName = FileAccess::tempFileName();
|
joachim99@68
|
172 QString cmd = "patch -f -u --ignore-whitespace -i \"" + m_file +
|
joachim99@68
|
173 "\" -o \""+tempFileName + "\" \"" + fileName1+ "\"";
|
joachim99@8
|
174
|
joachim99@8
|
175 ::system( cmd.ascii() );
|
joachim99@8
|
176
|
joachim99@8
|
177 m_widget->slotFileOpen2( fileName1, tempFileName, "", "",
|
joachim99@66
|
178 "", version2.isEmpty() ? fileName2 : "REV:"+version2+":"+fileName2, "", 0 ); // alias names
|
joachim99@68
|
179 std::cerr << "KDiff3: f1:" << fileName1.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
|
joachim99@68
|
180 // FileAccess::removeFile( tempFileName );
|
joachim99@8
|
181 }
|
joachim99@8
|
182 else if ( version2.isEmpty() && f2.exists() )
|
joachim99@8
|
183 {
|
joachim99@8
|
184 // Reverse patch
|
joachim99@8
|
185 // patch -f -u -R --ignore-whitespace -i [inputfile] -o [outfile] [patchfile]
|
joachim99@8
|
186 QString tempFileName = FileAccess::tempFileName();
|
joachim99@68
|
187 QString cmd = "patch -f -u -R --ignore-whitespace -i \"" + m_file +
|
joachim99@68
|
188 "\" -o \""+tempFileName + "\" \"" + fileName2+"\"";
|
joachim99@8
|
189
|
joachim99@8
|
190 ::system( cmd.ascii() );
|
joachim99@8
|
191
|
joachim99@8
|
192 m_widget->slotFileOpen2( tempFileName, fileName2, "", "",
|
joachim99@66
|
193 version1.isEmpty() ? fileName1 : "REV:"+version1+":"+fileName1, "", "", 0 ); // alias name
|
joachim99@68
|
194 std::cerr << "KDiff3: f2:" << fileName2.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
|
joachim99@8
|
195 }
|
joachim99@8
|
196 else if ( !version1.isEmpty() && !version2.isEmpty() )
|
joachim99@8
|
197 {
|
joachim99@68
|
198 std::cerr << "KDiff3: f1/2:" << fileName1.latin1() <<"<->"<<fileName2.latin1()<< std::endl;
|
joachim99@8
|
199 // Assuming that files are on CVS: Try to get them
|
joachim99@8
|
200 // cvs update -p -r [REV] [FILE] > [OUTPUTFILE]
|
joachim99@8
|
201
|
joachim99@8
|
202 QString tempFileName1 = FileAccess::tempFileName();
|
joachim99@68
|
203 QString cmd1 = "cvs update -p -r " + version1 + " \"" + fileName1 + "\" >\""+tempFileName1+"\"";
|
joachim99@8
|
204 ::system( cmd1.ascii() );
|
joachim99@8
|
205
|
joachim99@8
|
206 QString tempFileName2 = FileAccess::tempFileName();
|
joachim99@68
|
207 QString cmd2 = "cvs update -p -r " + version2 + " \"" + fileName2 + "\" >\""+tempFileName2+"\"";
|
joachim99@8
|
208 ::system( cmd2.ascii() );
|
joachim99@8
|
209
|
joachim99@8
|
210 m_widget->slotFileOpen2( tempFileName1, tempFileName2, "", "",
|
joachim99@8
|
211 "REV:"+version1+":"+fileName1,
|
joachim99@8
|
212 "REV:"+version2+":"+fileName2,
|
joachim99@66
|
213 "", 0
|
joachim99@8
|
214 );
|
joachim99@8
|
215
|
joachim99@68
|
216 std::cerr << "KDiff3: f1/2:" << tempFileName1.latin1() <<"<->"<<tempFileName2.latin1()<< std::endl;
|
joachim99@68
|
217 // FileAccess::removeFile( tempFileName1 );
|
joachim99@68
|
218 // FileAccess::removeFile( tempFileName2 );
|
joachim99@8
|
219 return true;
|
joachim99@8
|
220 }
|
joachim99@8
|
221 else
|
joachim99@8
|
222 {
|
joachim99@8
|
223 KMessageBox::sorry(m_widget, i18n("Couldn't find files for comparison."));
|
joachim99@8
|
224 }
|
joachim99@8
|
225
|
joachim99@8
|
226 return true;
|
joachim99@8
|
227 }
|
joachim99@8
|
228
|
joachim99@8
|
229 bool KDiff3Part::saveFile()
|
joachim99@8
|
230 {
|
joachim99@8
|
231 /* // if we aren't read-write, return immediately
|
joachim99@8
|
232 if (isReadWrite() == false)
|
joachim99@8
|
233 return false;
|
joachim99@8
|
234
|
joachim99@8
|
235 // m_file is always local, so we use QFile
|
joachim99@8
|
236 QFile file(m_file);
|
joachim99@8
|
237 if (file.open(IO_WriteOnly) == false)
|
joachim99@8
|
238 return false;
|
joachim99@8
|
239
|
joachim99@8
|
240 // use QTextStream to dump the text to the file
|
joachim99@8
|
241 QTextStream stream(&file);
|
joachim99@8
|
242 //stream << m_widget->text();
|
joachim99@8
|
243
|
joachim99@8
|
244 file.close();
|
joachim99@8
|
245 return true;
|
joachim99@8
|
246 */
|
joachim99@8
|
247 return false; // Not implemented
|
joachim99@8
|
248 }
|
joachim99@8
|
249
|
joachim99@8
|
250
|
joachim99@8
|
251 // It's usually safe to leave the factory code alone.. with the
|
joachim99@8
|
252 // notable exception of the KAboutData data
|
joachim99@8
|
253 #include <kaboutdata.h>
|
joachim99@8
|
254 #include <klocale.h>
|
joachim99@8
|
255
|
joachim99@8
|
256 KInstance* KDiff3PartFactory::s_instance = 0L;
|
joachim99@8
|
257 KAboutData* KDiff3PartFactory::s_about = 0L;
|
joachim99@8
|
258
|
joachim99@8
|
259 KDiff3PartFactory::KDiff3PartFactory()
|
joachim99@8
|
260 : KParts::Factory()
|
joachim99@8
|
261 {
|
joachim99@8
|
262 }
|
joachim99@8
|
263
|
joachim99@8
|
264 KDiff3PartFactory::~KDiff3PartFactory()
|
joachim99@8
|
265 {
|
joachim99@8
|
266 delete s_instance;
|
joachim99@8
|
267 delete s_about;
|
joachim99@8
|
268
|
joachim99@8
|
269 s_instance = 0L;
|
joachim99@8
|
270 }
|
joachim99@8
|
271
|
joachim99@8
|
272 KParts::Part* KDiff3PartFactory::createPartObject( QWidget *parentWidget, const char *widgetName,
|
joachim99@8
|
273 QObject *parent, const char *name,
|
joachim99@8
|
274 const char *classname, const QStringList&/*args*/ )
|
joachim99@8
|
275 {
|
joachim99@8
|
276 // Create an instance of our Part
|
joachim99@8
|
277 KDiff3Part* obj = new KDiff3Part( parentWidget, widgetName, parent, name );
|
joachim99@8
|
278
|
joachim99@8
|
279 // See if we are to be read-write or not
|
joachim99@8
|
280 if (QCString(classname) == "KParts::ReadOnlyPart")
|
joachim99@8
|
281 obj->setReadWrite(false);
|
joachim99@8
|
282
|
joachim99@8
|
283 return obj;
|
joachim99@8
|
284 }
|
joachim99@8
|
285
|
joachim99@8
|
286 KInstance* KDiff3PartFactory::instance()
|
joachim99@8
|
287 {
|
joachim99@8
|
288 if( !s_instance )
|
joachim99@8
|
289 {
|
joachim99@66
|
290 s_about = new KAboutData("kdiff3part", I18N_NOOP("KDiff3Part"), VERSION);
|
joachim99@69
|
291 s_about->addAuthor("Joachim Eibl", 0, "joachim.eibl at gmx.de");
|
joachim99@8
|
292 s_instance = new KInstance(s_about);
|
joachim99@8
|
293 }
|
joachim99@8
|
294 return s_instance;
|
joachim99@8
|
295 }
|
joachim99@8
|
296
|
joachim99@8
|
297 extern "C"
|
joachim99@8
|
298 {
|
joachim99@8
|
299 void* init_libkdiff3part()
|
joachim99@8
|
300 {
|
joachim99@8
|
301 return new KDiff3PartFactory;
|
joachim99@8
|
302 }
|
joachim99@53
|
303 }
|
joachim99@8
|
304
|
joachim99@66
|
305 // Suppress warning with --enable-final
|
joachim99@66
|
306 #undef VERSION
|
joachim99@66
|
307
|
joachim99@8
|
308 #include "kdiff3_part.moc"
|