1Dec 27, 2004 : Jeff Snyder 2 * Fix for bug 95640 (nothing displayed when kompare is embedded in Ark 3 fixed by forcing the delivery of childEvents to komparesplitter at 4 the end of its constructor 5 6Dec 20, 2004 : Jeff Snyder 7 * Things that have happened since 3.3: 8 (this list is not complete) 9 * Look & feel changed 10 11Dec 20, 2004 : Jeff Snyder 12 * Things that were changed sometime between Nov 25, 2003 and KDE 3.3: 13 (this list is not complete) 14 * KompareConnectWidget became draggable, by replacing KompareViewFrame 15 with KompareSplitter. 16 17Dec 20, 2004 : Jeff Snyder 18 * This changelog seems to have been neglected for over a year now. I'll 19 try to retroactively fix this as and when I remember things that have 20 been fixed - but it'll probably never be complete and accurate for the 21 Dec 2003 - Nov 2004 period. I'll be making entries concering what i'm 22 doing with kompare from now onwards. 23 24Nov 25, 2003 : Otto Bruggeman 25 * Fix nasty looping to the end of the file when hitting previous difference on the first difference in the first file 26 27Nov 25, 2003 : Laurent Montel 28 * Fix memleak, QStringList is implicitly shared so no need for a reference, it is already a pointer to data thing 29 30Nov 23, 2003 : Otto Bruggeman 31 * Fixed version string (bug 68872) 32 * Fix for 68871 (added slotNextDifference to slotApplyDifference()) 33 * Fix for a crash: dont call blendOriginalIntoModelList with Kompare::ShowingDiff 34 35Nov 22, 2003 : Otto Bruggeman 36 * Fix to make the bugs.kde.org dialog pop up instead of sending a mail to John when pressing 37 Help->Report bug... Also added my homepage since it has always been kompare's home imo. 38 39Nov 22, 2003 : Otto Bruggeman 40 * Rework the blendFile method so it actually works and as a bonus is a bit faster 41 This introduces a new form of show entire file when comparing, one that works 42 And because of it, it saves files properly now because the entire file is now available even if 43 you have a single line change in a million line file with only 2 context lines in the diff. 44 45Nov 22, 2003 : Otto Bruggeman 46 * Remove the Show entire file option. It only causes problems at the moment 47 Fixes bug 68729 48 49Nov 22, 2003 : Otto Bruggeman 50 * Commenting out a lot of debug output, it has served it's purpose well in levenshteintable.cpp 51 52Nov 21, 2003 : Otto Bruggeman 53 * Also expand tabs to spaces in strings without or after Commands (in the INLINE_DIFFERENCES 54 code path and yes commands is a shitty name for them but i cant think of something decent) 55 56Nov 21, 2003 : Otto Bruggeman 57 * Real Fix (tm) for activating the Swap source with destination action 58 59Nov 21, 2003 : Otto Bruggeman 60 * Fix empty line drawing in the INLINE_DIFFERENCES code path 61 62Nov 20, 2003 : Otto Bruggeman 63 * When swapping source with destination also change the windows caption and the statusbar text 64 * Make sure that when swapping and when there are changes, all changes that were made can be 65 saved, discarded or cancel the whole swap (strings are recycled from the queryClose method) 66 * Give a better parent to the KIO::NetAccess::download in komparemodellist.cpp 67 * Added some FIXME's for after the branching to make the urls appear in bold in the error message 68 * Make queryClose not use the isModified from the part but from the modellist 69 70Nov 20, 2003 : Otto Bruggeman 71 * Fix for activating the Swap Source with Destination action. 72 73Nov 19, 2003 : Otto Bruggeman 74 * Fixed bug 68570, it needed temp vars otherwise it was overwriting source with destination and then 75 overwriting that destination with source which was just changed into destination 76 77Nov 17, 2003 : Otto Bruggeman 78 * Fix for empty -x and -X arguments. 79 * Fix bugs 58858 and 58531 by using Kompare::Custom instead of Kompare::Default 80 * Fix last selected url in the kurlcomboboxes 81 * Fix for inline differences when there is only 1 char left that still needs to be drawn 82 * Remove support for the -a Treat all files as text diff option. This caused all sorts of weird crashes 83 when parsing the diff output now with the custom options. 84 * Move the per preference page code in the diffprefs constructor into seperate methods per page 85 86Nov 14, 2003 : Otto Bruggeman 87 * Fix to make Kompare listen to the kdisplayFontChanged signal and set the font properly and redraw with the new font. 88 Found by David Faure. 89 90Nov 09, 2003 : Otto Bruggeman 91 * Implemented inline differences (deactivated until KDE3.2 has been branched) 92 * added support for the -x and -X options to diff (deactivated until KDE3.2 has been branched) 93 * Various other code cleanups/reindenting 94 95Nov 09, 2003 : Otto Bruggeman 96 * Code cleanups 97 98Nov 02, 2003 : Otto Bruggeman 99 * Fixed some more scrolling problems 100 lastItem->scrollId(), add lastItem->maxHeight() and substract the minScrollId() 101 That is the maxScrollId i need in the QScrollBar, took me long enough... 102 103Oct 05, 2003 : Otto Bruggeman 104 * Fixed the scrolling problems, a stupid regression i introduced, i cant simplify mathematic expressions apparently 105 * Added an implementation for double clicking a difference in the view, but it is not properly connected yet 106 void contentsMouseDoubleClickEvent ( QMouseEvent* ); 107 * Fixed embedding in Konqueror by implementing openURL() 108 * Removed m_maxScrollId, it is not necessary and only costs time, QScrollView::contentsHeight() does the same 109 * Fixed some more warnings about unused variables 110 * Fixed the initial drawing of the vertical and horizontal scrollbar 111 112Oct 04, 2003 : Otto Bruggeman 113 * Added a call to m_modelList->openDirAndDiff to openDirAndDiff 114 * Fixed some error strings by swapping the %# thingies 115 * Added some useless debug output 116 * Fixed KompareModelList::openDirAndDiff to use the right models variable (m_models instead of models) 117 118Oct 03, 2003 : Otto Bruggeman 119 * Fixed ApplyAll and UnApplyAll, stupid copy and paste error 120 * Fixed some warnings about signed and unsigned 121 * Fixed some warnings about unused variables 122 * Fixed some redrawing issues in the connection widget 123 124Sep 27, 2003 : Otto Bruggeman 125 * Fixed the redrawing problems in the connect widget with a QTimer::singleShot() 126 * Undid a stupid commit that changed the keyboard shortcuts for next and previous difference 127 * Fixed another bug in the navigation part that made it emit a signal twice 128 * Fixed a bug in the listview drawing, still one left that i cant seem to solve :( 129 130Sep 27, 2003 : Otto Bruggeman 131 * Moved the apply and navigation actions into the komparemodellist 132 * Fixed Ingo's problem with the next and prev difference KActions 133 134Sep 26, 2003 : Otto Bruggeman 135 * Added a struct Info in the Kompare namespace. This one contains all the info about what kompare is doing 136 * Fixed splitting the path string in diffmodel 137 * Fixed showing the path in komparenavtreepart in the directory listviews 138 139Sep 24, 2003 : Otto Bruggeman 140 * Fixes opening diffs, comparing files after moving all that code around 141 142Sep 23, 2003 : Otto Bruggeman 143 * Moved a lot of url downloading to the kompare part and moved the opening and reading of the downloads to komparemodellist 144 145Sep 22, 2003 : Otto Bruggeman 146 * Added openStdin() to KompareShell 147 * Fixed stupid implicit conversion from QString to QStringList in kompare_part.cpp 148 * Added openDiff( QStringList ) to the interface and to the part 149 150Sep 14, 2003 : Otto Bruggeman 151 * Fixed exit status of the kompare process 152 153Sep 13, 2003 : Otto Bruggeman 154 * Removed some files that apparently came back after the merge 155 156Sep 07, 2003 : Otto Bruggeman 157 * Some changes to the interface. Made the copy ctor and assignment operator 158 and added a private d-pointer 159 * Removed the use of all deprecated methods and replaced them with undeprecated ones :) 160 161Sep 02, 2003 : Scott Wheeler 162 * Made the interface pure virtual 163 164Sep 01, 2003 : Scott Wheeler 165 * Fixed constness of the KompareModelList constructor 166 * Fixed another 2 warnings about comapring signed with unsigned ints 167 * Fixed the initialization of the difault var 168 169Aug 27, 2003 : Otto Bruggeman 170 * After shitloads of trouble here finally some fixes for the stupid desktop 171 file stuff 172 * Fixes for when there are not enough args for a certain commandline option. 173 174Aug 22, 2003 : Otto Bruggeman 175 * Fixed converting tabs to spaces in the view, i totally screwed up 176 * View settings now get applied to the view after pressing ok. 177 (Maybe i should make them apply on APlly instead of OK) 178 179Aug 13, 2003 : Otto Bruggeman 180 * Komkommertijd :) InitialPreference=10 for kompare.desktop as 181 requested 182 183Aug 10, 2003 : Otto Bruggeman 184 * Backported Helge Deller's changes from head to make_it_cool 185 (kompare_shell.cpp 1.33 -> 1.34). This is about roaming user fixes. 186 Thanks Helge ! 187 188Jul 19, 2003 : Otto Bruggeman 189 * Backported Ingo Klocker's changes from head to make_it_cool 190 (kompare_shell.cpp 1.34 -> 1.35). This is about being able to 191 configure the shortcuts from kompare_part as well. Thanks Ingo ! 192 193Jun 29, 2003 : Otto Bruggeman 194 * Fixed bug 58144 by adding a check for comparing dirs, in that case 195 destinationURL is a directory and not a file name so we need to 196 recreate the filename. This involved changing some code to use a 197 different enum value, so i hope i did it the right way, session 198 management may be broken now when the session was stored with 3.1.2 199 and restarted with 3.1.3. But that is unfortunately unfixable with a 200 kconf_update script. 201 202Jun 29, 2003 : Otto Bruggeman 203 * Removed a lot of commented code since it is no longer used and will 204 never be used again. 205 * Added 2 methods to the interface: openDiff3(KURL) and 206 openDiff3(QStringList) 207 * Fixed context diff parsing as indicated in bugreport 57774 208 (the example works now, hope there are no regressions) 209 * Removed all references to MiscSettings and MiscPrefs. 210 These classes will disappear RSN. 211 * Fixed the history saving of the urls in the kompare dialog 212 * Parser is no longer a static class but one that needs to be 213 instanciated 214 * Added ViewSettings to KompareProcess, maybe it is better to merge the 215 diff and view settings into one class. 216 217May 3, 2003 : Otto Bruggeman 218 * Implemented support for -I in the regular diff options (the one in 219 the kompare options dialog) 220 * Fixed the braindamage i created in main.cpp so that kompare no 221 longer stalls because of a missing mainwindow 222 * Made the kcomparedialog more generic and renamed it to 223 kompareurldialog so i can reuse it for blending too 224 * Removed some braindamage in the kompare/Makefile.am 225 * Some compile fixes because of changes to the CXXFLAGS 226 (QRegExp::match cant be used anymore, and some other old style stuff) 227 * Added an action to the menu for blending 228 * moved Open file (or in this case Open Diff) to the top of the file 229 menu 230 * Fixed the accel conflict in the file menu between open diff and 231 compare files 232 233Apr 30, 2003 : Otto Bruggeman 234 * Implemented blending of a diff file with the original file 235 * Renamed General* View* (more appropriate) 236 * Renamed m_models into m_modelList since it is more appropriate in komparepart 237 * Small fixes to the view, but they break more than they fix :( 238 * Added commandline options for comparing, opening a diff file and 239 blending 240 241Apr 20, 2003 : Otto Bruggeman 242 * Fixed bug 54264 with a statusbar that gets too wide when long 243 filenames are used 244 * Fixed the missing endline problem in the parser (bug 56552) 245 * Fixed all copyright years (probably too many but hey i'll change 246 those files some time this year so it will be valid :P) 247 * Added support for using a different diff program (Bug 55573) 248 * Added support for using a different tabsize in the viewer (Bug 38776) 249 * The interface is now final i guess so this fixes bug 42849, not 250 every method is implemented but i'll get to them eventually. 251 252Apr 19, 2003 : Otto Bruggeman 253 * Fixed bug 56322 where openURL did not clear the models when called 254 again with a new diff 255 256Aug 9, 2002 : Otto Bruggeman 257 * Fixed the whatsthis text for the compare button in the compare dialog 258 * Fixed the history of the comboboxes in the compare dialog 259 * Put the komparemodellist and all needed classes in a Diff2 namespace 260 * Implemented a better parser design (see parser.cpp/h) 261 * Removed the need to directly link to the komparepart for the shellapp 262 * Removed the need to link directly to the komparepart for the navigationpart 263 * Added support for perforce diffs in the new Parser classes 264 * Added a push design for the modified status instead of a pull design 265 * Added an interface to the Komparepart so people can use that to 266 reuse the komparepart 267 268Jul 15, 2002 : Otto Bruggeman 269 * Fixed normal diff a bit more, filenames dont work yet 270 * Removed some code duplication 271 * Fixed diff output parsing with Common subdirectories in it 272 * Fixed Copyright years in the about box (thanks Carsten Niehaus) 273 * Removed the K3ShellProcess and replaced it with a K3Process 274 275Feb 18, 2002 : Otto Bruggeman 276 * Fixed scrolling with a wheel mouse in the kompare(list)view and 277 connectwidget and added a config option for the number of lines 278 that is scrolled per wheelscroll. 279 * Fixed the history somehow in the compare dialog. 280 * Implemented the separate directory/file widget. 281 * Implemented reading from stdin by using - as file on the commandline. 282 * Partly implemented a better way for ed and rcs parsing, i'll 283 improve this before KDE 3.0 is released 284 285Jan 10, 2002 : Otto Bruggeman 286 Comparing directories works now :) You can select them from the begin 287 dialog, and select a directory and then press ok. It will enter the 288 directory but dont select a file so it keeps the directory. 289 Known bug here is that directories need a trailing slash :( 290 291Oct 07, 2001 : Otto Bruggeman 292 Fix crash when part is not found, basically dont use kapp->quit() 293 but use exit(int). Would be interested to know why it crashes though, 294 the bt gave nothing meaningful here. I should have compiled kompare with 295 debug code. 296 297Sep 17/18, 2001 : Otto Bruggeman 298 Fixed some stuff dont know what anymore (writing this on oct 7) 299 Probably some more fixes for the klibloader. 300 301Sep 17, 2001 : Otto Bruggeman 302 Moved to kdesdk and renamed to kompare with preservation of history. 303 Changed almost every occurence of kdiff to kompare (not in this file). 304 305Sep 08, 2001 : Otto Bruggeman 306 Removed the qt3back dir, changed everything over to qt3, 307 qlist->qptrlist, qlistconstiterator->qptrlistconstiterator 308 309Jul 29, 2001 : John Firebaugh 310 Add some tests. 311 Add the qregexp3 backport. 312 Use qregexp3 for diff parsing -- soooo much cleaner. 313 All the diff options work. 314 315Jul 28, 2001 : John Firebaugh 316 Directories can be selected in the compare dialog 317 New base clase KDiff, holds some common stuff 318 Use an enum for format in preferences 319 Implement a save options dialog, displayed at "Save .diff" 320 The diff can be run in any directory, the paths to source 321 and destination will be automatically determined from this. 322 Save all. 323 324Jul 25, 2001 : John Firebaugh 325 Prompt to save changes on close 326 Show [modified] caption 327 Clean up internal save mechanism 328 329Jul 14, 2001 : John Firebaugh 330 New menu item "Swap source and destination". 331 Make empty selection work. 332 333Jul 13, 2001 : John Firebaugh 334 Text view now works in compare mode. 335 Fix clicking difference to select it. 336 Don't scroll to difference when clicking to select it. 337 Give the diff view a nice frame. 338 339Jul 12, 2001 : Otto Bruggeman 340 Stats work now, maybe they need more info but i dont know what yet. 341 Will think some more about it. 342 343Jul 12, 2001 : John Firebaugh 344 When comparing files, you can apply or unapply changes and save 345 the result. 346 New menu item "Show Text View" (loads the diff in embedded text viewer). 347 Better status notification. 348 Set the window caption when comparing. 349 350Jun 27, 2001 : John Firebaugh 351 Ported main view to QListView 352 Remove obsolete files 353 Clicking a difference in the main view selects it 354 Better scrolling 355 356Jun 24, 2001 : John Firebaugh 357 Coverted to dock window and added navigation tree in a dock. 358 Multiple file diffs are now supported. Each file will show up 359 as an item in the tree, with differences as children. 360 361Jun 22, 2001 : Otto Bruggeman 362 Tried implementing rcs and ed but they dont work atm, same for show 363 diffstats, will fix that asap. 364 365May 22, 2001 : John Firebaugh 366 Reworking of most of the view code. Looks pretty. 367 368May 18, 2001 : Otto Bruggeman 369 Context seems to work, implemented saving... might have some problems 370 left (saving that is) 371 372May 15, 2001 : John Firebaugh 373 Make the settings work for all windows. Probably some more changes :) 374 375May 14, 2001 : Otto Bruggeman 376 context diff does not work atm, there is some problem with the separa- 377 tion of old and new. Maybe the old and new needs to be reintegrated. 378 I fixed some functions and now diffmodel does no longer need static 379 functions. All loading is done from the kdiffpart and that is where 380 save should go as well. Removed determineDiffFormat because it is not 381 needed anymore. 382 383May 13, 2001 : Otto Bruggeman 384 contextdiff is better implemented it finds all stuff in the diff atm 385 but it does not work. 386 387May 04, 2001 : Otto Bruggeman 388 cleaned up the code by moving the part to a subdir 389 halfassed implementation of contextdiff, will update later today 390 391Apr 10, 2001 : John Firebaugh 392 use new model/view architecture (not completely implemented yet) 393 NOTE: it will (should) compile, but you won't see any differences... a 394 work in progress 395 396Apr 05, 2001 : Otto Bruggeman 397 Implemented the ability to move from chuck to chunk in the htmlview 398 Cleaned up the preferences, squashed a few bugs 399 400Apr 04, 2001 : Otto Bruggeman 401 Normal format works as well 402 403Apr 04, 2001 : Otto Bruggeman 404 Finally implemented the preferences menu... i still lack some nice 405 icons for it but that will be solved in the near future... 406 407Mar 25, 2001 : Otto Bruggeman 408 Moved the application icons to the pics dir 409 410Mar 20, 2001 : Otto Bruggeman 411 Fixed a stupid bug that caused the last line in the rightview not 412 to be colored. 413 Implemented slots for using the KHistoryCombo in the views to select 414 files with. 415 Still a nasty bug with regard to the initial directory in the 416 KFileDialog, needs to be fixed asap but i dont know the cause. 417 Still an error in the historylist and completionlist items. They are 418 not shown correctly. 419 420Mar 19, 2001 : Otto Bruggeman 421 Added most of the preferences dialog 422 Some speed improvements 423 Some fixes to use the last used directory in KFileDialog 424