]> git.sur5r.net Git - glabels/commitdiff
Updated help screenshots.
authorJim Evins <evins@snaught.com>
Sun, 26 Dec 2010 22:30:15 +0000 (17:30 -0500)
committerJim Evins <evins@snaught.com>
Sun, 26 Dec 2010 22:30:15 +0000 (17:30 -0500)
Updated screenshots in help to be consistent with current development
version of glabels.  Updated help text to be consistent with the new
screenshots.

21 files changed:
help/C/editprop.page
help/C/figures/introduction-glabels-main-window.png
help/C/figures/main-window-empty.png [deleted file]
help/C/figures/merge-ex1-1.png
help/C/figures/merge-ex1-2.png
help/C/figures/merge-ex1-3.png
help/C/figures/merge-ex1-4.png
help/C/figures/merge-ex2-1.png
help/C/figures/merge-ex2-2.png
help/C/figures/merge-ex2-3.png
help/C/figures/merge-ex2-4.png
help/C/figures/merge-ex3-1.png [new file with mode: 0644]
help/C/figures/merge-ex3-2.png [new file with mode: 0644]
help/C/figures/merge-ex3-3.png [new file with mode: 0644]
help/C/figures/merge-ex3-4.png [new file with mode: 0644]
help/C/figures/object-editor-sidebar.png
help/C/figures/print-copies.png
help/C/figures/print-merge.png
help/C/merge-ex1.page
help/C/merge-ex2.page
help/C/merge-ex3.page

index 0723fefc97314a75443f22eba8ceab9dd577bb4b..07b4a40adf7b0b4d2a09fdea21f2f30fca8bc1c6 100644 (file)
 
 
       <section id="object-editor-shadow">
-       <title>Shadow Tabbed Section (All except image and barcode objects)</title>
+       <title>Shadow Tabbed Section (All except barcode objects)</title>
 
        <p>This section contains controls to add a shadow to an object.</p>
 
index b634317574eae3ce5a654f93b347e6c4b6ab1108..7d7b389dcd9515b4b401b00251b5e45b1bf9f1cd 100644 (file)
Binary files a/help/C/figures/introduction-glabels-main-window.png and b/help/C/figures/introduction-glabels-main-window.png differ
diff --git a/help/C/figures/main-window-empty.png b/help/C/figures/main-window-empty.png
deleted file mode 100644 (file)
index 305bd60..0000000
Binary files a/help/C/figures/main-window-empty.png and /dev/null differ
index f8673c1d7e9dfe1880f17810d5e668124e11c40d..19d68beef82a8a74289f9d58ef5ad537b38e5bc1 100644 (file)
Binary files a/help/C/figures/merge-ex1-1.png and b/help/C/figures/merge-ex1-1.png differ
index a87675aa06aa52dc08891d1547d0eb325834a978..f6633463c57a938d20f778ab06ccfab7c3d076e4 100644 (file)
Binary files a/help/C/figures/merge-ex1-2.png and b/help/C/figures/merge-ex1-2.png differ
index f31ecafe34ece80315e01b71631dfab606c15632..b9ad3477e82f1f04d36c59b5a04e9522707c72bf 100644 (file)
Binary files a/help/C/figures/merge-ex1-3.png and b/help/C/figures/merge-ex1-3.png differ
index 71e11864da8f52a893b8744460382c78f825f964..06a5743a5500b539e458b6cc79025acf0d624616 100644 (file)
Binary files a/help/C/figures/merge-ex1-4.png and b/help/C/figures/merge-ex1-4.png differ
index 1c64ed76d87b0d74b3e8ac0e45891e7e064a19fd..61be56c79da7cab56b924b7c5ea8b2d4bdeb3959 100644 (file)
Binary files a/help/C/figures/merge-ex2-1.png and b/help/C/figures/merge-ex2-1.png differ
index e1d8f2af0c5a9a7550ce59f0d781e5530a0ca9b2..580edc2c44f4c137f29b66bed1f22e73781ce413 100644 (file)
Binary files a/help/C/figures/merge-ex2-2.png and b/help/C/figures/merge-ex2-2.png differ
index baac803a92a338aeb2033cda28be9f810377205a..646618068b8191008d2a4af55a86fed8af47e5a4 100644 (file)
Binary files a/help/C/figures/merge-ex2-3.png and b/help/C/figures/merge-ex2-3.png differ
index 62d750c673a39ef79fc06d00e0a166de4639b3e3..3f53adfaf83d7a59b2d24a2d04147bbf9d200071 100644 (file)
Binary files a/help/C/figures/merge-ex2-4.png and b/help/C/figures/merge-ex2-4.png differ
diff --git a/help/C/figures/merge-ex3-1.png b/help/C/figures/merge-ex3-1.png
new file mode 100644 (file)
index 0000000..b3bc903
Binary files /dev/null and b/help/C/figures/merge-ex3-1.png differ
diff --git a/help/C/figures/merge-ex3-2.png b/help/C/figures/merge-ex3-2.png
new file mode 100644 (file)
index 0000000..80af644
Binary files /dev/null and b/help/C/figures/merge-ex3-2.png differ
diff --git a/help/C/figures/merge-ex3-3.png b/help/C/figures/merge-ex3-3.png
new file mode 100644 (file)
index 0000000..1dc127b
Binary files /dev/null and b/help/C/figures/merge-ex3-3.png differ
diff --git a/help/C/figures/merge-ex3-4.png b/help/C/figures/merge-ex3-4.png
new file mode 100644 (file)
index 0000000..3741595
Binary files /dev/null and b/help/C/figures/merge-ex3-4.png differ
index f0624a266a377bcd8b2b7ffe9e48b8750f1c2d36..118ac0aba818158c34f649a4c1b2fef0dc1c7f4c 100644 (file)
Binary files a/help/C/figures/object-editor-sidebar.png and b/help/C/figures/object-editor-sidebar.png differ
index d34d03c97cae00753bf436c4b9e1a98bc1208ba8..bcac68680195c9b0438e2ba34779df0133ddac0d 100644 (file)
Binary files a/help/C/figures/print-copies.png and b/help/C/figures/print-copies.png differ
index de654d095c82f100ad1f05784dc91e8930bed1a9..0d01733edf2bde30be435bf0fce2736d9d460c8b 100644 (file)
Binary files a/help/C/figures/print-merge.png and b/help/C/figures/print-merge.png differ
index 6ede570ce47eaa38bc95a32eab24067e6e9c6cc5..29ea44c789a4fe4cf21acb03e2fef8e267d7ba4c 100644 (file)
@@ -43,8 +43,8 @@ Name,Department,SN
         <guiseq> <gui>Objects</gui>
         <gui>Merge Properties</gui> </guiseq> menu item to display
         the <gui>merge properties</gui> dialog.  We use this dialog to
