Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/JMRI/JMRI
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielBoudreau committed Jan 15, 2020
2 parents 24b4909 + 14340d2 commit 0d5451d
Show file tree
Hide file tree
Showing 32 changed files with 590 additions and 980 deletions.
60 changes: 0 additions & 60 deletions help/en/html/Sidebar

This file was deleted.

135 changes: 135 additions & 0 deletions help/en/html/apps/index-compactside.shtml
@@ -0,0 +1,135 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">

<html lang="en">
<head>
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>JMRI: Applications</title>
<!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
media="screen">
<link rel="stylesheet" type="text/css" href="/css/print.css"
media="print">
<link rel="icon" href="/images/jmri.ico" type="image/png">
<link rel="home" title="Home" href="/">
<!-- /Style -->
</head>

<body>
<!--#include virtual="/Header" -->
<div id="mBody">
<!--#include virtual="/help/en/html/sidebar-compact.shtml" -->
<div id="mainContent">
<!-- Page Body -->

<h1>JMRI: Applications</h1>

<p>JMRI provides several applications that are optimized for
specific purposes. You can of course also <a href=
"../doc/Technical/index.shtml#writecode">write your
own</a>.</p>

<dl>
<dt>
<a href="./DecoderPro/index.shtml">DecoderPro&reg;</a>
</dt>

<dd>A better tool for programming decoders. DecoderPro
simplifies the job of configuring complicated DCC decoders
by providing screens on which you can select the various
options and values you want.<br>
Open DecoderPro by double clicking its icon in the JMRI
installation folder.</dd>

<dt>
<a href="./PanelPro/index.shtml">PanelPro&trade;</a>
</dt>

<dd>Operating CRT based CTC control panels that reflect the
real-time state of your railroad <em>and</em> let you
control it - almost like a Prototype dispatcher!<br>
Open PanelPro by double clicking its icon in the JMRI
installation folder.</dd>

<dt>
<a href="./DispatcherPro/index.shtml">DispatcherPro&trade;</a>
</dt>

<dd>A system for Dispatching, grouping your Roster and
Throttles.</dd>

<dt>
<a href="../../package/jmri/jmrit/operations/Operations.shtml">OperationsPro&trade;</a>
</dt>

<dd>Create Train Manifests that detail the work your train
crews will perform during an operations session. The
Manifest lists of car pick up and set outs, shows where the
cars are located, and provides the cars' destinations.</dd>

<dt>
<a href="./SoundPro/SoundPro.shtml">SoundPro</a>
</dt>

<dd>A set of tools for using Audio with JMRI.<br>
Open SoundPro by double clicking its icon in the JMRI
installation folder.</dd>
</dl>

<h2><a name="addonApplications" id=
"addonApplications">Aditional Applications with JMRI Connections...</a></h2>
Hobbyists have created applications that work with JMRI
to provide extra capabilities.

<dl>
<dt>
<a href=
"./ManifestCreator/index.shtml">Mainfest Creator</a>
</dt>

<dd>Manifest Creator is an Excel-based
add-on to JMRI that can provide
train manifests and switch lists
in a number of formats.</dd>

<dt>
<a href=
"./TrainCrew/index.shtml">TrainCrew</a>
</dt>

<dd>TrainCrew allows engineers and conductors
using wireless throttles to add
realism to their operations.</dd>

<dt>
<a href=
"http://cats4ctc.wikidot.com">CATS</a>
</dt>

<dd>CATS provides a modern dispatching screen for
your model railroad.</dd>

</dl>


<h2>JMRI Tools</h2>

<ul>
<li>Common <a href="../tools/index.shtml">Tools and
features</a> to set up and operate your layout shared by
most JMRI applications.</li>

<li><a href=
"../tools/index.shtml#systemSpecificTools">System-specific
Tools</a> are available in most of the JMRI applications
from their own menu when you have JMRI configured for that
System Connection.</li>
</ul><!--#include virtual="/Footer" -->
</div><!-- close #mainContent -->
</div><!-- close #mBody -->
</body>
</html>
135 changes: 135 additions & 0 deletions help/en/html/apps/index-newside.shtml
@@ -0,0 +1,135 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">

<html lang="en">
<head>
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>JMRI: Applications</title>
<!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
media="screen">
<link rel="stylesheet" type="text/css" href="/css/print.css"
media="print">
<link rel="icon" href="/images/jmri.ico" type="image/png">
<link rel="home" title="Home" href="/">
<!-- /Style -->
</head>

<body>
<!--#include virtual="/Header" -->
<div id="mBody">
<!--#include virtual="/help/en/html/sidebar-new.shtml" -->
<div id="mainContent">
<!-- Page Body -->

<h1>JMRI: Applications</h1>

<p>JMRI provides several applications that are optimized for
specific purposes. You can of course also <a href=
"../doc/Technical/index.shtml#writecode">write your
own</a>.</p>

<dl>
<dt>
<a href="./DecoderPro/index.shtml">DecoderPro&reg;</a>
</dt>

<dd>A better tool for programming decoders. DecoderPro
simplifies the job of configuring complicated DCC decoders
by providing screens on which you can select the various
options and values you want.<br>
Open DecoderPro by double clicking its icon in the JMRI
installation folder.</dd>

