[Winmerge-svn] SF.net SVN: winmerge: [3985] branches/R2_6/Docs/Users/Manual

[<ki...@us...>]

Revision: 3985
          http://svn.sourceforge.net/winmerge/?rev=3985&view=rev
Author:   kimmov
Date:     2006-12-20 06:45:12 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
PATCH: [ 1618935 ] Manual: Add screenshots and description for editor margin

Modified Paths:
--------------
    branches/R2_6/Docs/Users/Manual/Changes.txt
    branches/R2_6/Docs/Users/Manual/Compare_files.xml

Added Paths:
-----------
    branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin1.png
    branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin2.png

Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt	2006-12-20 14:42:21 UTC (rev 3984)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt	2006-12-20 14:45:12 UTC (rev 3985)
@@ -1,6 +1,9 @@
 2006-12-20 Kimmo
  PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different
   Manual: Faq.xml
+ PATCH: [ 1618935 ] Manual: Add screenshots and description for editor margin
+  Manual: Compare_files.xml
+  Manual/screenshots new files: filecomp_margin1.png filecomp_margin2.png
 
 2006-12-12 Kimmo
  Update revision number to 1.2.9 for new release

Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Compare_files.xml	2006-12-20 14:42:21 UTC (rev 3984)
+++ branches/R2_6/Docs/Users/Manual/Compare_files.xml	2006-12-20 14:45:12 UTC (rev 3985)
@@ -145,6 +145,34 @@
   </sect2>
 
   <sect2>
+    <title>Editor Margin</title>
+
+    <para>The editor panes (file panes) have gray margin area reserved for
+    line numbers and some symbols. If line numbers are not shown then margin
+    is shown like screenshot below.</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="screenshots/filecomp_margin1.png" format="PNG" />
+        </imageobject>
+      </inlinemediaobject></para>
+
+    <para>Blue circle is a Bookmark. And arrow marks word-wrapped line. Next
+    screenshot shows same lines without word-wrap and with linenumbers.</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="screenshots/filecomp_margin2.png" format="PNG" />
+        </imageobject>
+      </inlinemediaobject></para>
+
+    <para>The editor margin cannot be hidden, it is always visible. If
+    linenubmers are not visible it takes pretty minimal width. Note that with
+    linenumbers the margin width is set so that the longest line number fits
+    into it. So with long files it needs space for several numbers.</para>
+  </sect2>
+
+  <sect2>
     <title><indexterm>
         <primary>Difference Navigation</primary>
 

Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin1.png
===================================================================
(Binary files differ)


Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin2.png
===================================================================
(Binary files differ)


Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin2.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.