OSDN Git Service
Laurent Ganier [Sat, 17 Apr 2004 08:45:28 +0000 (08:45 +0000)]
PATCH: [ 936524 ] Cannot compare/Cancel,Retry,Continue
Kimmo Varis [Sat, 17 Apr 2004 06:44:32 +0000 (06:44 +0000)]
Fix for unicode build after patch #935048 -- add _T() around string
Laurent Ganier [Fri, 16 Apr 2004 20:32:12 +0000 (20:32 +0000)]
PATCH: [ 935048 ] Plugin manager and per-file plugin settings V2
Laurent Ganier [Fri, 16 Apr 2004 17:54:58 +0000 (17:54 +0000)]
updated swedish translation (with layout)
Laurent Ganier [Fri, 16 Apr 2004 17:29:04 +0000 (17:29 +0000)]
updated swedish translation
Kimmo Varis [Fri, 16 Apr 2004 15:32:50 +0000 (15:32 +0000)]
RFE: [ 934446 ] Syntax highlighting for XML files - submitted by Tim Gerundt
Christian Blackburn [Fri, 16 Apr 2004 11:08:08 +0000 (11:08 +0000)]
I compressed this png file and now it's slightly smaller.
Perry Rapp [Thu, 15 Apr 2004 23:42:52 +0000 (23:42 +0000)]
Update a cross-reference from planned item#1 to planned item#9 (now done).
Kimmo Varis [Wed, 14 Apr 2004 21:13:38 +0000 (21:13 +0000)]
PATCH: [ 934344 ] Reset dircompare columns
Christian Blackburn [Wed, 14 Apr 2004 20:48:30 +0000 (20:48 +0000)]
Russian and Swedish 4.18 or lower translations removed since I've replaced them with 4.21 Files.
Kimmo Varis [Wed, 14 Apr 2004 19:22:53 +0000 (19:22 +0000)]
BUG: [ 926578 ] Division by zero exception
Jochen Tucht [Tue, 13 Apr 2004 20:31:26 +0000 (20:31 +0000)]
Patch #889357 -- updated patch from 2004-03-18
Kimmo Varis [Tue, 13 Apr 2004 15:56:53 +0000 (15:56 +0000)]
Fix typo causing wrong icon for error items in dir compare
Kimmo Varis [Tue, 13 Apr 2004 15:43:05 +0000 (15:43 +0000)]
PATCH: [ 932086 ] Syntax highlighting of HTML not complete (Bug 930930) - submitted by Tim Gerundt
Laurent Ganier [Wed, 7 Apr 2004 22:40:32 +0000 (22:40 +0000)]
Rename 'list of sources.txt' to 'list_of_sources.txt'
Laurent Ganier [Wed, 7 Apr 2004 22:40:03 +0000 (22:40 +0000)]
Creation of 'readme_developpers.txt' and of a 'readme.txt' to log patches
Laurent Ganier [Wed, 7 Apr 2004 19:34:54 +0000 (19:34 +0000)]
BUG: [ 930995 ] Cursor help text ... ; part two : inversion in menu
Kimmo Varis [Wed, 7 Apr 2004 19:23:54 +0000 (19:23 +0000)]
PATCH: [ 931208 ] Missing screenshots and xsl typo
Kimmo Varis [Wed, 7 Apr 2004 17:46:29 +0000 (17:46 +0000)]
PATCH: [ 930512 ] Log delete file errors from multiformatText.cpp
Kimmo Varis [Wed, 7 Apr 2004 17:41:12 +0000 (17:41 +0000)]
PATCH: [ 930495 ] Log delete file errors from FileTransform.cpp
Kimmo Varis [Wed, 7 Apr 2004 14:05:26 +0000 (14:05 +0000)]
Remove bogus stylesheet definition
Kimmo Varis [Wed, 7 Apr 2004 13:56:48 +0000 (13:56 +0000)]
PATCH: [ 930704 ] WinMerge 2.1 User Guide (Manual) - reformat Command_line.xml - Submitted by Tim Gerundt
Laurent Ganier [Wed, 7 Apr 2004 12:32:41 +0000 (12:32 +0000)]
BUG: [ 930995 ] Cursor help text ...
Kimmo Varis [Mon, 5 Apr 2004 15:30:35 +0000 (15:30 +0000)]
PATCH: [ 929584 ] Reset scratchpad names
Kimmo Varis [Mon, 5 Apr 2004 12:42:02 +0000 (12:42 +0000)]
PATCH: [ 929155 ] Add identical folders to dircompare statepane
Perry Rapp [Sun, 4 Apr 2004 22:18:02 +0000 (22:18 +0000)]
PATCH: [ 928976 ] Handle when selected language not in list
Kimmo Varis [Sun, 4 Apr 2004 10:29:48 +0000 (10:29 +0000)]
PATCH: [ 914513 ] Move message ids to stdafx.h
Christian Blackburn [Sun, 4 Apr 2004 04:08:05 +0000 (04:08 +0000)]
I removed the ISTool Download DLL code since it has no purpose yet.
Perry Rapp [Sat, 3 Apr 2004 20:57:28 +0000 (20:57 +0000)]
Move enum ACT_TYPE, struct action, and typedef DeletedItemList inside of struct ActionList, of which they are part. Add header comment for ActionList.
Kimmo Varis [Sat, 3 Apr 2004 13:30:55 +0000 (13:30 +0000)]
Small fix to translation from Dmitriy.
Laurent Ganier [Sat, 3 Apr 2004 12:57:57 +0000 (12:57 +0000)]
[ 923044 ] Partial compare large files
Laurent Ganier [Fri, 2 Apr 2004 13:17:01 +0000 (13:17 +0000)]
[ 925172 ] Check for presence of Windows Script
Laurent Ganier [Fri, 2 Apr 2004 13:03:48 +0000 (13:03 +0000)]
Change plugins event title 'CONTEXT_MENU' -> 'EDITOR_SCRIPT'
Christian Blackburn [Fri, 2 Apr 2004 08:54:28 +0000 (08:54 +0000)]
Table updated to reflect "Installer Helper.*" renamed to "Setup Helper.*".
Christian Blackburn [Fri, 2 Apr 2004 08:53:04 +0000 (08:53 +0000)]
"Installer Helper.au3" renamed to "Setup Helper.au3".
Christian Blackburn [Fri, 2 Apr 2004 08:47:38 +0000 (08:47 +0000)]
Description of what's new in the beta added for "Winmerge Beta.iss" v1.5.
Christian Blackburn [Fri, 2 Apr 2004 08:46:49 +0000 (08:46 +0000)]
-Fixed the output file name to match our teams naming conventions
-A Setup Helper.exe program was added to update the ShellExtension without requiring a reboot (Explorer.exe is restarted). Note poorly written tray icon applications will disapear, and this is not our bug or fault.
-The localization plugin RCLLocalization.DLL is no longer included with the installer
-A language selection dialog appears at the start of the installation supporting 12/17 of our application's languages
-Once the user has selected a language for the installer to display in, they won't have to choose to install that language's Merge[Language].lang file, it'll happen automatically.
Christian Blackburn [Fri, 2 Apr 2004 08:23:47 +0000 (08:23 +0000)]
I renamed "Installer Helper.exe" to "Setup Helper.exe".
Christian Blackburn [Fri, 2 Apr 2004 08:22:01 +0000 (08:22 +0000)]
These are the Inno Setup language files for all the languages supported by our application. Some files will require further translation by project members and I'll be notifying them in a groupwide e-mail very soon.
Perry Rapp [Thu, 1 Apr 2004 23:16:11 +0000 (23:16 +0000)]
Merge Portuguese Brazilian to current English Merge.rc (mostly removing obsolete keywords).
Perry Rapp [Thu, 1 Apr 2004 23:05:11 +0000 (23:05 +0000)]
PATCH: [ 927000 ] Russian translation update (based on 1.32)
(Not applied exactly, but updated to match current English Merge.rc (mostly removing obsolete keywords)
Perry Rapp [Thu, 1 Apr 2004 18:58:22 +0000 (18:58 +0000)]
Remove most of obsolete keywords in rc file (a la Merge.rc 1.149, which didn't have them)
Christian Blackburn [Thu, 1 Apr 2004 12:43:58 +0000 (12:43 +0000)]
I added the settings to make InnoSetup automatically compile using our project-wide distribution naming convetion WinMerge-Version-Setup.exe.
Kimmo Varis [Wed, 31 Mar 2004 14:21:22 +0000 (14:21 +0000)]
PATCH: [ 924521 ] Add context menu for file compare
Christian Blackburn [Wed, 31 Mar 2004 05:38:17 +0000 (05:38 +0000)]
These are the updated Visual Studio 6 Service Pack 6 File dependencies.
Christian Blackburn [Wed, 31 Mar 2004 03:24:30 +0000 (03:24 +0000)]
Seier's Changes Recorded.
Christian Blackburn [Wed, 31 Mar 2004 03:19:29 +0000 (03:19 +0000)]
I don't know if you'll find this usefull, but I made this table in response to the table located at :sourceforge.net/project/shownotes.php?release_id=226701.
Laurent Ganier [Tue, 30 Mar 2004 15:34:26 +0000 (15:34 +0000)]
Remove RCLocalizationHelper from compiled plugins
Laurent Ganier [Tue, 30 Mar 2004 07:40:08 +0000 (07:40 +0000)]
PATCH [ 922724 ] "Don't display again" option for messageboxes
Kimmo Varis [Tue, 30 Mar 2004 05:34:45 +0000 (05:34 +0000)]
PATCH: [ 925179 ] Remove is_*file() functions from coretools.h/cpp
Laurent Ganier [Mon, 29 Mar 2004 22:21:25 +0000 (22:21 +0000)]
BUG [ 925202 ] broken feature: after save error, save with another filename
Laurent Ganier [Mon, 29 Mar 2004 08:24:29 +0000 (08:24 +0000)]
modify comment for UnpackDFM.dll
Christian Blackburn [Mon, 29 Mar 2004 02:38:43 +0000 (02:38 +0000)]
This is a description of what is new in the WinMerge beta installer.
Christian Blackburn [Mon, 29 Mar 2004 02:37:45 +0000 (02:37 +0000)]
This is an updated version of the WinMerge Beta Installer.
Kimmo Varis [Sun, 28 Mar 2004 12:40:13 +0000 (12:40 +0000)]
PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - File/Exit and Help/Contents icons from Tim Gerundt
Kimmo Varis [Sun, 28 Mar 2004 12:31:02 +0000 (12:31 +0000)]
PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - File/Exit and Help/Contents icons from Tim Gerundt
Laurent Ganier [Sat, 27 Mar 2004 15:06:53 +0000 (15:06 +0000)]
[ 921788 ] scripts submenu in the main menu
Laurent Ganier [Sat, 27 Mar 2004 14:59:59 +0000 (14:59 +0000)]
add Bulgarian to UpdateAll_resource_h.bat
Laurent Ganier [Sat, 27 Mar 2004 13:31:35 +0000 (13:31 +0000)]
WinMerge beta 2.1.6.0 released
Perry Rapp [Sat, 27 Mar 2004 02:25:48 +0000 (02:25 +0000)]
Many cosmetic changes to make MergeBulgarian.rc match Merge.rc (mostly dropping obsolete keywords).
Christian Blackburn [Fri, 26 Mar 2004 23:22:03 +0000 (23:22 +0000)]
Registry info necessary to customize the icon order in the start menu.
Laurent Ganier [Fri, 26 Mar 2004 18:19:36 +0000 (18:19 +0000)]
[ 847155 ] Utf8len_of_string is wrong for 8-bit
Perry Rapp [Fri, 26 Mar 2004 16:51:29 +0000 (16:51 +0000)]
Add Bulgarian credit to contributors.rtf. Move Portuguese to alphabetically Portuguese.
Christian Blackburn [Fri, 26 Mar 2004 11:37:03 +0000 (11:37 +0000)]
ATL.dll or atlA(Win9X) and atlU (Win NT) are required by WinMerge(+-U).exe.
Christian Blackburn [Fri, 26 Mar 2004 11:13:25 +0000 (11:13 +0000)]
This is required by our Auto IT "Installer Helper.exe" application. The good news is it's only 45KB so it's not exactly a big deal :).
Christian Blackburn [Fri, 26 Mar 2004 09:54:08 +0000 (09:54 +0000)]
-All files installed into application folder now have the release date of the installer.
-A Task item was added to or not to Install Tortoise CVS
-Plugins are now installed
-Installer no longer tries to delete locked ShellExtension.dll file since it's locked (speeds up installation)
-CompareTimeStamp was removed since it occurs automatically on files lacking version info
-TortoiseCVS registry are no longer installed unless the user requests them
Christian Blackburn [Fri, 26 Mar 2004 09:18:13 +0000 (09:18 +0000)]
I changed the mouse-over descriptions for the links to download Auto IT.
Christian Blackburn [Fri, 26 Mar 2004 07:40:42 +0000 (07:40 +0000)]
I added my changes so far for 2004-03-26. -Seier Blackburn
Christian Blackburn [Fri, 26 Mar 2004 07:04:19 +0000 (07:04 +0000)]
Fixed Swedish Language had a description of Spanish in the installer.
Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.
Perry Rapp [Fri, 26 Mar 2004 03:48:42 +0000 (03:48 +0000)]
Add new Bulgarian translation
Perry Rapp [Fri, 26 Mar 2004 03:45:46 +0000 (03:45 +0000)]
Adding Bulgarian translation
Perry Rapp [Thu, 25 Mar 2004 17:46:09 +0000 (17:46 +0000)]
Add back in "2004-03-24 WinMerge experimental release 2.1.5.16 (cvs)" (lost between 1.870 and 1.871)
Kimmo Varis [Thu, 25 Mar 2004 13:50:00 +0000 (13:50 +0000)]
BUG: [ 918760 ] doxygen.cfg moved
Laurent Ganier [Thu, 25 Mar 2004 10:56:28 +0000 (10:56 +0000)]
HideFirstLetter plugin : fix : open input and output file as binary
Perry Rapp [Thu, 25 Mar 2004 00:54:35 +0000 (00:54 +0000)]
2004-03-24 WinMerge experimental release 2.1.5.16 (cvs)
Kimmo Varis [Wed, 24 Mar 2004 20:31:57 +0000 (20:31 +0000)]
BUG: [ 922716 ] "delete both" broken
Christian Blackburn [Wed, 24 Mar 2004 10:52:11 +0000 (10:52 +0000)]
ShellExtensions.au3/.exe renamed to Installer Helper.au3/.exe.
Christian Blackburn [Wed, 24 Mar 2004 09:49:21 +0000 (09:49 +0000)]
WinMerge Beta.iss contains the current stable revisions to WinMerge.iss.
Christian Blackburn [Wed, 24 Mar 2004 09:45:22 +0000 (09:45 +0000)]
CustomFolderIcon() Function added.
Christian Blackburn [Wed, 24 Mar 2004 09:26:25 +0000 (09:26 +0000)]
The "Gold Watch.ico" file is used by \\InnoSetup\\Shell Extension.au3/.exe.
Christian Blackburn [Wed, 24 Mar 2004 09:25:06 +0000 (09:25 +0000)]
This file is meant to be read by anyone that plans on working with our Inno Setup Installer. It's bounding with useful information.
Christian Blackburn [Wed, 24 Mar 2004 09:05:49 +0000 (09:05 +0000)]
This file is meant to be read by anyone that plans on working with our Inno Setup Installer. It's bounding with useful information.
Perry Rapp [Tue, 23 Mar 2004 20:14:55 +0000 (20:14 +0000)]
Add simple comments in action list code
Kimmo Varis [Tue, 23 Mar 2004 14:12:17 +0000 (14:12 +0000)]
PATCH: [ 921440 ] UI option for detecting moved blocks
Christian Blackburn [Tue, 23 Mar 2004 07:58:20 +0000 (07:58 +0000)]
This is a sample registry file for future WinMerge integration with TortoiseSVN.
Christian Blackburn [Tue, 23 Mar 2004 06:36:43 +0000 (06:36 +0000)]
I've added GIF versions of the \\Docs\\Users\\Manual\\ScreenShots\\*.bmp since those will have to replaced.
Christian Blackburn [Tue, 23 Mar 2004 06:12:15 +0000 (06:12 +0000)]
Compare-dirs.xml now contains references to .GIF versions of your 16 color bitmap images. Since this help file should both be small and browser compatible BMP images shouldn't be used ever. BMP images are not support by all browsers, GIF, JPG, and to a certain PNG are however.
Christian Blackburn [Tue, 23 Mar 2004 04:50:22 +0000 (04:50 +0000)]
I added my changes to the ReadMe.txt file.
Christian Blackburn [Tue, 23 Mar 2004 03:57:01 +0000 (03:57 +0000)]
I removed the TortoiseCVS merge support Todo item and added that we need to support TortoiseSubVersion (or whatever they call it). I also added that the installer should set the order the icons appear in the start menu and that the installer should configure WinCVS as well.
-Seier Blackburn
Christian Blackburn [Tue, 23 Mar 2004 03:32:53 +0000 (03:32 +0000)]
I removed a little whitespace. Nothing else was changed!
-Seier Blackburn
Kimmo Varis [Mon, 22 Mar 2004 18:16:17 +0000 (18:16 +0000)]
Change directory compare statepane button to defaultbutton - Allows stopping directory compare with Enter-key
Kimmo Varis [Mon, 22 Mar 2004 17:49:33 +0000 (17:49 +0000)]
BUG: [ 902915 ] Directory compare statepane button text blinks - Fix submitted by Jochen in Patch #889357 Attempt to improve DirScan speed.
Kimmo Varis [Mon, 22 Mar 2004 17:23:41 +0000 (17:23 +0000)]
BUG: [ 920965 ] Merging moved block messes up linecolors
Kimmo Varis [Mon, 22 Mar 2004 13:48:53 +0000 (13:48 +0000)]
PATCH: [ 920530 ] Remember Patch-dialog settings
Christian Blackburn [Mon, 22 Mar 2004 09:38:38 +0000 (09:38 +0000)]
I added the items I'd completed.
-Seier Blackburn
Christian Blackburn [Mon, 22 Mar 2004 09:21:21 +0000 (09:21 +0000)]
I'm adding the OleAut32.dll necessary for others to compile the WinMerge.iss script. Sorry about that.
-Seier Blackburn
Laurent Ganier [Mon, 22 Mar 2004 08:48:26 +0000 (08:48 +0000)]
PATCH: [ 909672 ] Undo makes marker messy
Christian Blackburn [Mon, 22 Mar 2004 08:28:51 +0000 (08:28 +0000)]
I added the items I'd completed.
-Seier Blackburn
Christian Blackburn [Mon, 22 Mar 2004 07:41:02 +0000 (07:41 +0000)]
A couple of todo items were added and the user no longer has to have Windows 9X to install the shell extension.dll (PS: I introduced this bug in the last version, it was working prior to that as far as I can tell).
-Seier Blackburn
Christian Blackburn [Mon, 22 Mar 2004 07:31:20 +0000 (07:31 +0000)]
I don't know how I did this (late night perhaps :), but there were actually two locations listed for ShellExtension.dll. I don't know if two files were being included or what, but there is now only one location. Also after intalling the ComCtlUpd.exe is now deleted automatically by the installer.
-Seier Blackburn