simple compile fix

also a bunch of new screenshots which need to be backported to 1.6


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4897 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,13 @@
+2001-07-05  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/gnome/druid-qif-import.c: fix syntax bug.
+
+	* doc/sgml/C/image/<lots.png>: new and updated screenshots.
+
+	* doc/sgml/C/image/Makefile.am: include new files.
+
+	* doc/sgml/C/{lots}.sgml: update for new screenshots.
+
 2001-07-04  Bill Gribble  <grib@billgribble.com>
 
 	* src/gnome/druid-qif-import.c: fix cut-n-paste error in 

doc/sgml/C/image/Makefile.am

@@ -6,6 +6,8 @@ image_DATA = \
   appr-income.png \
   appr-main1.png \
   appr-main2.png \
+  asset-barchart.png \
+  asset-piechart.png \
   autosplitledger.png \
   bal-graph.png \
   basicledger.png \
@@ -15,12 +17,20 @@ image_DATA = \
   depr-main.png \
   editaccount.png \
   expand.png \
+  financial-calculator.png \
   foliowin-single.png \
   foliowin.png \
   foreign-currency.png \
+  general-ledger.png \
+  income-barchart.png \
+  income-piechart.png \
   logo-NetBSD-banner.png \
   logo-debian.png \
   logo-linux.png \
+  mdi-notebook.png \
+  mdi-onewindow.png \
+  mdi-toplevel.png \
+  menu-and-toolbar.png \
   newaccwin-code.png \
   newaccwin-trade.png \
   new-user-frame1.png \
@@ -36,6 +46,7 @@ image_DATA = \
   prefs-register-colors.png \
   prefs-register.png \
   prefs-user-info.png \
+  pricedb.png \
   recnwin.png \
   recninfo.png \
   regwin-double.png \

doc/sgml/C/xacc-asset-liability-barcharts.sgml

@@ -4,14 +4,20 @@
 </artheader>
 <sect1>
 <title></title>
-<para><emphasis>PICTURES NEEDED!!!!</emphasis> 
-</para>
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="image/asset-barchart.png">
+</imageobject>
+</mediaobject>
+</screenshot>
 <para>These reports allow you to display home one, some,
 or all of your assets or liabilities change over time.  
 If you want a barchart showing an overall picture of
 your net worth, use the <link linkend="xacc-net-worth-barchart">
 	  Net Worth Barchart</link> instead.</para>
-      
+
+<para>Options available for this report include:</para>
       <itemizedlist>
 	<listitem><para><emphasis><link linkend="xacc-options-accounts">
 		Accounts</link></emphasis></para>

doc/sgml/C/xacc-asset-liability-piecharts.sgml

@@ -4,8 +4,13 @@
 </artheader>
 <sect1>
 <title></title>
-<para><emphasis>PICTURES NEEDED!!!!</emphasis> 
-</para>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/asset-piechart.png">
+	    </imageobject>
+	</mediaobject>
+      </screenshot>
 <para>These piecharts are useful for getting an
 view of how your assets and liabilities are categorized.
 By selecting options appropriately, you can examine, say,

doc/sgml/C/xacc-calculator.sgml

@@ -22,7 +22,13 @@
 	To use the financial calculator, find it on the "tools" menu.
 	</para>
 
-      <para><emphasis>PICTURE NEEDED</emphasis></para>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/financial-calculator.png">
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
 
       <para>To do a calculation, simply enter the figures that you <emphasis>do</emphasis>
 	have into the text boxes on the left, and select the appropriate compounding and

doc/sgml/C/xacc-common-report-options.sgml

@@ -1,4 +1,4 @@
-<article ID="XACC-COMMON-REPORT-OPTIONS"
+<article ID="XACC-COMMON-REPORT-OPTIONS">
 <artheader>
 <title>Common Report Options</title>
 </artheader>
@@ -37,6 +37,14 @@ types of accounts - for instance, an expense piechart only allows
 expense accounts to be selected.  </para>
 </listitem>
 
+<listitem>
+<para><emphasis><anchor id="xacc-options-show-full-names">Show full 
+Account Names</emphasis></para>
+<para>Many reports and graphs let you select whether to display short
+account names (for example "power") or full account names (for example
+"utilities:power").</para>
+</listitem>
+
 <listitem>
 <para><emphasis><anchor id="xacc-options-include-subaccounts">
 Include Subaccounts?</emphasis></para>
