|
From: <ki...@us...> - 2007-02-01 18:52:06
|
Revision: 4090
http://svn.sourceforge.net/winmerge/?rev=4090&view=rev
Author: kimmov
Date: 2007-02-01 10:51:40 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
PATCH: [ 1639493 ] Updated Bulgarian language files
- Submitted by tigertron
Modified Paths:
--------------
trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt
trunk/Src/Changes.txt
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
Modified: trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt
===================================================================
--- trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-02-01 18:14:59 UTC (rev 4089)
+++ trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-02-01 18:51:40 UTC (rev 4090)
@@ -12,9 +12,9 @@
http://www.winmerge.org/2.6/manual/quickstart.html
HTML \xF0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE:
-\xD0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE\xF2\xEE \xE5 \xE4\xEE\xF1\xF2\xFA\xEF\xED\xEE \xEE\xED\xEB\xE0\xE9\xF2 \xED\xE0 \xE0\xE4\xF0\xE5\xF1:
+\xD0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE\xF2\xEE \xE5 \xE4\xEE\xF1\xF2\xFA\xEF\xED\xEE \xEE\xED\xEB\xE0\xE9\xED \xED\xE0 \xE0\xE4\xF0\xE5\xF1:
http://www.winmerge.org/2.6/manual/
-\xEC\xEE\xE6\xE5 \xE4\xE0 \xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xEE \xED\xE0 \xC2\xE0\xF8\xE8\xFF \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0 (\xE0\xEA\xEE \xE5 \xE8\xE7\xE1\xF0\xE0\xED\xEE) \xE8\xEB\xE8 \xE4\xE0 \xE3\xEE
+\xEC\xEE\xE6\xE5 \xE4\xE0 \xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xEE \xED\xE0 \xC2\xE0\xF8\xE8\xFF\xF2 \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0 (\xE0\xEA\xEE \xE5 \xE8\xE7\xE1\xF0\xE0\xED\xEE) \xE8\xEB\xE8 \xE4\xE0 \xE3\xEE
\xF1\xE2\xE0\xEB\xE8\xF2\xE5 \xEE\xF2 http://www.winmerge.org/ (\xE2\xE8\xE6\xF2\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xFF\xF2\xE0)
\xCF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8:
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-01 18:14:59 UTC (rev 4089)
+++ trunk/Src/Changes.txt 2007-02-01 18:51:40 UTC (rev 4090)
@@ -6,6 +6,10 @@
PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
Fix from Takashi
Src: MainFrm.cpp
+ PATCH: [ 1639493 ] Updated Bulgarian language files
+ Submitted by tigertron
+ Src/Languages/Bulgarian: MergeBulgarian.rc
+ Docs/Users/Languages: Readme-Bulgarian.txt
2007-01-31 Kimmo
PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-01 18:14:59 UTC (rev 4089)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-01 18:51:40 UTC (rev 4090)
@@ -104,14 +104,14 @@
MENUITEM SEPARATOR
MENUITEM "&\xC8\xE7\xE1\xE5\xF0\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0", ID_SELECTLINEDIFF
MENUITEM SEPARATOR
- MENUITEM "&\xCF\xF0\xE5\xE4\xE8\xF8\xED\xEE", ID_EDIT_UNDO
+ MENUITEM "\xCE&\xF2\xEC\xE5\xED\xE8", ID_EDIT_UNDO
MENUITEM "&\xC2\xFA\xF0\xED\xE8", ID_EDIT_REDO
MENUITEM SEPARATOR
MENUITEM "\xC8&\xE7\xF0\xE5\xE6\xE8", ID_EDIT_CUT
MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9", ID_EDIT_COPY
MENUITEM "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "\xCE\xF2&\xE8\xE4\xE8 \xED\xE0...", ID_EDIT_WMGOTO
+ MENUITEM "\xCE\xF2\xE8\xE4\xE8 &\xED\xE0...", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
POPUP "&\xCE\xF2\xE2\xEE\xF0\xE8"
BEGIN
@@ -189,7 +189,7 @@
MENUITEM SEPARATOR
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE", ID_WINDOW_TILE_HORZ
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE", ID_WINDOW_TILE_VERT
- MENUITEM "&\xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
+ MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
END
POPUP "&\xCF\xEE\xEC\xEE\xF9"
BEGIN
@@ -197,8 +197,8 @@
MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
MENUITEM "&\xD2\xFA\xF0\xF1\xE5\xED\xE5...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCD\xE0\xF1\xF2\xF0\xEE\xE8&\xEA\xE8...", ID_HELP_GETCONFIG
- MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE8\xEA\xE8...", ID_HELP_GETCONFIG
+ MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 &\xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xF9\xE5\xF1\xF2\xE2\xE5\xED GNU \xEB\xE8\xF6\xE5\xED\xE7...", ID_HELP_GNULICENSE
MENUITEM "&\xC7\xE0 WinMerge...", ID_APP_ABOUT
@@ -224,7 +224,7 @@
END
POPUP "&\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xED\xE5"
BEGIN
- MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+\xC2", ID_EDIT_SELECT_ALL
+ MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8...", ID_OPTIONS
MENUITEM SEPARATOR
@@ -305,8 +305,8 @@
MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
MENUITEM "&\xD2\xFA\xF0\xF1\xE5\xED\xE5...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCD\xE0\xF1\xF2\xF0\xEE\xE8&\xEA\xE8...", ID_HELP_GETCONFIG
- MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE8\xEA\xE8...", ID_HELP_GETCONFIG
+ MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 &\xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xF9\xE5\xF1\xF2\xE2\xE5\xED GNU \xEB\xE8\xF6\xE5\xED\xE7...", ID_HELP_GNULICENSE
MENUITEM "&\xC7\xE0 WinMerge...", ID_APP_ABOUT
@@ -317,13 +317,13 @@
BEGIN
POPUP "&\xD4\xE0\xE9\xEB"
BEGIN
- MENUITEM "&\xCD\xEE\xE2\tCtrl+\xCD", ID_FILE_NEW
+ MENUITEM "&\xCD\xEE\xE2\tCtrl+N", ID_FILE_NEW
MENUITEM "&\xCE\xF2\xE2\xEE\xF0\xE8...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "\xCE\xF2\xE2\xEE\xF0\xE8 &\xCF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8 \xCF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
+ MENUITEM "\xC7\xE0\xEF\xE8&\xF8\xE8 \xCF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
- MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8\tCtrl+\xD1", ID_FILE_SAVE
+ MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8\tCtrl+S", ID_FILE_SAVE
POPUP "\xC7\xE0\xEF\xE8\xF8\xE8 &\xEB\xFF\xE2\xE0\xF2\xE0 \xF7\xE0\xF1\xF2"
BEGIN
MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8", ID_FILE_SAVE_LEFT
@@ -341,7 +341,7 @@
MENUITEM "\xCE&\xF2 \xEB\xFF\xE2\xEE \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5", ID_FILE_LEFT_READONLY
MENUITEM "\xCE\xF2 \xE4\xFF\xF1&\xED\xEE \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&\xD4\xEE\xF0\xEC\xE0\xF2 \xE7\xE0"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -354,18 +354,18 @@
END
POPUP "&\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xED\xE5"
BEGIN
- MENUITEM "&\xCF\xF0\xE5\xE4\xE8\xF8\xED\xEE\tCtrl+\xCF", ID_EDIT_UNDO
- MENUITEM "\xC2\xFA&\xF0\xED\xE8\tCtrl+\xD0", ID_EDIT_REDO
+ MENUITEM "&\xCE\xF2\xEC\xE5\xED\xE8\tCtrl+Z", ID_EDIT_UNDO
+ MENUITEM "\xC2\xFA&\xF0\xED\xE8\tCtrl+Y", ID_EDIT_REDO
MENUITEM SEPARATOR
- MENUITEM "&\xC8\xE7\xF0\xE5\xE6\xE8\tCtrl+\xC6", ID_EDIT_CUT
- MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9\tCtrl+\xCE", ID_EDIT_COPY
- MENUITEM "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8\tCtrl+\xD1", ID_EDIT_PASTE
+ MENUITEM "&\xC8\xE7\xF0\xE5\xE6\xE8\tCtrl+X", ID_EDIT_CUT
+ MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9\tCtrl+C", ID_EDIT_COPY
+ MENUITEM "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR
MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5\tF4", ID_SELECTLINEDIFF
- MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+\xC2", ID_EDIT_SELECT_ALL
+ MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
- MENUITEM "\xCD&\xE0\xEC\xE5\xF0\xE8...\tCtrl+\xC0", ID_EDIT_FIND
- MENUITEM "\xC7\xE0\xEC\xE5\xF1&\xF2\xE8...\tCtrl+\xD2", ID_EDIT_REPLACE
+ MENUITEM "\xCD&\xE0\xEC\xE5\xF0\xE8...\tCtrl+F", ID_EDIT_FIND
+ MENUITEM "\xC7\xE0\xEC\xE5\xF1&\xF2\xE8...\tCtrl+H", ID_EDIT_REPLACE
MENUITEM SEPARATOR
POPUP "&\xD1\xEA\xF0\xE8\xEF\xF2\xEE\xE2\xE5"
BEGIN
@@ -390,7 +390,7 @@
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xED\xEE\xE2\xE8\tF5", ID_REFRESH
END
- POPUP "&\xCF\xF0\xE5\xE4\xF1\xF2\xE0\xE2\xFF\xED\xE5"
+ POPUP "&\xC8\xE7\xE3\xEB\xE5\xE4"
BEGIN
MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xF8\xF0\xE8\xF4\xF2...", ID_VIEW_SELECTFONT
MENUITEM "\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 &\xF8\xF0\xE8\xF4\xF2 \xEF\xEE \xEF\xEE\xE4\xF0\xE0\xE7\xE1\xE8\xF0\xE0\xED\xE5", ID_VIEW_USEDEFAULTFONT
@@ -398,11 +398,11 @@
MENUITEM "&\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xE0\xE7\xED\xE8\xF2\xE5 \xEC\xE5\xF1\xF2\xE0", ID_VIEW_WHITESPACE
MENUITEM "\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5", ID_VIEW_LINEDIFFS
MENUITEM "\xCF\xEE\xEA\xE0\xE6\xE8 \xED\xEE\xEC\xE5\xF0\xE0 \xED\xE0 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5", ID_VIEW_LINENUMBERS
- MENUITEM "\xCE\xF2\xF0\xE5\xE6\xE8 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5", ID_VIEW_WORDWRAP
+ MENUITEM "\xCE\xF2\xF0\xE5\xE6\xE8 \xE4\xFA\xEB\xE3\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "\xD0\xE0\xE7\xEC\xE5\xED\xE8 \xEB\xE8\xF1\xF2\xEE\xE2\xE5\xF2\xE5", ID_VIEW_SWAPPANES
MENUITEM SEPARATOR
- MENUITEM "&\xC8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR
+ MENUITEM "\xCB\xE5\xED\xF2\xE0 \xF1 &\xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR
MENUITEM "&\xCB\xE5\xED\xF2\xE0 \xED\xE0 \xF1\xFA\xF1\xF2\xEE\xFF\xED\xE8\xE5\xF2\xEE", ID_VIEW_STATUS_BAR
MENUITEM "\xCB\xE8\xF1\xF2 \xF1 &\xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0", ID_VIEW_DETAIL_BAR
MENUITEM "\xCD\xE0\xE2\xE8\xE3\xE0\xF2\xEE\xF0", ID_VIEW_LOCATION_BAR
@@ -460,7 +460,7 @@
MENUITEM SEPARATOR
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE", ID_WINDOW_TILE_HORZ
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE", ID_WINDOW_TILE_VERT
- MENUITEM "&\xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
+ MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
END
POPUP "&\xCF\xEE\xEC\xEE\xF9"
BEGIN
@@ -507,13 +507,13 @@
BEGIN
MENUITEM "\xF1 &\xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE8\xF0\xE0\xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0", ID_DIR_OPEN_LEFT
MENUITEM "\xF1 &\xE2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0", ID_DIR_OPEN_LEFT_WITHEDITOR
- MENUITEM "&\xF1...", ID_DIR_OPEN_LEFT_WITH
+ MENUITEM "&\xF1\xFA\xF1...", ID_DIR_OPEN_LEFT_WITH
END
POPUP "\xCE&\xF2\xE2\xEE\xF0\xE8 \xE2 \xE4\xFF\xF1\xED\xEE"
BEGIN
MENUITEM "\xF1 &\xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE8\xF0\xE0\xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0", ID_DIR_OPEN_RIGHT
MENUITEM "\xF1 &\xE2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0", ID_DIR_OPEN_RIGHT_WITHEDITOR
- MENUITEM "&\xF1...", ID_DIR_OPEN_RIGHT_WITH
+ MENUITEM "&\xF1\xFA\xF1...", ID_DIR_OPEN_RIGHT_WITH
END
MENUITEM SEPARATOR
POPUP "\xCA\xEE\xEF\xE8\xF0\xE0\xE9 &\xEF\xFA\xF2\xFF"
@@ -579,23 +579,22 @@
IDR_MAINFRAME ACCELERATORS
BEGIN
- "\xC2", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
- "\xCE", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
- "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
- "\xC0", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
+ "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
+ "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
+ "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT
+ "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
- "\xD2", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
"J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
"S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT
- "\xD1", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
+ "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
"W", ID_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT
- "\xC6", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
- "\xD0", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
- "\xCF", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
+ "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
+ "Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
+ "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
"Z", ID_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
@@ -641,7 +640,7 @@
LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
LTEXT "\xC2\xE5\xF0\xF1\xE8\xFF 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX
LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
- LTEXT "\xC2\xF1\xE8\xF7\xEA\xE8 \xEF\xF0\xE0\xE2\xE0 \xE7\xE0\xEF\xE0\xF1\xE5\xED\xE8.",IDC_STATIC,7,60,170,8
+ LTEXT "\xC2\xF1\xE8\xF7\xEA\xE8 \xEF\xF0\xE0\xE2\xE0 \xE7\xE0\xEF\xE0\xE7\xE5\xED\xE8.",IDC_STATIC,7,60,170,8
LTEXT "\xCF\xEE\xF1\xE5\xF2\xE8 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xED\xE0 WinMerge!",IDC_WWW,7,79,209,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1
LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
@@ -728,7 +727,7 @@
CAPTION "\xCE\xF1\xED\xEE\xE2\xED\xE8"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&\xD0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xEA\xEE\xEF\xE8\xE5 \xED\xE0 \xEF\xFA\xF0\xE2\xE8\xFF \xF4\xE0\xE9\xEB",IDC_BACKUP_CHECK,"Button",
+ CONTROL "&\xD0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xEA\xEE\xEF\xE8\xE5 \xED\xE0 \xEE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE8\xFF \xF4\xE0\xE9\xEB",IDC_BACKUP_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE &\xEF\xF0\xE8\xE4\xE2\xE8\xE6\xE2\xE0\xED\xE5 \xEA\xFA\xEC \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
@@ -767,7 +766,7 @@
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
- LTEXT "\xC2\xFA\xE7\xEC\xEE\xE6\xED\xE8 \xE5\xE7\xE8\xF6\xE8:",IDC_STATIC,7,7,140,8
+ LTEXT "\xCD\xE0\xEB\xE8\xF7\xED\xE8 \xE5\xE7\xE8\xF6\xE8:",IDC_STATIC,7,7,140,8
END
IDD_EDIT_FIND DIALOGEX 30, 73, 283, 74
@@ -781,7 +780,7 @@
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xF1\xE0\xEC\xEE \xF6\xE5\xEB\xE8 \xE4\xF3\xEC\xE8",IDC_EDIT_WHOLE_WORD,"Button",
BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10
- CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xE2 \xE4\xF3\xEC\xE8\xF2\xE5",IDC_EDIT_MATCH_CASE,"Button",
+ CONTROL "\xC3\xEB\xE0\xE2\xED\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_EDIT_MATCH_CASE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 &\xE8\xE7\xF0\xE0\xE7\xE8",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
@@ -810,7 +809,7 @@
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xF1\xE0\xEC\xEE \xF6\xE5\xEB\xE8 \xE4\xF3\xEC\xE8",IDC_EDIT_WHOLE_WORD,"Button",
BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
- CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xE2 \xE4\xF3\xEC\xE8\xF2\xE5",IDC_EDIT_MATCH_CASE,"Button",
+ CONTROL "\xC3\xEB\xE0\xE2\xED\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_EDIT_MATCH_CASE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
CONTROL "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 &\xE8\xE7\xF0\xE0\xE7\xE8",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
@@ -824,7 +823,7 @@
DEFPUSHBUTTON "&\xCD\xE0\xEC\xE5\xF0\xE8",IDC_EDIT_SKIP,247,7,50,14,WS_GROUP
PUSHBUTTON "&\xC7\xE0\xEC\xE5\xED\xE8",IDC_EDIT_REPLACE,247,24,50,14
PUSHBUTTON "\xC7\xE0\xEC. &\xE2\xF1\xE8\xF7\xEA\xEE",IDC_EDIT_REPLACE_ALL,247,41,50,14
- PUSHBUTTON "\xCF\xF0\xE5\xEA\xF0\xE0\xF2\xE8",IDCANCEL,247,58,50,14
+ PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,247,58,50,14
END
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
@@ -834,7 +833,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "\xC4\xE5\xE9\xF1\xF2\xE2\xE0\xE9",IDOK,169,115,50,14
- PUSHBUTTON "\xCF\xF0\xE5\xEA\xF0\xE0\xF2\xE8",IDCANCEL,223,115,50,14
+ PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,223,115,50,14
PUSHBUTTON "\xC7\xE0\xEF\xE8\xF8\xE8 \xEA\xE0\xF2\xEE...",IDC_SAVE_AS,169,115,50,14,NOT WS_VISIBLE
EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
@@ -850,10 +849,10 @@
CAPTION "\xD4\xE8\xEB\xF2\xF0\xE8 \xE7\xE0 \xF0\xE5\xE4"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEB\xE8\xED\xE8\xE8\xF2\xE5 \xF1\xFA\xE4\xFA\xF0\xE6\xE0\xF9\xE8 \xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE",
+ CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1\xFA\xE4\xFA\xF0\xE6\xE0\xF9\xE8 \xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE",
IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
7,221,15
- LTEXT "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8\xF2\xE5 \xE8\xE7\xF0\xE0\xE7\xE8 (\xEF\xEE \xE5\xE4\xE8\xED \xED\xE0 \xEB\xE8\xED\xE8\xFF):",IDC_STATIC,7,28,
+ LTEXT "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 \xE8\xE7\xF0\xE0\xE7\xE8 (\xEF\xEE \xE5\xE4\xE8\xED \xED\xE0 \xF0\xE5\xE4):",IDC_STATIC,7,28,
221,8
EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
ES_AUTOHSCROLL | ES_WANTRETURN
@@ -868,7 +867,7 @@
CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,29,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "\xC8\xE7\xE1\xE5\xF0\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5:",IDC_STATIC,7,49,90,8
+ RTEXT "\xC8\xE7\xE1\xF0\xE0\xED\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8:",IDC_STATIC,7,49,90,8
CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -924,7 +923,7 @@
CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "\xD0\xE0\xE7\xEB\xE8\xEA\xE8 \xE2 \xE8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xE4\xF3\xEC\xE8:",IDC_STATIC,7,149,90,8
+ RTEXT "\xC2 \xE8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xE4\xF3\xEC\xE8:",IDC_STATIC,7,149,90,8
CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -955,12 +954,12 @@
CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xE5\xEC\xE5\xE2\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xEF\xEE-\xEC\xE0\xEB\xEA\xE8 \xEE\xF2 3 \xF1\xE5\xEA\xF3\xED\xE4\xE8",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "\xC8\xED\xF2\xE5\xE3\xF0\xE0\xF6\xE8\xFF",IDC_STATIC,7,30,218,46
CONTROL "&\xC4\xEE\xE1\xE0\xE2\xE8 \xEA\xFA\xEC \xEC\xE5\xED\xFE\xF2\xEE \xED\xE0 \xC5\xEA\xF1\xEF\xEB\xEE\xF0\xE5\xF0\xE0",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 &\xE4\xEE\xEF\xFA\xEB\xED\xE8\xF2\xE5\xEB\xED\xEE \xEC\xE5\xED\xFE",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8\xF2\xE5",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&\xC2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -987,7 +986,7 @@
PUSHBUTTON "&\xD0\xE0\xE7\xEC\xE5\xED\xE8",IDC_DIFF_SWAPFILES,283,41,50,14
CONTROL "&\xCF\xF0\xE8\xEB\xEE\xE6\xE8 \xEA\xFA\xEC \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9 \xF4\xE0\xE9\xEB",IDC_DIFF_APPENDFILE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10
- LTEXT "&\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2\xE8:",IDC_STATIC,7,66,37,8
+ LTEXT "&\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2:",IDC_STATIC,7,66,37,8
COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "\xCF\xEE&\xF2\xFA\xF0\xF1\xE8...",IDC_DIFF_BROWSE_RESULT,283,63,50,14
@@ -1009,9 +1008,9 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,142,10
CONTROL "\xC3\xEE\xEB\xE5\xEC\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_DIFF_CASESENSITIVE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10
- CONTROL "\xCE\xE1\xF5\xE2\xE0&\xF9\xE0\xE9 \xEA\xEE\xEC\xE0\xED\xE4\xED\xE8\xFF \xF0\xE5\xE4",IDC_DIFF_INCLCMDLINE,"Button",
+ CONTROL "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEA\xEE\xEC\xE0\xED\xE4\xED\xE8\xFF \xF0\xE5\xE4",IDC_DIFF_INCLCMDLINE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10
- CONTROL "\xCE\xF2\xE2\xEE\xF0\xE8 \xF1 \xE2\xFA\xED\xF8&\xED\xE8\xFF \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0",IDC_DIFF_OPENTOEDITOR,"Button",
+ CONTROL "\xCE\xF2\xE2\xEE\xF0\xE8 \xF1 \xE2\xFA\xED\xF8\xE5&\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0",IDC_DIFF_OPENTOEDITOR,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10
PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_DIFF_DEFAULTS,7,159,50,14
DEFPUSHBUTTON "\xCE\xCA",IDOK,230,159,50,14
@@ -1104,12 +1103,12 @@
WS_GROUP,13,38,48,10
CONTROL "&\xC4\xFF\xF1\xED\xEE",IDC_WMGOTO_FILERIGHT,"Button",
BS_AUTORADIOBUTTON,13,48,47,10
- GROUPBOX "\xCE\xF2\xE8\xE4\xE8 \xED\xE0",IDC_STATIC,69,27,78,35
+ GROUPBOX "\xCE\xF2\xE8\xE4\xE8 \xED\xE0:",IDC_STATIC,69,27,78,35
CONTROL "\xD0\xE5&\xE4",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,76,38,68,10
CONTROL "&\xD0\xE0\xE7\xEB\xE8\xEA\xE0",IDC_WMGOTO_TODIFF,"Button",
BS_AUTORADIOBUTTON,76,48,68,10
- DEFPUSHBUTTON "&\xCE\xF2\xE8\xE4\xE8 \xED\xE0",IDOK,153,7,50,14
+ DEFPUSHBUTTON "&\xCE\xF2\xE8\xE4\xE8",IDOK,153,7,50,14
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,153,24,50,14
END
@@ -1118,7 +1117,7 @@
CAPTION "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "\xCF\xF0\xE0\xE7\xED\xE8\xF2\xE5 \xEC\xE5\xF1\xF2\xE0",IDC_STATIC,7,7,221,50
+ GROUPBOX "\xCF\xF0\xE0\xE7\xED\xE8 \xEC\xE5\xF1\xF2\xE0",IDC_STATIC,7,7,221,50
CONTROL "&\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,14,19,206,10
CONTROL "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5",IDC_WHITE_CHANGE,"Button",
@@ -1127,7 +1126,7 @@
14,41,206,10
CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xE0&\xE7\xED\xE8\xF2\xE5 \xEB\xE8\xED\xE8\xE8",IDC_IGNBLANKS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10
- CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 &\xF7\xE0\xF1\xF2\xE8\xF2\xE5 \xEE\xF2 \xE4\xF3\xEC\xE8\xF2\xE5",IDC_IGNCASE_CHECK,"Button",
+ CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 &\xC3\xEE\xEB\xE5\xEC\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_IGNCASE_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10
CONTROL "Igno&re carriage return differences (DOS/UNIX/MAC)",
IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -1158,11 +1157,11 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,17,215,10
CONTROL "&\xC7\xE0\xEF\xE0\xE7\xE8 \xEE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE8\xF2\xE5 EOL \xE2\xE8\xF4\xFA\xF0",IDC_MIXED_EOL,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,215,10
- GROUPBOX "\xC5\xF2\xE8\xEA\xE5\xF2",IDC_STATIC,7,44,221,33,WS_GROUP
- LTEXT "&\xC3\xEE\xEB\xE5\xEC\xE8\xED\xE0 \xED\xE0 \xE5\xF2\xE8\xEA\xE5\xF2\xE0:",IDC_STATIC,14,58,42,8
+ GROUPBOX "\xD2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF",IDC_STATIC,7,44,221,33,WS_GROUP
+ LTEXT "&\xC3\xEE\xEB\xE5\xEC\xE8\xED\xE0 \xED\xE0 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF\xF2\xE0:",IDC_STATIC,14,58,42,8
EDITTEXT IDC_TAB_EDIT,60,56,18,12,ES_AUTOHSCROLL | ES_NUMBER,
WS_EX_RIGHT
- CONTROL "&\xD1\xEB\xEE\xE6\xE8 \xE5\xF2\xE8\xEA\xE5\xF2",IDC_PROP_INSERT_TABS,"Button",
+ CONTROL "&\xD1\xEB\xEE\xE6\xE8 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF",IDC_PROP_INSERT_TABS,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,85,53,137,10
CONTROL "\xD1\xEB\xEE\xE6\xE8 &\xF0\xE0\xE7\xF1\xF2\xEE\xFF\xED\xE8\xFF",IDC_PROP_INSERT_SPACES,"Button",
BS_AUTORADIOBUTTON,85,62,137,10
@@ -1194,7 +1193,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "\xD2\xE5\xF1\xF2\xE2\xE0\xE9",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "\xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "\xCD\xEE\xE2...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xE9...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "\xC8\xE7\xF2\xF0\xE8\xE9...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1335,42 +1334,42 @@
CONTROL "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,40,55,10
CONTROL "Button1",...
[truncated message content] |
|
From: <ki...@us...> - 2007-02-22 22:17:34
|
Revision: 4125
http://svn.sourceforge.net/winmerge/?rev=4125&view=rev
Author: kimmov
Date: 2007-02-22 14:17:32 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
BUG: [ 1664832 ] Typo Error in the Registry
Modified Paths:
--------------
trunk/ShellExtension/WinMergeShell.rgs
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/WinMergeShell.rgs
===================================================================
--- trunk/ShellExtension/WinMergeShell.rgs 2007-02-22 17:32:15 UTC (rev 4124)
+++ trunk/ShellExtension/WinMergeShell.rgs 2007-02-22 22:17:32 UTC (rev 4125)
@@ -20,7 +20,7 @@
{
val ThreadingModel = s 'Apartment'
}
- 'TypeLib' = s '06029E17-28B5-456A-B866-4E79D98612FD}'
+ 'TypeLib' = s '{06029E17-28B5-456A-B866-4E79D98612FD}'
}
}
NoRemove *
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-22 17:32:15 UTC (rev 4124)
+++ trunk/Src/Changes.txt 2007-02-22 22:17:32 UTC (rev 4125)
@@ -6,8 +6,10 @@
BUG: [ 1664731 ] Margin and line numbers not separated
Src/editlib: ccrystaltextview.cpp
BUG: [ 1664727 ] Empty file compare looks broken
- Fix revision marks for scrachpads
+ Fix revision marks for scratchpads
Src/editlib: ccrystaltextview.cpp
+ BUG: [ 1664832 ] Typo Error in the Registry
+ ShellExtension: WinMergeShell.rgs
2007-02-21 Kimmo
BUG: [ 1664727 ] Empty file compare looks broken
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-27 16:54:25
|
Revision: 4135
http://svn.sourceforge.net/winmerge/?rev=4135&view=rev
Author: kimmov
Date: 2007-02-27 08:54:16 -0800 (Tue, 27 Feb 2007)
Log Message:
-----------
Bump ShellExtension version to 1.11
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.rc
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc 2007-02-27 16:36:01 UTC (rev 4134)
+++ trunk/ShellExtension/ShellExtension.rc 2007-02-27 16:54:16 UTC (rev 4135)
@@ -243,15 +243,15 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.10.0.0\0"
+ VALUE "FileVersion", "1.11.0.0\0"
VALUE "InternalName", "ShellExtension\0"
- VALUE "LegalCopyright", "Copyright 2003-2006\0"
+ VALUE "LegalCopyright", "Copyright 2003-2007\0"
VALUE "LegalTrademarks", "\0"
VALUE "OLESelfRegister", "\0"
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.10.0.0\0"
+ VALUE "ProductVersion", "1.11.0.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-27 16:36:01 UTC (rev 4134)
+++ trunk/Src/Changes.txt 2007-02-27 16:54:16 UTC (rev 4135)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-27 Kimmo
+ Bump ShellExtension version to 1.11
+ ShellExtension: ShellExtension.rc
+
2007-02-26 Kimmo
PATCH: [ 1664689 ] French translation
Submitted by Jean-F Jolin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-24 13:09:44
|
Revision: 4185
http://svn.sourceforge.net/winmerge/?rev=4185&view=rev
Author: gerundt
Date: 2007-03-24 05:53:07 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
(Initially without the 256*256 version)
Revision Links:
--------------
http://svn.sourceforge.net/winmerge/?rev=4&view=rev
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/MergeProject.ico
trunk/Src/Changes.txt
trunk/Src/res/MergeDoc.ico
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-03-22 11:56:36 UTC (rev 4184)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-03-24 12:53:07 UTC (rev 4185)
@@ -1,3 +1,8 @@
+2007-03-24 Tim
+ PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
+ (Initially without the 256*256 version)
+ InnoSetup: MergeProject.ico
+
2007-03-15 Tim
BUG: [ 1677923 ] Uninstaller icon must be changed
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/MergeProject.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-22 11:56:36 UTC (rev 4184)
+++ trunk/Src/Changes.txt 2007-03-24 12:53:07 UTC (rev 4185)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-24 Tim
+ PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
+ (Initially without the 256*256 version)
+ Src/res: MergeDoc.ico
+
2007-03-22 Gal
RFE: [ 1683061 ] Bug in highlighting
Src: stringdiffs.cpp
Modified: trunk/Src/res/MergeDoc.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-29 16:19:18
|
Revision: 4206
http://svn.sourceforge.net/winmerge/?rev=4206&view=rev
Author: kimmov
Date: 2007-03-29 09:19:06 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
PATCH: [ 1689854 ] C# development file filter
Modified Paths:
--------------
trunk/Src/Changes.txt
Added Paths:
-----------
trunk/Filters/CSharp_loose.flt
Added: trunk/Filters/CSharp_loose.flt
===================================================================
--- trunk/Filters/CSharp_loose.flt (rev 0)
+++ trunk/Filters/CSharp_loose.flt 2007-03-29 16:19:06 UTC (rev 4206)
@@ -0,0 +1,29 @@
+## This is a directory/file filter for WinMerge
+## This filter suppresses various binaries found in Visual C# source trees
+name: Visual C# loose
+desc: Suppresses various binaries found in Visual C# source trees
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.aps$ ## VC Binary version of resource file, for quick loading
+f: \.bsc$ ## VC Browser database
+f: \.dll$ ## Windows DLL
+f: \.exe$ ## Windows executable
+f: \.obj$ ## VC object module file
+f: \.pdb$ ## VC program database file (debugging symbolic information)
+f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
+f: \.suo$ ## VC options file (binary)
+f: \.cache$ ## ??
+f: \.resource$ ## Compiled resource file.
+f: \.xfrm ## ??
+f: \.bak$ ## backup
+
+d: \\cvs$ ## CVS control directory
+d: \\.svn$ ## Subversion control directory
+
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-29 15:05:20 UTC (rev 4205)
+++ trunk/Src/Changes.txt 2007-03-29 16:19:06 UTC (rev 4206)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-29 Kimmo
+ PATCH: [ 1689854 ] C# development file filter
+ Filters new file: CSharp_loose.flt
+
2007-03-27 Tim
RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
(Fixed the blurred icons and minimize the flicking effect)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-31 10:07:26
|
Revision: 4216
http://svn.sourceforge.net/winmerge/?rev=4216&view=rev
Author: kimmov
Date: 2007-03-31 03:07:18 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
PATCH: [ 1689293 ] Batch file for building WinMerge files
Modified Paths:
--------------
trunk/Src/Changes.txt
Added Paths:
-----------
trunk/buildall.bat
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-30 14:12:13 UTC (rev 4215)
+++ trunk/Src/Changes.txt 2007-03-31 10:07:18 UTC (rev 4216)
@@ -2,11 +2,16 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-31 Kimmo
+ PATCH: [ 1689293 ] Batch file for building WinMerge files
+ : buildall.bat
+
2007-03-30 Kimmo
PATCH: [ 1690503 ] fix for bug 1659281 "WinMerge forgets monitor to use when th
Submitted by from Dan Pidcock
Src: MainFrm.cpp
+>>>>>>> .r4215
2007-03-30 Gal
RFE: [ 1690346 ] Manual selection of syntax highlighting scheme
Src/Languages/*: Merge*.rc
Added: trunk/buildall.bat
===================================================================
--- trunk/buildall.bat (rev 0)
+++ trunk/buildall.bat 2007-03-31 10:07:18 UTC (rev 4216)
@@ -0,0 +1,47 @@
+: WinMerge build "script" using devenv commandline to build
+: all needed WinMerge files. This batch must be run from Visual Studio
+: command prompt or vcvars32.bat must be run first!
+
+: Building language files requires you have compiled language compiler
+: from Tools\MakeResDll and copied the MakeResDll.exe from
+: Build\mergerelease to Src\Languages folder.
+
+: !!!NOTENOTE!!!
+: If you are using VS2003.Net or VS2005, you'll need to convert project
+: files to new format before this batch file can be used. Converting is
+: done when the project file is first time opened in Visual Studio.
+: So you'll need to open these project files once to get them converted:
+: Externals\expat\lib\expat.dsp
+: Externals\expat\lib\expatw.dsp
+: Externals\scew\win32\scew.dsp
+: Externals\pcre\dll_pcre\pcre.dsp
+: Src\Merge.dsp
+
+@echo off
+
+: Build dependencies first in this order:
+: 1. expat
+: 2. SCEW
+: 3. PCRE
+: Note that expat MUST be compiled before SCEW!
+:
+: Projects contain proper dependencies, so all needed projects are
+: compiled by compiling the main project.
+
+: Build expat
+devenv Externals\expat\lib\expat.dsp /rebuild Release
+devenv Externals\expat\lib\expatw.dsp /rebuild Release
+
+: Build SCEW
+devenv Externals\scew\win32\scew.dsp /rebuild Release
+devenv Externals\scew\win32\scew.dsp /rebuild "Release Unicode"
+
+: Build PCRE
+devenv Externals\pcre\dll_pcre\pcre.dsp /rebuild Release
+
+: Build WinMerge executables
+devenv Src\Merge.dsp /rebuild Release
+devenv Src\Merge.dsp /rebuild UnicodeRelease
+
+: Build language files
+call Src\Languages\BuildAll.bat
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-03 19:04:03
|
Revision: 4228
http://svn.sourceforge.net/winmerge/?rev=4228&view=rev
Author: kimmov
Date: 2007-04-03 12:04:01 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds
Modified Paths:
--------------
trunk/ShellExtension/WinMergeShell.cpp
trunk/ShellExtension/WinMergeShell.rgs
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/WinMergeShell.cpp
===================================================================
--- trunk/ShellExtension/WinMergeShell.cpp 2007-04-03 14:30:17 UTC (rev 4227)
+++ trunk/ShellExtension/WinMergeShell.cpp 2007-04-03 19:04:01 UTC (rev 4228)
@@ -128,62 +128,82 @@
HRESULT CWinMergeShell::Initialize(LPCITEMIDLIST pidlFolder,
LPDATAOBJECT pDataObj, HKEY hProgID)
{
- FORMATETC fmt = {CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
- STGMEDIUM stg = {TYMED_HGLOBAL};
- HDROP hDropInfo;
USES_WINMERGELOCALE;
+ HRESULT hr = E_INVALIDARG;
- // Look for CF_HDROP data in the data object.
- if (FAILED(pDataObj->GetData(&fmt, &stg)))
- // Nope! Return an "invalid argument" error back to Explorer.
- return E_INVALIDARG;
+ // Files/folders selected normally from the explorer
+ if (pDataObj)
+ {
+ FORMATETC fmt = {CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
+ STGMEDIUM stg = {TYMED_HGLOBAL};
+ HDROP hDropInfo;
- // Get a pointer to the actual data.
- hDropInfo = (HDROP) GlobalLock(stg.hGlobal);
+ // Look for CF_HDROP data in the data object.
+ if (FAILED(pDataObj->GetData(&fmt, &stg)))
+ // Nope! Return an "invalid argument" error back to Explorer.
+ return E_INVALIDARG;
- // Make sure it worked.
- if (NULL == hDropInfo)
- return E_INVALIDARG;
+ // Get a pointer to the actual data.
+ hDropInfo = (HDROP) GlobalLock(stg.hGlobal);
- // Sanity check & make sure there is at least one filename.
- UINT uNumFilesDropped = DragQueryFile (hDropInfo, 0xFFFFFFFF, NULL, 0);
- m_nSelectedItems = uNumFilesDropped;
+ // Make sure it worked.
+ if (NULL == hDropInfo)
+ return E_INVALIDARG;
- if (uNumFilesDropped == 0)
- {
- GlobalUnlock(stg.hGlobal);
- ReleaseStgMedium(&stg);
- return E_INVALIDARG;
- }
+ // Sanity check & make sure there is at least one filename.
+ UINT uNumFilesDropped = DragQueryFile (hDropInfo, 0xFFFFFFFF, NULL, 0);
+ m_nSelectedItems = uNumFilesDropped;
- HRESULT hr = S_OK;
+ if (uNumFilesDropped == 0)
+ {
+ GlobalUnlock(stg.hGlobal);
+ ReleaseStgMedium(&stg);
+ return E_INVALIDARG;
+ }
- // Get all file names.
- for (WORD x = 0 ; x < uNumFilesDropped; x++)
- {
- // Get the number of bytes required by the file's full pathname
- UINT wPathnameSize = DragQueryFile(hDropInfo, x, NULL, 0);
+ hr = S_OK;
- // Allocate memory to contain full pathname & zero byte
- wPathnameSize += 1;
- LPTSTR npszFile = (TCHAR *) new TCHAR[wPathnameSize];
+ // Get all file names.
+ for (WORD x = 0 ; x < uNumFilesDropped; x++)
+ {
+ // Get the number of bytes required by the file's full pathname
+ UINT wPathnameSize = DragQueryFile(hDropInfo, x, NULL, 0);
- // If not enough memory, skip this one
- if (npszFile == NULL)
- continue;
+ // Allocate memory to contain full pathname & zero byte
+ wPathnameSize += 1;
+ LPTSTR npszFile = (TCHAR *) new TCHAR[wPathnameSize];
- // Copy the pathname into the buffer
- DragQueryFile(hDropInfo, x, npszFile, wPathnameSize);
+ // If not enough memory, skip this one
+ if (npszFile == NULL)
+ continue;
- if (x < MaxFileCount)
- m_strPaths[x] = npszFile;
+ // Copy the pathname into the buffer
+ DragQueryFile(hDropInfo, x, npszFile, wPathnameSize);
- delete[] npszFile;
+ if (x < MaxFileCount)
+ m_strPaths[x] = npszFile;
+
+ delete[] npszFile;
+ }
+ GlobalUnlock(stg.hGlobal);
+ ReleaseStgMedium(&stg);
}
- GlobalUnlock(stg.hGlobal);
- ReleaseStgMedium(&stg);
- return hr;
+ // No item selected - selection is the folder background
+ if (pidlFolder)
+ {
+ TCHAR szPath[MAX_PATH] = {0};
+
+ if (SHGetPathFromIDList(pidlFolder, szPath))
+ {
+ m_strPaths[0] = szPath;
+ m_nSelectedItems = 1;
+ hr = S_OK;
+ }
+ else
+ hr = E_INVALIDARG;
+ }
+ return hr;
}
/// Adds context menu item
Modified: trunk/ShellExtension/WinMergeShell.rgs
===================================================================
--- trunk/ShellExtension/WinMergeShell.rgs 2007-04-03 14:30:17 UTC (rev 4227)
+++ trunk/ShellExtension/WinMergeShell.rgs 2007-04-03 19:04:01 UTC (rev 4228)
@@ -44,4 +44,18 @@
}
}
}
+
+ NoRemove Directory
+ {
+ NoRemove Background
+ {
+ NoRemove ShellEx
+ {
+ NoRemove ContextMenuHandlers
+ {
+ ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-04-03 14:30:17 UTC (rev 4227)
+++ trunk/Src/Changes.txt 2007-04-03 19:04:01 UTC (rev 4228)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-04-03 Kimmo
+ PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds
+ ShellExtension: WinMergeShell.cpp WinMergeShell.rgs
+
2007-04-03 Takashi
BUG: [ 1693275 ] File extension filter does not work correctly
Src: FileFilterHelper.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-04 04:18:34
|
Revision: 4230
http://svn.sourceforge.net/winmerge/?rev=4230&view=rev
Author: kimmov
Date: 2007-04-03 21:18:33 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
Remove expat and SCEW unicode targets from build batch
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/buildall.bat
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-04-03 19:35:32 UTC (rev 4229)
+++ trunk/Src/Changes.txt 2007-04-04 04:18:33 UTC (rev 4230)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-04-04 Kimmo
+ Remove expat and SCEW unicode targets from build batch
+ : buildall.bat
+
2007-04-03 Kimmo
PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds
ShellExtension: WinMergeShell.cpp WinMergeShell.rgs
Modified: trunk/buildall.bat
===================================================================
--- trunk/buildall.bat 2007-04-03 19:35:32 UTC (rev 4229)
+++ trunk/buildall.bat 2007-04-04 04:18:33 UTC (rev 4230)
@@ -12,7 +12,6 @@
: done when the project file is first time opened in Visual Studio.
: So you'll need to open these project files once to get them converted:
: Externals\expat\lib\expat.dsp
-: Externals\expat\lib\expatw.dsp
: Externals\scew\win32\scew.dsp
: Externals\pcre\dll_pcre\pcre.dsp
: Src\Merge.dsp
@@ -30,11 +29,9 @@
: Build expat
devenv Externals\expat\lib\expat.dsp /rebuild Release
-devenv Externals\expat\lib\expatw.dsp /rebuild Release
: Build SCEW
devenv Externals\scew\win32\scew.dsp /rebuild Release
-devenv Externals\scew\win32\scew.dsp /rebuild "Release Unicode"
: Build PCRE
devenv Externals\pcre\dll_pcre\pcre.dsp /rebuild Release
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-04 18:59:39
|
Revision: 4232
http://svn.sourceforge.net/winmerge/?rev=4232&view=rev
Author: kimmov
Date: 2007-04-04 11:59:24 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Bump ShellExtension version to 1.12
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.rc
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc 2007-04-04 18:06:01 UTC (rev 4231)
+++ trunk/ShellExtension/ShellExtension.rc 2007-04-04 18:59:24 UTC (rev 4232)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,11,0,0
- PRODUCTVERSION 1,11,0,0
+ FILEVERSION 1,12,0,0
+ PRODUCTVERSION 1,12,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -243,7 +243,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.11.0.0\0"
+ VALUE "FileVersion", "1.12.0.0\0"
VALUE "InternalName", "ShellExtension\0"
VALUE "LegalCopyright", "Copyright 2003-2007\0"
VALUE "LegalTrademarks", "\0"
@@ -251,7 +251,7 @@
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.11.0.0\0"
+ VALUE "ProductVersion", "1.12.0.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-04-04 18:06:01 UTC (rev 4231)
+++ trunk/Src/Changes.txt 2007-04-04 18:59:24 UTC (rev 4232)
@@ -8,6 +8,8 @@
BUG: [ 1576168 ] Cannot find file filter path message is wrong
Src: FileFiltersDlg.cpp
Src/Languages/*: Merge*.rc
+ Bump ShellExtension version to 1.12
+ ShellExtension: ShellExtension.rc
2007-04-03 Kimmo
PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-07 09:26:53
|
Revision: 4237
http://svn.sourceforge.net/winmerge/?rev=4237&view=rev
Author: kimmov
Date: 2007-04-07 02:26:50 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
Fix building language files (buildall.bat)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/buildall.bat
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-04-06 10:07:51 UTC (rev 4236)
+++ trunk/Src/Changes.txt 2007-04-07 09:26:50 UTC (rev 4237)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-04-07 Kimmo
+ Fix building language files (buildall.bat)
+ : buildall.bat
+
2007-04-04 WinMerge experimental release 2.7.3.3 (SVN revision 4234)
2007-04-04 Kimmo
Modified: trunk/buildall.bat
===================================================================
--- trunk/buildall.bat 2007-04-06 10:07:51 UTC (rev 4236)
+++ trunk/buildall.bat 2007-04-07 09:26:50 UTC (rev 4237)
@@ -41,4 +41,7 @@
devenv Src\Merge.dsp /rebuild UnicodeRelease
: Build language files
-call Src\Languages\BuildAll.bat
+cd Src\Languages
+call BuildAll.bat
+cd ..\..
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-08 13:05:06
|
Revision: 4239
http://svn.sourceforge.net/winmerge/?rev=4239&view=rev
Author: kimmov
Date: 2007-04-08 06:05:01 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Add Jeremy Dewey and Dan Pidcock to contributors.txt
Modified Paths:
--------------
trunk/Docs/Users/Contributors.txt
trunk/Src/Changes.txt
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2007-04-08 00:53:46 UTC (rev 4238)
+++ trunk/Docs/Users/Contributors.txt 2007-04-08 13:05:01 UTC (rev 4239)
@@ -105,6 +105,7 @@
* Andre Arpin
* Steve Beaudoin
* Hern Chen
+* Jeremy Dewey
* Jim Fougeron
* Marvin Gouw
* Jan Hryz
@@ -117,6 +118,7 @@
* Oliver Mellet
* Andreas Morsing
* Tim Musschoot
+* Dan Pidcock
* Vincent Osele
* Michael Richter
* Markus Rollmann
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-04-08 00:53:46 UTC (rev 4238)
+++ trunk/Src/Changes.txt 2007-04-08 13:05:01 UTC (rev 4239)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-04-08 Kimmo
+ Add Jeremy Dewey and Dan Pidcock to contributors.txt
+ Docs/Users: Contributors.txt
+
2007-04-08 Takashi
BUG: [ 1694581 ] Need to limit window tab width
Src/Common: MDITabBar.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-10 20:23:06
|
Revision: 4243
http://svn.sourceforge.net/winmerge/?rev=4243&view=rev
Author: kimmov
Date: 2007-04-10 13:23:02 -0700 (Tue, 10 Apr 2007)
Log Message:
-----------
PATCH: [ 1694048 ] File filter for Symbian developers
Modified Paths:
--------------
trunk/Src/Changes.txt
Added Paths:
-----------
trunk/Filters/Symbian.flt
Added: trunk/Filters/Symbian.flt
===================================================================
--- trunk/Filters/Symbian.flt (rev 0)
+++ trunk/Filters/Symbian.flt 2007-04-10 20:23:02 UTC (rev 4243)
@@ -0,0 +1,37 @@
+## This is a directory/file filter for WinMerge
+## This filter suppresses various binaries found in Symbian development source trees.
+name: Symbian C++
+desc: Suppresses various binaries found in Visual C++ source trees compiling Symbian
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.bsc$ ## VC Browser database
+f: \.aps$ ## VC Binary version of resource file, for quick loading
+f: \.bsc$ ## VC Browser database
+f: \.clw$ ## VC class-wizard status file
+f: \.dll$ ## Windows DLL
+f: \.exe$ ## Windows executable
+f: \.exp$ ## VC library export file
+f: \\vc60.idb$ ## VC ?
+f: \.ilk$ ## VC incremental linker memory file
+f: \.lib$ ## compiled libraries
+f: \.ncb$ ## VC parser information file (class view & component gallery stuff)
+f: \.obj$ ## VC object module file
+f: \.pch$ ## VC precompiled header file
+f: \.pdb$ ## VC program database file (debugging symbolic information)
+f: \.sbr$ ## VC source browser file (used to create bsc file)
+f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
+f: \.rsc ## Compiled resources
+f: \.app ## Application
+f: \.aif
+f: \.bak$ ## backup
+f: \ABLD.bat$ ## Bat file
+
+d: \\cvs$ ## CVS control directory
+d: \\.svn$ ## Subversion control directory
\ No newline at end of file
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-04-10 14:08:27 UTC (rev 4242)
+++ trunk/Src/Changes.txt 2007-04-10 20:23:02 UTC (rev 4243)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-04-10 Kimmo
+ PATCH: [ 1694048 ] File filter for Symbian developers
+ Filters new file: Symbian.flt
+
2007-04-10 Gal
BUG: [ 1694102 ] Compare with comments bug
Src: stringdiffs.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-05-31 14:12:57
|
Revision: 4302
http://svn.sourceforge.net/winmerge/?rev=4302&view=rev
Author: kimmov
Date: 2007-05-31 07:12:56 -0700 (Thu, 31 May 2007)
Log Message:
-----------
PATCH: [ 1699783 ] Filter addon x borland delphi
- Submitted by Alberto Kalb
Modified Paths:
--------------
trunk/Src/Changes.txt
Added Paths:
-----------
trunk/Filters/Delphi.flt
Added: trunk/Filters/Delphi.flt
===================================================================
--- trunk/Filters/Delphi.flt (rev 0)
+++ trunk/Filters/Delphi.flt 2007-05-31 14:12:56 UTC (rev 4302)
@@ -0,0 +1,33 @@
+## This is a directory/file filter template for WinMerge
+name: Delphi filter
+desc: View only files .PAS and files .DFM
+
+## Select if filter is inclusive or exclusive
+## Inclusive (loose) filter lets through all items not matching rules
+## Exclusive filter lets through only items that match to rule
+## include or exclude
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.^~ ## EXCLUDE temporary files
+f: \.dcu$ ## EXCLUDE Delphi compiled unit
+f: \.exe$ ## EXCLUDE Exe file
+f: \.cfg$ ## EXCLUDE configuration file
+f: \.dsk$ ## EXCLUDE File of internal information of the project
+f: \.dof$ ## EXCLUDE Delphi options file
+f: \.ddp$ ## EXCLUDE Delphi diagram portfolio file
+f: \.db$ ## EXCLUDE File Paradox
+f: \.ims$ ## EXCLUDE Icon file, normally created with IconForge
+f: \.bak$ ## EXCLUDE Backup file made with WinMerge
+
+## f: \.dfm$ ## Delphi Form
+## f: \.pas$ ## Delphi source
+## f: \.dpr$ ## Delphi Project
+## f: \.dpk$ ## Delphi Package
+## f: \.bpg$ ## Delphi Package Group
+## f: \.bpl$ ## Delphi Package Library
+
+## d: \\subdir$ ## Filter for directory
\ No newline at end of file
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-05-30 15:02:12 UTC (rev 4301)
+++ trunk/Src/Changes.txt 2007-05-31 14:12:56 UTC (rev 4302)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-05-31 Kimmo
+ PATCH: [ 1699783 ] Filter addon x borland delphi
+ Submitted by Alberto Kalb
+ Filters new file: Delphi.flt
+
2007-05-30 Kimmo
PATCH: [ 1727722 ] Remove AppSerialize (only used for fonts)
Src: MainFrm.cpp Merge.dsp Merge.h OptionsDef.h OptionsInit.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-05-31 14:18:39
|
Revision: 4303
http://svn.sourceforge.net/winmerge/?rev=4303&view=rev
Author: kimmov
Date: 2007-05-31 07:18:37 -0700 (Thu, 31 May 2007)
Log Message:
-----------
Add Alberto Kalb to contributors
Modified Paths:
--------------
trunk/Docs/Users/Contributors.txt
trunk/Src/Changes.txt
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2007-05-31 14:12:56 UTC (rev 4302)
+++ trunk/Docs/Users/Contributors.txt 2007-05-31 14:18:37 UTC (rev 4303)
@@ -109,6 +109,7 @@
* Marvin Gouw
* Jan Hryz
* Ed_K
+* Alberto Kalb
* Ferenc Kubatovics
* Ren\xE9 Leonhardt
* Vladimir Lukianov
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-05-31 14:12:56 UTC (rev 4302)
+++ trunk/Src/Changes.txt 2007-05-31 14:18:37 UTC (rev 4303)
@@ -6,6 +6,8 @@
PATCH: [ 1699783 ] Filter addon x borland delphi
Submitted by Alberto Kalb
Filters new file: Delphi.flt
+ Add Alberto Kalb to contributors
+ Docs/Users: Contributors.txt
2007-05-30 Kimmo
PATCH: [ 1727722 ] Remove AppSerialize (only used for fonts)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-06-01 23:24:28
|
Revision: 4311
http://svn.sourceforge.net/winmerge/?rev=4311&view=rev
Author: gerundt
Date: 2007-06-01 16:24:23 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Add "bugtraq:url" and "bugtraq:logregex" to Subversion properties
Property Changed:
----------------
trunk/
trunk/ArchiveSupport/
trunk/ArchiveSupport/Merge7z/
trunk/ArchiveSupport/Merge7zInstaller/
trunk/Docs/
trunk/Docs/Developers/
trunk/Docs/Logos/
trunk/Docs/Users/
trunk/Docs/Users/Languages/
trunk/Docs/Users/Manual/
trunk/Docs/Users/Manual/art/
trunk/Docs/Users/Manual/build/
trunk/Docs/Users/Manual/css/
trunk/Docs/Users/Manual/images/
trunk/Docs/Users/Manual/images/callouts/
trunk/Docs/Users/Manual/screenshots/
trunk/Externals/
trunk/Externals/cppunit/
trunk/Externals/cppunit/config/
trunk/Externals/cppunit/contrib/
trunk/Externals/cppunit/contrib/bc5/
trunk/Externals/cppunit/contrib/msvc/
trunk/Externals/cppunit/contrib/xml-xsl/
trunk/Externals/cppunit/doc/
trunk/Externals/cppunit/examples/
trunk/Externals/cppunit/examples/ClockerPlugIn/
trunk/Externals/cppunit/examples/DumperPlugIn/
trunk/Externals/cppunit/examples/cppunittest/
trunk/Externals/cppunit/examples/hierarchy/
trunk/Externals/cppunit/examples/money/
trunk/Externals/cppunit/examples/msvc6/
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/
trunk/Externals/cppunit/examples/msvc6/HostApp/
trunk/Externals/cppunit/examples/msvc6/HostApp/res/
trunk/Externals/cppunit/examples/msvc6/TestPlugIn/
trunk/Externals/cppunit/examples/qt/
trunk/Externals/cppunit/examples/simple/
trunk/Externals/cppunit/include/
trunk/Externals/cppunit/include/cppunit/
trunk/Externals/cppunit/include/cppunit/config/
trunk/Externals/cppunit/include/cppunit/extensions/
trunk/Externals/cppunit/include/cppunit/plugin/
trunk/Externals/cppunit/include/cppunit/portability/
trunk/Externals/cppunit/include/cppunit/tools/
trunk/Externals/cppunit/include/cppunit/ui/
trunk/Externals/cppunit/include/cppunit/ui/mfc/
trunk/Externals/cppunit/include/cppunit/ui/qt/
trunk/Externals/cppunit/include/cppunit/ui/text/
trunk/Externals/cppunit/include/msvc6/
trunk/Externals/cppunit/include/msvc6/DSPlugin/
trunk/Externals/cppunit/include/msvc6/testrunner/
trunk/Externals/cppunit/lib/
trunk/Externals/cppunit/src/
trunk/Externals/cppunit/src/DllPlugInTester/
trunk/Externals/cppunit/src/cppunit/
trunk/Externals/cppunit/src/msvc6/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/
trunk/Externals/cppunit/src/msvc6/DllPlugInTester/
trunk/Externals/cppunit/src/msvc6/testpluginrunner/
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/
trunk/Externals/cppunit/src/msvc6/testrunner/
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/
trunk/Externals/cppunit/src/msvc6/testrunner/res/
trunk/Externals/cppunit/src/qttestrunner/
trunk/Externals/expat/
trunk/Externals/expat/amiga/
trunk/Externals/expat/amiga/include/
trunk/Externals/expat/amiga/include/inline4/
trunk/Externals/expat/amiga/include/interfaces/
trunk/Externals/expat/amiga/include/libraries/
trunk/Externals/expat/amiga/include/proto/
trunk/Externals/expat/bcb5/
trunk/Externals/expat/conftools/
trunk/Externals/expat/doc/
trunk/Externals/expat/examples/
trunk/Externals/expat/lib/
trunk/Externals/expat/tests/
trunk/Externals/expat/tests/benchmark/
trunk/Externals/expat/vms/
trunk/Externals/expat/win32/
trunk/Externals/expat/xmlwf/
trunk/Externals/pcre/
trunk/Externals/pcre/config_pcre/
trunk/Externals/pcre/dll_pcre/
trunk/Externals/pcre/lib_pcre/
trunk/Externals/pcre/lib_pcreposix/
trunk/Externals/pcre/pcre-6.7/
trunk/Externals/pcre/pcre-6.7/doc/
trunk/Externals/pcre/pcre-6.7/doc/html/
trunk/Externals/pcre/pcre-6.7/testdata/
trunk/Externals/pcre/pcretest/
trunk/Externals/scew/
trunk/Externals/scew/doc/
trunk/Externals/scew/etc/
trunk/Externals/scew/etc/autoconf/
trunk/Externals/scew/etc/pkg-config/
trunk/Externals/scew/examples/
trunk/Externals/scew/examples/scew_print/
trunk/Externals/scew/examples/scew_stream/
trunk/Externals/scew/examples/scew_write/
trunk/Externals/scew/scew/
trunk/Externals/scew/win32/
trunk/Filters/
trunk/Installer/
trunk/Installer/InnoSetup/
trunk/Installer/InnoSetup/Art/
trunk/Installer/InnoSetup/Languages/
trunk/Installer/Runtimes/
trunk/Installer/Runtimes/Docs/
trunk/Plugins/
trunk/Plugins/dlls/
trunk/Plugins/src_Delphi/
trunk/Plugins/src_Delphi/UnpackDFM/
trunk/Plugins/src_VB/
trunk/Plugins/src_VB/CompareMSExcelFiles/
trunk/Plugins/src_VB/CompareMSWordFiles/
trunk/Plugins/src_VB/HideLastLetter/
trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/
trunk/Plugins/src_VB/IgnoreTwoFirstCharsOrder/
trunk/Plugins/src_VB/ToUpper/
trunk/Plugins/src_VCPP/
trunk/Plugins/src_VCPP/DisplayBinaryFiles/
trunk/Plugins/src_VCPP/DisplayXMLFiles/
trunk/Plugins/src_VCPP/EditBinaryFiles/
trunk/Plugins/src_VCPP/HideFirstLetter/
trunk/Plugins/src_VCPP/IgnoreColumns/
trunk/Plugins/src_VCPP/IgnoreCommentsC/
trunk/Plugins/src_VCPP/IgnoreFieldsComma/
trunk/Plugins/src_VCPP/IgnoreFieldsTab/
trunk/Plugins/src_VCPP/RCLocalizationHelper/
trunk/Plugins/src_VCPP/WatchBeginningOfLog/
trunk/Plugins/src_VCPP/WatchEndOfLog/
trunk/ShellExtension/
trunk/ShellExtension/Languages/
trunk/Src/
trunk/Src/Common/
trunk/Src/ExpatMapLib/
trunk/Src/ExpatMapLib/mappings/
trunk/Src/ExpatMapLib/mappings/ISO8859/
trunk/Src/ExpatMapLib/mappings/VENDORS/
trunk/Src/ExpatMapLib/mappings/VENDORS/MICSFT/
trunk/Src/ExpatMapLib/mappings/VENDORS/MICSFT/WINDOWS/
trunk/Src/Languages/
trunk/Src/Languages/Brazilian/
trunk/Src/Languages/Brazilian/res/
trunk/Src/Languages/Bulgarian/
trunk/Src/Languages/Bulgarian/res/
trunk/Src/Languages/Catalan/
trunk/Src/Languages/Catalan/res/
trunk/Src/Languages/ChineseSimplified/
trunk/Src/Languages/ChineseSimplified/res/
trunk/Src/Languages/ChineseTraditional/
trunk/Src/Languages/ChineseTraditional/res/
trunk/Src/Languages/Czech/
trunk/Src/Languages/Czech/res/
trunk/Src/Languages/Danish/
trunk/Src/Languages/Danish/res/
trunk/Src/Languages/Dutch/
trunk/Src/Languages/Dutch/res/
trunk/Src/Languages/French/
trunk/Src/Languages/French/res/
trunk/Src/Languages/German/
trunk/Src/Languages/German/res/
trunk/Src/Languages/Hungarian/
trunk/Src/Languages/Hungarian/res/
trunk/Src/Languages/Italian/
trunk/Src/Languages/Italian/res/
trunk/Src/Languages/Japanese/
trunk/Src/Languages/Japanese/res/
trunk/Src/Languages/Korean/
trunk/Src/Languages/Korean/res/
trunk/Src/Languages/Norwegian/
trunk/Src/Languages/Norwegian/res/
trunk/Src/Languages/Polish/
trunk/Src/Languages/Polish/res/
trunk/Src/Languages/Russian/
trunk/Src/Languages/Russian/res/
trunk/Src/Languages/Slovak/
trunk/Src/Languages/Slovak/res/
trunk/Src/Languages/Spanish/
trunk/Src/Languages/Spanish/res/
trunk/Src/Languages/Swedish/
trunk/Src/Languages/Swedish/res/
trunk/Src/Languages/Turkish/
trunk/Src/Languages/Turkish/res/
trunk/Src/diffutils/
trunk/Src/diffutils/lib/
trunk/Src/diffutils/src/
trunk/Src/editlib/
trunk/Src/res/
trunk/Testing/
trunk/Testing/CppUnit/
trunk/Testing/CppUnit/ProjectFile/
trunk/Testing/CppUnit/ProjectFile/TestData/
trunk/Testing/CppUnit/StringDifferencing/
trunk/Testing/EditorTest/
trunk/Testing/EditorTest/res/
trunk/Testing/selftests/
trunk/Testing/selftests/m/
trunk/Testing/selftests/mixed/
trunk/Testing/selftests/u/
trunk/Testing/selftests/w/
trunk/Tools/
trunk/Tools/MakePatchDirs/
trunk/Tools/MakeResDll/
trunk/Tools/diff2winmerge/
trunk/Web/
trunk/Web/1.7/
trunk/Web/1.7/images/
trunk/Web/2.0/
trunk/Web/2.0/images/
trunk/Web/2.2/
trunk/Web/2.2/images/
trunk/Web/2.4/
trunk/Web/2.4/images/
trunk/Web/2.6/
trunk/Web/2.6/images/
trunk/Web/css/
trunk/Web/images/
trunk/Web/support/
Property changes on: trunk
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/ArchiveSupport
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/ArchiveSupport/Merge7z
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/ArchiveSupport/Merge7zInstaller
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Developers
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Logos
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Languages
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual/art
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual/build
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual/css
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual/images
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual/images/callouts
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Docs/Users/Manual/screenshots
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/config
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib/bc5
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib/msvc
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib/xml-xsl
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/doc
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/ClockerPlugIn
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/DumperPlugIn
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/cppunittest
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/hierarchy
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/money
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/HostApp
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/HostApp/res
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/TestPlugIn
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/qt
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/simple
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/config
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/extensions
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/plugin
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/portability
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/tools
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui/mfc
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui/qt
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui/text
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/msvc6
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/msvc6/DSPlugin
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/include/msvc6/testrunner
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/lib
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/DllPlugInTester
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/cppunit
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/DSPlugIn
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/DSPlugIn/res
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/DllPlugInTester
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testpluginrunner
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testpluginrunner/res
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner/res
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/cppunit/src/qttestrunner
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/amiga
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/inline4
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/interfaces
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/libraries
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/proto
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/bcb5
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/conftools
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/doc
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/examples
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/lib
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/tests
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/tests/benchmark
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/vms
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/win32
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/expat/xmlwf
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/pcre
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/pcre/config_pcre
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/pcre/dll_pcre
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/pcre/lib_pcre
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/pcre/lib_pcreposix
___________________________________________________________________
Name: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
+ (\d{6,})
Property changes on: trunk/Externals/pcre/pcre-6.7
___________________________________________________________________
Name: bugtraq:url
+ http://sou...
[truncated message content] |
|
From: <ge...@us...> - 2007-06-01 23:40:15
|
Revision: 4313
http://svn.sourceforge.net/winmerge/?rev=4313&view=rev
Author: gerundt
Date: 2007-06-01 16:40:08 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Sorry, we need "bugtraq:url" and "bugtraq:logregex" not recursive!
Property Changed:
----------------
trunk/ArchiveSupport/
trunk/ArchiveSupport/Merge7z/
trunk/ArchiveSupport/Merge7zInstaller/
trunk/Docs/
trunk/Docs/Developers/
trunk/Docs/Logos/
trunk/Docs/Users/
trunk/Docs/Users/Languages/
trunk/Docs/Users/Manual/
trunk/Docs/Users/Manual/art/
trunk/Docs/Users/Manual/build/
trunk/Docs/Users/Manual/css/
trunk/Docs/Users/Manual/images/
trunk/Docs/Users/Manual/images/callouts/
trunk/Docs/Users/Manual/screenshots/
trunk/Externals/
trunk/Externals/cppunit/
trunk/Externals/cppunit/config/
trunk/Externals/cppunit/contrib/
trunk/Externals/cppunit/contrib/bc5/
trunk/Externals/cppunit/contrib/msvc/
trunk/Externals/cppunit/contrib/xml-xsl/
trunk/Externals/cppunit/doc/
trunk/Externals/cppunit/examples/
trunk/Externals/cppunit/examples/ClockerPlugIn/
trunk/Externals/cppunit/examples/DumperPlugIn/
trunk/Externals/cppunit/examples/cppunittest/
trunk/Externals/cppunit/examples/hierarchy/
trunk/Externals/cppunit/examples/money/
trunk/Externals/cppunit/examples/msvc6/
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/
trunk/Externals/cppunit/examples/msvc6/HostApp/
trunk/Externals/cppunit/examples/msvc6/HostApp/res/
trunk/Externals/cppunit/examples/msvc6/TestPlugIn/
trunk/Externals/cppunit/examples/qt/
trunk/Externals/cppunit/examples/simple/
trunk/Externals/cppunit/include/
trunk/Externals/cppunit/include/cppunit/
trunk/Externals/cppunit/include/cppunit/config/
trunk/Externals/cppunit/include/cppunit/extensions/
trunk/Externals/cppunit/include/cppunit/plugin/
trunk/Externals/cppunit/include/cppunit/portability/
trunk/Externals/cppunit/include/cppunit/tools/
trunk/Externals/cppunit/include/cppunit/ui/
trunk/Externals/cppunit/include/cppunit/ui/mfc/
trunk/Externals/cppunit/include/cppunit/ui/qt/
trunk/Externals/cppunit/include/cppunit/ui/text/
trunk/Externals/cppunit/include/msvc6/
trunk/Externals/cppunit/include/msvc6/DSPlugin/
trunk/Externals/cppunit/include/msvc6/testrunner/
trunk/Externals/cppunit/lib/
trunk/Externals/cppunit/src/
trunk/Externals/cppunit/src/DllPlugInTester/
trunk/Externals/cppunit/src/cppunit/
trunk/Externals/cppunit/src/msvc6/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/
trunk/Externals/cppunit/src/msvc6/DllPlugInTester/
trunk/Externals/cppunit/src/msvc6/testpluginrunner/
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/
trunk/Externals/cppunit/src/msvc6/testrunner/
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/
trunk/Externals/cppunit/src/msvc6/testrunner/res/
trunk/Externals/cppunit/src/qttestrunner/
trunk/Externals/expat/
trunk/Externals/expat/amiga/
trunk/Externals/expat/amiga/include/
trunk/Externals/expat/amiga/include/inline4/
trunk/Externals/expat/amiga/include/interfaces/
trunk/Externals/expat/amiga/include/libraries/
trunk/Externals/expat/amiga/include/proto/
trunk/Externals/expat/bcb5/
trunk/Externals/expat/conftools/
trunk/Externals/expat/doc/
trunk/Externals/expat/examples/
trunk/Externals/expat/lib/
trunk/Externals/expat/tests/
trunk/Externals/expat/tests/benchmark/
trunk/Externals/expat/vms/
trunk/Externals/expat/win32/
trunk/Externals/expat/xmlwf/
trunk/Externals/pcre/
trunk/Externals/pcre/config_pcre/
trunk/Externals/pcre/dll_pcre/
trunk/Externals/pcre/lib_pcre/
trunk/Externals/pcre/lib_pcreposix/
trunk/Externals/pcre/pcre-6.7/
trunk/Externals/pcre/pcre-6.7/doc/
trunk/Externals/pcre/pcre-6.7/doc/html/
trunk/Externals/pcre/pcre-6.7/testdata/
trunk/Externals/pcre/pcretest/
trunk/Externals/scew/
trunk/Externals/scew/doc/
trunk/Externals/scew/etc/
trunk/Externals/scew/etc/autoconf/
trunk/Externals/scew/etc/pkg-config/
trunk/Externals/scew/examples/
trunk/Externals/scew/examples/scew_print/
trunk/Externals/scew/examples/scew_stream/
trunk/Externals/scew/examples/scew_write/
trunk/Externals/scew/scew/
trunk/Externals/scew/win32/
trunk/Filters/
trunk/Installer/
trunk/Installer/InnoSetup/
trunk/Installer/InnoSetup/Art/
trunk/Installer/InnoSetup/Languages/
trunk/Installer/Runtimes/
trunk/Installer/Runtimes/Docs/
trunk/Plugins/
trunk/Plugins/dlls/
trunk/Plugins/src_Delphi/
trunk/Plugins/src_Delphi/UnpackDFM/
trunk/Plugins/src_VB/
trunk/Plugins/src_VB/CompareMSExcelFiles/
trunk/Plugins/src_VB/CompareMSWordFiles/
trunk/Plugins/src_VB/HideLastLetter/
trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/
trunk/Plugins/src_VB/IgnoreTwoFirstCharsOrder/
trunk/Plugins/src_VB/ToUpper/
trunk/Plugins/src_VCPP/
trunk/Plugins/src_VCPP/DisplayBinaryFiles/
trunk/Plugins/src_VCPP/DisplayXMLFiles/
trunk/Plugins/src_VCPP/EditBinaryFiles/
trunk/Plugins/src_VCPP/HideFirstLetter/
trunk/Plugins/src_VCPP/IgnoreColumns/
trunk/Plugins/src_VCPP/IgnoreCommentsC/
trunk/Plugins/src_VCPP/IgnoreFieldsComma/
trunk/Plugins/src_VCPP/IgnoreFieldsTab/
trunk/Plugins/src_VCPP/RCLocalizationHelper/
trunk/Plugins/src_VCPP/WatchBeginningOfLog/
trunk/Plugins/src_VCPP/WatchEndOfLog/
trunk/ShellExtension/
trunk/ShellExtension/Languages/
trunk/Src/
trunk/Src/Common/
trunk/Src/ExpatMapLib/
trunk/Src/ExpatMapLib/mappings/
trunk/Src/ExpatMapLib/mappings/ISO8859/
trunk/Src/ExpatMapLib/mappings/VENDORS/
trunk/Src/ExpatMapLib/mappings/VENDORS/MICSFT/
trunk/Src/ExpatMapLib/mappings/VENDORS/MICSFT/WINDOWS/
trunk/Src/Languages/
trunk/Src/Languages/Brazilian/
trunk/Src/Languages/Brazilian/res/
trunk/Src/Languages/Bulgarian/
trunk/Src/Languages/Bulgarian/res/
trunk/Src/Languages/Catalan/
trunk/Src/Languages/Catalan/res/
trunk/Src/Languages/ChineseSimplified/
trunk/Src/Languages/ChineseSimplified/res/
trunk/Src/Languages/ChineseTraditional/
trunk/Src/Languages/ChineseTraditional/res/
trunk/Src/Languages/Czech/
trunk/Src/Languages/Czech/res/
trunk/Src/Languages/Danish/
trunk/Src/Languages/Danish/res/
trunk/Src/Languages/Dutch/
trunk/Src/Languages/Dutch/res/
trunk/Src/Languages/French/
trunk/Src/Languages/French/res/
trunk/Src/Languages/German/
trunk/Src/Languages/German/res/
trunk/Src/Languages/Hungarian/
trunk/Src/Languages/Hungarian/res/
trunk/Src/Languages/Italian/
trunk/Src/Languages/Italian/res/
trunk/Src/Languages/Japanese/
trunk/Src/Languages/Japanese/res/
trunk/Src/Languages/Korean/
trunk/Src/Languages/Korean/res/
trunk/Src/Languages/Norwegian/
trunk/Src/Languages/Norwegian/res/
trunk/Src/Languages/Polish/
trunk/Src/Languages/Polish/res/
trunk/Src/Languages/Russian/
trunk/Src/Languages/Russian/res/
trunk/Src/Languages/Slovak/
trunk/Src/Languages/Slovak/res/
trunk/Src/Languages/Spanish/
trunk/Src/Languages/Spanish/res/
trunk/Src/Languages/Swedish/
trunk/Src/Languages/Swedish/res/
trunk/Src/Languages/Turkish/
trunk/Src/Languages/Turkish/res/
trunk/Src/diffutils/
trunk/Src/diffutils/lib/
trunk/Src/diffutils/src/
trunk/Src/editlib/
trunk/Src/res/
trunk/Testing/
trunk/Testing/CppUnit/
trunk/Testing/CppUnit/ProjectFile/
trunk/Testing/CppUnit/ProjectFile/TestData/
trunk/Testing/CppUnit/StringDifferencing/
trunk/Testing/EditorTest/
trunk/Testing/EditorTest/res/
trunk/Testing/selftests/
trunk/Testing/selftests/m/
trunk/Testing/selftests/mixed/
trunk/Testing/selftests/u/
trunk/Testing/selftests/w/
trunk/Tools/
trunk/Tools/MakePatchDirs/
trunk/Tools/MakeResDll/
trunk/Tools/diff2winmerge/
trunk/Web/
trunk/Web/1.7/
trunk/Web/1.7/images/
trunk/Web/2.0/
trunk/Web/2.0/images/
trunk/Web/2.2/
trunk/Web/2.2/images/
trunk/Web/2.4/
trunk/Web/2.4/images/
trunk/Web/2.6/
trunk/Web/2.6/images/
trunk/Web/css/
trunk/Web/images/
trunk/Web/support/
Property changes on: trunk/ArchiveSupport
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/ArchiveSupport/Merge7z
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/ArchiveSupport/Merge7zInstaller
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Developers
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Logos
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Languages
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual/art
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual/build
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual/css
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual/images
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual/images/callouts
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Docs/Users/Manual/screenshots
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/config
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib/bc5
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib/msvc
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/contrib/xml-xsl
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/doc
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/ClockerPlugIn
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/DumperPlugIn
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/cppunittest
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/hierarchy
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/money
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/HostApp
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/HostApp/res
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/msvc6/TestPlugIn
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/qt
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/examples/simple
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/config
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/extensions
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/plugin
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/portability
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/tools
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui/mfc
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui/qt
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/cppunit/ui/text
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/msvc6
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/msvc6/DSPlugin
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/include/msvc6/testrunner
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/lib
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/DllPlugInTester
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/cppunit
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/DSPlugIn
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/DSPlugIn/res
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/DllPlugInTester
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testpluginrunner
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testpluginrunner/res
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/msvc6/testrunner/res
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/cppunit/src/qttestrunner
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/amiga
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/inline4
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/interfaces
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/libraries
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/amiga/include/proto
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/bcb5
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/conftools
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/doc
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/examples
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/lib
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/tests
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/tests/benchmark
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/vms
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/win32
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/expat/xmlwf
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre/config_pcre
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre/dll_pcre
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre/lib_pcre
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre/lib_pcreposix
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre/pcre-6.7
___________________________________________________________________
Name: bugtraq:url
- http://sourceforge.net/support/tracker.php?aid=%BUGID%
Name: bugtraq:logregex
- (\d{6,})
Property changes on: trunk/Externals/pcre/pcre-6.7/doc
___________________________________________________________________
Name: bugtraq:u...
[truncated message content] |
|
From: <gr...@us...> - 2007-06-05 22:55:18
|
Revision: 4316
http://svn.sourceforge.net/winmerge/?rev=4316&view=rev
Author: grimmdp
Date: 2007-06-05 15:55:14 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
PATCH: [ 1731551 ] Recent Projects MRU
Some cleanup on readme-developers.html
Modified Paths:
--------------
trunk/Docs/Developers/readme-developers.html
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/Merge.rc
Modified: trunk/Docs/Developers/readme-developers.html
===================================================================
--- trunk/Docs/Developers/readme-developers.html 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Docs/Developers/readme-developers.html 2007-06-05 22:55:14 UTC (rev 4316)
@@ -119,8 +119,9 @@
the "<em>Platform SDK</em>" start menu folder.</p>
<h4>buildall.bat</h4>
-<p>There is a <code>buildall.bat</code> in root folder of source tree. This batch file invokes
-<code>devenv.exe</code> to build (almost) all projects in WinMerge tree. However, it has couple
+<p>There is a <code>buildall.bat</code> in the root folder of source tree. This batch file invokes
+<code>devenv.exe</code> to build (almost) all projects in WinMerge tree. However, it has
+a couple
of restrictions:
<ul>
<li>It cannot convert project files from VC6 format to newer formats. This must be done first
@@ -140,27 +141,28 @@
ShellExtension (in <code>/ShellExtension</code>) have their own project files. There is no one
single project/workspace file to compile all projects.<p>
-<p>Visual Studio project file for MSVC6 comes with WinMerge sources. Newer versions of
-Visual Studio can open that file too, they just ask if one wants to convert to new version.
-Reason we don't ship project files for all Visual Studio versions is we have no resources
-to keep all versions up to date. People can't test all versions themselves and easily forget
-to update at least one file. So we easily end up in situation when there is no properly
+<p>The Visual Studio project file for MSVC6 comes with the WinMerge sources. Newer versions of
+Visual Studio can open that file too, they just ask if one wants to convert to
+the new version.
+The reason we don't ship project files for all Visual Studio versions is we have no resources
+to keep all versions up to date. People can't test all versions themselves, and easily forget
+to update at least one file. So we easily end up in a situation where there is no properly
working project file at all...</p>
-<p>After opening the project file you need to add HTML Help Workshop path as additional include-
+<p>After opening the project file you need to add the HTML Help Workshop path as additional include-
and library-path.</p>
<p>NOTE: There might be problems compiling/debugging with Visual Studio 2003 when using
-HTML Help WorkShop from Platform SDK in Visual Studio directory. Download and
+HTML Help WorkShop from the Platform SDK in Visual Studio directory. Download and
install HTML Workshop as stand-alone and include headers and libraries from standalone
-directory. Probable cause is that including files from Platform SDK directories breaks
+directory. The probable cause is that including files from Platform SDK directories breaks
things.</p>
<h4>Compiling expat</h4>
<p>expat is in <code>/Externals/expat</code> folder in source tree. To compile expat:</p>
<ul>
<li>Open Visual Studio workspace <code>/Externals/expat/expat.dsw</code>. If you are
- using Visual Studio 2003.Net or later you need to convert the file to new format when
+ using Visual Studio 2003.Net or later you need to convert the file to the new format when
Visual Studio opens the file.</li>
<li>Select from Visual Studio menu Build / Batch Build</li>
<li>Select either debug or release targets.</li>
@@ -174,7 +176,7 @@
<p>scew is in <code>/Externals/scew</code> folder in source tree. To compile scew:</p>
<ul>
<li>Open Visual Studio project file <code>/Externals/scew/win32/scew.dsp</code> If you are
- using Visual Studio 2003.Net or later you need to convert the file to new format when
+ using Visual Studio 2003.Net or later you need to convert the file to the new format when
Visual Studio opens the file.</li>
<li>Select from Visual Studio menu Build / Batch Build</li>
<li>Make sure all targets are selected</li>
@@ -185,7 +187,7 @@
<p>PCRE is in <code>/Externals/pcre</code> folder in source tree. To compile PCRE:</p>
<ul>
<li>Open Visual Studio workspace file <code>/Externals/pcre/pcre.dsw</code> If you are
- using Visual Studio 2003.Net or later you need to convert the file to new format when
+ using Visual Studio 2003.Net or later you need to convert the file to the new format when
Visual Studio opens the file.</li>
<li>Select from Visual Studio menu Build / Batch Build</li>
<li>Select <code>config_pcre</code> and <code>pcre</code> projects and build them</li>
@@ -209,9 +211,10 @@
</ul>
<h4>Visual Studio 2005</h4>
-<p>When VC6 project file (.dsp) is converted to Visual Studio 2005 project, it does not
+<p>When the VC6 project file (.dsp) is converted to a Visual Studio 2005 project, it does not
compile correctly as is. The problem is Visual Studio 2005 automatically generates and
-embeds manifest file for the executable. And as WinMerge resource file includes manifest
+embeds a manifest file for the executable. And as the WinMerge resource file includes
+a manifest
file there are conflicts.</p>
<p>The easiest way to fix the compile is to disable VS2005 from creating and embedding
@@ -226,9 +229,10 @@
<p>Please follow these guidelines when submitting changes to WinMerge sources
as patches.</p>
-<p class="note">Do not waste yours and ours time by submitting large feature patches
-before you have made sure the feature is wanted to WinMerge. Communicate with developers,
-either in bug/feature request(rfe) items or preferably in Developers-forum or Developers-
+<p class="note">Do not waste yours and our time by submitting large feature
+patches before you have made sure the feature is a desired addition to WinMerge. Communicate with
+our developers,
+either in bug/feature request(rfe) items or preferably in the Developers-forum or Developers-
mailing list.</p>
<ol>
@@ -241,8 +245,8 @@
<li>
If you are implementing a new feature, put a note in the SourceForge Feature
Request item that you're implementing it. If there is no SourceForge Feature
- Request item, create one. Alternatively you can discuss about new features
- in Developers-forum or Developers-mailing list. Please use this! It is a lot
+ Request item, create one. Alternatively you can discuss new features
+ in the Developers-forum or Developers-mailing list. Please use this! It is a lot
less work wasted when we agree about design first.
</li>
</ul>
@@ -252,10 +256,11 @@
a snapshot of your starting sources (presumably a pristine copy of sources from
subversion, or of a source zip from a distribution).</p>
- <p><b>DO NOT</b> submit a patch against year-old version. Latest experimental/beta version
- is at most a few weeks old. Stable releases should only get bug fixes. And even then bugfix
+ <p><b>DO NOT</b> submit a patch against a year-old version. The latest experimental/beta version
+ is at most a few weeks old. Stable releases should only get bug fixes. And even then
+ the bugfix
is usually first applied to development versions. So there should be no reason to submit
- a patch against old version.</p>
+ a patch against an old version.</p>
</li>
<li>
<p>Review the sections on <a href="#Coding_conventions">Coding conventions</a>
@@ -279,12 +284,13 @@
</li>
<li>
<p>Wait for reactions from other developers (and sometimes active users).<br>
- Usually this means one of active developers approves your patch before commit.</p>
+ Usually this means one of the active developers approves your patch before
+ you commit.</p>
</li>
<li>
<p>After a reasonable amount of time has passed, and one of active developers
has approved the patch, apply the patch to Subversion. (Or ask a
- project member to do so, if you don't have yourself developer access to
+ project member to do so, if you don't have developer access to
the project.)</p>
<p>What is a reasonable amount of time? That is somewhat subjective, and
we need to rely on your expertise as the patch developer, but let us
@@ -294,7 +300,7 @@
<li>
<p>Add a note in <code>Src/Changes.txt</code> telling what files you committed,
and what bug/RFE/patch you solved. This is very important so everybody else
- has a change to figure out who did what and when.</p>
+ has a chance to figure out who did what and when.</p>
</li>
</ol>
@@ -420,13 +426,14 @@
<h3><a name="Packaging_file_releases">Packaging file releases</a></h3>
-<p>On SourceForge there is some space to put in Release Notes and Change Notes.
+<p>On SourceForge there is some space to enter Release Notes and Change Notes.
For experimental releases make sure to put in a note telling people that this is indeed experimental,
so they should not expect everything to work perfectly.
For beta builds we paste in all the changes since the last beta release, so that people can see exactly what changed.
For major releases, we paste in the list of changes since the last major release, and this list can become very long.</p>
-<p>We are using <a href="http://www.jrsoftware.org/isinfo.php">InnoSetup</a> to make an installer for WinMerge.
+<p>We are using <a href="http://www.jrsoftware.org/isinfo.php">InnoSetup</a> to make
+the installer for WinMerge.
See <a href="readme-developers-InnoSetup.html">readme-developers-InnoSetup.html</a> for more information.
Also zip-packages for releases are provided, zip up these files:</p>
@@ -496,9 +503,9 @@
<p>When we make a release we always put a note in <code>Src/Changes.txt</code> in SVN.</p>
-<p>It is recommended to create a tag to repository when making a stable- or beta- releases.
+<p>It is recommended to create a tag to the repository when making a stable- or beta- releases.
Although with subversion we have kind of tags for every commit (revision numbers) it is still a lot
-easier to handle and remeber them with human-readable names (R2_6_0) than with revision numbers
+easier to handle and remember them with human-readable names (R2_6_0) than with revision numbers
(revision 3637 (not a real revision number!)). Experimental or other testing releases don't need
tags since they are not intended for wide use and are usually just one-time snapshots.</p>
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Src/Changes.txt 2007-06-05 22:55:14 UTC (rev 4316)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-06-05 Dean
+ PATCH: [ 1731551 ] Recent Projects MRU
+ Src: Merge.cpp Merge.h Mainfrm.cpp Mainfrm.h Merge.rc
+
2007-06-01 Gal
BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
Src: DirView.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Src/MainFrm.cpp 2007-06-05 22:55:14 UTC (rev 4316)
@@ -98,6 +98,7 @@
ON_WM_MENUCHAR()
ON_WM_MEASUREITEM()
ON_WM_INITMENUPOPUP()
+ ON_WM_INITMENU()
ON_COMMAND(ID_OPTIONS_SHOWDIFFERENT, OnOptionsShowDifferent)
ON_COMMAND(ID_OPTIONS_SHOWIDENTICAL, OnOptionsShowIdentical)
ON_COMMAND(ID_OPTIONS_SHOWUNIQUELEFT, OnOptionsShowUniqueLeft)
@@ -581,7 +582,10 @@
if (!bSysMenu)
{
if (BCMenu::IsMenu(pPopupMenu))
+ {
BCMenu::UpdateMenu(pPopupMenu);
+ theApp.UpdateRecentProjectsMRUMenu(pPopupMenu, this);
+ }
}
}
@@ -1037,6 +1041,7 @@
bRecurse = FALSE;
else if (projRecurse > 0)
bRecurse = TRUE;
+
}
pathsType = static_cast<PATH_EXISTENCE>(dlg.m_pathsType);
// TODO: add codepage options to open dialog ?
@@ -3278,3 +3283,9 @@
int toolbar = GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE);
pCmdUI->SetRadio(enabled && toolbar == 1);
}
+
+void CMainFrame::OnInitMenu(CMenu *pMenu)
+{
+ CMergeApp* pApp = (CMergeApp*)AfxGetApp();
+ //pApp->UpdateMRUMenu(pMenu);
+}
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Src/MainFrm.h 2007-06-05 22:55:14 UTC (rev 4316)
@@ -232,6 +232,7 @@
//{{AFX_MSG(CMainFrame)
afx_msg void OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct);
afx_msg LRESULT OnMenuChar(UINT nChar, UINT nFlags, CMenu* pMenu) ;
+ afx_msg void OnInitMenu(CMenu* pMenu);
afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
afx_msg void OnOptionsShowDifferent();
afx_msg void OnOptionsShowIdentical();
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Src/Merge.cpp 2007-06-05 22:55:14 UTC (rev 4316)
@@ -81,6 +81,7 @@
ON_COMMAND(ID_VIEW_LANGUAGE, OnViewLanguage)
ON_UPDATE_COMMAND_UI(ID_VIEW_LANGUAGE, OnUpdateViewLanguage)
ON_COMMAND(ID_HELP, OnHelp)
+ ON_COMMAND_EX_RANGE(ID_FILE_MRU_FILE1, ID_FILE_MRU_FILE16, OnOpenRecentFile)
//}}AFX_MSG_MAP
// Standard file based document commands
//ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
@@ -283,7 +284,7 @@
}
}
- LoadStdProfileSettings(0); // Load standard INI file options (including MRU)
+ LoadStdProfileSettings(8); // Load standard INI file options (including MRU)
BOOL bDisableSplash = GetOptionsMgr()->GetBool(OPT_DISABLE_SPLASH);
InitializeFileFilters();
@@ -737,6 +738,8 @@
WriteProfileInt(_T("Settings"), _T("Recurse"), bRecursive);
BOOL rtn = GetMainFrame()->DoFileOpen(sLeft, sRight, dwLeftFlags, dwRightFlags, bRecursive);
+
+ AddToRecentProjectsMRU(sProject);
return !!rtn;
}
@@ -806,3 +809,61 @@
}
return pathFilters;
}
+
+
+/**
+ * @brief Adds specified file to the recent projects list.
+ * @param [in] sPathName Path to project file
+ */
+void CMergeApp::AddToRecentProjectsMRU(const CString& sPathName)
+{
+ // sPathName will be added to the top of the MRU list.
+ // If sPathName already exists in the MRU list, it will be moved to the top
+ if (m_pRecentFileList != NULL) {
+ m_pRecentFileList->Add(sPathName);
+ m_pRecentFileList->WriteList();
+ }
+}
+
+
+/**
+ * @brief Updates menu with recent file entries
+ * @param [in] sPathName Path to project file
+ */
+void CMergeApp::UpdateRecentProjectsMRUMenu(CMenu* pMenu, CCmdTarget* pTarget)
+{
+ CCmdUI cmdUI;
+
+ if (NULL != pMenu)
+ {
+ for (UINT n = 0; n < pMenu->GetMenuItemCount(); ++n)
+ {
+ CMenu* pSubMenu = pMenu->GetSubMenu(n);
+
+ if (NULL != pSubMenu)
+ {
+ UpdateRecentProjectsMRUMenu(pSubMenu, pTarget); // recursive call
+ }
+ else
+ {
+ cmdUI.m_nIndex = n;
+ cmdUI.m_nID = pMenu->GetMenuItemID(n);
+ cmdUI.m_pMenu = pMenu;
+ // Need to set this value otherwise you will assert when
+ // you have an empty recent file list.
+ cmdUI.m_nIndexMax = pMenu->GetMenuItemCount();
+ cmdUI.DoUpdate(pTarget, FALSE);
+ }
+ }
+ }
+}
+
+
+/**
+ * @brief Handles menu selection from recent projects list
+ * @param [in] nID Menu ID of the selected item
+ */
+BOOL CMergeApp::OnOpenRecentFile(UINT nID)
+{
+ return LoadAndOpenProjectFile(m_pRecentFileList->m_arrNames[nID-ID_FILE_MRU_FILE1]);
+}
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Src/Merge.h 2007-06-05 22:55:14 UTC (rev 4316)
@@ -70,6 +70,8 @@
~CMergeApp();
public:
+ void UpdateRecentProjectsMRUMenu(CMenu* pMenu, CCmdTarget* pTarget);
+ void AddToRecentProjectsMRU(const CString& sPathName);
void SetNeedIdleTimer();
void SetLastCompareResult(int nResult) { m_nLastCompareResult = nResult; }
CString GetDefaultEditor();
@@ -107,6 +109,7 @@
void ReloadMenu();
//{{AFX_MSG(CMergeApp)
+ afx_msg BOOL OnOpenRecentFile(UINT nID);
afx_msg void OnAppAbout();
afx_msg void OnViewLanguage();
afx_msg void OnUpdateViewLanguage(CCmdUI* pCmdUI);
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-06-03 11:58:00 UTC (rev 4315)
+++ trunk/Src/Merge.rc 2007-06-05 22:55:14 UTC (rev 4316)
@@ -125,6 +125,8 @@
MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
+ MENUITEM "Recent Projects", ID_FILE_MRU_FILE1
+ MENUITEM SEPARATOR
MENUITEM "E&xit", ID_APP_EXIT
END
POPUP "&Edit"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-07-26 08:05:43
|
Revision: 4387
http://winmerge.svn.sourceforge.net/winmerge/?rev=4387&view=rev
Author: kimmov
Date: 2007-07-26 01:05:42 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
Add standard properties to files (eolstyle, keywords).
Modified Paths:
--------------
trunk/Filters/CSharp_loose.flt
trunk/Filters/Delphi.flt
trunk/Filters/SourceControl.flt
trunk/Filters/Symbian.flt
trunk/Src/Common/Ucs2Utf8.cpp
trunk/Src/Common/Ucs2Utf8.h
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
trunk/Src/FilterList.cpp
trunk/Src/FilterList.h
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
trunk/Src/LineFiltersList.cpp
trunk/Src/LineFiltersList.h
trunk/Src/MergeDocDiffSync.cpp
trunk/Src/MovedLines.cpp
trunk/Src/MovedLines.h
trunk/Src/PropBackups.cpp
trunk/Src/PropBackups.h
Property Changed:
----------------
trunk/Filters/CSharp_loose.flt
trunk/Filters/Delphi.flt
trunk/Filters/SourceControl.flt
trunk/Filters/Symbian.flt
trunk/Src/Common/Ucs2Utf8.cpp
trunk/Src/Common/Ucs2Utf8.h
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
trunk/Src/FilterList.cpp
trunk/Src/FilterList.h
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
trunk/Src/LineFiltersList.cpp
trunk/Src/LineFiltersList.h
trunk/Src/MergeDocDiffSync.cpp
trunk/Src/MovedLines.cpp
trunk/Src/MovedLines.h
trunk/Src/PropBackups.cpp
trunk/Src/PropBackups.h
Modified: trunk/Filters/CSharp_loose.flt
===================================================================
--- trunk/Filters/CSharp_loose.flt 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Filters/CSharp_loose.flt 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,29 +1,29 @@
-## This is a directory/file filter for WinMerge
-## This filter suppresses various binaries found in Visual C# source trees
-name: Visual C# loose
-desc: Suppresses various binaries found in Visual C# source trees
-
-## This is an inclusive (loose) filter
-## (it lets through everything not specified)
-def: include
-
-## Filters for filenames begin with f:
-## Filters for directories begin with d:
-## (Inline comments begin with " ##" and extend to the end of the line)
-
-f: \.aps$ ## VC Binary version of resource file, for quick loading
-f: \.bsc$ ## VC Browser database
-f: \.dll$ ## Windows DLL
-f: \.exe$ ## Windows executable
-f: \.obj$ ## VC object module file
-f: \.pdb$ ## VC program database file (debugging symbolic information)
-f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
-f: \.suo$ ## VC options file (binary)
-f: \.cache$ ## ??
-f: \.resource$ ## Compiled resource file.
-f: \.xfrm ## ??
-f: \.bak$ ## backup
-
-d: \\cvs$ ## CVS control directory
-d: \\.svn$ ## Subversion control directory
-
+## This is a directory/file filter for WinMerge
+## This filter suppresses various binaries found in Visual C# source trees
+name: Visual C# loose
+desc: Suppresses various binaries found in Visual C# source trees
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.aps$ ## VC Binary version of resource file, for quick loading
+f: \.bsc$ ## VC Browser database
+f: \.dll$ ## Windows DLL
+f: \.exe$ ## Windows executable
+f: \.obj$ ## VC object module file
+f: \.pdb$ ## VC program database file (debugging symbolic information)
+f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
+f: \.suo$ ## VC options file (binary)
+f: \.cache$ ## ??
+f: \.resource$ ## Compiled resource file.
+f: \.xfrm ## ??
+f: \.bak$ ## backup
+
+d: \\cvs$ ## CVS control directory
+d: \\.svn$ ## Subversion control directory
+
Property changes on: trunk/Filters/CSharp_loose.flt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Filters/Delphi.flt
===================================================================
--- trunk/Filters/Delphi.flt 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Filters/Delphi.flt 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,33 +1,33 @@
-## This is a directory/file filter template for WinMerge
-name: Delphi filter
-desc: View only files .PAS and files .DFM
-
-## Select if filter is inclusive or exclusive
-## Inclusive (loose) filter lets through all items not matching rules
-## Exclusive filter lets through only items that match to rule
-## include or exclude
-def: include
-
-## Filters for filenames begin with f:
-## Filters for directories begin with d:
-## (Inline comments begin with " ##" and extend to the end of the line)
-
-f: \.^~ ## EXCLUDE temporary files
-f: \.dcu$ ## EXCLUDE Delphi compiled unit
-f: \.exe$ ## EXCLUDE Exe file
-f: \.cfg$ ## EXCLUDE configuration file
-f: \.dsk$ ## EXCLUDE File of internal information of the project
-f: \.dof$ ## EXCLUDE Delphi options file
-f: \.ddp$ ## EXCLUDE Delphi diagram portfolio file
-f: \.db$ ## EXCLUDE File Paradox
-f: \.ims$ ## EXCLUDE Icon file, normally created with IconForge
-f: \.bak$ ## EXCLUDE Backup file made with WinMerge
-
-## f: \.dfm$ ## Delphi Form
-## f: \.pas$ ## Delphi source
-## f: \.dpr$ ## Delphi Project
-## f: \.dpk$ ## Delphi Package
-## f: \.bpg$ ## Delphi Package Group
-## f: \.bpl$ ## Delphi Package Library
-
+## This is a directory/file filter template for WinMerge
+name: Delphi filter
+desc: View only files .PAS and files .DFM
+
+## Select if filter is inclusive or exclusive
+## Inclusive (loose) filter lets through all items not matching rules
+## Exclusive filter lets through only items that match to rule
+## include or exclude
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.^~ ## EXCLUDE temporary files
+f: \.dcu$ ## EXCLUDE Delphi compiled unit
+f: \.exe$ ## EXCLUDE Exe file
+f: \.cfg$ ## EXCLUDE configuration file
+f: \.dsk$ ## EXCLUDE File of internal information of the project
+f: \.dof$ ## EXCLUDE Delphi options file
+f: \.ddp$ ## EXCLUDE Delphi diagram portfolio file
+f: \.db$ ## EXCLUDE File Paradox
+f: \.ims$ ## EXCLUDE Icon file, normally created with IconForge
+f: \.bak$ ## EXCLUDE Backup file made with WinMerge
+
+## f: \.dfm$ ## Delphi Form
+## f: \.pas$ ## Delphi source
+## f: \.dpr$ ## Delphi Project
+## f: \.dpk$ ## Delphi Package
+## f: \.bpg$ ## Delphi Package Group
+## f: \.bpl$ ## Delphi Package Library
+
## d: \\subdir$ ## Filter for directory
\ No newline at end of file
Property changes on: trunk/Filters/Delphi.flt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Filters/SourceControl.flt
===================================================================
--- trunk/Filters/SourceControl.flt 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Filters/SourceControl.flt 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,26 +1,26 @@
-## This is a directory/file filter for WinMerge
-## This filter lets through only files ASP.NET developers care about
-name: Exclude Source Control
-desc: Exclude Source Control files and directories
-
-## This is an inclusive (loose) filter
-## (it lets through everything not specified)
-def: include
-
-
-## Filters for filenames begin with f:
-## Filters for directories begin with d:
-## (Inline comments begin with " ##" and extend to the end of the line)
-
-## f: *\.bzrignore$ ## Bazaar ignore file
-## f: *\.cvsignore$ ## CVS ignore file
-## f: *\.hgignore$ ## Mercurial ignore file
-## f: *\.svnignore$ ## Subversion ignore file
-
-f: *\.*scc$ ## Visual SourceSafe files
-
-d: \\\.svn$ ## Subversion working copy
-d: \\_svn$ ## Subversion working copy ASP.NET Hack
-d: \\cvs$ ## CVS control directory
-d: \\\.bzr$ ## Bazaar branch
-d: \\\.hg$ ## Mercurial repository
+## This is a directory/file filter for WinMerge
+## This filter lets through only files ASP.NET developers care about
+name: Exclude Source Control
+desc: Exclude Source Control files and directories
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+## f: *\.bzrignore$ ## Bazaar ignore file
+## f: *\.cvsignore$ ## CVS ignore file
+## f: *\.hgignore$ ## Mercurial ignore file
+## f: *\.svnignore$ ## Subversion ignore file
+
+f: *\.*scc$ ## Visual SourceSafe files
+
+d: \\\.svn$ ## Subversion working copy
+d: \\_svn$ ## Subversion working copy ASP.NET Hack
+d: \\cvs$ ## CVS control directory
+d: \\\.bzr$ ## Bazaar branch
+d: \\\.hg$ ## Mercurial repository
Property changes on: trunk/Filters/SourceControl.flt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Filters/Symbian.flt
===================================================================
--- trunk/Filters/Symbian.flt 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Filters/Symbian.flt 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,37 +1,37 @@
-## This is a directory/file filter for WinMerge
-## This filter suppresses various binaries found in Symbian development source trees.
-name: Symbian C++
-desc: Suppresses various binaries found in Visual C++ source trees compiling Symbian
-
-## This is an inclusive (loose) filter
-## (it lets through everything not specified)
-def: include
-
-## Filters for filenames begin with f:
-## Filters for directories begin with d:
-## (Inline comments begin with " ##" and extend to the end of the line)
-
-f: \.bsc$ ## VC Browser database
-f: \.aps$ ## VC Binary version of resource file, for quick loading
-f: \.bsc$ ## VC Browser database
-f: \.clw$ ## VC class-wizard status file
-f: \.dll$ ## Windows DLL
-f: \.exe$ ## Windows executable
-f: \.exp$ ## VC library export file
-f: \\vc60.idb$ ## VC ?
-f: \.ilk$ ## VC incremental linker memory file
-f: \.lib$ ## compiled libraries
-f: \.ncb$ ## VC parser information file (class view & component gallery stuff)
-f: \.obj$ ## VC object module file
-f: \.pch$ ## VC precompiled header file
-f: \.pdb$ ## VC program database file (debugging symbolic information)
-f: \.sbr$ ## VC source browser file (used to create bsc file)
-f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
-f: \.rsc ## Compiled resources
-f: \.app ## Application
-f: \.aif
-f: \.bak$ ## backup
-f: \ABLD.bat$ ## Bat file
-
-d: \\cvs$ ## CVS control directory
+## This is a directory/file filter for WinMerge
+## This filter suppresses various binaries found in Symbian development source trees.
+name: Symbian C++
+desc: Suppresses various binaries found in Visual C++ source trees compiling Symbian
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.bsc$ ## VC Browser database
+f: \.aps$ ## VC Binary version of resource file, for quick loading
+f: \.bsc$ ## VC Browser database
+f: \.clw$ ## VC class-wizard status file
+f: \.dll$ ## Windows DLL
+f: \.exe$ ## Windows executable
+f: \.exp$ ## VC library export file
+f: \\vc60.idb$ ## VC ?
+f: \.ilk$ ## VC incremental linker memory file
+f: \.lib$ ## compiled libraries
+f: \.ncb$ ## VC parser information file (class view & component gallery stuff)
+f: \.obj$ ## VC object module file
+f: \.pch$ ## VC precompiled header file
+f: \.pdb$ ## VC program database file (debugging symbolic information)
+f: \.sbr$ ## VC source browser file (used to create bsc file)
+f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
+f: \.rsc ## Compiled resources
+f: \.app ## Application
+f: \.aif
+f: \.bak$ ## backup
+f: \ABLD.bat$ ## Bat file
+
+d: \\cvs$ ## CVS control directory
d: \\.svn$ ## Subversion control directory
\ No newline at end of file
Property changes on: trunk/Filters/Symbian.flt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/Common/Ucs2Utf8.cpp
===================================================================
--- trunk/Src/Common/Ucs2Utf8.cpp 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Src/Common/Ucs2Utf8.cpp 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,127 +1,127 @@
-/////////////////////////////////////////////////////////////////////////////
-// License (GPLv2+):
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or (at
-// your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-/////////////////////////////////////////////////////////////////////////////
-/**
- * @file Ucs2Utf8.cpp
- *
- * @brief UCS-2 <--> UTF-8 conversion routines implementation.
- */
-
-#include "stdafx.h"
-#include "unicoder.h"
-#include "Ucs2Utf8.h"
-
-/**
- * @brief Copy UCS-2LE string to UTF-8 string
- *
- * @param nUcs is the size in wide characters of the source string
- * @param nUtf is the size in bytes of the resulting string
- *
- * @return if nUtf = 0, return the size required for the translation buffer
- */
-UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf)
-{
- if (nUtf == 0)
- // just tell required length
- return ucr::Utf8len_of_string(psUcs, nUcs);
-
- // the buffer is allocated, output in it directly
- unsigned char * pc = (unsigned char *) pcsUtf;
- int nremains = nUtf;
-
- // quick way
- UINT i=0;
- for (i = 0 ; i < nUcs && nremains > 10; ++i)
- nremains -= ucr::to_utf8_advance(psUcs[i], pc);
-
- // be careful for the end of the buffer, risk of overflow because
- // of the variable length of the UTF-8 character
- unsigned char smallTempBuffer[20];
- int nremainsend = nremains;
- unsigned char * pcTemp = (unsigned char *) smallTempBuffer;
- for ( ; i < nUcs && nremainsend > 0; ++i)
- nremainsend -= ucr::to_utf8_advance(psUcs[i], pcTemp);
-
- int ncomplement = min(nremains, pcTemp-smallTempBuffer);
- CopyMemory(pc, smallTempBuffer, ncomplement);
- nremains -= ncomplement;
-
- // return number of written bytes
- return (nUtf - nremains);
-}
-
-/**
- * @brief Copy UTF-8 string to UCS-2LE string
- *
- * @return if nUcs = 0, return the size required for the translation buffer
- */
-UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs)
-{
- if (nUcs == 0)
- // just tell required length
- return ucr::stringlen_of_utf8(pcsUtf, nUtf);
-
- // the buffer is allocated, output in it directly
- unsigned char * pUtf = (unsigned char * ) pcsUtf;
- LPWSTR pwc = psUcs;
- int nremains = nUcs;
-
- for (UINT i = 0 ; i < nUtf && nremains > 0; )
- {
- *pwc++ = ucr::GetUtf8Char(pUtf+i);
- nremains --;
- int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);
- if (chlen < 1) chlen = 1;
- i += chlen;
- }
-
- // return number of written wchars
- return (nUtf - nremains);
-}
-
-/**
- * @brief Convert string to UTF-8.
- * This function converts the given string to UTF-8, and returns pointer
- * to converted string. Given string must be deallocated by calling
- * UCS2UTF8_Dealloc() after use.
- * @param [in] strOrigin String to convert.
- * @return Pointer to UTF-8 string.
- */
-char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin)
-{
-#ifdef UNICODE
- // Get the size of UTF-8 string
- int str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), NULL, 0);
- ++str_len; // Space for zero at end
-
- char * str_utf = (char *) malloc(str_len);
- ZeroMemory(str_utf, str_len);
- str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), str_utf, str_len);
-#else
- char *str_utf = strdup(strOrigin);
-#endif
-
- return str_utf;
-}
-
-/**
- * @brief Free string allocated by UCS2UTF8_ConvertToUtf8().
- * @param [in] Utf8Str String to deallocate.
- */
-void UCS2UTF8_Dealloc(char * Utf8Str)
-{
- free(Utf8Str);
-}
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file Ucs2Utf8.cpp
+ *
+ * @brief UCS-2 <--> UTF-8 conversion routines implementation.
+ */
+
+#include "stdafx.h"
+#include "unicoder.h"
+#include "Ucs2Utf8.h"
+
+/**
+ * @brief Copy UCS-2LE string to UTF-8 string
+ *
+ * @param nUcs is the size in wide characters of the source string
+ * @param nUtf is the size in bytes of the resulting string
+ *
+ * @return if nUtf = 0, return the size required for the translation buffer
+ */
+UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf)
+{
+ if (nUtf == 0)
+ // just tell required length
+ return ucr::Utf8len_of_string(psUcs, nUcs);
+
+ // the buffer is allocated, output in it directly
+ unsigned char * pc = (unsigned char *) pcsUtf;
+ int nremains = nUtf;
+
+ // quick way
+ UINT i=0;
+ for (i = 0 ; i < nUcs && nremains > 10; ++i)
+ nremains -= ucr::to_utf8_advance(psUcs[i], pc);
+
+ // be careful for the end of the buffer, risk of overflow because
+ // of the variable length of the UTF-8 character
+ unsigned char smallTempBuffer[20];
+ int nremainsend = nremains;
+ unsigned char * pcTemp = (unsigned char *) smallTempBuffer;
+ for ( ; i < nUcs && nremainsend > 0; ++i)
+ nremainsend -= ucr::to_utf8_advance(psUcs[i], pcTemp);
+
+ int ncomplement = min(nremains, pcTemp-smallTempBuffer);
+ CopyMemory(pc, smallTempBuffer, ncomplement);
+ nremains -= ncomplement;
+
+ // return number of written bytes
+ return (nUtf - nremains);
+}
+
+/**
+ * @brief Copy UTF-8 string to UCS-2LE string
+ *
+ * @return if nUcs = 0, return the size required for the translation buffer
+ */
+UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs)
+{
+ if (nUcs == 0)
+ // just tell required length
+ return ucr::stringlen_of_utf8(pcsUtf, nUtf);
+
+ // the buffer is allocated, output in it directly
+ unsigned char * pUtf = (unsigned char * ) pcsUtf;
+ LPWSTR pwc = psUcs;
+ int nremains = nUcs;
+
+ for (UINT i = 0 ; i < nUtf && nremains > 0; )
+ {
+ *pwc++ = ucr::GetUtf8Char(pUtf+i);
+ nremains --;
+ int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);
+ if (chlen < 1) chlen = 1;
+ i += chlen;
+ }
+
+ // return number of written wchars
+ return (nUtf - nremains);
+}
+
+/**
+ * @brief Convert string to UTF-8.
+ * This function converts the given string to UTF-8, and returns pointer
+ * to converted string. Given string must be deallocated by calling
+ * UCS2UTF8_Dealloc() after use.
+ * @param [in] strOrigin String to convert.
+ * @return Pointer to UTF-8 string.
+ */
+char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin)
+{
+#ifdef UNICODE
+ // Get the size of UTF-8 string
+ int str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), NULL, 0);
+ ++str_len; // Space for zero at end
+
+ char * str_utf = (char *) malloc(str_len);
+ ZeroMemory(str_utf, str_len);
+ str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), str_utf, str_len);
+#else
+ char *str_utf = strdup(strOrigin);
+#endif
+
+ return str_utf;
+}
+
+/**
+ * @brief Free string allocated by UCS2UTF8_ConvertToUtf8().
+ * @param [in] Utf8Str String to deallocate.
+ */
+void UCS2UTF8_Dealloc(char * Utf8Str)
+{
+ free(Utf8Str);
+}
Property changes on: trunk/Src/Common/Ucs2Utf8.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/Common/Ucs2Utf8.h
===================================================================
--- trunk/Src/Common/Ucs2Utf8.h 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Src/Common/Ucs2Utf8.h 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,33 +1,33 @@
-/////////////////////////////////////////////////////////////////////////////
-// License (GPLv2+):
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-/////////////////////////////////////////////////////////////////////////////
-/**
- * @file Ucs2Utf8.h
- *
- * @brief Declaration for UCS-2 <--> UTF-8 conversions functions.
- *
- */
-
-#ifndef _UCS2UTF8_H_
-#define _UCS2UTF8_H_
-
-UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf);
-UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs);
-
-char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin);
-void UCS2UTF8_Dealloc(char * Utf8Str);
-
-#endif // _UCS2UTF8_H_
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file Ucs2Utf8.h
+ *
+ * @brief Declaration for UCS-2 <--> UTF-8 conversions functions.
+ *
+ */
+
+#ifndef _UCS2UTF8_H_
+#define _UCS2UTF8_H_
+
+UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf);
+UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs);
+
+char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin);
+void UCS2UTF8_Dealloc(char * Utf8Str);
+
+#endif // _UCS2UTF8_H_
Property changes on: trunk/Src/Common/Ucs2Utf8.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2007-07-26 07:50:30 UTC (rev 4386)
+++ trunk/Src/FileOrFolderSelect.cpp 2007-07-26 08:05:42 UTC (rev 4387)
@@ -1,295 +1,295 @@
-/////////////////////////////////////////////////////////////////////////////
-// WinMerge: an interactive diff/merge utility
-// Copyright (C) 1997-2000 Thingamahoochie Software
-// Author: Dean Grimm
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-/////////////////////////////////////////////////////////////////////////////
-/**
- * @file FileOrFolderSelect.cpp
- *
- * @brief Implementation of the file and folder selection routines.
- */
-
-#include "stdafx.h"
-#include <sys/stat.h>
-
-#include "FileOrFolderSelect.h"
-#include "coretools.h"
-#include "paths.h"
-
-// VC 6 headers don't define these constants for folder browse dialog
-// so define them here. Copied from shlobj.h
-#ifndef BIF_EDITBOX
-#define BIF_EDITBOX 0x0010 // Add an editbox to the dialog
-#endif
-#ifndef BIF_NEWDIALOGSTYLE
-#define BIF_NEWDIALOGSTYLE 0x0040 // Use the new dialog layout with the ability to resize
- // Caller needs to call OleInitialize() before using this API
-#endif
-#ifndef BIF_USENEWUI
-#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
-#endif
-
-static void ConvertFilter(LPTSTR filterStr);
-
-/**
- * @brief Helper function for selecting folder or file.
- * This function shows standard Windows file selection dialog for selecting
- * file or folder to open or file to save. The last parameter @p is_open selects
- * between open or save modes. Biggest difference is that in save-mode Windows
- * asks if user wants to override existing file.
- * @param [in] parent Handle to parent window. Can be a NULL, but then
- * CMainFrame is used which can cause modality problems.
- * @param [out] path Selected path is returned in this string
- * @param [in] initialPath Initial path (and file) shown when dialog is opened
- * @param [in] title Title for path selection dialog
- * @param [in] filterid 0 or STRING ID for filter string
- * - 0 means "All files (*.*)". Note the string formatting!
- * @param [in] is_open Selects Open/Save -dialog (mode).
- * @note Be careful when setting @p parent to NULL as there are potential
- * modality problems with this. Dialog can be lost behind other windows!
- * @param [in] defaultExtension Extension to append if user doesn't provide one
- */
-BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
- LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
- BOOL is_open /*=TRUE*/, LPCTSTR defaultExtension /*=NULL*/)
-{
- path.Empty(); // Clear output param
-
- // This will tell common file dialog what to show
- // and also this will hold its return value
- CString sSelectedFile;
-
- // check if specified path is a file
- if (initialPath && initialPath[0])
- {
- // If initial path info includes a file
- // we put the bare filename into sSelectedFile
- // so the common file dialog will start up with that file selected
- if (paths_DoesPathExist(initialPath) == IS_EXISTING_FILE)
- {
- SplitFilename(initialPath, 0, &sSelectedFile, 0);
- }
- }
-
- if (parent == NULL)
- parent = AfxGetMainWnd()->GetSafeHwnd();
-
- if (!filterid)
- filterid = IDS_ALLFILES;
- CString filters = LoadResString(filterid);
-
- // Convert extension mask from MFC style separators ('|')
- // to Win32 style separators ('\0')
- LPTSTR filtersStr = filters.GetBuffer(0);
- ConvertFilter(filtersStr);
- filters.ReleaseBuffer();
-
- OPENFILENAME ofn;
- memset(&ofn, 0, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = parent;
- ofn.lpstrFilter = filtersStr;
- ofn.lpstrCustomFilter = NULL;
- ofn.nFilterIndex = 1;
- ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
- ofn.nMaxFile = MAX_PATH;
- ofn.lpstrInitialDir = initialPath;
- ofn.lpstrTitle = title;
- ofn.lpstrFileTitle = NULL;
- if (defaultExtension)
- ofn.lpstrDefExt = defaultExtension;
- ofn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
-
- BOOL bRetVal = FALSE;
- if (is_open)
- bRetVal = GetOpenFileName(&ofn);
- else
- bRetVal = GetSaveFileName(&ofn);
- // common file dialog populated sSelectedFile variable's buffer
- sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
-
- if (bRetVal)
- path = sSelectedFile;
-
- return bRetVal;
-}
-
-/**
- * @brief Helper function for selecting directory
- * @param [out] path Selected path is returned in this string
- * @param [in] root_path Initial path shown when dialog is opened
- * @param [in] title Title for path selection dialog
- * @param [in] hwndOwner Handle to owner window or NULL
- * @return TRUE if valid folder selected (not cancelled)
- */
-BOOL SelectFolder(CString& path, LPCTSTR root_path /*=NULL*/,
- LPCTSTR title /*=NULL*/,
- HWND hwndOwner /*=NULL*/)
-{
- UNREFERENCED_PARAMETER(root_path);
- BROWSEINFO bi;
- LPMALLOC pMalloc;
- LPITEMIDLIST pidl;
- TCHAR szPath[MAX_PATH] = {0};
- BOOL bRet = FALSE;
-
- bi.hwndOwner = hwndOwner;
- bi.pidlRoot = NULL; // Start from desktop folder
- bi.pszDisplayName = szPath;
- bi.lpszTitle = title;
- bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
- bi.lpfn = NULL;
- bi.lParam = NU...
[truncated message content] |
|
From: <ge...@us...> - 2007-08-12 22:16:58
|
Revision: 4424
http://winmerge.svn.sourceforge.net/winmerge/?rev=4424&view=rev
Author: gerundt
Date: 2007-08-12 15:16:52 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Optimize CreateReviewPoFiles script and change output filenames to "<Language>Review.po".
Modified Paths:
--------------
trunk/Docs/Developers/Translations.html
trunk/Src/Languages/CreateReviewPoFiles.vbs
Property Changed:
----------------
trunk/Src/Languages/CreateReviewPoFiles.vbs
Modified: trunk/Docs/Developers/Translations.html
===================================================================
--- trunk/Docs/Developers/Translations.html 2007-08-12 20:54:54 UTC (rev 4423)
+++ trunk/Docs/Developers/Translations.html 2007-08-12 22:16:52 UTC (rev 4424)
@@ -171,7 +171,7 @@
<h3><a name="helper">Helper</a></h3>
<h4><code>CreateReviewPoFiles.vbs</code></h4>
<p>With this VBScript file under the <code>Src\Languages\</code> folder you can create <a href="http://en.wikipedia.org/wiki/Gettext">gettext</a> PO files to review the translations.
-The script tries to collect all strings from the resource files and save the original and translated strings into PO files. For each language you will find the PO file under the language subfolder: <code>Src\Languages\<em>Language</em>\<em>Language</em>.po</code>.
+The script tries to collect all strings from the resource files and save the original and translated strings into PO files. For each language you will find the PO file under the language subfolder: <code>Src\Languages\<em>Language</em>\<em>Language</em>Review.po</code>.
<strong>The script can take several minutes to finish!</strong></p>
<p>If you have a PO file from your language, you could use a simple text editor or better <a href="http://www.poedit.net">poEdit</a> to review the file:</p>
<pre>#: IDD_PROPPAGE_LARGE.IDC_SINGLE_INSTANCE
Modified: trunk/Src/Languages/CreateReviewPoFiles.vbs
===================================================================
--- trunk/Src/Languages/CreateReviewPoFiles.vbs 2007-08-12 20:54:54 UTC (rev 4423)
+++ trunk/Src/Languages/CreateReviewPoFiles.vbs 2007-08-12 22:16:52 UTC (rev 4424)
@@ -1,262 +1,263 @@
-Option Explicit
-''
-' This script creates PO files for easier reviewing of the translations.
-'
-' Copyright (C) 2007 by Tim Gerundt
-' Released under the "GNU General Public License"
-'
-' ID line follows -- this is updated by SVN
-' $Id: $
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-
-Dim oFSO
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-Call Main
-
-''
-' ...
-Sub Main
- Dim oLanguages, sLanguage
- Dim oOriginalTranslations, oLanguageTranslations
-
- Wscript.Echo "Warning: This step could take some time!"
-
- Set oOriginalTranslations = GetTranslationsFromRcFile("../Merge.rc")
-
- Set oLanguages = GetLanguages
- For Each sLanguage In oLanguages.Keys 'For all languages...
- Set oLanguageTranslations = GetTranslationsFromRcFile(oLanguages(sLanguage))
- CreateReviewPoFile sLanguage, oOriginalTranslations, oLanguageTranslations
- Next
-
- Wscript.Echo "Finished!"
-End Sub
-
-''
-' ...
-Function GetLanguages()
- Dim oLanguages, oSubFolder, sRcPath
-
- Set oLanguages = CreateObject("Scripting.Dictionary")
-
- For Each oSubFolder In oFSO.GetFolder(".").SubFolders 'For all subfolders in the current folder...
- If (oSubFolder.Name <> ".svn") Then 'If NOT a SVN folder...
- sRcPath = oFSO.BuildPath (oSubFolder.Path, "Merge" & oSubFolder.Name & ".rc")
- If (oFSO.FileExists(sRcPath) = True) Then '...
- oLanguages.Add oSubFolder.Name, sRcPath
- End If
- End If
- Next
- Set GetLanguages = oLanguages
-End Function
-
-''
-' ...
-Function GetTranslationsFromRcFile(ByVal sRcPath)
- Dim oTranslations, oTextFile, sLine
- Dim oMatch, iBlockType, sKey1, sKey2, iPosition, sValue
- Dim sCodePage
-
- Set oTranslations = CreateObject("Scripting.Dictionary")
-
- If (oFSO.FileExists(sRcPath) = True) Then
- iBlockType = NO_BLOCK
- sKey1 = ""
- sKey2 = ""
- iPosition = 0
- sCodePage = ""
- Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
- Do Until oTextFile.AtEndOfStream = True
- sLine = Trim(oTextFile.ReadLine)
-
- sValue = ""
-
- If (FoundRegExpMatch(sLine, "(IDR_.*) MENU", oMatch) = True) Then 'MENU...
- iBlockType = MENU_BLOCK
- sKey1 = oMatch.SubMatches(0)
- iPosition = 0
- ElseIf (FoundRegExpMatch(sLine, "(IDD_.*) DIALOGEX", oMatch) = True) Then 'DIALOGEX...
- iBlockType = DIALOGEX_BLOCK
- sKey1 = oMatch.SubMatches(0)
- iPosition = 0
- ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
- iBlockType = STRINGTABLE_BLOCK
- sKey1 = "STRINGTABLE"
- 'iPosition = 0
- ElseIf (sLine = "END") Then 'END...
- If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
- iBlockType = NO_BLOCK
- sKey1 = ""
- 'iPosition = 0
- End If
- End If
-
- Select Case iBlockType
- Case NO_BLOCK:
- If (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
- sCodePage = oMatch.SubMatches(0)
- End If
- '...
- '...
- '...
-
- Case MENU_BLOCK:
- 'POPUP...
- If (FoundRegExpMatch(sLine, "POPUP ""(.*)""", oMatch) = True) Then 'POPUP...
- If (InStr(oMatch.SubMatches(0), "_POPUP_") = 0) Then
- sKey2 = iPosition
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- ElseIf (FoundRegExpMatch(sLine, "MENUITEM.*""(.*)"".*(ID_.*)", oMatch) = True) Then 'MENUITEM...
- sKey2 = oMatch.SubMatches(1)
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- '...
- '...
- '...
-
- Case DIALOGEX_BLOCK:
- If (FoundRegExpMatch(sLine, "CAPTION.*""(\w+)""", oMatch) = True) Then 'CAPTION...
- sKey2 = "CAPTION"
- sValue = oMatch.SubMatches(0)
- ElseIf (FoundRegExpMatch(sLine, "PUSHBUTTON.*""(.*)"",(\w+)", oMatch) = True) Then 'DEFPUSHBUTTON/PUSHBUTTON...
- sKey2 = oMatch.SubMatches(1)
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- ElseIf (FoundRegExpMatch(sLine, "[L|R]TEXT.*""(.*)"",(\w+)", oMatch) = True) Then 'LTEXT/RTEXT...
- If (oMatch.SubMatches(0) <> "") And (oMatch.SubMatches(0) <> "Static") Then
- If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
- sKey2 = oMatch.SubMatches(1)
- Else
- sKey2 = iPosition & "_TEXT"
- iPosition = iPosition + 1
- End If
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- ElseIf (FoundRegExpMatch(sLine, "[L|R]TEXT.*""(.*)"",", oMatch) = True) Then 'LTEXT/RTEXT (without ID)...
- sKey2 = iPosition & "_TEXT"
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",(\w+)", oMatch) = True) Then 'CONTROL...
- If (oMatch.SubMatches(0) <> "Dif") And (oMatch.SubMatches(0) <> "Btn") And (oMatch.SubMatches(0) <> "Button1") Then
- sKey2 = oMatch.SubMatches(1)
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",", oMatch) = True) Then 'CONTROL (without ID)...
- sKey2 = iPosition & "_CONTROL"
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- ElseIf (FoundRegExpMatch(sLine, "GROUPBOX +""(.*?)"",(\w+)", oMatch) = True) Then 'GROUPBOX...
- If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
- sKey2 = oMatch.SubMatches(1)
- Else
- sKey2 = iPosition & "_GROUPBOX"
- iPosition = iPosition + 1
- End If
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- '...
- '...
- '...
-
- Case STRINGTABLE_BLOCK:
- If (FoundRegExpMatch(sLine, "(\w+).*""(.*)""", oMatch) = True) Then 'String...
- sKey2 = oMatch.SubMatches(0)
- sValue = oMatch.SubMatches(1)
- ElseIf (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) Then 'String (without ID)...
- sKey2 = iPosition
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- End If
- '...
- '...
- '...
-
- End Select
-
- If (sValue <> "") Then
- oTranslations.Add sKey1 & "." & sKey2, sValue
- End If
- Loop
- oTextFile.Close
-
- oTranslations.Add "code_page", sCodePage
- End If
- Set GetTranslationsFromRcFile = oTranslations
-End Function
-
-''
-' ...
-Sub CreateReviewPoFile(ByVal sLanguage, ByVal oOriginalTranslations, ByVal oLanguageTranslations)
- Dim oPoFile, sKey
- Dim sOriginalTranslation, sLanguageTranslation
-
- Set oPoFile = oFSO.CreateTextFile(sLanguage & "\" & sLanguage & ".po", True)
-
- oPoFile.WriteLine "# DO NOT EDIT THIS FILE!"
- oPoFile.WriteLine "# This file is only for easier reviewing of the WinMerge translation..."
- oPoFile.WriteLine "#"
- oPoFile.WriteLine "msgid """""
- oPoFile.WriteLine "msgstr """""
- oPoFile.WriteLine """Project-Id-Version: \n"""
- oPoFile.WriteLine """Report-Msgid-Bugs-To: \n"""
- oPoFile.WriteLine """POT-Creation-Date: \n"""
- oPoFile.WriteLine """PO-Revision-Date: \n"""
- oPoFile.WriteLine """Last-Translator: \n"""
- oPoFile.WriteLine """Language-Team: \n"""
- oPoFile.WriteLine """MIME-Version: 1.0\n"""
- oPoFile.WriteLine """Content-Type: text/plain; charset=CP" & oLanguageTranslations("code_page") & "\n"""
- oPoFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
- oPoFile.WriteLine
- For Each sKey In oOriginalTranslations.Keys 'For all original translations...
- If (sKey <> "code_page") Then
- sOriginalTranslation = oOriginalTranslations(sKey)
- sLanguageTranslation = oLanguageTranslations(sKey)
- oPoFile.WriteLine "#: " & sKey
- If (sOriginalTranslation = sLanguageTranslation) Then 'If MAYBE NOT translated...
- oPoFile.WriteLine "#, fuzzy"
- End If
- oPoFile.WriteLine "msgid """ & sOriginalTranslation & """"
- oPoFile.WriteLine "msgstr """ & sLanguageTranslation & """"
- oPoFile.WriteLine
- End If
- Next
- oPoFile.Close
-End Sub
-
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
- Dim oRegExp, oMatches, oMatch
-
- Set oRegExp = New RegExp
- oRegExp.Pattern = sPattern
- oRegExp.IgnoreCase = True
-
- oMatchReturn = Null
- FoundRegExpMatch = False
- If (oRegExp.Test(sString) = True) Then
- Set oMatches = oRegExp.Execute(sString)
- Set oMatch = oMatches(0)
- If (oMatch.SubMatches(0) <> "") Then
- Set oMatchReturn = oMatch
- FoundRegExpMatch = True
- End If
- End If
-End Function
+Option Explicit
+''
+' This script creates PO files for easier reviewing of the translations.
+'
+' Copyright (C) 2007 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Const NO_BLOCK = 0
+Const MENU_BLOCK = 1
+Const DIALOGEX_BLOCK = 2
+Const STRINGTABLE_BLOCK = 3
+Const VERSIONINFO_BLOCK = 4
+
+Dim oFSO, bRunFromCmd
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+bRunFromCmd = False
+If (LCase(Right(Wscript.FullName, 11))) = "cscript.exe" Then
+ bRunFromCmd = True
+End If
+
+Call Main
+
+''
+' ...
+Sub Main
+ Dim oLanguages, sLanguage
+ Dim oOriginalTranslations, oLanguageTranslations
+ Dim StartTime, EndTime, Seconds
+
+ StartTime = Time
+
+ Wscript.Echo "Warning: " & Wscript.ScriptName & " can take several minutes to finish!"
+
+ Set oOriginalTranslations = GetTranslationsFromRcFile("../Merge.rc")
+
+ Set oLanguages = GetLanguages
+ For Each sLanguage In oLanguages.Keys 'For all languages...
+ If (bRunFromCmd = True) Then 'If run from command line...
+ Wscript.Echo sLanguage
+ End If
+ Set oLanguageTranslations = GetTranslationsFromRcFile(oLanguages(sLanguage))
+ CreateReviewPoFile sLanguage, oOriginalTranslations, oLanguageTranslations
+ Next
+
+ EndTime = Time
+ Seconds = DateDiff("s", StartTime, EndTime)
+
+ Wscript.Echo Wscript.ScriptName & " finished after " & Seconds & " seconds!"
+End Sub
+
+''
+' ...
+Function GetLanguages()
+ Dim oLanguages, oSubFolder, sRcPath
+
+ Set oLanguages = CreateObject("Scripting.Dictionary")
+
+ For Each oSubFolder In oFSO.GetFolder(".").SubFolders 'For all subfolders in the current folder...
+ If (oSubFolder.Name <> ".svn") Then 'If NOT a SVN folder...
+ sRcPath = oFSO.BuildPath(oSubFolder.Path, "Merge" & oSubFolder.Name & ".rc")
+ If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
+ oLanguages.Add oSubFolder.Name, sRcPath
+ End If
+ End If
+ Next
+ Set GetLanguages = oLanguages
+End Function
+
+''
+' ...
+Function GetTranslationsFromRcFile(ByVal sRcPath)
+ Dim oTranslations, oTextFile, sLine
+ Dim oMatch, iBlockType, sKey1, sKey2, iPosition, sValue
+ Dim sCodePage
+
+ Set oTranslations = CreateObject("Scripting.Dictionary")
+
+ If (oFSO.FileExists(sRcPath) = True) Then
+ iBlockType = NO_BLOCK
+ sKey1 = ""
+ sKey2 = ""
+ iPosition = 0
+ sCodePage = ""
+ Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
+ Do Until oTextFile.AtEndOfStream = True
+ sLine = Trim(oTextFile.ReadLine)
+
+ sValue = ""
+
+ If (FoundRegExpMatch(sLine, "(IDR_.*) MENU", oMatch) = True) Then 'MENU...
+ iBlockType = MENU_BLOCK
+ sKey1 = oMatch.SubMatches(0)
+ iPosition = 0
+ ElseIf (FoundRegExpMatch(sLine, "(IDD_.*) DIALOGEX", oMatch) = True) Then 'DIALOGEX...
+ iBlockType = DIALOGEX_BLOCK
+ sKey1 = oMatch.SubMatches(0)
+ iPosition = 0
+ ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
+ iBlockType = STRINGTABLE_BLOCK
+ sKey1 = "STRINGTABLE"
+ 'iPosition = 0
+ ElseIf (FoundRegExpMatch(sLine, "(VS_.*) VERSIONINFO", oMatch) = True) Then 'VERSIONINFO...
+ iBlockType = VERSIONINFO_BLOCK
+ sKey1 = "VERSIONINFO"
+ iPosition = 0
+ ElseIf (sLine = "END") Then 'END...
+ If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
+ iBlockType = NO_BLOCK
+ sKey1 = ""
+ 'iPosition = 0
+ End If
+ ElseIf (sLine <> "") Then 'If NOT empty line...
+ Select Case iBlockType
+ Case NO_BLOCK:
+ If (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
+ sCodePage = oMatch.SubMatches(0)
+ End If
+
+ Case MENU_BLOCK:
+ If (FoundRegExpMatch(sLine, "POPUP ""(.*)""", oMatch) = True) Then 'POPUP...
+ If (InStr(oMatch.SubMatches(0), "_POPUP_") = 0) Then
+ sKey2 = iPosition
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "MENUITEM.*""(.*)"".*(ID_.*)", oMatch) = True) Then 'MENUITEM...
+ sKey2 = oMatch.SubMatches(1)
+ sValue = oMatch.SubMatches(0)
+ End If
+
+ Case DIALOGEX_BLOCK:
+ If (FoundRegExpMatch(sLine, "CAPTION.*""(.*)""", oMatch) = True) Then 'CAPTION...
+ sKey2 = "CAPTION"
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "PUSHBUTTON.*""(.*)"",(\w+)", oMatch) = True) Then 'DEFPUSHBUTTON/PUSHBUTTON...
+ sKey2 = oMatch.SubMatches(1)
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "[L|R|C]TEXT.*""(.*)"",(\w+)", oMatch) = True) Then 'LTEXT/RTEXT...
+ If (oMatch.SubMatches(0) <> "") And (oMatch.SubMatches(0) <> "Static") Then
+ If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
+ sKey2 = oMatch.SubMatches(1)
+ Else
+ sKey2 = iPosition & "_TEXT"
+ iPosition = iPosition + 1
+ End If
+ sValue = oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "[L|R]TEXT.*""(.*)"",", oMatch) = True) Then 'LTEXT/RTEXT (without ID)...
+ sKey2 = iPosition & "_TEXT"
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",(\w+)", oMatch) = True) Then 'CONTROL...
+ If (oMatch.SubMatches(0) <> "Dif") And (oMatch.SubMatches(0) <> "Btn") And (oMatch.SubMatches(0) <> "Button1") _
+ And (oMatch.SubMatches(0) <> "List1") And (oMatch.SubMatches(0) <> "Tree1") Then
+ sKey2 = oMatch.SubMatches(1)
+ sValue = oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",", oMatch) = True) Then 'CONTROL (without ID)...
+ sKey2 = iPosition & "_CONTROL"
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "GROUPBOX +""(.*?)"",(\w+)", oMatch) = True) Then 'GROUPBOX...
+ If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
+ sKey2 = oMatch.SubMatches(1)
+ Else
+ sKey2 = iPosition & "_GROUPBOX"
+ iPosition = iPosition + 1
+ End If
+ sValue = oMatch.SubMatches(0)
+ End If
+
+ Case STRINGTABLE_BLOCK:
+ If (FoundRegExpMatch(sLine, "(\w+).*""(.*)""", oMatch) = True) Then 'String...
+ sKey2 = oMatch.SubMatches(0)
+ sValue = oMatch.SubMatches(1)
+ ElseIf (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) Then 'String (without ID)...
+ sKey2 = iPosition
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ End If
+
+ Case VERSIONINFO_BLOCK:
+ '...
+ '...
+ '...
+
+ End Select
+ End If
+
+ If (sValue <> "") Then
+ oTranslations.Add sKey1 & "." & sKey2, sValue
+ End If
+ Loop
+ oTextFile.Close
+
+ oTranslations.Add "code_page", sCodePage
+ End If
+ Set GetTranslationsFromRcFile = oTranslations
+End Function
+
+''
+' ...
+Sub CreateReviewPoFile(ByVal sLanguage, ByVal oOriginalTranslations, ByVal oLanguageTranslations)
+ Dim oPoFile, sKey
+ Dim sOriginalTranslation, sLanguageTranslation
+
+ Set oPoFile = oFSO.CreateTextFile(sLanguage & "\" & sLanguage & "Review.po", True)
+
+ oPoFile.WriteLine "# DO NOT EDIT THIS FILE!"
+ oPoFile.WriteLine "# This file is only for easier reviewing of the WinMerge translation..."
+ oPoFile.WriteLine "#"
+ oPoFile.WriteLine "msgid """""
+ oPoFile.WriteLine "msgstr """""
+ oPoFile.WriteLine """Project-Id-Version: \n"""
+ oPoFile.WriteLine """Report-Msgid-Bugs-To: \n"""
+ oPoFile.WriteLine """POT-Creation-Date: \n"""
+ oPoFile.WriteLine """PO-Revision-Date: \n"""
+ oPoFile.WriteLine """Last-Translator: \n"""
+ oPoFile.WriteLine """Language-Team: \n"""
+ oPoFile.WriteLine """MIME-Version: 1.0\n"""
+ oPoFile.WriteLine """Content-Type: text/plain; charset=CP" & oLanguageTranslations("code_page") & "\n"""
+ oPoFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
+ oPoFile.WriteLine
+ For Each sKey In oOriginalTranslations.Keys 'For all original translations...
+ If (sKey <> "code_page") Then
+ sOriginalTranslation = oOriginalTranslations(sKey)
+ sLanguageTranslation = oLanguageTranslations(sKey)
+ oPoFile.WriteLine "#: " & sKey
+ If (sOriginalTranslation = sLanguageTranslation) Then 'If MAYBE NOT translated...
+ oPoFile.WriteLine "#, fuzzy"
+ End If
+ oPoFile.WriteLine "msgid """ & sOriginalTranslation & """"
+ oPoFile.WriteLine "msgstr """ & sLanguageTranslation & """"
+ oPoFile.WriteLine
+ End If
+ Next
+ oPoFile.Close
+End Sub
+
+''
+' ...
+Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
+ Dim oRegExp, oMatches
+
+ Set oRegExp = New RegExp
+ oRegExp.Pattern = sPattern
+ oRegExp.IgnoreCase = True
+
+ oMatchReturn = Null
+ FoundRegExpMatch = False
+ If (oRegExp.Test(sString) = True) Then
+ Set oMatches = oRegExp.Execute(sString)
+ Set oMatchReturn = oMatches(0)
+ FoundRegExpMatch = True
+ End If
+End Function
Property changes on: trunk/Src/Languages/CreateReviewPoFiles.vbs
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-08-13 21:09:06
|
Revision: 4426
http://winmerge.svn.sourceforge.net/winmerge/?rev=4426&view=rev
Author: gerundt
Date: 2007-08-13 14:09:00 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
PATCH: [ 1771319 ] Generate language resource files from PO files
Added Paths:
-----------
trunk/Src/Languages/CreateMasterPotFile.vbs
trunk/Src/Languages/CreateRcFilesFromPoFiles.vbs
trunk/Tools/Scripts/CreateMasterPotFile.bat
trunk/Tools/Scripts/CreateRcFilesFromPoFiles.bat
Added: trunk/Src/Languages/CreateMasterPotFile.vbs
===================================================================
--- trunk/Src/Languages/CreateMasterPotFile.vbs (rev 0)
+++ trunk/Src/Languages/CreateMasterPotFile.vbs 2007-08-13 21:09:00 UTC (rev 4426)
@@ -0,0 +1,277 @@
+Option Explicit
+''
+' This script creates the master POT file (English.pot).
+'
+' Copyright (C) 2007 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Const NO_BLOCK = 0
+Const MENU_BLOCK = 1
+Const DIALOGEX_BLOCK = 2
+Const STRINGTABLE_BLOCK = 3
+Const VERSIONINFO_BLOCK = 4
+Const ACCELERATORS_BLOCK = 5
+
+Dim oFSO
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+Call Main
+
+''
+' ...
+Sub Main
+ Dim oStrings, oComments, sCodePage
+ Dim StartTime, EndTime, Seconds
+
+ StartTime = Time
+
+ Wscript.Echo "Warning: " & Wscript.ScriptName & " can take several seconds to finish!"
+
+ Set oStrings = GetStringsFromRcFile("../Merge.rc", oComments, sCodePage)
+ CreateMasterPotFile "English.pot", oStrings, oComments, sCodePage
+
+ EndTime = Time
+ Seconds = DateDiff("s", StartTime, EndTime)
+
+ Wscript.Echo Wscript.ScriptName & " finished after " & Seconds & " seconds!"
+End Sub
+
+''
+' ...
+Function GetStringsFromRcFile(ByVal sRcFilePath, ByRef oComments, ByRef sCodePage)
+ Dim oBlacklist, oStrings, oRcFile, sLine, iLine
+ Dim sRcFileName, iBlockType, sReference, sString, sComment, oMatches, oMatch, sTemp
+
+ '--------------------------------------------------------------------------------
+ ' Blacklist...
+ '--------------------------------------------------------------------------------
+ Set oBlacklist = CreateObject("Scripting.Dictionary")
+ oBlacklist.Add "_HDR_POPUP_", True
+ oBlacklist.Add "_ITEM_POPUP_", True
+ oBlacklist.Add "_POPUP_", True
+ oBlacklist.Add "Btn", True
+ oBlacklist.Add "Button", True
+ oBlacklist.Add "Button1", True
+ oBlacklist.Add "Dif", True
+ oBlacklist.Add "IDS_SAVEVSS_FMT", True
+ oBlacklist.Add "List1", True
+ oBlacklist.Add "msctls_progress32", True
+ oBlacklist.Add "Static", True
+ oBlacklist.Add "SysListView32", True
+ oBlacklist.Add "SysTreeView32", True
+ oBlacklist.Add "Tree1", True
+ '--------------------------------------------------------------------------------
+
+ Set oStrings = CreateObject("Scripting.Dictionary")
+ Set oComments = CreateObject("Scripting.Dictionary")
+
+ If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
+ sRcFileName = oFSO.GetFileName(sRcFilePath)
+ iLine = 0
+ iBlockType = NO_BLOCK
+ sCodePage = ""
+ Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
+ Do Until oRcFile.AtEndOfStream = True 'For all lines...
+ sLine = Trim(oRcFile.ReadLine)
+ iLine = iLine + 1
+
+ sReference = sRcFileName & ":" & iLine
+ sString = ""
+ sComment = ""
+
+ If (FoundRegExpMatch(sLine, "IDR_.* MENU", oMatch) = True) Then 'MENU...
+ iBlockType = MENU_BLOCK
+ ElseIf (FoundRegExpMatch(sLine, "IDD_.* DIALOGEX", oMatch) = True) Then 'DIALOGEX...
+ iBlockType = DIALOGEX_BLOCK
+ ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
+ iBlockType = STRINGTABLE_BLOCK
+ ElseIf (FoundRegExpMatch(sLine, "VS_.* VERSIONINFO", oMatch) = True) Then 'VERSIONINFO...
+ iBlockType = VERSIONINFO_BLOCK
+ ElseIf (FoundRegExpMatch(sLine, "IDR_.* ACCELERATORS", oMatch) = True) Then 'ACCELERATORS...
+ iBlockType = ACCELERATORS_BLOCK
+ ElseIf (sLine = "END") Then 'END...
+ If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
+ iBlockType = NO_BLOCK
+ End If
+ ElseIf (sLine <> "") Then 'If NOT empty line...
+ Select Case iBlockType
+ Case NO_BLOCK:
+ If (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, SUBLANG_\w*)", oMatch) = True) Then 'LANGUAGE...
+ sString = oMatch.SubMatches(0)
+ sComment = "LANGUAGE, SUBLANGUAGE"
+ ElseIf (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
+ sString = oMatch.SubMatches(0)
+ sComment = "Codepage"
+ sCodePage = oMatch.SubMatches(0)
+ End If
+
+ Case MENU_BLOCK, DIALOGEX_BLOCK, STRINGTABLE_BLOCK:
+ If (FoundRegExpMatches(sLine, """(.*?)""", oMatches) = True) Then 'String...
+ For Each oMatch In oMatches 'For all strings...
+ sTemp = oMatch.SubMatches(0)
+ If (sTemp <> "") And (oBlacklist.Exists(sTemp) = False) Then 'If NOT blacklisted...
+ If (oStrings.Exists(sTemp) = True) Then 'If the key is already used...
+ oStrings(sTemp) = oStrings(sTemp) & vbTab & sReference
+ Else 'If the key is NOT already used...
+ oStrings.Add sTemp, sReference
+ End If
+ End If
+ Next
+ End If
+
+ Case VERSIONINFO_BLOCK:
+ If (FoundRegExpMatch(sLine, "BLOCK ""([0-9A-F]+)""", oMatch) = True) Then 'StringFileInfo.Block...
+ sString = oMatch.SubMatches(0)
+ sComment = "StringFileInfo.Block"
+ ElseIf (FoundRegExpMatch(sLine, "VALUE ""(.*?)"", ""(.*?)\\?0?""", oMatch) = True) Then 'StringFileInfo.Value...
+ If (oMatch.SubMatches(0) <> "FileVersion") And (oMatch.SubMatches(0) <> "ProductVersion") Then 'If NOT file or product version...
+ sString = oMatch.SubMatches(1)
+ sComment = "StringFileInfo." & oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "VALUE ""Translation"", (.*?)$", oMatch) = True) Then 'VarFileInfo.Translation...
+ sString = oMatch.SubMatches(0)
+ sComment = "VarFileInfo.Translation"
+ End If
+
+ End Select
+ End If
+
+ If (sString <> "") Then
+ If (oStrings.Exists(sString) = True) Then 'If the key is already used...
+ oStrings(sString) = oStrings(sString) & vbTab & sReference
+ Else 'If the key is NOT already used...
+ oStrings.Add sString, sReference
+ End If
+
+ If (sComment <> "") Then
+ If (oComments.Exists(sString) = True) Then 'If the comment key is already used...
+ If (oComments(sString) <> sComment) Then 'If new comment...
+ oComments(sString) = oComments(sString) & vbTab & sComment
+ End If
+ Else 'If the comment key is NOT already used...
+ oComments.Add sString, sComment
+ End If
+ End If
+ End If
+ Loop
+ oRcFile.Close
+ End If
+ Set GetStringsFromRcFile = oStrings
+End Function
+
+''
+' ...
+Sub CreateMasterPotFile(ByVal sPotPath, ByVal oStrings, ByVal oComments, ByVal sCodePage)
+ Dim oPotFile, sMsgId, aComments, aReferences, i
+
+ Set oPotFile = oFSO.CreateTextFile(sPotPath, True)
+
+ oPotFile.WriteLine "# This file is part from WinMerge <http://winmerge.org/>"
+ oPotFile.WriteLine "# Released under the ""GNU General Public License"""
+ oPotFile.WriteLine "#"
+ oPotFile.WriteLine "# ID line follows -- this is updated by SVN"
+ oPotFile.WriteLine "# $" & "Id: " & "$"
+ oPotFile.WriteLine "#"
+ oPotFile.WriteLine "msgid """""
+ oPotFile.WriteLine "msgstr """""
+ oPotFile.WriteLine """Project-Id-Version: WinMerge\n"""
+ oPotFile.WriteLine """Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"""
+ oPotFile.WriteLine """POT-Creation-Date: " & GetPotCreationDate() & "\n"""
+ oPotFile.WriteLine """PO-Revision-Date: \n"""
+ oPotFile.WriteLine """Last-Translator: \n"""
+ oPotFile.WriteLine """Language-Team: English <win...@li...>\n"""
+ oPotFile.WriteLine """MIME-Version: 1.0\n"""
+ oPotFile.WriteLine """Content-Type: text/plain; charset=CP" & sCodePage & "\n"""
+ oPotFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
+ oPotFile.WriteLine """X-Poedit-Language: English\n"""
+ oPotFile.WriteLine """X-Poedit-SourceCharset: CP" & sCodePage & "\n"""
+ oPotFile.WriteLine """X-Generator: CreateMasterPotFile.vbs\n"""
+ oPotFile.WriteLine
+ For Each sMsgId In oStrings.Keys 'For all strings...
+ aComments = SplitByTab(oComments(sMsgId))
+ For i = LBound(aComments) To UBound(aComments) 'For all comments...
+ oPotFile.WriteLine "#. " & aComments(i)
+ Next
+ aReferences = SplitByTab(oStrings(sMsgId))
+ For i = LBound(aReferences) To UBound(aReferences) 'For all references...
+ oPotFile.WriteLine "#: " & aReferences(i)
+ Next
+ oPotFile.WriteLine "#, c-format"
+ oPotFile.WriteLine "msgid """ & sMsgId & """"
+ oPotFile.WriteLine "msgstr """""
+ oPotFile.WriteLine
+ Next
+ oPotFile.Close
+End Sub
+
+''
+' ...
+Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
+ Dim oRegExp, oMatches
+
+ Set oRegExp = New RegExp
+ oRegExp.Pattern = sPattern
+ oRegExp.IgnoreCase = True
+
+ oMatchReturn = Null
+ FoundRegExpMatch = False
+ If (oRegExp.Test(sString) = True) Then
+ Set oMatches = oRegExp.Execute(sString)
+ Set oMatchReturn = oMatches(0)
+ FoundRegExpMatch = True
+ End If
+End Function
+
+''
+' ...
+Function FoundRegExpMatches(ByVal sString, ByVal sPattern, ByRef oMatchesReturn)
+ Dim oRegExp
+
+ Set oRegExp = New RegExp
+ oRegExp.Pattern = sPattern
+ oRegExp.IgnoreCase = True
+ oRegExp.Global = True
+
+ oMatchesReturn = Null
+ FoundRegExpMatches = False
+ If (oRegExp.Test(sString) = True) Then
+ Set oMatchesReturn = oRegExp.Execute(sString)
+ FoundRegExpMatches = True
+ End If
+End Function
+
+''
+' ...
+Function SplitByTab(ByVal sString)
+ SplitByTab = Array()
+ If (InStr(sString, vbTab) > 0) Then
+ SplitByTab = Split(sString, vbTab, -1)
+ Else
+ SplitByTab = Array(sString)
+ End If
+End Function
+
+''
+' ...
+Function GetPotCreationDate()
+ Dim oNow, sYear, sMonth, sDay, sHour, sMinute
+
+ oNow = Now()
+ sYear = Year(oNow)
+ sMonth = Month(oNow)
+ If (sMonth < 10) Then sMonth = "0" & sMonth
+ sDay = Day(oNow)
+ If (sDay < 10) Then sDay = "0" & sDay
+ sHour = Hour(oNow)
+ If (sHour < 10) Then sHour = "0" & sHour
+ sMinute = Minute(oNow)
+ If (sMinute < 10) Then sMinute = "0" & sMinute
+
+ GetPotCreationDate = sYear & "-" & sMonth & "-" & sDay & " " & sHour & ":" & sMinute & "+0000"
+End Function
Property changes on: trunk/Src/Languages/CreateMasterPotFile.vbs
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Src/Languages/CreateRcFilesFromPoFiles.vbs
===================================================================
--- trunk/Src/Languages/CreateRcFilesFromPoFiles.vbs (rev 0)
+++ trunk/Src/Languages/CreateRcFilesFromPoFiles.vbs 2007-08-13 21:09:00 UTC (rev 4426)
@@ -0,0 +1,252 @@
+Option Explicit
+''
+' This script creates the language RC files from the language PO files.
+'
+' Copyright (C) 2007 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Const NO_BLOCK = 0
+Const MENU_BLOCK = 1
+Const DIALOGEX_BLOCK = 2
+Const STRINGTABLE_BLOCK = 3
+Const VERSIONINFO_BLOCK = 4
+Const ACCELERATORS_BLOCK = 5
+
+Dim oFSO, bRunFromCmd
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+bRunFromCmd = False
+If (LCase(Right(Wscript.FullName, 11))) = "cscript.exe" Then
+ bRunFromCmd = True
+End If
+
+Call Main
+
+''
+' ...
+Sub Main
+ Dim oLanguages, sLanguage
+ Dim oLanguageTranslations, sLanguagePoFilePath
+ Dim StartTime, EndTime, Seconds
+
+ StartTime = Time
+
+ Wscript.Echo "Warning: " & Wscript.ScriptName & " can take several minutes to finish!"
+
+ 'Set oLanguageTranslations = GetTranslationsFromPoFile("German\German.po")
+ 'CreateRcFileWithTranslations "../Merge.rc", "German\MergeGermanTest.rc", oLanguageTranslations
+
+ Set oLanguages = GetLanguages
+ For Each sLanguage In oLanguages.Keys 'For all languages...
+ If (bRunFromCmd = True) Then 'If run from command line...
+ Wscript.Echo sLanguage
+ End If
+ Set oLanguageTranslations = GetTranslationsFromPoFile(oLanguages(sLanguage))
+ If (oLanguageTranslations.Count > 0) Then 'If translations exists...
+ CreateRcFileWithTranslations "../Merge.rc", sLanguage & "\Merge" & sLanguage & "Test.rc", oLanguageTranslations
+ End If
+ Next
+
+ EndTime = Time
+ Seconds = DateDiff("s", StartTime, EndTime)
+
+ Wscript.Echo Wscript.ScriptName & " finished after " & Seconds & " seconds!"
+End Sub
+
+''
+' ...
+Function GetLanguages()
+ Dim oLanguages, oSubFolder, sPoPath
+
+ Set oLanguages = CreateObject("Scripting.Dictionary")
+
+ For Each oSubFolder In oFSO.GetFolder(".").SubFolders 'For all subfolders in the current folder...
+ If (oSubFolder.Name <> ".svn") Then 'If NOT a SVN folder...
+ sPoPath = oFSO.BuildPath(oSubFolder.Path, oSubFolder.Name & ".po")
+ If (oFSO.FileExists(sPoPath) = True) Then 'If the PO file exists...
+ oLanguages.Add oSubFolder.Name, sPoPath
+ End If
+ End If
+ Next
+ Set GetLanguages = oLanguages
+End Function
+
+''
+' ...
+Function GetTranslationsFromPoFile(ByVal sPoPath)
+ Dim oTranslations, oTextFile, sLine
+ Dim oMatch, iMsgStarted, sMsgId, sMsgStr
+
+ Set oTranslations = CreateObject("Scripting.Dictionary")
+
+ If (oFSO.FileExists(sPoPath) = True) Then 'If the PO file exists...
+ iMsgStarted = 0
+ sMsgId = ""
+ sMsgStr = ""
+ Set oTextFile = oFSO.OpenTextFile(sPoPath, ForReading)
+ Do Until oTextFile.AtEndOfStream = True 'For all lines...
+ sLine = Trim(oTextFile.ReadLine)
+
+ If (sLine <> "") Then 'If NOT empty line...
+ If (FoundRegExpMatch(sLine, "^msgid ""(.*)""$", oMatch) = True) Then 'If "msgid"...
+ iMsgStarted = 1
+ sMsgId = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "^msgstr ""(.*)""$", oMatch) = True) Then 'If "msgstr"...
+ iMsgStarted = 2
+ sMsgStr = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "^""(.*)""$", oMatch) = True) Then 'If "msgid" or "msgstr" continued...
+ If (iMsgStarted = 1) Then
+ sMsgId = sMsgId & oMatch.SubMatches(0)
+ ElseIf (iMsgStarted = 2) Then
+ sMsgStr = sMsgStr & oMatch.SubMatches(0)
+ End If
+ End If
+ Else 'If empty line
+ iMsgStarted = 0
+ End If
+
+ If (iMsgStarted = 0) Then 'If not inside a translation...
+ If (sMsgId <> "") And (sMsgStr <> "") And (sMsgId <> sMsgStr) Then 'If translated...
+ oTranslations.Add sMsgId, sMsgStr
+ iMsgStarted = 0
+ sMsgId = ""
+ sMsgStr = ""
+ End If
+ End If
+ Loop
+ oTextFile.Close
+ End If
+ Set GetTranslationsFromPoFile = oTranslations
+End Function
+
+''
+' ...
+Sub CreateRcFileWithTranslations(ByVal sMasterRcPath, ByVal sLanguageRcPath, ByVal oTranslations)
+ Dim oMasterRcFile, sMasterLine
+ Dim oLanguageRcFile, sLanguageLine
+ Dim iBlockType, oMatches, oMatch, sMsgId, sMsgStr
+
+ If (oFSO.FileExists(sMasterRcPath) = True) Then 'If the master RC file exists...
+ iBlockType = NO_BLOCK
+ Set oMasterRcFile = oFSO.OpenTextFile(sMasterRcPath, ForReading)
+ Set oLanguageRcFile = oFSO.CreateTextFile(sLanguageRcPath, True)
+ Do Until oMasterRcFile.AtEndOfStream = True 'For all lines...
+ sMasterLine = oMasterRcFile.ReadLine
+ sLanguageLine = sMasterLine
+ sMasterLine = Trim(sMasterLine) 'Save Masterline trimmed!
+
+ If (FoundRegExpMatch(sMasterLine, "IDR_.* MENU", oMatch) = True) Then 'MENU...
+ iBlockType = MENU_BLOCK
+ ElseIf (FoundRegExpMatch(sMasterLine, "IDD_.* DIALOGEX", oMatch) = True) Then 'DIALOGEX...
+ iBlockType = DIALOGEX_BLOCK
+ ElseIf (sMasterLine = "STRINGTABLE") Then 'STRINGTABLE...
+ iBlockType = STRINGTABLE_BLOCK
+ ElseIf (FoundRegExpMatch(sMasterLine, "VS_.* VERSIONINFO", oMatch) = True) Then 'VERSIONINFO...
+ iBlockType = VERSIONINFO_BLOCK
+ ElseIf (FoundRegExpMatch(sMasterLine, "IDR_.* ACCELERATORS", oMatch) = True) Then 'ACCELERATORS...
+ iBlockType = ACCELERATORS_BLOCK
+ ElseIf (sMasterLine = "END") Then 'END...
+ If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
+ iBlockType = NO_BLOCK
+ End If
+ ElseIf (sMasterLine <> "") Then 'If NOT empty line...
+ Select Case iBlockType
+ Case NO_BLOCK:
+ If (FoundRegExpMatch(sMasterLine, "LANGUAGE (LANG_\w*, SUBLANG_\w*)", oMatch) = True) Then 'LANGUAGE...
+ sMsgId = oMatch.SubMatches(0)
+ If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located...
+ sMsgStr = oTranslations(sMsgId)
+ sLanguageLine = Replace(sLanguageLine, "LANGUAGE " & sMsgId, "LANGUAGE " & sMsgStr)
+ End If
+ ElseIf (FoundRegExpMatch(sMasterLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
+ sMsgId = oMatch.SubMatches(0)
+ If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located...
+ sMsgStr = oTranslations(sMsgId)
+ sLanguageLine = Replace(sLanguageLine, "code_page(" & sMsgId & ")", "code_page(" & sMsgStr & ")")
+ End If
+ ElseIf (InStr(sMasterLine, "#include ""resource.h""") > 0) Then '#include "resource.h"...
+ sLanguageLine = Replace(sLanguageLine, "#include ""resource.h""", "#include ""..\..\resource.h""")
+ End If
+
+ Case MENU_BLOCK, DIALOGEX_BLOCK, STRINGTABLE_BLOCK:
+ If (FoundRegExpMatches(sMasterLine, """(.*?)""", oMatches) = True) Then 'String...
+ For Each oMatch In oMatches 'For all strings...
+ sMsgId = oMatch.SubMatches(0)
+ If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located...
+ sMsgStr = oTranslations(sMsgId)
+ sLanguageLine = Replace(sLanguageLine, """" & sMsgId & """", """" & sMsgStr & """")
+ End If
+ Next
+ End If
+
+ Case VERSIONINFO_BLOCK:
+ If (FoundRegExpMatch(sMasterLine, "BLOCK ""([0-9A-F]+)""", oMatch) = True) Then 'StringFileInfo.Block...
+ sMsgId = oMatch.SubMatches(0)
+ If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located...
+ sMsgStr = oTranslations(sMsgId)
+ sLanguageLine = Replace(sLanguageLine, """" & sMsgId & """", """" & sMsgStr & """")
+ End If
+ ElseIf (FoundRegExpMatch(sMasterLine, "VALUE ""(.*?)"", ""(.*?)\\?0?""", oMatch) = True) Then 'StringFileInfo.Value...
+ sMsgId = oMatch.SubMatches(1)
+ If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located...
+ sMsgStr = oTranslations(sMsgId)
+ sLanguageLine = Replace(sLanguageLine, """, """ & sMsgId, """, """ & sMsgStr)
+ End If
+ ElseIf (FoundRegExpMatch(sMasterLine, "VALUE ""Translation"", (.*?)$", oMatch) = True) Then 'VarFileInfo.Translation...
+ sMsgId = oMatch.SubMatches(0)
+ If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located...
+ sMsgStr = oTranslations(sMsgId)
+ sLanguageLine = Replace(sLanguageLine, sMsgId, sMsgStr)
+ End If
+ End If
+
+ End Select
+ End If
+ oLanguageRcFile.WriteLine sLanguageLine
+ Loop
+ oMasterRcFile.Close
+ oLanguageRcFile.Close
+ End If
+End Sub
+
+''
+' ...
+Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
+ Dim oRegExp, oMatches
+
+ Set oRegExp = New RegExp
+ oRegExp.Pattern = sPattern
+ oRegExp.IgnoreCase = True
+
+ oMatchReturn = Null
+ FoundRegExpMatch = False
+ If (oRegExp.Test(sString) = True) Then
+ Set oMatches = oRegExp.Execute(sString)
+ Set oMatchReturn = oMatches(0)
+ FoundRegExpMatch = True
+ End If
+End Function
+
+''
+' ...
+Function FoundRegExpMatches(ByVal sString, ByVal sPattern, ByRef oMatchesReturn)
+ Dim oRegExp
+
+ Set oRegExp = New RegExp
+ oRegExp.Pattern = sPattern
+ oRegExp.IgnoreCase = True
+ oRegExp.Global = True
+
+ oMatchesReturn = Null
+ FoundRegExpMatches = False
+ If (oRegExp.Test(sString) = True) Then
+ Set oMatchesReturn = oRegExp.Execute(sString)
+ FoundRegExpMatches = True
+ End If
+End Function
Property changes on: trunk/Src/Languages/CreateRcFilesFromPoFiles.vbs
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Tools/Scripts/CreateMasterPotFile.bat
===================================================================
--- trunk/Tools/Scripts/CreateMasterPotFile.bat (rev 0)
+++ trunk/Tools/Scripts/CreateMasterPotFile.bat 2007-08-13 21:09:00 UTC (rev 4426)
@@ -0,0 +1,8 @@
+@echo off
+rem This batch file calls the script to creates the master POT file.
+
+pushd "../../Src/Languages/"
+cscript //nologo CreateMasterPotFile.vbs
+popd
+
+@echo on
\ No newline at end of file
Property changes on: trunk/Tools/Scripts/CreateMasterPotFile.bat
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Tools/Scripts/CreateRcFilesFromPoFiles.bat
===================================================================
--- trunk/Tools/Scripts/CreateRcFilesFromPoFiles.bat (rev 0)
+++ trunk/Tools/Scripts/CreateRcFilesFromPoFiles.bat 2007-08-13 21:09:00 UTC (rev 4426)
@@ -0,0 +1,9 @@
+@echo off
+rem This batch file calls the script to creates the language RC files from the
+rem language PO files.
+
+pushd "../../Src/Languages/"
+cscript //nologo CreateRcFilesFromPoFiles.vbs
+popd
+
+@echo on
\ No newline at end of file
Property changes on: trunk/Tools/Scripts/CreateRcFilesFromPoFiles.bat
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-08-20 14:06:50
|
Revision: 4451
http://winmerge.svn.sourceforge.net/winmerge/?rev=4451&view=rev
Author: sdottaka
Date: 2007-08-20 07:06:42 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
PATCH: [ 1770175 ] Translucent LocationView
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2007-08-17 23:05:47 UTC (rev 4450)
+++ trunk/Docs/Users/ChangeLog.txt 2007-08-20 14:06:42 UTC (rev 4451)
@@ -2,6 +2,9 @@
Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
to Subversion revision numbers (rXXXXX).
+WinMerge 2.7.5.2
+ Graphical improvements to location pane (#1770175)
+
WinMerge 2.7.5.1
HTML reports for file compare (#1739209)
Ask confirmation when exiting with multiple windows open (#1757800)
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2007-08-17 23:05:47 UTC (rev 4450)
+++ trunk/Src/LocationView.cpp 2007-08-20 14:06:42 UTC (rev 4451)
@@ -38,6 +38,7 @@
#include "BCMenu.h"
#include "OptionsDef.h"
#include "MergeLineFlags.h"
+#include <math.h>
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -76,7 +77,120 @@
IMPLEMENT_DYNCREATE(CLocationView, CView)
+/**
+ * @brief Save an area as a bitmap
+ * @param pDC [in] The source device context
+ * @param rect [in] The rect to be copied
+ * @return The bitmap object
+ */
+static CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect)
+{
+ CRect rc = rect;
+ CDC dcMem;
+ dcMem.CreateCompatibleDC(pDC);
+ CBitmap *pBitmap = new CBitmap;
+ pBitmap->CreateCompatibleBitmap(pDC, rc.Width(), rc.Height());
+ CBitmap *pOldBitmap = dcMem.SelectObject(pBitmap);
+ dcMem.BitBlt(0, 0, rc.Width(), rc.Height(), pDC, rc.left, rc.top, SRCCOPY);
+ dcMem.SelectObject(pOldBitmap);
+ dcMem.DeleteDC();
+ return pBitmap;
+}
+/**
+ * @brief Draw a bitmap image
+ * @param pDC [in] The destination device context to draw to
+ * @param x [in] The x-coordinate of the upper-left corner of the bitmap
+ * @param y [in] The y-coordinate of the upper-left corner of the bitmap
+ * @param pBitmap [in] the bitmap to draw
+ */
+static void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap)
+{
+ CDC dcMem;
+ dcMem.CreateCompatibleDC(pDC);
+ BITMAP bm;
+ pBitmap->GetBitmap(&bm);
+ CBitmap *pOldBitmap = dcMem.SelectObject(pBitmap);
+ pDC->BitBlt(x, y, bm.bmWidth, bm.bmHeight, &dcMem, 0, 0, SRCCOPY);
+ dcMem.SelectObject(pOldBitmap);
+ dcMem.DeleteDC();
+}
+
+/**
+ * @brief Duplicate a bitmap and make it dark
+ * @param pDC [in] Device context
+ * @param pBitmap [in] the bitmap to darken
+ * @return The bitmap object
+ */
+static CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap)
+{
+ CDC dcMem;
+ dcMem.CreateCompatibleDC(pDC);
+ BITMAP bm;
+ pBitmap->GetObject(sizeof(bm), &bm);
+ CBitmap *pBitmapDarkened = new CBitmap();
+ pBitmapDarkened->CreateCompatibleBitmap(pDC, bm.bmWidth, bm.bmHeight);
+ CBitmap *pOldBitmap = dcMem.SelectObject(pBitmapDarkened);
+ DrawBitmap(&dcMem, 0, 0, pBitmap);
+
+ BITMAPINFO bi;
+ bi.bmiHeader.biSize = sizeof(bi.bmiHeader);
+ bi.bmiHeader.biWidth = bm.bmWidth;
+ bi.bmiHeader.biHeight = bm.bmHeight;
+ bi.bmiHeader.biPlanes = 1;
+ bi.bmiHeader.biBitCount = 32;
+ bi.bmiHeader.biCompression = 0;
+ bi.bmiHeader.biSizeImage = bm.bmWidth * 4 * bm.bmHeight;
+ bi.bmiHeader.biXPelsPerMeter = 0;
+ bi.bmiHeader.biYPelsPerMeter = 0;
+ bi.bmiHeader.biClrUsed = 0;
+ bi.bmiHeader.biClrImportant = 0;
+
+ BYTE *pbuf = new BYTE[bi.bmiHeader.biSizeImage];
+ GetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf, &bi, DIB_RGB_COLORS);
+
+ int x;
+ for (x = 0; x < bm.bmWidth; x++)
+ {
+ double b = 0.70 + (0.20 * sin(acos((double)x/bm.bmWidth*2.0-1.0)));
+ for (int y = 1; y < bm.bmHeight-1; y++)
+ {
+ int i = x * 4 + y * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * b);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * b);
+ }
+ }
+ for (x = 0; x < bm.bmWidth; x++)
+ {
+ int i = x * 4 + 0 * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.7);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.7);
+ i = x * 4 + (bm.bmHeight-1) * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.7);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.7);
+ }
+ for (int y = 0; y < bm.bmHeight; y++)
+ {
+ int i = 0 * 4 + y * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.4);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.4);
+ i = (bm.bmWidth-1) * 4 + y * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.4);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.4);
+ }
+
+ SetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf, &bi, DIB_RGB_COLORS);
+ delete pbuf;
+ dcMem.SelectObject(pOldBitmap);
+ dcMem.DeleteDC();
+ return pBitmapDarkened;
+}
+
CLocationView::CLocationView()
: m_visibleTop(-1)
, m_visibleBottom(-1)
@@ -84,7 +198,8 @@
, m_bIgnoreTrivials(true)
, m_hwndFrame(NULL)
, m_nPrevPaneWidth(0)
- , m_DiffMarkerCoord(-1)
+ , m_pSavedBackgroundBitmap(NULL)
+ , m_bDrawn(false)
{
// NB: set m_bIgnoreTrivials to false to see trivial diffs in the LocationView
// There is no GUI to do this
@@ -95,6 +210,12 @@
m_view[MERGE_VIEW_RIGHT] = NULL;
}
+CLocationView::~CLocationView()
+{
+ if (m_pSavedBackgroundBitmap)
+ delete m_pSavedBackgroundBitmap;
+}
+
BEGIN_MESSAGE_MAP(CLocationView, CView)
//{{AFX_MSG_MAP(CLocationView)
ON_WM_LBUTTONDOWN()
@@ -104,6 +225,8 @@
ON_WM_CONTEXTMENU()
ON_WM_CLOSE()
ON_WM_SIZE()
+ ON_WM_ERASEBKGND()
+ ON_WM_PAINT()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -152,6 +275,43 @@
}
/**
+ * @brief Change the background color for a CView
+ * See http://support.microsoft.com/kb/103786
+ */
+BOOL CLocationView::OnEraseBkgnd(CDC* pDC)
+{
+ // Set brush to desired background color
+ CBrush backBrush(RGB(0xe8, 0xe8, 0xf4));
+
+ // Save old brush
+ CBrush* pOldBrush = pDC->SelectObject(&backBrush);
+
+ CRect rect;
+ pDC->GetClipBox(&rect); // Erase the area needed
+
+ pDC->PatBlt(rect.left, rect.top, rect.Width(), rect.Height(), PATCOPY);
+
+ pDC->SelectObject(pOldBrush);
+ return TRUE;
+}
+
+/**
+ * @brief Invalidate rect of old visible area indicator to restore background correctly
+ */
+void CLocationView::OnPaint()
+{
+ if (m_visibleTop != -1 && m_visibleBottom != -1)
+ {
+ CRect rc;
+ GetClientRect(rc);
+ rc.top = m_visibleTop;
+ rc.bottom = m_visibleBottom;
+ InvalidateRect(rc);
+ }
+ CView::OnPaint();
+}
+
+/**
* @brief Draw maps of files.
*
* Draws maps of differences in files. Difference list is walked and
@@ -196,11 +356,6 @@
m_pixInLines = 1 / MAX_LINEPIX;
}
- // Since we have invalidated locationbar there is no previous
- // arearect to remove
- m_visibleTop = -1;
- m_visibleBottom = -1;
- DrawVisibleAreaRect();
m_movedLines.RemoveAll();
// Adjust line coloring if ignoring trivials
@@ -244,13 +399,9 @@
const int nBeginY = (int)(nBlockStart * LineInPix + Y_OFFSET);
const int nEndY = (int)((nBlockStart + nBlockHeight) * LineInPix + Y_OFFSET);
- // If no selected diff, remove diff marker
- if (nCurDiff == -1)
- DrawDiffMarker(pDC, -1);
-
const BOOL bInsideDiff = (nCurDiff == nDiff);
- if (nPrevEndY != nEndY)
+ if ((nPrevEndY != nEndY) || bInsideDiff)
{
// Draw left side block
m_view[MERGE_VIEW_LEFT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr0, crt, bwh);
@@ -342,7 +493,15 @@
}
if (m_displayMovedBlocks != DISPLAY_MOVED_NONE)
- DrawConnectLines();
+ DrawConnectLines(pDC);
+
+ // Since we have invalidated locationbar there is no previous
+ // arearect to remove
+ m_visibleTop = -1;
+ m_visibleBottom = -1;
+ DrawVisibleAreaRect(pDC);
+
+ m_bDrawn = true;
}
/**
@@ -410,7 +569,10 @@
// Vertical scroll handlers are range safe, so there is no need to
// make sure value is valid and in range.
- const int nSubLine = (int) (m_pixInLines * (point.y - Y_OFFSET));
+ int nSubLine = (int) (m_pixInLines * (point.y - Y_OFFSET));
+ nSubLine -= m_view[0]->GetScreenLines() / 2;
+ if (nSubLine < 0)
+ nSubLine = 0;
// Just a random choose as both view share the same scroll bar.
CWnd *pView = m_view[MERGE_VIEW_LEFT];
@@ -671,7 +833,7 @@
* @param [in] nBottomLine New bottomline for indicator
* @todo This function dublicates too much DrawRect() code.
*/
-void CLocationView::DrawVisibleAreaRect(int nTopLine, int nBottomLine)
+void CLocationView::DrawVisibleAreaRect(CDC *pClientDC, int nTopLine, int nBottomLine)
{
CMergeDoc* pDoc = GetDocument();
const DWORD areaColor = GetSysColor(COLOR_3DSHADOW);
@@ -707,25 +869,11 @@
return;
// Clear previous visible rect
- if (m_visibleTop != -1 && m_visibleBottom != -1)
+ if (m_visibleTop != -1 && m_visibleBottom != -1 && m_pSavedBackgroundBitmap)
{
- CDC *pClientDC = GetDC();
- CRect rcVisibleArea(2, m_visibleTop, m_nLeftBarLeft - 2, m_visibleBottom);
- pClientDC->FillSolidRect(rcVisibleArea, bkColor);
- rcVisibleArea.left = m_nLeftBarRight + 2;
- rcVisibleArea.right = m_nRightBarLeft - 2;
- pClientDC->FillSolidRect(rcVisibleArea, bkColor);
- rcVisibleArea.left = m_nRightBarRight + 2;
- rcVisibleArea.right = rc.Width() - 2;
- pClientDC->FillSolidRect(rcVisibleArea, bkColor);
- if (((m_DiffMarkerCoord - DIFFMARKER_TOP >= m_visibleTop) &&
- (m_DiffMarkerCoord - DIFFMARKER_TOP <= m_visibleBottom)) ||
- ((m_DiffMarkerCoord + DIFFMARKER_BOTTOM >= m_visibleTop) &&
- (m_DiffMarkerCoord + DIFFMARKER_BOTTOM <= m_visibleBottom)))
- {
- DrawDiffMarker(pClientDC, m_DiffMarkerCoord);
- }
- ReleaseDC(pClientDC);
+ DrawBitmap(pClientDC, 2, m_visibleTop, m_pSavedBackgroundBitmap);
+ delete m_pSavedBackgroundBitmap;
+ m_pSavedBackgroundBitmap = NULL;
}
double xbarBottom = min(nbLines / m_pixInLines + Y_OFFSET, rc.Height() - Y_OFFSET);
@@ -748,24 +896,14 @@
m_visibleTop = nTopCoord;
m_visibleBottom = nBottomCoord;
- CDC *pClientDC = GetDC();
- CRect rcVisibleArea(2, m_visibleTop, m_nLeftBarLeft - 2, m_visibleBottom);
- pClientDC->FillSolidRect(rcVisibleArea, areaColor);
- rcVisibleArea.left = m_nLeftBarRight + 2;
- rcVisibleArea.right = m_nRightBarLeft - 2;
- pClientDC->FillSolidRect(rcVisibleArea, areaColor);
- rcVisibleArea.left = m_nRightBarRight + 2;
- rcVisibleArea.right = rc.Width() - 2;
- pClientDC->FillSolidRect(rcVisibleArea, areaColor);
-
- if (((m_DiffMarkerCoord - DIFFMARKER_TOP >= m_visibleTop) &&
- (m_DiffMarkerCoord - DIFFMARKER_TOP <= m_visibleBottom)) ||
- ((m_DiffMarkerCoord + DIFFMARKER_BOTTOM >= m_visibleTop) &&
- (m_DiffMarkerCoord + DIFFMARKER_BOTTOM <= m_visibleBottom)))
- {
- DrawDiffMarker(pClientDC, m_DiffMarkerCoord);
- }
- ReleaseDC(pClientDC);
+ CRect rcVisibleArea(2, m_visibleTop, rc.right - 2, m_visibleBottom);
+ CBitmap *pBitmap = CopyRectToBitmap(pClientDC, rcVisibleArea);
+ CBitmap *pDarkenedBitmap = GetDarkenedBitmap(pClientDC, pBitmap);
+ DrawBitmap(pClientDC, rcVisibleArea.left, rcVisibleArea.top, pDarkenedBitmap);
+ delete pDarkenedBitmap;
+ if (m_pSavedBackgroundBitmap)
+ delete m_pSavedBackgroundBitmap;
+ m_pSavedBackgroundBitmap = pBitmap;
}
/**
@@ -776,9 +914,12 @@
*/
void CLocationView::UpdateVisiblePos(int nTopLine, int nBottomLine)
{
- DrawVisibleAreaRect(nTopLine, nBottomLine);
- if (m_displayMovedBlocks != DISPLAY_MOVED_NONE)
- DrawConnectLines();
+ if (m_bDrawn)
+ {
+ CDC *pDC = GetDC();
+ DrawVisibleAreaRect(pDC, nTopLine, nBottomLine);
+ ReleaseDC(pDC);
+ }
}
/**
@@ -795,9 +936,8 @@
/**
* @brief Draw lines connecting moved blocks.
*/
-void CLocationView::DrawConnectLines()
+void CLocationView::DrawConnectLines(CDC *pClientDC)
{
- CDC *pClientDC = GetDC();
CPen* oldObj = (CPen*)pClientDC->SelectStockObject(BLACK_PEN);
POSITION pos = m_movedLines.GetHeadPosition();
@@ -809,7 +949,6 @@
}
pClientDC->SelectObject(oldObj);
- ReleaseDC(pClientDC);
}
/**
@@ -848,54 +987,26 @@
*/
void CLocationView::DrawDiffMarker(CDC* pDC, int yCoord)
{
- // First erase marker from current position
- if (m_DiffMarkerCoord != -1)
- {
- // If in visible area, use its background color
- COLORREF cr;
- if (m_DiffMarkerCoord > m_visibleTop && m_DiffMarkerCoord < m_visibleBottom)
- cr = GetSysColor(COLOR_3DSHADOW);
- else
- cr = GetSysColor(COLOR_WINDOW);
+ CPoint points[3];
+ points[0].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
+ points[0].y = yCoord - DIFFMARKER_TOP;
+ points[1].x = m_nLeftBarLeft - 1;
+ points[1].y = yCoord;
+ points[2].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
+ points[2].y = yCoord + DIFFMARKER_BOTTOM;
- CRect rect;
- rect.left = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
- rect.top = m_DiffMarkerCoord - DIFFMARKER_TOP;
- rect.right = m_nLeftBarLeft;
- rect.bottom = m_DiffMarkerCoord + DIFFMARKER_BOTTOM + 1;
- pDC->FillSolidRect(rect, cr);
+ CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
+ CBrush brushBlue(RGB(0x80, 0x80, 0xff));
+ CBrush* pOldBrush = pDC->SelectObject(&brushBlue);
- rect.left = m_nRightBarRight;
- rect.right = m_nRightBarRight + 2 + DIFFMARKER_WIDTH;
- pDC->FillSolidRect(rect, cr);
- }
+ pDC->SetPolyFillMode(WINDING);
+ pDC->Polygon(points, 3);
- m_DiffMarkerCoord = yCoord;
+ points[0].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
+ points[1].x = m_nRightBarRight + 1;
+ points[2].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
+ pDC->Polygon(points, 3);
- // Then draw marker to new position
- if (yCoord != -1)
- {
- CPoint points[3];
- points[0].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
- points[0].y = yCoord - DIFFMARKER_TOP;
- points[1].x = m_nLeftBarLeft - 1;
- points[1].y = yCoord;
- points[2].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
- points[2].y = yCoord + DIFFMARKER_BOTTOM;
-
- CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- CBrush brushBlack(RGB(0, 0, 0));
- CBrush* pOldBrush = pDC->SelectObject(&brushBlack);
-
- pDC->SetPolyFillMode(WINDING);
- pDC->Polygon(points, 3);
-
- points[0].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
- points[1].x = m_nRightBarRight + 1;
- points[2].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
- pDC->Polygon(points, 3);
-
- pDC->SelectObject(pOldBrush);
- pDC->SelectObject(oldObj);
- }
+ pDC->SelectObject(pOldBrush);
+ pDC->SelectObject(oldObj);
}
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2007-08-17 23:05:47 UTC (rev 4450)
+++ trunk/Src/LocationView.h 2007-08-20 14:06:42 UTC (rev 4451)
@@ -38,6 +38,7 @@
{
public:
CLocationView();
+ ~CLocationView();
DECLARE_DYNCREATE(CLocationView)
void SetConnectMovedBlocks(int displayMovedBlocks);
void UpdateVisiblePos(int nTopLine = -1, int nBottomLine = -1);
@@ -60,8 +61,8 @@
BOOL GotoLocation(const CPoint& point, BOOL bRealLine = TRUE);
int GetLineFromYPos(int nYCoord, int bar, BOOL bRealLine = TRUE);
int IsInsideBar(const CRect& rc, const POINT& pt);
- void DrawVisibleAreaRect(int nTopLine = -1, int nBottomLine = -1);
- void DrawConnectLines();
+ void DrawVisibleAreaRect(CDC* pDC, int nTopLine = -1, int nBottomLine = -1);
+ void DrawConnectLines(CDC* pDC);
void DrawDiffMarker(CDC* pDC, int yCoord);
private:
@@ -78,7 +79,8 @@
bool m_bIgnoreTrivials; //*< Whether to paint trivial blocks */
HWND m_hwndFrame; //*< Frame window handle */
UINT m_nPrevPaneWidth; //*< Previous pane width, used to track width changes */
- int m_DiffMarkerCoord; //*< Y-Coord for active diff marker, -1 if no marker */
+ CBitmap *m_pSavedBackgroundBitmap; //*< Saved background */
+ bool m_bDrawn; //*< Is already drawn in location pane? */
// Generated message map functions
protected:
@@ -90,6 +92,8 @@
afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
afx_msg void OnClose();
afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg BOOL OnEraseBkgnd(CDC* pDC);
+ afx_msg void OnPaint();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-08-21 14:15:56
|
Revision: 4456
http://winmerge.svn.sourceforge.net/winmerge/?rev=4456&view=rev
Author: kimmov
Date: 2007-08-21 07:15:54 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
PATCH: [ 1777822 ] MakeResDll: Convert more CStrings to Strings
Modified Paths:
--------------
trunk/Src/Common/UnicodeString.h
trunk/Tools/MakeResDll/MakeResDll.cpp
trunk/Tools/MakeResDll/MakeResDll.dsp
Added Paths:
-----------
trunk/Src/Common/UnicodeString.cpp
Added: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp (rev 0)
+++ trunk/Src/Common/UnicodeString.cpp 2007-08-21 14:15:54 UTC (rev 4456)
@@ -0,0 +1,41 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file UnicodeString.cpp
+ *
+ * @brief String utilities.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include "UnicodeString.h"
+
+void string_replace(String &target, const String &find, const String &replace)
+{
+// String copy;
+ const int replace_len = find.length();
+ int prevPos = 0;
+ int pos = target.find(find, prevPos);
+ while (pos >= 0)
+ {
+ target.replace(pos, replace_len, replace);
+ prevPos = pos;
+ pos = target.find(find, prevPos);
+ }
+}
Property changes on: trunk/Src/Common/UnicodeString.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/Common/UnicodeString.h
===================================================================
--- trunk/Src/Common/UnicodeString.h 2007-08-21 14:11:04 UTC (rev 4455)
+++ trunk/Src/Common/UnicodeString.h 2007-08-21 14:15:54 UTC (rev 4456)
@@ -41,4 +41,7 @@
#endif // _UNICODE
+void string_replace(String &target, const String &find, const String &replace);
+
+
#endif // _UNICODE_STRING_
Modified: trunk/Tools/MakeResDll/MakeResDll.cpp
===================================================================
--- trunk/Tools/MakeResDll/MakeResDll.cpp 2007-08-21 14:11:04 UTC (rev 4455)
+++ trunk/Tools/MakeResDll/MakeResDll.cpp 2007-08-21 14:15:54 UTC (rev 4456)
@@ -33,13 +33,14 @@
struct VcPaths
{
- CString sRCExe;
- CString sLinkExe;
- CString sVcBaseFolder;
- CString sIncludes;
- CString sLibs;
- CString sAdditionalPath;
- bool needsInfo() const { return sRCExe.IsEmpty() || sLinkExe.IsEmpty() || sIncludes.IsEmpty() || sLibs.IsEmpty(); }
+ String sRCExe;
+ String sLinkExe;
+ String sVcBaseFolder;
+ String sIncludes;
+ String sLibs;
+ String sAdditionalPath;
+ bool needsInfo() const { return sRCExe.empty() || sLinkExe.empty() ||
+ sIncludes.empty() || sLibs.empty(); }
};
// File-level globals
@@ -79,7 +80,7 @@
static BOOL ProcessArgs(int argc, TCHAR* argv[]);
static void FixPath();
static bool DoesFileExist(LPCTSTR filepath);
-static void TrimPath(CString & sPath);
+static void TrimPath(String & sPath);
//static void DisplayUi(const CStringArray & VsBaseDirs);
static void LoadVsBaseDirs(CStringArray & VsBaseDirs);
static void SplitFilename(LPCTSTR path, TCHAR * folder, TCHAR * filename, TCHAR * ext);
@@ -182,27 +183,27 @@
*/
static void FixPath()
{
- CString strPath(getenv(_T("PATH")));
+ String strPath(getenv(_T("PATH")));
TCHAR spath[MAX_PATH] = {0};
if (gbVerbose)
- _tprintf(_T("Initial path: %s\r\n"), strPath);
+ _tprintf(_T("Initial path: %s\r\n"), strPath.c_str());
strPath = _T("PATH=") + strPath;
- SplitFilename(gVcPaths.sRCExe, spath, NULL, NULL);
+ SplitFilename(gVcPaths.sRCExe.c_str(), spath, NULL, NULL);
strPath += _T(";");
strPath += spath;
- SplitFilename(gVcPaths.sLinkExe, spath, NULL, NULL);
+ SplitFilename(gVcPaths.sLinkExe.c_str(), spath, NULL, NULL);
strPath += _T(";");
strPath += spath;
strPath += _T(";");
- if (!gVcPaths.sAdditionalPath.IsEmpty())
+ if (!gVcPaths.sAdditionalPath.empty())
{
strPath += gVcPaths.sAdditionalPath + _T(";");
}
- putenv(strPath);
+ putenv(strPath.c_str());
if (gbVerbose)
- _tprintf(_T("New path: %s\r\n"), strPath);
+ _tprintf(_T("New path: %s\r\n"), strPath.c_str());
}
/**
@@ -411,13 +412,13 @@
gsLang,
strOutFolder,
strStem,
- gVcPaths.sIncludes,
+ gVcPaths.sIncludes.c_str(),
pszRCPath);
if (gbVerbose)
- _tprintf(_T("%s %s\r\n\r\n"), gVcPaths.sRCExe, strRCArgs);
+ _tprintf(_T("%s %s\r\n\r\n"), gVcPaths.sRCExe.c_str(), strRCArgs);
Status(IDS_BUILD_RC);
- HANDLE hRC = RunIt(gVcPaths.sRCExe, strRCArgs, TRUE, FALSE);
+ HANDLE hRC = RunIt(gVcPaths.sRCExe.c_str(), strRCArgs, TRUE, FALSE);
if (hRC)
{
DWORD dwReturn;
@@ -434,7 +435,7 @@
else
Status(_T("Error creating process\r\n"));
- _tcscpy(temp, gVcPaths.sLibs);
+ _tcscpy(temp, gVcPaths.sLibs.c_str());
p = _tcstok(temp, ";\r\n\t");
while (p != NULL)
{
@@ -459,7 +460,7 @@
_tprintf(_T("%s %s\r\n\r\n"), gVcPaths.sLinkExe, strLinkArgs);
Status(IDS_LINK);
- hLink = RunIt(gVcPaths.sLinkExe, strLinkArgs, TRUE, FALSE);
+ hLink = RunIt(gVcPaths.sLinkExe.c_str(), strLinkArgs, TRUE, FALSE);
if (hLink)
{
DWORD dwReturn;
@@ -499,17 +500,17 @@
static BOOL CheckCompiler()
{
// look for the compiler
- if (!DoesFileExist(gVcPaths.sRCExe))
+ if (!DoesFileExist(gVcPaths.sRCExe.c_str()))
{
- Status(IDS_BAD_RC_PATH_FMT, gVcPaths.sRCExe);
+ Status(IDS_BAD_RC_PATH_FMT, gVcPaths.sRCExe.c_str());
Usage();
return FALSE;
}
// look for the linker
- if (!DoesFileExist(gVcPaths.sLinkExe))
+ if (!DoesFileExist(gVcPaths.sLinkExe.c_str()))
{
- Status(IDS_BAD_LINK_PATH_FMT, gVcPaths.sLinkExe);
+ Status(IDS_BAD_LINK_PATH_FMT, gVcPaths.sLinkExe.c_str());
Usage();
return FALSE;
}
@@ -559,11 +560,11 @@
LPCTSTR settings = _T("Software\\Thingamahoochie\\MakeResDll\\Settings");
if (RegOpenUser(reg, settings))
{
- gVcPaths.sVcBaseFolder = reg.ReadString(_T("VcBaseFolder"), _T("")).c_str();
- if (gVcPaths.sRCExe.IsEmpty())
- gVcPaths.sRCExe = reg.ReadString(_T("RCExe"), _T("")).c_str();
- if (gVcPaths.sLinkExe.IsEmpty())
- gVcPaths.sLinkExe = reg.ReadString(_T("LinkExe"), _T("")).c_str();
+ gVcPaths.sVcBaseFolder = reg.ReadString(_T("VcBaseFolder"), _T(""));
+ if (gVcPaths.sRCExe.empty())
+ gVcPaths.sRCExe = reg.ReadString(_T("RCExe"), _T(""));
+ if (gVcPaths.sLinkExe.empty())
+ gVcPaths.sLinkExe = reg.ReadString(_T("LinkExe"), _T(""));
// This is the main way for the user to override these settings
// VcVersion values handled:
// Net2005 - Use Microsoft Visual Studio .NET 2005
@@ -590,10 +591,10 @@
FindAndLoadVsVersion(VsBaseDirs, vsnum);
_tprintf(_T("Build paths:\r\n"));
- _tprintf(_T(" %s\r\n"), gVcPaths.sRCExe);
- _tprintf(_T(" %s\r\n"), gVcPaths.sLinkExe);
- _tprintf(_T(" inc: %s\r\n"), gVcPaths.sIncludes);
- _tprintf(_T(" lib: %s\r\n"), gVcPaths.sLibs);
+ _tprintf(_T(" %s\r\n"), gVcPaths.sRCExe.c_str());
+ _tprintf(_T(" %s\r\n"), gVcPaths.sLinkExe.c_str());
+ _tprintf(_T(" inc: %s\r\n"), gVcPaths.sIncludes.c_str());
+ _tprintf(_T(" lib: %s\r\n"), gVcPaths.sLibs.c_str());
}
@@ -645,7 +646,7 @@
// Root directory of Visual C
// eg, C:\Program Files\Microsoft Visual Studio 8\VC\
- if (gVcPaths.sVcBaseFolder.IsEmpty())
+ if (gVcPaths.sVcBaseFolder.empty())
gVcPaths.sVcBaseFolder = sProductDir;
// Get root directory of Visual Studio
@@ -659,15 +660,15 @@
}
// Found MSVC .NET 2005, so grab resource compiler & linker
- if (gVcPaths.sRCExe.IsEmpty())
- gVcPaths.sRCExe.Format(_T("%sbin\\rc.exe"), gVcPaths.sVcBaseFolder);
- if (gVcPaths.sLinkExe.IsEmpty())
- gVcPaths.sLinkExe.Format(_T("%sbin\\link.exe"), gVcPaths.sVcBaseFolder);
+ if (gVcPaths.sRCExe.empty())
+ gVcPaths.sRCExe = gVcPaths.sVcBaseFolder + _T("bin\\rc.exe");
+ if (gVcPaths.sLinkExe.empty())
+ gVcPaths.sLinkExe = gVcPaths.sVcBaseFolder + _T("bin\\link.exe");
if (RegOpenMachine(reg, _T("SOFTWARE\\Microsoft\\VisualStudio\\8.0")))
{
// eg, C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\
- gVcPaths.sAdditionalPath = reg.ReadString(_T("InstallDir"), _T("")).c_str();
+ gVcPaths.sAdditionalPath = reg.ReadString(_T("InstallDir"), _T(""));
TrimPath(gVcPaths.sAdditionalPath);
}
@@ -677,20 +678,20 @@
LPCTSTR bd71 = _T("SOFTWARE\\Microsoft\\VisualStudio\\7.1\\VC\\VC_OBJECTS_PLATFORM_INFO\\Win32\\Directories");
if (RegOpenMachine(reg, bd71))
{
- if (gVcPaths.sIncludes.IsEmpty())
+ if (gVcPaths.sIncludes.empty())
{
- gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T("")).c_str();
- gVcPaths.sIncludes.Replace(_T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
+ gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T(""));
+ string_replace(gVcPaths.sIncludes, _T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
}
- if (gVcPaths.sLibs.IsEmpty())
+ if (gVcPaths.sLibs.empty())
{
- gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T("")).c_str();
- gVcPaths.sLibs.Replace(_T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
+ gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T(""));
+ string_replace(gVcPaths.sLibs, _T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
if (!sVsRoot.empty())
{
// eg C:\Program Files\Microsoft Visual Studio 8\SDK\v1.1"));
String sFrameworkSdkDir = sVsRoot + _T("SDK\\v1.1");
- gVcPaths.sLibs.Replace(_T("$(FrameworkSDKDir)"), sFrameworkSdkDir.c_str());
+ string_replace(gVcPaths.sLibs, _T("$(FrameworkSDKDir)"), sFrameworkSdkDir);
}
}
reg.Close();
@@ -708,7 +709,7 @@
// Root directory of Visual C
// eg, C:\Program Files\Microsoft Visual Studio 8\VC\
- if (gVcPaths.sVcBaseFolder.IsEmpty())
+ if (gVcPaths.sVcBaseFolder.empty())
gVcPaths.sVcBaseFolder = sProductDir;
// Get root directory of Visual Studio
@@ -722,15 +723,15 @@
}
// Found MSVC .NET 2003, so grab resource compiler & linker
- if (gVcPaths.sRCExe.IsEmpty())
- gVcPaths.sRCExe.Format(_T("%sbin\\rc.exe"), gVcPaths.sVcBaseFolder);
- if (gVcPaths.sLinkExe.IsEmpty())
- gVcPaths.sLinkExe.Format(_T("%sbin\\link.exe"), gVcPaths.sVcBaseFolder);
+ if (gVcPaths.sRCExe.empty())
+ gVcPaths.sRCExe = gVcPaths.sVcBaseFolder + _T("bin\\rc.exe");
+ if (gVcPaths.sLinkExe.empty())
+ gVcPaths.sLinkExe = gVcPaths.sVcBaseFolder + _T("bin\\link.exe");
if (RegOpenMachine(reg, _T("SOFTWARE\\Microsoft\\VisualStudio\\7.1")))
{
// eg, C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\
- gVcPaths.sAdditionalPath = reg.ReadString(_T("InstallDir"), _T("")).c_str();
+ gVcPaths.sAdditionalPath = reg.ReadString(_T("InstallDir"), _T(""));
TrimPath(gVcPaths.sAdditionalPath);
}
@@ -742,20 +743,20 @@
LPCTSTR bd71 = _T("SOFTWARE\\Microsoft\\VisualStudio\\7.1\\VC\\VC_OBJECTS_PLATFORM_INFO\\Win32\\Directories");
if (RegOpenMachine(reg, bd71))
{
- if (gVcPaths.sIncludes.IsEmpty())
+ if (gVcPaths.sIncludes.empty())
{
- gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T("")).c_str();
- gVcPaths.sIncludes.Replace(_T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
+ gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T(""));
+ string_replace(gVcPaths.sIncludes, _T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
}
- if (gVcPaths.sLibs.IsEmpty())
+ if (gVcPaths.sLibs.empty())
{
- gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T("")).c_str();
- gVcPaths.sLibs.Replace(_T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
+ gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T(""));
+ string_replace(gVcPaths.sLibs, _T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
if (!sVsRoot.empty())
{
// eg C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1"));
String sFrameworkSdkDir = sVsRoot + _T("SDK\\v1.1");
- gVcPaths.sLibs.Replace(_T("$(FrameworkSDKDir)"), sFrameworkSdkDir.c_str());
+ string_replace(gVcPaths.sLibs, _T("$(FrameworkSDKDir)"), sFrameworkSdkDir);
}
}
reg.Close();
@@ -772,14 +773,14 @@
CRegKeyEx reg;
// Get root directory of Visual C
- if (gVcPaths.sVcBaseFolder.IsEmpty())
+ if (gVcPaths.sVcBaseFolder.empty())
gVcPaths.sVcBaseFolder = sProductDir;
// Found MSVC .NET, so grab resource compiler & linker
- if (gVcPaths.sRCExe.IsEmpty())
- gVcPaths.sRCExe.Format(_T("%sbin\\rc.exe"), gVcPaths.sVcBaseFolder);
- if (gVcPaths.sLinkExe.IsEmpty())
- gVcPaths.sLinkExe.Format(_T("%sbin\\link.exe"), gVcPaths.sVcBaseFolder);
+ if (gVcPaths.sRCExe.empty())
+ gVcPaths.sRCExe = gVcPaths.sVcBaseFolder + _T("bin\\rc.exe");
+ if (gVcPaths.sLinkExe.empty())
+ gVcPaths.sLinkExe = gVcPaths.sVcBaseFolder + _T("bin\\link.exe");
// Now also grab includes & libs
// The default installation ones are in HKLM
@@ -790,17 +791,17 @@
if (RegOpenMachine(reg, bd70))
{
String fmwk = gVcPaths.sVcBaseFolder+_T("FrameworkSDK\\");
- if (gVcPaths.sIncludes.IsEmpty())
+ if (gVcPaths.sIncludes.empty())
{
- gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T("")).c_str();
- gVcPaths.sIncludes.Replace(_T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
- gVcPaths.sIncludes.Replace(_T("$(FrameworkSDKDir)"), fmwk.c_str());
+ gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T(""));
+ string_replace(gVcPaths.sIncludes, _T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
+ string_replace(gVcPaths.sIncludes, _T("$(FrameworkSDKDir)"), fmwk);
}
- if (gVcPaths.sLibs.IsEmpty())
+ if (gVcPaths.sLibs.empty())
{
- gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T("")).c_str();
- gVcPaths.sLibs.Replace(_T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
- gVcPaths.sLibs.Replace(_T("$(FrameworkSDKDir)"), fmwk.c_str());
+ gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T(""));
+ string_replace(gVcPaths.sLibs, _T("$(VCInstallDir)"), gVcPaths.sVcBaseFolder);
+ string_replace(gVcPaths.sLibs, _T("$(FrameworkSDKDir)"), fmwk);
}
reg.Close();
}
@@ -817,7 +818,7 @@
// Get root directory of Visual C
// eg, C:\Program Files\Microsoft Visual Studio\VC98
- if (gVcPaths.sVcBaseFolder.IsEmpty())
+ if (gVcPaths.sVcBaseFolder.empty())
gVcPaths.sVcBaseFolder = sProductDir;
LPCTSTR Dev6Dirs = _T("Software\\Microsoft\\DevStudio\\6.0\\Directories");
@@ -825,23 +826,23 @@
{
// eg, C:\Program Files\Microsoft Visual Studio\COMMON\MSDev98\Bin
String sVsDevBin = reg.ReadString(_T("Install Dirs"), _T(""));
- if (gVcPaths.sRCExe.IsEmpty())
- gVcPaths.sRCExe.Format(_T("%s\\rc.exe"), sVsDevBin.c_str());
+ if (gVcPaths.sRCExe.empty())
+ gVcPaths.sRCExe = sVsDevBin + _T("\\rc.exe");
}
// Get linker
// eg, C:\Program Files\Microsoft Visual Studio\VC98\bin\link.exe
- if (gVcPaths.sLinkExe.IsEmpty())
- gVcPaths.sLinkExe.Format(_T("%s\\bin\\link.exe"), gVcPaths.sVcBaseFolder);
+ if (gVcPaths.sLinkExe.empty())
+ gVcPaths.sLinkExe = gVcPaths.sVcBaseFolder + _T("\\bin\\link.exe");
// Now also grab includes & libs
LPCTSTR bd = _T("Software\\Microsoft\\DevStudio\\6.0\\Build System\\Components\\Platforms\\Win32 (x86)\\Directories");
if (RegOpenUser(reg, bd))
{
- if (gVcPaths.sIncludes.IsEmpty())
- gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T("")).c_str();
- if (gVcPaths.sLibs.IsEmpty())
- gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T("")).c_str();
+ if (gVcPaths.sIncludes.empty())
+ gVcPaths.sIncludes = reg.ReadString(_T("Include Dirs"), _T(""));
+ if (gVcPaths.sLibs.empty())
+ gVcPaths.sLibs = reg.ReadString(_T("Library Dirs"), _T(""));
reg.Close();
}
}
@@ -855,12 +856,13 @@
}
/**
- * @brief Remove any trailing slashes
+ * @brief Remove any trailing slashes.
+ * @param [in, out] sPath String to handle.
*/
-static void TrimPath(CString & sPath)
+static void TrimPath(String & sPath)
{
- if (sPath.GetLength() && IsSlash(sPath[sPath.GetLength()-1]))
- sPath = sPath.Left(sPath.GetLength()-1);
+ if (sPath.length() && IsSlash(sPath[sPath.length() - 1]))
+ sPath = sPath.erase(sPath.length() - 1, 1);
}
/**
Modified: trunk/Tools/MakeResDll/MakeResDll.dsp
===================================================================
--- trunk/Tools/MakeResDll/MakeResDll.dsp 2007-08-21 14:11:04 UTC (rev 4455)
+++ trunk/Tools/MakeResDll/MakeResDll.dsp 2007-08-21 14:15:54 UTC (rev 4456)
@@ -102,6 +102,10 @@
SOURCE=.\StdAfx.cpp
# ADD CPP /Yc"stdafx.h"
# End Source File
+# Begin Source File
+
+SOURCE=..\..\Src\Common\UnicodeString.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -122,6 +126,10 @@
SOURCE=.\StdAfx.h
# End Source File
+# Begin Source File
+
+SOURCE=..\..\Src\Common\UnicodeString.h
+# End Source File
# End Group
# Begin Group "Resource Files"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-08-31 14:46:23
|
Revision: 4494
http://winmerge.svn.sourceforge.net/winmerge/?rev=4494&view=rev
Author: kimmov
Date: 2007-08-31 07:46:18 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
PATCH: [ 1783581 ] Build MakeResDll without MFC
Modified Paths:
--------------
trunk/Src/Common/RegKey.cpp
trunk/Src/Common/RegKey.h
trunk/Src/Common/UnicodeString.cpp
trunk/Tools/MakeResDll/MakeResDll.cpp
trunk/Tools/MakeResDll/MakeResDll.dsp
trunk/Tools/MakeResDll/StdAfx.cpp
trunk/Tools/MakeResDll/StdAfx.h
Modified: trunk/Src/Common/RegKey.cpp
===================================================================
--- trunk/Src/Common/RegKey.cpp 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Src/Common/RegKey.cpp 2007-08-31 14:46:18 UTC (rev 4494)
@@ -6,7 +6,6 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
#include <assert.h>
#include "UnicodeString.h"
#include "RegKey.h"
Modified: trunk/Src/Common/RegKey.h
===================================================================
--- trunk/Src/Common/RegKey.h 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Src/Common/RegKey.h 2007-08-31 14:46:18 UTC (rev 4494)
@@ -6,6 +6,8 @@
// ID line follows -- this is updated by SVN
// $Id$
+#include <windows.h>
+#include <tchar.h>
#include <winreg.h>
#include "UnicodeString.h"
Modified: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Src/Common/UnicodeString.cpp 2007-08-31 14:46:18 UTC (rev 4494)
@@ -23,7 +23,6 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
#include "UnicodeString.h"
void string_replace(String &target, const String &find, const String &replace)
Modified: trunk/Tools/MakeResDll/MakeResDll.cpp
===================================================================
--- trunk/Tools/MakeResDll/MakeResDll.cpp 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Tools/MakeResDll/MakeResDll.cpp 2007-08-31 14:46:18 UTC (rev 4494)
@@ -7,21 +7,19 @@
// $Id$
#include "stdafx.h"
+#include <windows.h>
+#include <tchar.h>
+#include "UnicodeString.h"
#include <vector>
+#include <iostream>
#include <sys/types.h>
#include "sys/stat.h"
#include "MakeResDll.h"
// Following files included from WinMerge/Src/Common
-#include "UnicodeString.h"
#include "RegKey.h"
+
// Local files
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
using namespace std;
/////////////////////////////////////////////////////////////////////////////
@@ -116,13 +114,14 @@
int nRetCode = 0;
// initialize MFC and print an error on failure
- if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
+/* if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
{
// TODO: change error code to suit your needs
cerr << _T("Fatal Error: MFC initialization failed") << endl;
nRetCode = 1;
}
else
+*/
{
if (argc < 2)
{
@@ -169,9 +168,11 @@
nRetCode = 1;
if (ok && !gbSilent && !gbBatch)
{
- CString s;
- AfxFormatString1(s, IDS_SUCCESS_FMT, strOutFile.c_str());
- AfxMessageBox(s, MB_ICONINFORMATION);
+ TCHAR tmpStr[200];
+ LoadString(::GetModuleHandle(NULL), IDS_SUCCESS_FMT, tmpStr, 200);
+ String s = tmpStr;
+ string_replace(s, _T("%1"), strOutFile);
+ MessageBox(NULL, s.c_str(), _T("MakeResDll"), MB_ICONINFORMATION);
}
if (gbPause && !gbSilent)
@@ -397,6 +398,8 @@
const int TempStringLen = 4096;
String libs;
TCHAR *p = NULL;
+ TCHAR * linkArgs = NULL;
+ TCHAR *libsPath = NULL;
HANDLE hLink;
String strOutFolder(pszOutputPath);
String strStem(pszOutputStem);
@@ -450,7 +453,7 @@
else
Status(_T("Error creating process\r\n"));
- TCHAR *libsPath = new TCHAR[TempStringLen];
+ libsPath = new TCHAR[TempStringLen];
_tcscpy(libsPath, gVcPaths.sLibs.c_str());
p = _tcstok(libsPath, ";\r\n\t");
while (p != NULL)
@@ -464,7 +467,7 @@
strOutFile = strOutFolder + _T("\\") + strStem + _T(".lang");
- TCHAR * linkArgs = new TCHAR[TempStringLen];
+ linkArgs = new TCHAR[TempStringLen];
_stprintf(linkArgs, _T("/nologo /subsystem:console /dll ")
_T("/machine:I386 %s ")
_T("/noentry ")
@@ -552,7 +555,7 @@
if (gbSilent)
return;
- TRY {
+ try {
String s;
if (szText1 != NULL && szText2 != NULL)
{
@@ -577,10 +580,9 @@
}
Status(s.c_str());
}
- CATCH_ALL (e)
+ catch (exception ex)
{
}
- END_CATCH_ALL;
}
@@ -962,7 +964,12 @@
{
if (!MyCreateDirectoryIfNeeded(tempPath)
&& !MyCreateDirectoryIfNeeded(tempPath))
- TRACE(_T("Failed to create folder %s\n"), tempPath);
+ {
+ String str(_T("Failed to create folder "));
+ str += tempPath;
+ str += _T("\n");
+ OutputDebugStr(str.c_str());
+ }
_tccpy(p, _T("\\"));
}
}
@@ -971,10 +978,15 @@
if (!MyCreateDirectoryIfNeeded(filename)
&& !MyCreateDirectoryIfNeeded(filename))
- TRACE(_T("Failed to create folder %s\n"), filename);
+ {
+ String str(_T("Failed to create folder "));
+ str += filename;
+ str += _T("\n");
+ OutputDebugStr(str.c_str());
+ }
- CFileStatus status;
- return (CFile::GetStatus(filename, status));
+ bool fileExists = DoesFileExist(filename);
+ return fileExists;
}
// Create directory (via Win32 API)
Modified: trunk/Tools/MakeResDll/MakeResDll.dsp
===================================================================
--- trunk/Tools/MakeResDll/MakeResDll.dsp 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Tools/MakeResDll/MakeResDll.dsp 2007-08-31 14:46:18 UTC (rev 4494)
@@ -35,16 +35,16 @@
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
+# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\BuildTmp\MakeResDll___Win32_Release"
# PROP Intermediate_Dir "..\..\BuildTmp\MakeResDll___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -59,16 +59,16 @@
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
+# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\BuildTmp\MakeResDll___Win32_Debug"
# PROP Intermediate_Dir "..\..\BuildTmp\MakeResDll___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
Modified: trunk/Tools/MakeResDll/StdAfx.cpp
===================================================================
--- trunk/Tools/MakeResDll/StdAfx.cpp 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Tools/MakeResDll/StdAfx.cpp 2007-08-31 14:46:18 UTC (rev 4494)
@@ -9,14 +9,6 @@
// TODO: reference any additional headers you need in STDAFX.H
// and not in this file
-// Load string resource and return as CString
-CString LoadResString(int id)
-{
- CString s;
- VERIFY(s.LoadString(id));
- return s;
-}
-
// Get appropriate clipboard format for TCHAR text
int GetClipTcharTextFormat()
{
Modified: trunk/Tools/MakeResDll/StdAfx.h
===================================================================
--- trunk/Tools/MakeResDll/StdAfx.h 2007-08-30 20:51:43 UTC (rev 4493)
+++ trunk/Tools/MakeResDll/StdAfx.h 2007-08-31 14:46:18 UTC (rev 4494)
@@ -12,16 +12,10 @@
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
+#include <windows.h>
-#include <iostream>
-#include <afxsock.h>
-
// TODO: reference additional headers your program requires here
-CString LoadResString(int id);
class CRegKeyEx;
bool RegOpenMachine(CRegKeyEx & reg, LPCTSTR key);
bool RegOpenUser(CRegKeyEx & reg, LPCTSTR key);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-05 14:55:17
|
Revision: 4512
http://winmerge.svn.sourceforge.net/winmerge/?rev=4512&view=rev
Author: kimmov
Date: 2007-09-05 07:55:12 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
BUG: [ 1787816 ] Bug in File Rename
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DirActions.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2007-09-04 21:04:16 UTC (rev 4511)
+++ trunk/Docs/Users/ChangeLog.txt 2007-09-05 14:55:12 UTC (rev 4512)
@@ -5,6 +5,7 @@
WinMerge 2.7.5.2
Graphical improvements to location pane (#1770175)
Remove MFC dependency from resource compiler (#1783581)
+ BugFix: Renaming unique item (only other side) renamed parent folder (#1787816)
Translation updates:
- Traditional Chinese (r4473)
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-09-04 21:04:16 UTC (rev 4511)
+++ trunk/Src/DirActions.cpp 2007-09-05 14:55:12 UTC (rev 4512)
@@ -1488,14 +1488,18 @@
return FALSE;
}
- BOOL bRenameLeft = RenameOnSameDir(sLeftFile, szNewItemName);
- BOOL bRenameRight = RenameOnSameDir(sRightFile, szNewItemName);
-
POSITION key = GetItemKey(nSelItem);
ASSERT(key != SPECIAL_ITEM_POS);
di = GetDocument()->GetDiffRefByKey(key);
- if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
+ BOOL bRenameLeft = FALSE;
+ BOOL bRenameRight = FALSE;
+ if (di.diffcode.isSideLeftOrBoth())
+ bRenameLeft = RenameOnSameDir(sLeftFile, szNewItemName);
+ if (di.diffcode.isSideRightOrBoth())
+ bRenameRight = RenameOnSameDir(sRightFile, szNewItemName);
+
+ if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
{
di.sLeftFilename = szNewItemName;
di.sRightFilename = szNewItemName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-07 17:53:54
|
Revision: 4521
http://winmerge.svn.sourceforge.net/winmerge/?rev=4521&view=rev
Author: kimmov
Date: 2007-09-07 10:53:51 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
PATCH: [ 1788168 ] Better multi-monitor support
submitted by highjinx at sourceforge.net
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/ChildFrm.cpp
trunk/Src/ChildFrm.h
trunk/Src/Common/SplitterWndEx.cpp
trunk/Src/Common/SplitterWndEx.h
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Docs/Users/ChangeLog.txt 2007-09-07 17:53:51 UTC (rev 4521)
@@ -5,6 +5,7 @@
WinMerge 2.7.5.2
Graphical improvements to location pane (#1770175)
Remove MFC dependency from resource compiler (#1783581)
+ Better multi-monitor support (split file view on monitor boundary) (#1788168)
BugFix: Renaming unique item (only other side) renamed parent folder (#1787816)
Translation updates:
- Traditional Chinese (r4473)
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Src/ChildFrm.cpp 2007-09-07 17:53:51 UTC (rev 4521)
@@ -602,6 +602,11 @@
theApp.SetLastCompareResult(nResult);
}
+void CChildFrame::UpdateSplitter()
+{
+ m_wndSplitter.RecalcLayout();
+}
+
void CChildFrame::OnTimer(UINT_PTR nIDEvent)
{
if (IsWindowVisible())
Modified: trunk/Src/ChildFrm.h
===================================================================
--- trunk/Src/ChildFrm.h 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Src/ChildFrm.h 2007-09-07 17:53:51 UTC (rev 4521)
@@ -55,6 +55,9 @@
CMergeDoc * GetMergeDoc() { return m_pMergeDoc; }
void SetLastCompareResult(int nResult);
+ void UpdateSplitter();
+
+
// Attributes
protected:
CSplitterWndEx m_wndSplitter;
Modified: trunk/Src/Common/SplitterWndEx.cpp
===================================================================
--- trunk/Src/Common/SplitterWndEx.cpp 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Src/Common/SplitterWndEx.cpp 2007-09-07 17:53:51 UTC (rev 4521)
@@ -13,6 +13,11 @@
#include "stdafx.h"
#include "SplitterWndEx.h"
+#ifdef COMPILE_MULTIMON_STUBS
+#undef COMPILE_MULTIMON_STUBS
+#endif
+#include <multimon.h>
+
#ifdef _DEBUG
#undef THIS_FILE
static char THIS_FILE[]=__FILE__;
@@ -159,15 +164,18 @@
GetRowInfo(i, h, hmin);
sum += h;
}
- int hEqual = sum/m_nRows;
- for (i = 0 ; i < m_nRows-1 ; i++)
+ if (sum > 0)
{
- SetRowInfo(i, hEqual, hmin);
- sum -= hEqual;
- }
- SetRowInfo(i, sum, hmin);
+ int hEqual = sum/m_nRows;
+ for (i = 0 ; i < m_nRows-1 ; i++)
+ {
+ SetRowInfo(i, hEqual, hmin);
+ sum -= hEqual;
+ }
+ SetRowInfo(i, sum, hmin);
- RecalcLayout();
+ RecalcLayout();
+ }
}
void CSplitterWndEx::EqualizeCols()
@@ -201,10 +209,39 @@
}
}
+void CSplitterWndEx::RecalcLayout()
+{
+ if (m_nCols == 2)
+ {
+ CRect vSplitterWndRect;
+ GetWindowRect(vSplitterWndRect);
+ HMONITOR hLeftMonitor = MonitorFromPoint(vSplitterWndRect.TopLeft(), MONITOR_DEFAULTTONEAREST);
+ HMONITOR hRightMonitor = MonitorFromPoint(CPoint(vSplitterWndRect.right, vSplitterWndRect.top), MONITOR_DEFAULTTONEAREST);
+ if (hLeftMonitor != hRightMonitor)
+ {
+ MONITORINFO info;
+ info.cbSize = sizeof(MONITORINFO);
+ GetMonitorInfo(hLeftMonitor, &info);
+ int iDesiredWidthOfLeftPane = info.rcMonitor.right - vSplitterWndRect.left;
+ int iDesiredWidthOfRightPane = vSplitterWndRect.right - info.rcMonitor.right;
+ SetColumnInfo(0, iDesiredWidthOfLeftPane, 0);
+ SetColumnInfo(1, iDesiredWidthOfRightPane, 0);
+ }
+ else
+ {
+ CRect vSplitterWndRect;
+ GetWindowRect(vSplitterWndRect);
+ SetColumnInfo(0, vSplitterWndRect.Width() / 2, 0);
+ SetColumnInfo(1, vSplitterWndRect.Width() / 2, 0);
+ }
+ }
+ CSplitterWnd::RecalcLayout();
+}
+
void CSplitterWndEx::OnSize(UINT nType, int cx, int cy)
{
CSplitterWnd::OnSize(nType, cx, cy);
Modified: trunk/Src/Common/SplitterWndEx.h
===================================================================
--- trunk/Src/Common/SplitterWndEx.h 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Src/Common/SplitterWndEx.h 2007-09-07 17:53:51 UTC (rev 4521)
@@ -28,6 +28,8 @@
void EqualizeRows();
void EqualizeCols();
+ virtual void RecalcLayout(); // call after changing sizes
+
private:
BOOL m_bBarLocked;
BOOL m_bResizePanes;
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Src/MainFrm.cpp 2007-09-07 17:53:51 UTC (rev 4521)
@@ -160,6 +160,7 @@
ON_UPDATE_COMMAND_UI(ID_TOOLBAR_SMALL, OnUpdateToolbarSmall)
ON_COMMAND(ID_TOOLBAR_BIG, OnToolbarBig)
ON_UPDATE_COMMAND_UI(ID_TOOLBAR_BIG, OnUpdateToolbarBig)
+ ON_WM_MOVE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -3310,6 +3311,14 @@
pCmdUI->SetRadio(enabled && toolbar == 1);
}
+
+void CMainFrame::OnMove(int, int)
+{
+ CChildFrame * pFrame = dynamic_cast<CChildFrame *>(GetActiveFrame());
+ if (pFrame)
+ pFrame->UpdateSplitter();
+}
+
/**
* @brief Ask user for close confirmation when closing the mainframe.
* This function asks if user wants to close multiple open windows when user
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-09-07 14:34:44 UTC (rev 4520)
+++ trunk/Src/MainFrm.h 2007-09-07 17:53:51 UTC (rev 4521)
@@ -295,6 +295,7 @@
afx_msg void OnUpdateToolbarSmall(CCmdUI* pCmdUI);
afx_msg void OnToolbarBig();
afx_msg void OnUpdateToolbarBig(CCmdUI* pCmdUI);
+ afx_msg void OnMove(int, int);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
@@ -324,3 +325,4 @@
#endif // !defined(AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
