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