<dt>
<a href="./PanelPro/index.shtml">PanelPro&trade;</a>
</dt>

<dd>Operating CRT based CTC control panels that reflect the
real-time state of your railroad <em>and</em> let you
control it - almost like a Prototype dispatcher!<br>
Open PanelPro by double clicking its icon in the JMRI
installation folder.</dd>

<dt>
<a href="./DispatcherPro/index.shtml">DispatcherPro&trade;</a>
</dt>

<dd>A system for Dispatching, grouping your Roster and
Throttles.</dd>

<dt>
<a href="../../package/jmri/jmrit/operations/Operations.shtml">OperationsPro&trade;</a>
</dt>

<dd>Create Train Manifests that detail the work your train
crews will perform during an operations session. The
Manifest lists of car pick up and set outs, shows where the
cars are located, and provides the cars' destinations.</dd>

<dt>
<a href="./SoundPro/SoundPro.shtml">SoundPro</a>
</dt>

<dd>A set of tools for using Audio with JMRI.<br>
Open SoundPro by double clicking its icon in the JMRI
installation folder.</dd>
</dl>

<h2><a name="addonApplications" id=
"addonApplications">Aditional Applications with JMRI Connections...</a></h2>
Hobbyists have created applications that work with JMRI
to provide extra capabilities.

<dl>
<dt>
<a href=
"./ManifestCreator/index.shtml">Mainfest Creator</a>
</dt>

<dd>Manifest Creator is an Excel-based
add-on to JMRI that can provide
train manifests and switch lists
in a number of formats.</dd>

<dt>
<a href=
"./TrainCrew/index.shtml">TrainCrew</a>
</dt>

<dd>TrainCrew allows engineers and conductors
using wireless throttles to add
realism to their operations.</dd>

<dt>
<a href=
"http://cats4ctc.wikidot.com">CATS</a>
</dt>

<dd>CATS provides a modern dispatching screen for
your model railroad.</dd>

</dl>


<h2>JMRI Tools</h2>

<ul>
<li>Common <a href="../tools/index.shtml">Tools and
features</a> to set up and operate your layout shared by
most JMRI applications.</li>

<li><a href=
"../tools/index.shtml#systemSpecificTools">System-specific
Tools</a> are available in most of the JMRI applications
from their own menu when you have JMRI configured for that
System Connection.</li>
</ul><!--#include virtual="/Footer" -->
</div><!-- close #mainContent -->
</div><!-- close #mBody -->
</body>
</html>
32 changes: 32 additions & 0 deletions help/en/html/sidebar-compact.shtml
@@ -0,0 +1,32 @@
<!-- Compact version of sidebar -->
<!-- Sidebar-compact.shtml -->
<!-- This is the common sidebar definition for Help system pages -->
<hr class="hide">

<div id="side"> <!-- Block of text on left side of page -->
<div style="text-align: center">JMRI&reg; is...</div>
<dl>

<!--#include virtual="/help/en/parts/SidebarApplications.shtml" -->

<dt><h3><a href="/help/en/html/tools/">Tools</a></h3></dt>
<dd>JMRI provides powerful tools for working with your layout.</dd>

<dt><h3><a href="/help/en/html/tools/automation/">Layout Automation</a></h3></dt>
<dd>Use JMRI to automate parts of your layout, from simply controlling a crossing gate
to running trains in the background.</dd>

<dt><h3 style="padding-left: 1em;"><a href="/help/en/html/hardware/">Supported Hardware</a></h3></dt>
<dd>JMRI supports a wide range of DCC systems, command stations and protocols.</dd>

<dt><h3 style="padding-left: 1em;"><a href="/help/en/html/setup/">JMRI Setup and Installation</a></h3></dt>
<dd>JMRI can be installed on a variety of hardware and operating systems.</dd>

</dl>

</div> <!-- closes #side -->

<!--#include virtual="/help/en/parts/SidebarTail.shtml" -->


<!-- /Sidebar-compact.shtml -->
30 changes: 30 additions & 0 deletions help/en/html/sidebar-new.shtml
@@ -0,0 +1,30 @@
<!-- Sidebar.shtml -->
<!-- This is the common sidebar definition for Help system pages -->
<hr class="hide">

<div id="side"> <!-- Block of text on left side of page -->
<div style="text-align: center">JMRI&reg; is...</div>
<dl>

<!--#include virtual="/help/en/parts/SidebarApplications.shtml" -->

<!--#include virtual="/help/en/parts/SidebarTools.shtml" -->

<!--#include virtual="/help/en/parts/SidebarLayoutAutomation.shtml" -->

<!--#include virtual="/help/en/parts/SidebarSupportedHardware.shtml" -->

<!--#include virtual="/help/en/parts/SidebarSetup.shtml" -->


</dl>

<!--#include virtual="/help/en/parts/SidebarTail.shtml" -->


<!-- /Sidebar.shtml -->

<!-- ============================================================================ -->

<!-- Help pages should use Sidebar in help/en/html unless something unique to add -->
<!-- [replace with pound sign]include virtual="/help/en/Sidebar.shtml" -->

0 comments on commit 0d5451d

Please sign in to comment.