Revision: 3640
http://svn.sourceforge.net/winmerge/?rev=3640&view=rev
Author: kimmov
Date: 2006-09-25 14:48:44 -0700 (Mon, 25 Sep 2006)
Log Message:
-----------
PATCH: [ 1564623 ] Manual: New screenshots for file compare
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Compare_files.xml
trunk/Docs/Users/Manual/Quick_start.xml
Added Paths:
-----------
trunk/Docs/Users/Manual/screenshots/file_headerbar1.png
trunk/Docs/Users/Manual/screenshots/filecomp1.png
trunk/Docs/Users/Manual/screenshots/filecomp_context1.png
trunk/Docs/Users/Manual/screenshots/filecomp_inlinediff.png
trunk/Docs/Users/Manual/screenshots/linediff.png
trunk/Docs/Users/Manual/screenshots/merge_menu.png
Removed Paths:
-------------
trunk/Docs/Users/Manual/screenshots/File_headerbar1.gif
trunk/Docs/Users/Manual/screenshots/Merge_menu.gif
trunk/Docs/Users/Manual/screenshots/filecomp1.gif
trunk/Docs/Users/Manual/screenshots/filecomp_context1.gif
trunk/Docs/Users/Manual/screenshots/filecomp_inlinediff.gif
trunk/Docs/Users/Manual/screenshots/linediff.gif
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-09-25 21:41:23 UTC (rev 3639)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-09-25 21:48:44 UTC (rev 3640)
@@ -3,6 +3,14 @@
Manual: Compare_dirs.xml Quick_start.xml
Manual/screenshots new file: foldercomp1.png
Manual/screenshots deleted file: dircomp1.gif
+ PATCH: [ 1564623 ] Manual: New screenshots for file compare
+ Manual: Compare_files.xml Quick_start.xml
+ Manual/screenshots new files: file_headerbar1.png filecomp1.png
+ filecomp_context1.png filecomp_inlinediff1.png linediff.png
+ merge_menu.png
+ Manual/screenshots deleted files: File_headerbar1.gif filecomp1.gif
+ filecomp_context1.gif filecomp_inlinediff.gif linediff.gif
+ Merge_menu.gif
2006-09-14 Tim
PATCH: [ 1558909 ] Manual: New <screen> layout (XSL)
Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml 2006-09-25 21:41:23 UTC (rev 3639)
+++ trunk/Docs/Users/Manual/Compare_files.xml 2006-09-25 21:48:44 UTC (rev 3640)
@@ -3,9 +3,9 @@
<title>Comparing Files</title>
<para>File compare window is basically two files opened to editor into two
- horizontal panes. Editing files is the big difference between 1.7.1 and
- newer versions. Editing allows user to easily do small changes without the
- need to open the files to other editor or development environment.</para>
+ horizontal panes. The editor allows user to do basic file editing inside
+ WinMerge without needing to open files to external editor program or
+ devepment environment.</para>
<para>WinMerge editor is not comparable to specialized editor programs, but
it has basic features like
@@ -23,7 +23,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="screenshots/filecomp1.gif" format="GIF" />
+ <imagedata fileref="screenshots/filecomp1.png" format="PNG" />
</imageobject>
</mediaobject>
@@ -45,7 +45,7 @@
<para><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/File_headerbar1.gif" format="GIF" />
+ <imagedata fileref="screenshots/file_headerbar1.png" format="PNG" />
</imageobject>
</inlinemediaobject></para>
@@ -53,15 +53,15 @@
than available space one part of the path is replaced with an ellipsis
(...). Headerbar also shows:<itemizedlist>
<listitem>
- <para>the current active file with sunken border (like in the above
- screenshot), the non-active file is shown with flat
- headerbar.</para>
+ <simpara>the current active file with sunken border (like in the
+ above screenshot), the non-active file is shown with flat
+ headerbar.</simpara>
</listitem>
<listitem>
- <para>if the file has been modified (has unsaved changes). This is
- indicated by adding asterisk (<guilabel>*</guilabel>) before the
- filename, like in the screenshot.</para>
+ <simpara>if the file has been modified (has unsaved changes). This
+ is indicated by adding asterisk (<guilabel>*</guilabel>) before the
+ filename, like in the screenshot.</simpara>
</listitem>
</itemizedlist></para>
@@ -84,23 +84,23 @@
<itemizedlist>
<listitem>
- <para><guilabel>Ln</guilabel> : current linenumber</para>
+ <simpara><guilabel>Ln</guilabel> : current linenumber</simpara>
</listitem>
<listitem>
- <para><guilabel>Col</guilabel>: current column for cursor and total
- number of columns in line</para>
+ <simpara><guilabel>Col</guilabel>: current column for cursor and total
+ number of columns in line</simpara>
</listitem>
<listitem>
- <para><guilabel>Ch</guilabel> : current char for cursor and total
- number of chars in line</para>
+ <simpara><guilabel>Ch</guilabel> : current char for cursor and total
+ number of chars in line</simpara>
</listitem>
<listitem>
- <para><guilabel>EOL</guilabel> : current line EOL style (shown only
+ <simpara><guilabel>EOL</guilabel> : current line EOL style (shown only
when <guilabel>Preserve original EOL chars</guilabel>-option is
- enabled)</para>
+ enabled)</simpara>
</listitem>
</itemizedlist>
@@ -127,19 +127,19 @@
<para>Lower line in statusbar shows current difference and amount of
differences. Text can be:<itemizedlist>
<listitem>
- <para><guilabel>Identical</guilabel> : files are identical there are
- no differences</para>
+ <simpara><guilabel>Identical</guilabel> : files are identical there
+ are no differences</simpara>
</listitem>
<listitem>
- <para><guilabel>X differences</guilabel> : amount of differences, no
- difference is selected</para>
+ <simpara><guilabel>X differences</guilabel> : amount of differences,
+ no difference is selected</simpara>
</listitem>
<listitem>
- <para><guilabel>Difference X of Y</guilabel> : amount of differences
- (<guilabel>Y</guilabel>) and number of selected difference
- (<guilabel>X</guilabel>)</para>
+ <simpara><guilabel>Difference X of Y</guilabel> : amount of
+ differences (<guilabel>Y</guilabel>) and number of selected
+ difference (<guilabel>X</guilabel>)</simpara>
</listitem>
</itemizedlist></para>
</sect2>
@@ -147,12 +147,16 @@
<sect2>
<title>Difference Navigation</title>
+ <indexterm>
+ <primary>Difference navigation (File compare)</primary>
+ </indexterm>
+
<para>Difference navigation commands are in <guimenu>Merge</guimenu>
menu:</para>
<para><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/Merge_menu.gif" format="GIF" />
+ <imagedata fileref="screenshots/merge_menu.png" format="PNG" />
</imageobject>
</inlinemediaobject></para>
@@ -165,12 +169,12 @@
<itemizedlist>
<listitem>
- <para>Double-click over difference with mouse</para>
+ <simpara>Double-click over difference with mouse</simpara>
</listitem>
<listitem>
- <para>Move cursor inside difference and select it with
- <guimenuitem>Current Difference</guimenuitem>.</para>
+ <simpara>Move cursor inside difference and select it with
+ <guimenuitem>Current Difference</guimenuitem>.</simpara>
</listitem>
</itemizedlist>
</sect3>
@@ -195,16 +199,16 @@
<para>This command has two important functions:<itemizedlist>
<listitem>
- <para>When there is no difference selected and cursor is inside
+ <simpara>When there is no difference selected and cursor is inside
difference, it selects this difference. This is very handy way to
- select difference from keyboard.</para>
+ select difference from keyboard.</simpara>
</listitem>
<listitem>
- <para>When there is selected difference, it scrolls to selected
+ <simpara>When there is selected difference, it scrolls to selected
difference. This is handy if user has scrolled selected difference
out of screen. So this allows user to scroll files to see other
- contents and quickly return back to selected difference.</para>
+ contents and quickly return back to selected difference.</simpara>
</listitem>
</itemizedlist></para>
</sect3>
@@ -229,6 +233,10 @@
<sect2>
<title>Merging Differences</title>
+ <indexterm>
+ <primary>Merging differences</primary>
+ </indexterm>
+
<para>Merging commands are located in <guimenu>Merge</guimenu>-menu after
navigation commands. Basically there are only two types of merging
commands - copy difference from right to left and copy difference from
@@ -288,19 +296,23 @@
<sect2>
<title>Merge Mode</title>
+ <indexterm>
+ <primary>Merge mode</primary>
+ </indexterm>
+
<para>Merge mode can be enabled from the <guimenu>File</guimenu>-menu. It
restores the WinMerge 1.7.1 single keys for difference merging and
navigating:</para>
<itemizedlist>
<listitem>
- <para><keycap>Up-</keycap> and <keycap>Down arrow</keycap> keys select
- previous and next difference</para>
+ <simpara><keycap>Up-</keycap> and <keycap>Down arrow</keycap> keys
+ select previous and next difference</simpara>
</listitem>
<listitem>
- <para><keycap>Left-</keycap> and <keycap>Right arrow</keycap> keys
- merge difference to left side or right side.</para>
+ <simpara><keycap>Left-</keycap> and <keycap>Right arrow</keycap> keys
+ merge difference to left side or right side.</simpara>
</listitem>
</itemizedlist>
@@ -364,12 +376,13 @@
<sect2>
<title>Line Difference Highlight</title>
- <para>Maybe the greatest new feature in WinMerge 2.4 is the difference
- highlight in all differences of the files.</para>
+ <para>WinMerge can automatically highlight all differences it finds in
+ lines. This makes it fast to look through and find differences. See
+ screenshot below for an example of highlighted differences.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="screenshots/filecomp_inlinediff.gif" />
+ <imagedata fileref="screenshots/filecomp_inlinediff.png" format="PNG" />
</imageobject>
</mediaobject>
@@ -398,15 +411,14 @@
<para>Many times it is useful to see exact differences inside lines.
WinMerge can highlight different area between lines. This feature is
- called <guilabel>Highlight File Diff</guilabel>. It is available in
+ called <guilabel>Select Line Difference</guilabel>. It is available in
<guimenu>Edit</guimenu>-menu, toolbar and shortcut key
(<keycap>F4</keycap>). In screenshot below there is one difference
- highlighted. First time whole difference area in one line is highlighted.
- Repeating cycles through individual changed words.</para>
+ highlighted</para>
<mediaobject>
<imageobject>
- <imagedata fileref="screenshots/linediff.gif" format="GIF" />
+ <imagedata fileref="screenshots/linediff.png" format="PNG" />
</imageobject>
</mediaobject>
</sect2>
@@ -419,7 +431,7 @@
<para><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/filecomp_context1.gif" format="GIF" />
+ <imagedata fileref="screenshots/filecomp_context1.png" format="PNG" />
</imageobject>
</inlinemediaobject></para>
@@ -445,25 +457,25 @@
<itemizedlist>
<listitem>
- <para>Simplified Chinese texts with the <guilabel>SimSun</guilabel> or
- <guilabel>SimHei</guilabel> fixed-width fonts</para>
+ <simpara>Simplified Chinese texts with the <guilabel>SimSun</guilabel>
+ or <guilabel>SimHei</guilabel> fixed-width fonts</simpara>
</listitem>
<listitem>
- <para>Traditional Chinese texts with the <guilabel>MingLiU</guilabel>
- fixed-width font, or</para>
+ <simpara>Traditional Chinese texts with the
+ <guilabel>MingLiU</guilabel> fixed-width font, or</simpara>
</listitem>
<listitem>
- <para>Japanese texts with the <guilabel>MS Gothic</guilabel> or
- <guilabel>MS Mincho</guilabel> fixed-width fonts</para>
+ <simpara>Japanese texts with the <guilabel>MS Gothic</guilabel> or
+ <guilabel>MS Mincho</guilabel> fixed-width fonts</simpara>
</listitem>
<listitem>
- <para>Korean texts with the <guilabel>GulimChe</guilabel> fixed-width
- font (not Gulim as this variant uses proportional-spacing glyphs that
- are not centered in grid cells and then poorly aligned in fixed-width
- mode)</para>
+ <simpara>Korean texts with the <guilabel>GulimChe</guilabel>
+ fixed-width font (not Gulim as this variant uses proportional-spacing
+ glyphs that are not centered in grid cells and then poorly aligned in
+ fixed-width mode)</simpara>
</listitem>
</itemizedlist>
</sect2>
Modified: trunk/Docs/Users/Manual/Quick_start.xml
===================================================================
--- trunk/Docs/Users/Manual/Quick_start.xml 2006-09-25 21:41:23 UTC (rev 3639)
+++ trunk/Docs/Users/Manual/Quick_start.xml 2006-09-25 21:48:44 UTC (rev 3640)
@@ -196,7 +196,7 @@
<para><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/filecomp1.gif" format="GIF" />
+ <imagedata fileref="screenshots/filecomp1.png" format="PNG" />
</imageobject>
</inlinemediaobject></para>
Deleted: trunk/Docs/Users/Manual/screenshots/File_headerbar1.gif
===================================================================
(Binary files differ)
Deleted: trunk/Docs/Users/Manual/screenshots/Merge_menu.gif
===================================================================
(Binary files differ)
Added: trunk/Docs/Users/Manual/screenshots/file_headerbar1.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/file_headerbar1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/Docs/Users/Manual/screenshots/filecomp1.gif
===================================================================
(Binary files differ)
Added: trunk/Docs/Users/Manual/screenshots/filecomp1.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/Docs/Users/Manual/screenshots/filecomp_context1.gif
===================================================================
(Binary files differ)
Added: trunk/Docs/Users/Manual/screenshots/filecomp_context1.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_context1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/Docs/Users/Manual/screenshots/filecomp_inlinediff.gif
===================================================================
(Binary files differ)
Added: trunk/Docs/Users/Manual/screenshots/filecomp_inlinediff.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_inlinediff.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/Docs/Users/Manual/screenshots/linediff.gif
===================================================================
(Binary files differ)
Added: trunk/Docs/Users/Manual/screenshots/linediff.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/linediff.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Docs/Users/Manual/screenshots/merge_menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/merge_menu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|