@@ -86,7 +94,17 @@ this currency for graphical display or summarization.</para>
 You can choose a weighted average of prices over all transactions, 
 prices at current values, or prices at the time of the report date.</para>
 </listitem>
-</itemizedlist>
-</para>
+<listitem>
+	<para><emphasis><anchor id="xacc-options-graph-totals">Totals</emphasis></para>
+	<para>Some piecharts display totals in the chart legend if this option is
+	  selected.
+	  </para></listitem>
+
+<listitem>
+	<para><emphasis><anchor id="xacc-options-max-slices">Maximum Slices</emphasis></para>
+	<para>Controls the maximum number of slices displayed in a piechart - other accounts
+	  will be placed in a slice marked "other".
+	</para>
+	</listitem></itemizedlist>
 </sect1>
 </article>

doc/sgml/C/xacc-gnome-mdi.sgml

@@ -3,8 +3,7 @@
 <title>The Gnome MDI</title>
 </artheader>
 
-<para><emphasis>PICTURES NEEDED!!!!</emphasis> 
-</para>
+
 <para>GnuCash can display multiple views of your finances at once, in 
 multiple windows, a tabbed "notebook" style, or in one plain window.
 This facility is provided through the GNOME MDI (multiple document
@@ -16,7 +15,13 @@ new view can be displayed in several ways.
 
 <sect1 id="xacc-notebook-view">
 <title>Notebook View</title>
-<para><emphasis>Picture Needed Here!</emphasis></para>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/mdi-notebook.png">
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
 <para>Notebook view puts all new views in the main window, but places
 them on named tabs - just like a real notebook, in fact.  You can bring
 a notebook tab to the front by clicking on it.</para>
@@ -24,7 +29,14 @@ a notebook tab to the front by clicking on it.</para>
 
 <sect1 id="xacc-multiple-windows-view">
 <title>Multiple Windows</title>
-<para><emphasis>Picture Needed Here!</emphasis></para>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/mdi-toplevel.png">
+	   
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
 <para>If this mode is selected, a new top-level window will be created
 for the new view.  You can move and resize this window any way you
 want, independently of the original gnucash main window.  If you have
@@ -35,7 +47,14 @@ move it onto a to a different one.
 
 <sect1 id="xacc-single-window-view">
 <title>Single Window</title>
-<para><emphasis>Picture Needed Here!</emphasis></para>
+<screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/mdi-onewindow.png">
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
+
 <para>The single-window view works like the notebook view, except
 that instead of using tabs to select which report/account 
 tree you wish to view, you can select them from the Window menu.

doc/sgml/C/xacc-income-expense-barcharts.sgml

@@ -4,9 +4,48 @@
 </artheader>
 <sect1>
 <title></title>
-<para><emphasis>PICTURES NEEDED!!!!</emphasis> 
-</para>
-<para>This is not yet documented.</para>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="image/income-barchart.png">
+</imageobject>
+</mediaobject>
+</screenshot>
+
+<para>These reports allow you to track how various expenses change over 
+      a period of time.</para>
+
+<para>Options available for this report include:</para>
+      <itemizedlist>
+	<listitem><para><emphasis><link linkend="xacc-options-accounts">
+		Accounts</link></emphasis></para>
+	</listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-report-title">
+		Report Title</link></emphasis></para></listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-date">
+		From & To</link></emphasis></para></listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-interval">
+		Step Size</link></emphasis></para>
+	</listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-style-sheet">
+		Style Sheet</link></emphasis></para>
+	</listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-price-source">
+		Price Source</link></emphasis></para>
+	</listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-max-slices">
+		Maximum Slices</link></emphasis></para>
+	</listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-plot-dimensions">
+		Width & Height</link></emphasis></para>
+	</listitem>
+	<listitem><para><emphasis><link linkend="xacc-options-graph-totals">Show Totals:</link></emphasis></para></listitem>
+	<listitem>
+	  <para><emphasis><link linkend="xacc-options-show-full-names">Show Long Account Names</link></emphasis></para>
+	</listitem>
+
+      </itemizedlist>
 </sect1>
 </article>
 

doc/sgml/C/xacc-multicolumn-view-reports.sgml

@@ -4,8 +4,13 @@
 </artheader>
 <sect1>
 <title></title>
-<para><emphasis>PICTURES NEEDED!!!!</emphasis> 
-</para>
+<screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/multicolumn-view.png">
+	  </imageobject>
+	</mediaobject>
+	</screenshot>
 <para>If you want to display multiple reports in a single window, 
 you can use the multicolumn view display .</para>
 </sect1>

doc/sgml/C/xacc-price-editor.sgml

@@ -19,7 +19,14 @@
       <para>The price editor is available from the "Tools" menu. Selecting
 	it brings up the editor:</para>
       
-      <para><emphasis>PICTURE NEEDED</emphasis></para>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/pricedb.png">
+	    
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
       
       <para>Each entry in the editor shows a record of a price:</para>
       <itemizedlist>

doc/sgml/C/xacc-regwin.sgml

@@ -1,4 +1,4 @@
-<article id="XACC-REGWIN">
+<article id="xacc-regwin">
  <title>The Account Register</title>
   <sect1>
    <title>Introduction</title>
@@ -142,21 +142,25 @@
     Date Range</guimenuitem><guimenuitem>Show All</guimenuitem></menuchoice>.
    </para>
   </sect2>
-    <sect2 id=xacc-general-ledger>
+    <sect2 id="xacc-general-ledger">
 	<title>
 	The General Ledger
 	</title>
-	  <para>
-	  The general ledger is a special register which contains entries
-	  for more than one, account.  You can get a general ledger for
-	  an account and its subaccounts by using the <guimenu>Open subaccounts</guimenu>
-	  menu item on an account window, or a general ledger for <emphasis>
-	    every</emphasis> account by selecting <guimenu>General Ledger</guimenu>
-	  in the <guimenu>Tools</guimenu> main menu item.
-	  </para>
-	<para>
-	  <emphasis>FIXME: Picture probably needed</emphasis>
-	</para>
+      <para>
+	The general ledger is a special register which contains entries
+	for more than one, account.  You can get a general ledger for
+	an account and its subaccounts by using the <guimenu>Open subaccounts</guimenu>
+	menu item on an account window, or a general ledger for <emphasis>
+	  every</emphasis> account by selecting <guimenu>General Ledger</guimenu>
+	in the <guimenu>Tools</guimenu> main menu item.
+      </para>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="image/general-ledger.png">
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
 	<para>
 	  General ledgers show the ledger entries in all the accounts
 	  a transaction appears in, which you can edit directly.  Note

doc/sgml/C/xacc-toplevel.sgml

@@ -4,8 +4,13 @@
 </artheader>
 <sect1>
 <title>The Main Menu</title>
-<para><emphasis>PICTURES NEEDED!!!!</emphasis> 
-</para>
+<screenshot>
+   <mediaobject>
+      <imageobject>
+         <imagedata fileref="image/menu-and-toolbar.png">
+	  </imageobject>
+	</mediaobject>
+      </screenshot>
 <para>The main menu is displayed above all top-level windows, and is
 a gateway to everything that GnuCash can do, including file operations, 
 reports, account operations, window operations, and getting help.

doc/sgml/C/xacc-whats-new.sgml

@@ -163,10 +163,17 @@
 	use of the GUPPI plotting tool.
       </para>
       <para>
-	We could talk about the graphs all day, but it's probably
-	more interesting to show you just how good they look:
-      </para>
-      <para><emphasis>PICTURES NEEDED!</emphasis></para>
+	We could talk about the graphs all day, but they're 
+	  much more interesting to look at than talk about - 
+	  for example:
+	  </para>
+	<screenshot>
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="image/asset-piechart.png">
+	    </imageobject>
+	  </mediaobject>
+	</screenshot>
     </sect2>
 
     <sect2>

src/gnome/druid-qif-import.c

@@ -1396,7 +1396,7 @@ gnc_ui_qif_import_commodity_prepare_cb(GnomeDruidPage * page,
 
   /* insert new pages, one for each stock */
   stocks = wind->new_stocks;
-  while(!gh_null_p(stocks) && (stocks != SCM_BOOL_F))) {
+  while(!gh_null_p(stocks) && (stocks != SCM_BOOL_F)) {
     comm_ptr_token = gh_call2(hash_ref, wind->stock_hash, gh_car(stocks));
     commodity      = gw_wcp_get_ptr(comm_ptr_token);