GNOME.org
 

[glabels] Updated help screenshots.

commit 73897c1e98299fff6a935757ede72b32cb838637
Author: Jim Evins <evins snaught com>
Date:   Sun Dec 26 17:30:15 2010 -0500

    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.

 help/C/editprop.page                               |    2 +-
 .../C/figures/introduction-glabels-main-window.png |  Bin 73394 -> 61674 bytes
 help/C/figures/main-window-empty.png               |  Bin 24965 -> 0 bytes
 help/C/figures/merge-ex1-1.png                     |  Bin 33290 -> 38274 bytes
 help/C/figures/merge-ex1-2.png                     |  Bin 65785 -> 58969 bytes
 help/C/figures/merge-ex1-3.png                     |  Bin 25588 -> 43961 bytes
 help/C/figures/merge-ex1-4.png                     |  Bin 42154 -> 56557 bytes
 help/C/figures/merge-ex2-1.png                     |  Bin 32534 -> 38405 bytes
 help/C/figures/merge-ex2-2.png                     |  Bin 54708 -> 55981 bytes
 help/C/figures/merge-ex2-3.png                     |  Bin 24091 -> 39367 bytes
 help/C/figures/merge-ex2-4.png                     |  Bin 35276 -> 44112 bytes
 help/C/figures/merge-ex3-1.png                     |  Bin 0 -> 41824 bytes
 help/C/figures/merge-ex3-2.png                     |  Bin 0 -> 50078 bytes
 help/C/figures/merge-ex3-3.png                     |  Bin 0 -> 39537 bytes
 help/C/figures/merge-ex3-4.png                     |  Bin 0 -> 45455 bytes
 help/C/figures/object-editor-sidebar.png           |  Bin 33661 -> 12059 bytes
 help/C/figures/print-copies.png                    |  Bin 6642 -> 50499 bytes
 help/C/figures/print-merge.png                     |  Bin 7866 -> 36678 bytes
 help/C/merge-ex1.page                              |   15 +++++----------
 help/C/merge-ex2.page                              |   13 ++++++-------
 help/C/merge-ex3.page                              |    2 +-
 21 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/help/C/editprop.page b/help/C/editprop.page
index 0723fef..07b4a40 100644
--- a/help/C/editprop.page
+++ b/help/C/editprop.page
@@ -132,7 +132,7 @@
 
 
       <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>
 
diff --git a/help/C/figures/introduction-glabels-main-window.png b/help/C/figures/introduction-glabels-main-window.png
index b634317..7d7b389 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/merge-ex1-1.png b/help/C/figures/merge-ex1-1.png
index f8673c1..19d68be 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 a87675a..f663346 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 f31ecaf..b9ad347 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 71e1186..06a5743 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 1c64ed7..61be56c 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 e1d8f2a..580edc2 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 baac803..6466180 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 62d750c..3f53adf 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 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
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
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
index 0000000..3741595
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 f0624a2..118ac0a 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 d34d03c..bcac686 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 de654d0..0d01733 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 6ede570..29ea44c 100644
--- a/help/C/merge-ex1.page
+++ b/help/C/merge-ex1.page
@@ -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
diff --git a/help/C/merge-ex2.page b/help/C/merge-ex2.page
index f63d1fd..4dfef4f 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
         <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>
diff --git a/help/C/merge-ex3.page b/help/C/merge-ex3.page
index ad07bbc..6505936 100644
--- a/help/C/merge-ex3.page
+++ b/help/C/merge-ex3.page
@@ -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 ==== -->
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]