-        select the source type (in our case CSV) and the merge source (filename) as
-        shown.</p>
+        select the source type (in our case CSV with keys on line 1) and the merge
+       source (filename) as shown.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex1-1.png" mime="image/png" style="right">
@@ -52,11 +52,6 @@ Name,Department,SN
                </media>
       <!-- ==== End of Figure ==== -->
 
-      <p>Before applying the merge source, we uncheck the first record since it is only
-        column headers from our original <app>gnumeric</app> spreadsheet
-        and would simply waste our first label.  We could also unselect any other records
-        that we didn't want to print a label for.</p>
-
       <p>We can also view each record in more detail by clicking on the appropriate
         expander (the little triangles) as shown.  Once we are satisfied with the
         selections in this dialog we click <gui>OK</gui> to accept the
@@ -72,12 +67,12 @@ Name,Department,SN
 
       <p>In this example we have added three text objects and a barcode object.  The
         first text object contains only simple literal text ("Hello, my name is").  The
-        second text object contains a single merge field ("${1}") corresponding to the
+        second text object contains a single merge field ("${Name}") corresponding to the
         first field of a record (first column of a line) which contains the new crew
         member's full name.  The third text field contains both literal text
-        ("Department: ") followed by a single merge field ("${2}") corresponding to
+        ("Department: ") followed by a single merge field ("${Department}") corresponding to
         the second field or the crew member's department.  The barcode object is
-        configured to use field (or key) "3" which contains our crew member's
+        configured to use field (or key) "SN" which contains our crew member's
         starfleet serial number.</p>
 
       <p>Now we can print our name tags by selecting the
index f63d1fd3d54bd4effb5a9fc492e899db1d783a57..4dfef4fa3e859db7b2e9933453ca9b5492a31f7d 100644 (file)
@@ -45,8 +45,8 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
         <guiseq> <gui>Objects</gui>
         <gui>Merge Properties</gui> </guiseq> menu item to display
         the <gui>merge properties</gui> dialog.  We use this dialog to
-        select the source type (in our case CSV) and the merge source (filename) as
-        shown.</p>
+        select the source type (in our case CSV with keys on line 1) and the merge
+       source (filename) as shown.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex2-1.png" mime="image/png" style="right">
@@ -54,10 +54,9 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
                </media>
       <!-- ==== End of Figure ==== -->
 
-      <p>Before applying the merge source, we uncheck the first record since it is only
-        column headers from our original <app>gnumeric</app> spreadsheet
-        and would simply waste our first label.  We also unselect the second record
-        which is empty (an artifact of our original spreadsheet).  We could also unselect
+      <p>Before applying the merge source, we uncheck the first record since it only
+        contains empty fields.  It is an artifact of our original <app>gnumeric</app> spreadsheet
+        and would simply waste our first label.  We could also unselect
         any other records that we didn't want to print a label for.</p>
 
       <p>We can also view each record in more detail by clicking on the appropriate
@@ -75,7 +74,7 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
 
       <p>In this example we have a single text object.  This text object contains
         all of our merge fields organized on multiple lines as a mailing address.
-        Notice that fields ${4} and ${5} (corresponding to ADDR1 and ADDR2) are each
+        Notice that fields ${ADDR1} and ${ADDR2} are each
         located with no other text on their own lines.  When
         <app>glabels</app> encounters a field as the only text on
         a line, it will not expand the line if the field is empty.</p>
index ad07bbcf5b0462bfef9bf2857d436c98208c5b14..6505936bd730d7d4b6963118c10360c81237fa13 100644 (file)
@@ -85,7 +85,7 @@
         the print dialog as shown below.</p>
 
       <!-- ==== Figure ==== -->
-               <media type="image" src="figures/merge-ex2-3.png" mime="image/png" style="right">
+               <media type="image" src="figures/merge-ex3-3.png" mime="image/png" style="right">
                <p>Printing address labels</p>
                </media>
       <!-- ==== End of Figure ==== -->