New upstream version 4.2.4aupstream/4.2.4a

6 files changed, 22 insertions, 49 deletions

diff --git a/app/doc/filem.but b/app/doc/filem.but
index 10eb969..a47452e 100644
--- a/app/doc/filem.but
+++ b/app/doc/filem.but
@@ -134,6 +134,8 @@ The dialog contains a list of parameter files.  Each file is preceded by a check
 
 Loaded definition files associated with current scale settings appear on the \f{Hot Bar} (\K{cmdHotBar}).  If you \e{unload} a file the definitions are removed from the selection lists and the \f{Hot Bar}.  An unloaded file may be \e{reloaded} by selecting the  \f{Reload} button (The \f{Unload} button changes to \f{Reload} when a selected file is unloaded).
 
+It is possible to change the state of several files at once. The \f{Select All} button allows you to select all parameter files for the next operation.
+
 \e{Unloaded} files are removed from the list when \e{XTrackCAD} terminates.
 
 Files can be listed by either their file name or by their contents description. This is controlled by the \f{Show File Names} check box.
@@ -269,68 +271,24 @@ The \f{Printer Setup} dialog allows you to configure the application's use of th
 
 The \f{Printer Setup} window contains:
 
-\dd \f{Printer} - a list to select a particular printer.  The entries on this list are defined by \c{printer} lines in the \c{~/.xtrkcad/xtrkcad.rc} file.  The first entry, 'File', causes printouts to be sent to a file.  You will be prompted for a file name when doing a print.
-
-\u000
-
-\dd \f{Paper Size} - a list of various North American and European paper sizes.
+\dd \f{Format for} - a list to select a particular printer.  The entries on this list are defined by \c{printer} lines in the \c{~/.xtrkcad/xtrkcad.rc} file.  The first entry, 'File', causes printouts to be sent to a file.  You will be prompted for a file name when doing a print.
 
 \u000
 
-\dd \f{Margins} - non-printable margins for particular printers.  You can adjust these entries or select a printer type from the list.  To add margins for a new printer, enter the printer's name and then enter the margin for each edge.  You can use \f{Print Test Page} to determine the margins for your printer.
+\dd \f{Paper Size} - a list of various supported paper sizes.
 
 \u000
 
-\dd The \f{Delete} button removes a printer from the margin list.
+\dd \f{Orientation} - a Radio button to select various Landscape or Portrait formats.
 
 \u000
 
-\dd \f{Format} - a Radio button to select either Landscape or Portrait format.
-
-\u000
-
-\dd \f{X Font} and \f{PS Font} - specifies the mapping between the displays X Font and the corresponding Postscript Font.  You can change the Postscript font for a specified X Font by typing the new font name in the \f{PS Font} field.  The \e{font alias} map will be printed on the \f{Print Test Page}.
-
-\u000
-
-\dd \f{Factor} - adjusts the scaling between X Font and Postscript Font sizes.  Due to differences between the two font systems, text size may be of slightly different between the display and printer. This option allows you to adjust the font size.  Normally only a small adjustment is required, (like 0.950).
-
-\u000
-
-\dd \f{OK} - updates the data and ends the dialog.
+\dd \f{Apply} - updates the data and ends the dialog.
 
 \u000
 
 \dd \f{Cancel} - ends the dialog without update.
 
-\u000
-
-\dd \f{Print Test Page} - prints a test page you can use to determine the printer margins.
-
-\u000
-
-The formats of the \e{printer} entries are:
-
-\dd PRINTER.Iprinter-num: Iprinter-name\e{=}Icommand
-
-\u000
-
-\dd where:
-
-\lcont{
-
-\dd \c{Iprinter-num} is the next value in a sequential list (starting at \f{1}, \f{0} is reserved for \f{FILE}). \f{printer.1} is predefined as \c{lp=lpr -P%s}.
-
-\dd \c{Iprinter-name} is the name of the printer as it appears in the \f{Printer} selection list.
-
-\dd \c{Icommand} is the command to invoke where \e{%s} will be replaced by the \c{Iprinter-name}.
-
-}
-
-To add a new printer, select the next value for Iprinter-num and add the printer line with the name and print command.
-
-Printing generates Postscript data which is sent to the specified printer (or File).  The names of fonts differs between the X Window System and Postscript and there is no formula to convert them.  The printing system uses a \e{font alias} map to convert from X font names to Postscript font names.  Font aliases for the common Postscript fonts are predefined but you must supply an alias for unknown fonts.  The 'Font Alias' window will be shown whenever you are printing an unknown font.  You will be asked to supply a Postscript font name for a X font.  You can change the \e{font alias} mapping by using the \f{X Font} and \f{PS Font} entries on the \f{Printer Setup} dialog.
-
 \rule
 
 \S2{MS-Windows} \i{Microsoft Windows}
@@ -371,4 +329,4 @@ The \f{Printer Setup} window contains:
 
 \dd \f{Orientation} - a Radio button to select either Landscape or Portrait format.
 
-\rule
\ No newline at end of file
+\rule
diff --git a/app/doc/navigation.but b/app/doc/navigation.but
index c2c492b..a11e4fa 100644
--- a/app/doc/navigation.but
+++ b/app/doc/navigation.but
@@ -219,6 +219,8 @@ The size of the \e{Map Window} changes when you change the Room Size (see \K{cmd
 
 If you close the \e{Map Window}, you can reopen it by the \e{Window} menu.
 
+Visibility of the \e{Map Window} can be toggled by pressing \e{Ctrl+Space}
+
 \rule
 
 
@@ -687,6 +689,15 @@ Note Dialog
 
 }
 
+\u000
+
+\dd Map Window:
+
+\lcont{ 
+
+\b On / Off - \e{Ctrl+Space}
+
+}
 }
 
 \rule
diff --git a/app/doc/png.d/dprmfile.png b/app/doc/png.d/dprmfile.png
index 483eb92..7e10970 100644
--- a/app/doc/png.d/dprmfile.png
+++ b/app/doc/png.d/dprmfile.png
diff --git a/app/doc/png.d/mview.png b/app/doc/png.d/mview.png
index 1593954..9def0b8 100644
--- a/app/doc/png.d/mview.png
+++ b/app/doc/png.d/mview.png
diff --git a/app/doc/png.d/printset.png b/app/doc/png.d/printset.png
index 27e7770..20b307f 100644
--- a/app/doc/png.d/printset.png
+++ b/app/doc/png.d/printset.png
diff --git a/app/doc/view_winm.but b/app/doc/view_winm.but
index f1cee8d..eecb843 100644
--- a/app/doc/view_winm.but
+++ b/app/doc/view_winm.but
@@ -29,6 +29,10 @@ The \f{View Menu} shows commands affecting the display of the \f{Main Canvas} (\
 
 \u000
 
+\dd \f{ Show Map} - Toggles display of the \f{Map Window} on and off.
+
+\u000
+
 \dd \f{Tool-bar} - Command button groups displayed on the \f{Tool-bar} are selected using the Tool-bar Configuration Menu (\K{toolbarM}).
 
 \u000