From: Jim Evins Date: Sun, 26 Dec 2010 22:30:15 +0000 (-0500) Subject: Updated help screenshots. X-Git-Tag: glabels-2_3_1~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73897c1e98299fff6a935757ede72b32cb838637;p=glabels Updated help screenshots. Updated screenshots in help to be consistent with current development version of glabels. Updated help text to be consistent with the new screenshots. --- diff --git a/help/C/editprop.page b/help/C/editprop.page index 0723fefc..07b4a40a 100644 --- a/help/C/editprop.page +++ b/help/C/editprop.page @@ -132,7 +132,7 @@
- Shadow Tabbed Section (All except image and barcode objects) + Shadow Tabbed Section (All except barcode objects)

This section contains controls to add a shadow to an object.

diff --git a/help/C/figures/introduction-glabels-main-window.png b/help/C/figures/introduction-glabels-main-window.png index b6343175..7d7b389d 100644 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 index 305bd609..00000000 Binary files a/help/C/figures/main-window-empty.png and /dev/null differ diff --git a/help/C/figures/merge-ex1-1.png b/help/C/figures/merge-ex1-1.png index f8673c1d..19d68bee 100644 Binary files a/help/C/figures/merge-ex1-1.png and b/help/C/figures/merge-ex1-1.png differ diff --git a/help/C/figures/merge-ex1-2.png b/help/C/figures/merge-ex1-2.png index a87675aa..f6633463 100644 Binary files a/help/C/figures/merge-ex1-2.png and b/help/C/figures/merge-ex1-2.png differ diff --git a/help/C/figures/merge-ex1-3.png b/help/C/figures/merge-ex1-3.png index f31ecafe..b9ad3477 100644 Binary files a/help/C/figures/merge-ex1-3.png and b/help/C/figures/merge-ex1-3.png differ diff --git a/help/C/figures/merge-ex1-4.png b/help/C/figures/merge-ex1-4.png index 71e11864..06a5743a 100644 Binary files a/help/C/figures/merge-ex1-4.png and b/help/C/figures/merge-ex1-4.png differ diff --git a/help/C/figures/merge-ex2-1.png b/help/C/figures/merge-ex2-1.png index 1c64ed76..61be56c7 100644 Binary files a/help/C/figures/merge-ex2-1.png and b/help/C/figures/merge-ex2-1.png differ diff --git a/help/C/figures/merge-ex2-2.png b/help/C/figures/merge-ex2-2.png index e1d8f2af..580edc2c 100644 Binary files a/help/C/figures/merge-ex2-2.png and b/help/C/figures/merge-ex2-2.png differ diff --git a/help/C/figures/merge-ex2-3.png b/help/C/figures/merge-ex2-3.png index baac803a..64661806 100644 Binary files a/help/C/figures/merge-ex2-3.png and b/help/C/figures/merge-ex2-3.png differ diff --git a/help/C/figures/merge-ex2-4.png b/help/C/figures/merge-ex2-4.png index 62d750c6..3f53adfa 100644 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 index 00000000..b3bc9034 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 index 00000000..80af644a 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 index 00000000..1dc127bc 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 index 00000000..37415957 Binary files /dev/null and b/help/C/figures/merge-ex3-4.png differ diff --git a/help/C/figures/object-editor-sidebar.png b/help/C/figures/object-editor-sidebar.png index f0624a26..118ac0ab 100644 Binary files a/help/C/figures/object-editor-sidebar.png and b/help/C/figures/object-editor-sidebar.png differ diff --git a/help/C/figures/print-copies.png b/help/C/figures/print-copies.png index d34d03c9..bcac6868 100644 Binary files a/help/C/figures/print-copies.png and b/help/C/figures/print-copies.png differ diff --git a/help/C/figures/print-merge.png b/help/C/figures/print-merge.png index de654d09..0d01733e 100644 Binary files a/help/C/figures/print-merge.png and b/help/C/figures/print-merge.png differ diff --git a/help/C/merge-ex1.page b/help/C/merge-ex1.page index 6ede570c..29ea44c7 100644 --- a/help/C/merge-ex1.page +++ b/help/C/merge-ex1.page @@ -43,8 +43,8 @@ Name,Department,SN Objects Merge Properties menu item to display the merge properties dialog. We use this dialog to - select the source type (in our case CSV) and the merge source (filename) as - shown.

+ select the source type (in our case CSV with keys on line 1) and the merge + source (filename) as shown.

@@ -52,11 +52,6 @@ Name,Department,SN -

Before applying the merge source, we uncheck the first record since it is only - column headers from our original gnumeric 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.

-

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 OK to accept the @@ -72,12 +67,12 @@ Name,Department,SN

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.

Now we can print our name tags by selecting the diff --git a/help/C/merge-ex2.page b/help/C/merge-ex2.page index f63d1fd3..4dfef4fa 100644 --- a/help/C/merge-ex2.page +++ b/help/C/merge-ex2.page @@ -45,8 +45,8 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207 Objects Merge Properties menu item to display the merge properties dialog. We use this dialog to - select the source type (in our case CSV) and the merge source (filename) as - shown.

+ select the source type (in our case CSV with keys on line 1) and the merge + source (filename) as shown.

@@ -54,10 +54,9 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207 -

Before applying the merge source, we uncheck the first record since it is only - column headers from our original gnumeric 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 +

Before applying the merge source, we uncheck the first record since it only + contains empty fields. It is an artifact of our original gnumeric 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.

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

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 glabels encounters a field as the only text on a line, it will not expand the line if the field is empty.

diff --git a/help/C/merge-ex3.page b/help/C/merge-ex3.page index ad07bbcf..6505936b 100644 --- a/help/C/merge-ex3.page +++ b/help/C/merge-ex3.page @@ -85,7 +85,7 @@ the print dialog as shown below.

- +

Printing address labels