Merge branch 'master' into development

README

 
 Typica is free software released under the MIT license as follows:
 
-Copyright 2007-2015 Neal Evan Wilson
+Copyright 2007-2016 Neal Evan Wilson
 
 Permission is hereby granteed, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config/Windows/editbatchdetails.xml

                     unitEdit.text = TTR("editBatchDetails", "Kg");
                     conversion = 2.2;
                 } else {
-                    unitEdit.text = TTR("editBatchDetails", "Lb";
+                    unitEdit.text = TTR("editBatchDetails", "Lb");
                 }
             };
             submit.clicked.connect(function() {

config/Windows/greeninventory.xml

         <![CDATA[
             var types = findChildObject(this, 'transactiontype');
             types.addItem(TTR("inventory", "inventory"));
-            types.addItem(TTR("inventory", "loss");
+            types.addItem(TTR("inventory", "loss"));
             var optionalDisplay = findChildObject(this, 'optional');
             var units = findChildObject(this, 'units');
             units.addItem(TTR("inventory", "bag"));
             var value = findChildObject(this, 'quantity');
             var reason = findChildObject(this, 'reason');
             var reasonlabel = findChildObject(this, 'reasonlabel');
-            reason.enabled = false;
             button.clicked.connect(function() {
                 q = "INSERT INTO ";
                 q += (types.currentIndex == 0 ?

config/Windows/newbatch.xml

                                     displayValue = convertFromPounds(displayValue, "oz");
                                     break;
                             }
-                            displayValue = "" + displayValue + " (" + bagCount + " bags)";
+                            displayValue = "" + Number(displayValue).toFixed(3) + " (" + Number(bagCount).toFixed(3) + " bags)";
                             if(table.data(r, 2, 0) != displayValue)
                             {
                                 table.setData(r, 2, displayValue, 0);

docs/documentation.html

 					<a class="tab" href="downloads.html" >Downloads</a>
 					<a class="tab active" >Documentation</a>
 					<a class="tab" href="screenshots.html" >Screenshots and Videos</a>
-					<a class="tab" href="involvement.html" >Get Involved</a>
 					<a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
 				</div>
 			</div>

docs/documentation/part2.html

 					<a class="tab" href="../downloads.html" >Downloads</a>
 					<a class="tab active" href="../documentation.html" >Documentation</a>
 					<a class="tab" href="../screenshots.html" >Screenshots and Videos</a>
-					<a class="tab" href="../involvement.html" >Get Involved</a>
 					<a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
 				</div>
 			</div>
 				<ul>
 					<li><a href="part2/application.html">Opening the Application</a></li>
 					<ul>
-						<li><a href="part2/database-connection.html">Database Connection Settings</a></li>
-						<li><a href="part2/open-configuration.html">Open Configuration File</a></li>
+						<li><a href="windowreference/databaseconnection.html">Connecting to a database</a></li>
+						<li><a href="windowreference/openconfigurationfile">Open Configuration File</a></li>
 						<ul>
 							<li><a href="part2/argument-c.html">Eliminating the Configuration Prompt</a></li>
 						</ul>
-						<li><a>Choose Your Path</a></li>
+						<li><a href="windowreference/navigation.html">Main navigation window</a></li>
 					</ul>
 					<li><a>Configure Roasters</a></li>
-					<li><a>Roast Coffee</a></li>
+					<li><a href="windowreference/logging.html">The Logging View</a></li>
 					<li><a>Purchase Green Coffee</a></li>
 					<li><a>Manage Roasted Coffee Items</a></li>
 					<li><a>Update Inventory</a></li>
-					<li><a>Batch Log</a></li>
 					<li><a>Cupping</a></li>
 					<li><a>Import Target Roast Profiles</a></li>
-					<li><a>Invoice List</a></li>
 					<li><a>Enter Green Coffee Sales</a></li>
-					<li><a>Reports</a></li>
 				</ul>
 			</div>
 		</div>

docs/documentation/windowreference/databaseconnection.html

+<html>
+    <head>
+        <title>Typica - Connecting to a database</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>Connecting to a database</h1>
+                <p>When opening Typica, if you have not previously connected to
+                a database, you will be prompted for information needed to
+                connect to that database.</p>
+
+                <img src="databaseconnection.png"/>
+                
+                <p>If you do not want to connect to a database, you can click
+                the Cancel button, but doing so means that most of the features
+                of Typica will not work. Clicking the Connect button will cause
+                Typica to attempt to connect to the database with the
+                information provided in the fields. An error message will be
+                presented if that connection attempt fails.</p>
+                
+                <p>After either successfully connecting to a database or
+                cancelling, you will be prompted to
+                <a href="openconfigurationfile.html">open a configuration
+                file.</a></p>
+                
+                <h2>Field descriptions</h2>
+                
+                <h3>Database driver</h3>
+                <p>Currently the only database supported is PostgreSQL.</p>
+                
+                <h3>Host name</h3>
+                <p>This identifies the computer the database is installed on.
+                If the database is on the same computer as Typica, this can be
+                <tt>localhost</tt> otherwise it will most likely be an IP
+                address for another computer on your network.</p>
+                
+                <h3>Port number</h3>
+                <p>PostgreSQL normally communicates on port 5432 but if you
+                have PostgreSQL configured to communicate over a different port
+                this field should be changed to match.</p>
+                
+                <h3>Database name</h3>
+                <p>During installation, the PostgreSQL installer creates a
+                database called <tt>postgres</tt>. If you've created a new
+                database for use with Typica, its name should be used.</p>
+                
+                <h3>User name</h3>
+                <p>During installation, the PostgreSQL installer creates a
+                database user called <tt>postgres</tt>. If you don't want to
+                create separate users, this account can be used. Typica keeps
+                track of which database user performed many data entry tasks so
+                it is recommended to create new users for everybody who will be
+                using Typica.</p>
+                
+                <h3>Password</h3>
+                <p>This is the password previously set for the database user.
+                If you are using the <tt>postgres</tt> user, this was set
+                during PostgreSQL installation.</p>
+
+            </div>
+        </div>
+    </body>
+</html>

docs/documentation/windowreference/logging.html

+<html>
+    <head>
+        <title>Typica - The Logging View</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>The Logging View</h1>
+                <p>The appearance of the logging view depends on how the selected
+                roaster was configured, but there are a few main areas where
+                different interface items are located.</p>
+
+                <img src="logging.png"/>
+                
+                <p>The window title will change to reflect a loaded target roast
+                profile and can provide the name of the coffee being roasted.</p>
+
+                <p>The menu bar provides access to a number of operations such
+                as saving or loading data on disk, entering new batch information,
+                clearing recorded data, changing how data is displayed, and more.
+                Note that on a Mac the menu bar will be at the top of the screen
+                and not within the window as is normal on that platform.</p>
+
+                <p>Continuing down the window is the indicator panel. This is
+                where current temperature indicators, rate of change information,
+                and timers will be displayed. The number, type, and order of
+                indicators depends on the roaster configuration. There are
+                splitter handles between each indicator which can be used to
+                control the width of each indicator. The last indicator should
+                always be the batch timer. If you don't see this, there should
+                be a splitter handle to the right of the last visible indicator
+                which can be dragged left to reveal additional indicators. A
+                splitter handle at the bottom can be used to control the height
+                of all indicators.</p>
+
+                <p>Next is a row of buttons. At minimum this will include buttons
+                for starting and stopping the batch, but a number of other
+                controls for inserting notes in the log can also be configured
+                to appear here. Under these buttons is another splitter handle
+                that can be used to control the height of to table and graph
+                below.</p>
+
+                <p>Below this and on the left is a table view showing times,
+                temperatures, and notes for both a target profile if one is
+                loaded and the current batch if one is being recorded.</p>
+
+                <p>To the right of the table view is a graph showing both
+                loaded target profiles, if any, and current batch data.</p>
+
+                <h2>Buttons</h2>
+
+                <h3>Start Batch</h3>
+                <p>This button starts recording roasting data. If the New Batch
+                or New Sample Batch windows were used, the roasting data can be
+                associated with a batch in the database. Clicking this will
+                also start the batch timer from 00:00, start any other timers
+                that have been configured to start from the start of the batch,
+                and create any annotations that have been configured for entry
+                at the start of the batch if any.</p>
+
+                <h3>Stop Batch</h3>
+                <p>This button stops the batch timer, stops recording roasting
+                data, and if the New Batch or New Sample Batch windows were
+                used, the window with data associated with the finished batch
+                will be raised.</p>
+
+                <h3>Additional Buttons</h3>
+                <p>Additional buttons and controls will appear if these have
+                been configured.</p>
+
+                <h2>The File Menu</h2>
+
+                <img src="loggingfile.png" />
+
+                <h3>Open...</h3>
+                <p>This can be used to load roasting data previously saved to
+                disk. This is mainly useful when receiving roasting data that
+                has been shared from another roaster. In normal use it is much
+                better to use information saved to the database instead of
+                managing files manually.</p>
+
+                <h3>Save...</h3>
+                <p>This can be used to save roasting data to disk. This is
+                mainly useful to share roasting data with another person using
+                Typica. For other uses it is much better to use the New Batch
+                and New Sample Batch windows to have roasting data saved to the
+                database.</p>
+
+                <h3>Print...</h3>
+                <p>This can be used to print roasting data. The print window
+                will appear, allowing the information printed to be
+                customized.</p>
+
+                <h3>Export CSV...</h3>
+                <p>This can be used to export roasting data as a CSV file which
+                can be opened in all popular spreadsheet applications or used
+                with a wide variety of other tools. If this is something that
+                you frequently require, it may be a good idea to reach out to
+                the author with your use case and see if there is a way to do
+                what you want within Typica or if Typica should be extended to
+                support your use case.</p>
+
+                <h3>Export XHTML+SVG</h3>
+                <p>This can be used to produce the same information that can be
+                printed, but produces that as an XHTML+SVG document.</p>
+
+                <h3>Quit</h3>
+                <p>On some platforms this might be called Exit and on the Mac
+                this will be moved under the Typica menu. It is used to quit
+                Typica.</p>
+                
+                <h2>The Batch Menu</h2>
+                
+                <img src="loggingbatch.png" />
+                
+                <h3>New Batch...</h3>
+                <p>This is the preferred way to enter the details of a
+                production roast such that recorded roasting data can be
+                associated with a batch and green coffee inventory can be
+                adjusted. Selecting this will open the New Batch window.</p>
+                
+                <h3>New Sample Batch...</h3>
+                <p>When roasting a green coffee not in inventory such as
+                pre-purchase samples, you can use this menu item to open the
+                New Sample Batch window and associate the roasting data with
+                additional information about the coffee.</p>
+                
+                <h3>Load Additional Profiles...</h3>
+                <p>If you do not have a target roast profile for the roasted
+                coffee item you are producing but have a batch that you would
+                like to have available for reference previously saved in the
+                database, you can use this menu item to load that information
+                as a target roast profile.</p>
+                
+                <h2>The Log Menu</h2>
+                
+                <img src="logginglog.png" />
+                
+                <h3>Display Celsius</h3>
+                <p>This menu item can be used to change displayed temperature
+                measurements to Celsius.</p>
+                
+                <h3>Display Fahrenheit</h3>
+                <p>This menu item can be used to change displayed temperature
+                measurements to Fahrenheit.</p>
+                
+                <h3>New Sample Parameters</h3>
+                <p>If a Counting Button has been configured, this menu item
+                will be available to change the annotation text or reset the
+                number used in annotations when that button is activated.</p>
+                
+                <h3>Clear Log</h3>
+                <p>This menu item removes all information currently visible in
+                the table and graph views.</p>
+                
+                <h3>Millisecond View</h3>
+                <h3>1 Second View</h3>
+                <h3>5 Second View</h3>
+                <h3>10 Second View</h3>
+                <h3>15 Second View</h3>
+                <h3>30 Second View</h3>
+                <h3>1 Minute View</h3>
+                
+                <p>These items affect the table view. The millisecond view will
+                show every measurement in the table while the other views will
+                limit the entries shown to one per indicated interval with the
+                exception of times associated with an annotation which will
+                always be shown regardless of the selected view.</p>
+                
+                <h3>Manual Entry</h3>
+                <p>This can be used for entering roasting data collected when
+                not connected to a roaster. The utility of this feature is
+                somewhat limited and generally not worth using.</p>
+                
+                <h2> The Graph Menu</h2>
+                
+                <img src="logginggraph.png" />
+                
+                <h3>Reset Translation</h3>
+                <p>If the roaster in use has been configured to use roast
+                profile translation, this item can be used to reset any
+                currently applied translation transformation in the graph.</p>
+                
+            </div>
+        </div>
+    </body>
+</html>

docs/documentation/windowreference/navigation.html

+<html>
+    <head>
+        <title>Typica - Choose Your Path</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>Main navigation window</h1>
+                <p>Most of the functionality in Typica is available through the
+                main navigation window.</p>
+
+                <img src="navigation.png"/>
+                
+                <h2>Buttons</h2>
+                
+                <h3>Configure Roasters</h3>
+                
+                <p>Typica can communicate with different pieces of data
+                acquisition hardware which must be configured before use.
+                Various features related to recording roasting data can be
+                set in the configuration
+                window.
+                
+                <h3>Roast Coffee</h3>
+                
+                <p>Once at least one coffee roaster has been configured, it
+                will be available from the selector next to the Roast Coffee
+                button. When you want to roast coffee, select the machine
+                you'll be using and click the Roast Coffee button. This will
+                take you to <a href="logging.html">the logging view.</a></p>
+                
+                <h3>Purchase Green Coffee</h3>
+                
+                <p>Typica tracks green coffee inventory. This button allows
+                you to enter the details of green coffee purchases.</p>
+                
+                <h3>Manage Roasted Coffee Items</h3>
+                
+                <p>When entering the details of a new production batch, you
+                will want to select a roasted coffee item. This is connected
+                to the green coffee(s) used, a target roast profile and
+                roasting specification if set. This button allows you to create
+                new roasted coffee items, discontinue items so that they will
+                not show up in lists, and bring back old items.</p>
+                
+                <h3>Edit Roasting Specification</h3>
+                
+                <p>Expected percent weight loss and other information can be
+                presented when roasting coffee for use in determining if a
+                batch matches its product specification.</p>
+                
+                <h3>Update Inventory</h3>
+                
+                <p>Inventory and loss transactions can be used to adjust
+                green coffee inventory.</p>
+                
+                <h3>New Cupping Session</h3>
+                <h3>Join Cupping Session</h3>
+                <h3>Summarize Cupping Session</h3>
+                
+                <p>Typica includes a set of cupping features. Some people use
+                this, but the author does not recommend it. Something much
+                better will be available in the future.</p>
+                
+                <h3>View Target Roast Profiles</h3>
+                
+                <p>Any data ever saved as a target roast profile for roasted
+                coffee items can be seen here.</p>
+                
+                <h3>Import Target Roast Profiles</h3>
+                
+                <p>It is possible to save batch data to disk instead of or in
+                addition to saving that to the database. These files can be
+                shared with other people using Typica. If you want to set data
+                from one of these files as a target roast profile for a given
+                roasted coffee item, this is where you do that.
+                
+                <h3>Enter Green Coffee Sales</h3>
+                
+                <p>If you sell green coffee, the inventory can be adjusted to
+                reflect that here.</p>
+                
+                <h2>Reports Menu</h2>
+                
+                <img src="reportsmenu.png" />
+                
+                <h3>Production</h3>
+                
+                <p>Production reports present information related to coffee
+                roasting activity.</p>
+                
+                <img src="productionreports.png" />
+                
+                <h3>Average Use and Cost by Origin</h3>
+                <h3>Previous Year Production Comparison</h3>
+                <h3>Cost of Green Coffee for Roasted Coffee</h3>
+                <h3>Daily Production Report (Detailed)</h3>
+                <h3>Batch Log</h3>
+                <h3>Previous Year Production Comparison By Month</h3>
+                <h3>Production Summary</h3>
+                <h3>Reminders</h3>
+                <h3>Recent Average Coffee Production</h3>
+                
+                <h3>Purchase</h3>
+                
+                <p>Purchase reports present information related to green coffee
+                purchases.</p>
+                
+                <img src="purchasereports.png" />
+                
+                <h3>Coffee Purchase Previous Years Comparison</h3>
+                <h3>Invoices</h3>
+                
+                <h3>Sales</h3>
+                
+                <p>Sales reports present information related to sales.</p>
+                
+                <img src="salesreport.png" />
+                
+                <h3>Green Coffee Sales</h3>
+                
+                <h3>Inventory</h3>
+                
+                <p>Inventory reports present information on inventory.</p>
+                
+                <img src="inventoryreports.png" />
+                
+                <h3>Inventory Change Summary</h3>
+                <h3>Current Inventory and Availability Projection</h3>
+                <h3>Item Transactions</h3>
+                
+                <h2>Database Menu</h2>
+                <h3>Forget Connection Details</h3>
+                <p>This menu item can be used to force Typica to prompt for
+                database connection information the next time Typica is
+                opened.</p>
+                
+            </div>
+        </div>
+    </body>
+</html>

docs/documentation/windowreference/openconfigurationfile.html

+<html>
+    <head>
+        <title>Typica - Open Configuration File</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>Open Configuration File</h1>
+                <p>Most of Typica's appearance and functionality is controlled
+                by a set of configuration files. This documentation covers an
+                example configuration included with Typica. When prompted to
+                open a configuration file, select the config.xml file included
+                with Typica. When switching to a new version of Typica, it is
+                important to use the configuration file included with the new
+                version and not the old one. Opening that file will open the
+                <a href="navigation.html">main navigation window.</a></p>
+
+                <img src="openconfigurationfile.png"/>
+                
+            </div>
+        </div>
+    </body>
+</html>

src/Typica.pro

 RC_FILE = typica.rc
 ICON = resources/icons/appicons/logo.icns
 QMAKE_INFO_PLIST = resources/Info.plist
+
+CODECFORTR = UTF-8

src/abouttypica.cpp

-/*265:*/
+/*275:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*266:*/
+/*276:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
 setCentralWidget(banner);
 }
 
-#line 6404 "./typica.w"
+#line 6592 "./typica.w"
 
-/*:266*/
+/*:276*/
 #line 36 "./abouttypica.w"
 
 
-/*:265*/
+/*:275*/

src/abouttypica.h

-/*264:*/
+/*274:*/
 #line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
 
 #endif
 
-/*:264*/
+/*:274*/

src/daterangeselector.cpp

-/*656:*/
+/*666:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
 
 #include "daterangeselector.h"
 
-/*658:*/
+/*668:*/
 #line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
 setLayout(outerLayout);
 }
 
-/*:658*//*659:*/
+/*:668*//*669:*/
 #line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:659*//*660:*/
+/*:669*//*670:*/
 #line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
 hide();
 }
 
-/*:660*//*661:*/
+/*:670*//*671:*/
 #line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
 }
 }
 
-/*:661*/
+/*:671*/
 #line 81 "./daterangeselector.w"
 
-/*662:*/
+/*672:*/
 #line 207 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*663:*/
+/*673:*/
 #line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:663*/
+/*:673*/
 #line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:662*//*664:*/
+/*:672*//*674:*/
 #line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
 }
 }
 
-/*:664*//*665:*/
+/*:674*//*675:*/
 #line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:665*//*666:*/
+/*:675*//*676:*/
 #line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:666*//*667:*/
+/*:676*//*677:*/
 #line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
 }
 }
 
-/*:667*//*668:*/
+/*:677*//*678:*/
 #line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:668*//*669:*/
+/*:678*//*679:*/
 #line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
 return quickSelector->currentIndex();
 }
 
-/*:669*//*670:*/
+/*:679*//*680:*/
 #line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:670*//*671:*/
+/*:680*//*681:*/
 #line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:671*/
+/*:681*/
 #line 82 "./daterangeselector.w"
 
 
-#if 0
+#ifdef __unix__
 #include "moc_daterangeselector.cpp"
 #endif
 
-/*:656*/
+/*:666*/

src/daterangeselector.h

-/*655:*/
+/*665:*/
 #line 30 "./daterangeselector.w"
 
 
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-/*657:*/
+/*667:*/
 #line 91 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
 QPushButton*applyButton;
 };
 
-/*:657*/
+/*:667*/
 #line 39 "./daterangeselector.w"
 
 
 
 #endif
 
-/*:655*/
+/*:665*/

src/draglabel.cpp

-/*992:*/
+/*1002:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
 }
 }
 
-/*:992*/
+/*:1002*/

src/draglabel.h

-/*991:*/
+/*1001:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
 
 #endif
 
-/*:991*/
+/*:1001*/

src/helpmenu.cpp

-/*194:*/
+/*204:*/
 #line 36 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 #include "licensewindow.h"
 
-/*195:*/
+/*205:*/
 #line 46 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
 #endif
 }
 
-/*:195*//*196:*/
+/*:205*//*206:*/
 #line 66 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
 aboutBox->show();
 }
 
-/*:196*//*197:*/
+/*:206*//*207:*/
 #line 76 "./helpmenu.w"
 
 void HelpMenu::displayLicenseWindow()
 window->show();
 }
 
-#line 4615 "./typica.w"
+#line 4772 "./typica.w"
 
 #line 1 "./licensewindow.w"
-/*:197*/
+/*:207*/
 #line 41 "./helpmenu.w"
 
 
-/*:194*/
+/*:204*/

src/helpmenu.h

-/*193:*/
+/*203:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
 
 #endif
 
-/*:193*/
+/*:203*/

src/licensewindow.cpp

+/*209:*/
+#line 36 "./licensewindow.w"
+
+/*213:*/
+#line 97 "./licensewindow.w"
+
+#include "licensewindow.h"
+
+#include <QSplitter> 
+#include <QListWidget> 
+#include <QVariant> 
+#include <QUrl> 
+
+#line 4774 "./typica.w"
+
+/*:213*/
+#line 37 "./licensewindow.w"
+
+/*210:*/
+#line 43 "./licensewindow.w"
+
+LicenseWindow::LicenseWindow()
+:QMainWindow(NULL),view(new QWebView)
+{
+QSplitter*split= new QSplitter;
+QListWidget*projects= new QListWidget;
+
+/*212:*/
+#line 79 "./licensewindow.w"
+
+QListWidgetItem*item= new QListWidgetItem("Typica",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/typica.html")));
+projects->setCurrentItem(item);
+setWebView(item,NULL);
+item= new QListWidgetItem("d3.js",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/d3.html")));
+item= new QListWidgetItem("Entypo",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/entypo.html")));
+item= new QListWidgetItem("Tango Desktop Project",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/tango.html")));
+item= new QListWidgetItem("QextSerialPort",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextserialport.html")));
+item= new QListWidgetItem("Qt",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
+
+/*:212*/
+#line 50 "./licensewindow.w"
+
+connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+this,SLOT(setWebView(QListWidgetItem*,QListWidgetItem*)));
+
+split->addWidget(projects);
+split->addWidget(view);
+setCentralWidget(split);
+}
+
+/*:210*//*211:*/
+#line 64 "./licensewindow.w"
+
+void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
+{
+view->load(current->data(Qt::UserRole).toUrl());
+}
+
+/*:211*/
+#line 38 "./licensewindow.w"
+
+
+/*:209*/

src/licensewindow.h

+/*208:*/
+#line 13 "./licensewindow.w"
+
+#include <QMainWindow> 
+#include <QListWidgetItem> 
+#include <QWebView> 
+
+#ifndef TypicaLicenseHeader
+#define TypicaLicenseHeader
+
+class LicenseWindow:public QMainWindow
+{
+Q_OBJECT
+public:
+LicenseWindow();
+private slots:
+void setWebView(QListWidgetItem*current,QListWidgetItem*);
+private:
+QWebView*view;
+};
+
+#endif
+
+/*:208*/

src/moc_helpmenu.cpp

        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       2,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
 
  // slots: signature, parameters, type, tag, flags
       10,    9,    9,    9, 0x0a,
+      31,    9,    9,    9, 0x0a,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_HelpMenu[] = {
     "HelpMenu\0\0displayAboutTypica()\0"
+    "displayLicenseWindow()\0"
 };
 
 void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
         HelpMenu *_t = static_cast<HelpMenu *>(_o);
         switch (_id) {
         case 0: _t->displayAboutTypica(); break;
+        case 1: _t->displayLicenseWindow(); break;
         default: ;
         }
     }
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 2)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 2;
     }
     return _id;
 }

src/moc_typica.cpp

        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       4,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
-       1,   19, // constructors
+       1,   34, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: signature, parameters, type, tag, flags
       22,   19,   18,   18, 0x08,
+      49,   43,   18,   18, 0x08,
+      74,   43,   18,   18, 0x08,
+      98,   43,   18,   18, 0x08,
 
  // constructors: signature, parameters, type, tag, flags
-      55,   43,   18,   18, 0x0e,
+     138,  126,   18,   18, 0x0e,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_RoasterConfWidget[] = {
     "RoasterConfWidget\0\0id\0updateRoasterId(int)\0"
-    "model,index\0RoasterConfWidget(DeviceTreeModel*,QModelIndex)\0"
+    "value\0updateCapacityCheck(int)\0"
+    "updateCapacity(QString)\0"
+    "updateCapacityUnit(QString)\0model,index\0"
+    "RoasterConfWidget(DeviceTreeModel*,QModelIndex)\0"
 };
 
 void RoasterConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
         RoasterConfWidget *_t = static_cast<RoasterConfWidget *>(_o);
         switch (_id) {
         case 0: _t->updateRoasterId((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 1: _t->updateCapacityCheck((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 2: _t->updateCapacity((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 3: _t->updateCapacityUnit((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         default: ;
         }
     }
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 4)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 4;
     }
     return _id;
 }

src/resources/Info.plist

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Typica 1.6.4</string>
+	<string>Typica 1.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>@TYPEINFO@</string>
 	<key>CFBundleExecutable</key>
 	<key>CFBundleDisplayName</key>
 	<string>Typica</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.4</string>
+	<string>1.7.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.4</string>
+	<string>1.7.0</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2007–2015 Neal Wilson</string>
+	<string>© 2007–2016 Neal Wilson</string>
 </dict>
 </plist>

src/resources/html/about.html

 				<div class="topbanner">
 					<a href="http://www.randomfield.com/programs/typica/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
 					<h1><a href="http://www.randomfield.com/programs/typica/">Typica</a></h1>
-					<h2>Version 1.6.4</h2>
+					<h2>Version 1.7.0</h2>
 				</div>
 			<div id="maintext">
-				<p>Copyright &copy; 2007&ndash;2015 Neal Evan Wilson
+				<p>Copyright &copy; 2007&ndash;2016 Neal Evan Wilson
 					<span class="icons">
 						<a href="mailto:roaster@wilsonscoffee.com?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
 						<a href="https://twitter.com/N3Roaster">&#62217;</a>
 						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
 					</span>
 				</p>
-				<h3>Special Thanks</h3>
-				<p>Ongoing development of Typica is made possible through the
-				generous financial contributions from the following:</p>
-				
-				<p>La Cosecha Coffee Roasters</p>
-				<p>Pinnacle Coffee Roasting</p>
-				<p>Water Street Coffee Roaster</p>
-				<p>Anonymous Funders</p>
-				
-				<p>Hardware for developing Phidgets 1048 support was provided
-				by Phidgets, Inc.</p>
-				
-				<p>Special thanks also to all who have sent bug reports and
-				feature requests.</p>
-
-				<div class="nbg">
-				<div class="nextversion">
-				<div class="nextbanner">
-					<img src="typica2logo96.png" height="96px" width="96px" alt="Typica 2.0 logo" />
-					<h1>Preview of the Next Episode</h3>
-				</div>
-				<p>This will likely be one of the last releases in the 1.x
-				series. Typica 1.0 was released in 2007 and I've learned a
-				lot from developing this, using it, and having conversations
-				with others about how they're using this. While there is the
-				possibility of further improvements, I believe Typica has
-				reached a point of maturity with a feature set appropriate for
-				many coffee roasting firms.</p>
-
-				<p>There is a large set of features and extensions that I have
-				avoided implementing because the changes would have been too
-				intrusive for the code base as it currently exists, but that
-				feature set has become too compelling for me to leave undone.
-				I am, therefore, attempting to spend as much time as I can on
-				the development of Typica 2.0. This removes many of the legacy
-				considerations and modernizes the tools and techniques used. I
-				hope that the result is a better and more broadly useful Typica
-				that can be maintained for another several years.</p>
-				
-				<p>While Typica is free and will continue to be made freely
-				available complete with all source code, there are still costs
-				associated with ongoing development and keeping the software
-				available. Some of the costs include:
-					<ul>
-						<li>Obtaining and maintaining hardware appropriate for
-						building and testing new releases</li>
-						<li>Building and maintaining test rigs for various
-						types of data acquisition hardware</li>
-						<li>Maintaining the ability to test on new operating
-						system releases</li>
-						<li>Hosting service</li>
-					</ul>
-				There is also a huge commitment of time in developing, testing,
-				and supporting this.</p>
-
-				<p>Financial support to date does not come close to covering
-				these costs, nor has it been enough that I could consider
-				hiring people to improve the pace and quality of ongoing
-				development. This is fine. I have no intention of halting work
-				on the project as my work has benefitted greatly from having
-				this software and I expect even greater benefit from the next
-				major release. Personally I find the new feature set exciting
-				to work on and am willing to cover funding shortfalls when I
-				can afford to do so.</p>
-				
-				<p>That said, if you're finding this software to be useful in
-				your business, if you've had a good support experience, or if
-				you'd like to help me continue to develop this software, please
-				consider providing some financial support to:</p>
-				
-				<p>Neal Wilson<br />
-				c/o Wilson's Coffee &amp; Tea<br />
-				3306 Washington Ave.<br />
-				Racine, WI 53405<br />
-				USA</p>
-				
-				<p>Another great way to help Typica right now is to reach out
-				to your professional colleagues and let them know that you're
-				using Typica and what you like about it.</p>
-				</div>
-				</div>
+				<p>German Translation: Mario Champignon
+                                    <span class="icons">
+                                        <a href="mailto:mario_champignon@hotmail.com">&#9993;</a>
+                                    </span>
+                                </p>
 				
 				<h3>License Information</h3>
 				<p>Permission is hereby granted, free of charge, to any person

src/scale.cpp

-/*998:*/
+/*1008:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:998*//*999:*/
+/*:1008*//*1009:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
 }
 else
 {
-/*1000:*/
+/*1010:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
 }
 emit newMeasurement(weight,unit);
 
-/*:1000*/
+/*:1010*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
 }
 }
 
-/*:999*//*1001:*/
+/*:1009*//*1011:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
 write("!KP\x0D");
 }
 
-/*:1001*/
+/*:1011*/

src/scale.h

-/*997:*/
+/*1007:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
 
 #endif
 
-/*:997*/
+/*:1007*/

src/typica.rc

 #include <winver.h>
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION 	1,6,4,0
-PRODUCTVERSION 	1,6,4,0
+FILEVERSION 	1,7,0,0
+PRODUCTVERSION 	1,7,0,0
 FILEFLAGSMASK	0x3fL
 #ifdef _DEBUG
 	FILEFLAGS	VS_FF_DEBUG
 		BLOCK "040904b0"
 		BEGIN
 			VALUE "CompanyName", "Wilson's Coffee & Tea\0"
-			VALUE "FileDescription", "Typica 1.6.4\0"
-			VALUE "FileVersion", "1.6.4\0"
+			VALUE "FileDescription", "Typica 1.7.0\0"
+			VALUE "FileVersion", "1.7.0\0"
 			VALUE "InternalName", "Typica\0"
-			VALUE "LegalCopyright", "Copyright 2007-2015 Neal Evan Wilson\0"
+			VALUE "LegalCopyright", "Copyright 2007-2016 Neal Evan Wilson\0"
 			VALUE "OriginalFilename", "Typica.exe\0"
 			VALUE "ProductName", "Typica\0"
-			VALUE "ProductVersion", "1.6.4\0"
+			VALUE "ProductVersion", "1.7.0\0"
 		END
 	END
 	BLOCK "VarFileInfo"

src/typica.w

 \mark{\noexpand\nullsec0{A Note on Notation}}
 \def\pn{Typica}
 \def\filebase{typica}
-\def\version{1.6.4 \number\year-\number\month-\number\day}
-\def\years{2007--2015}
+\def\version{1.7.0 \number\year-\number\month-\number\day}
+\def\years{2007--2016}
 \def\title{\pn{} (Version \version)}
 \newskip\dangerskipb
 \newskip\dangerskip
 QScriptValue scriptTr(QScriptContext *context, QScriptEngine *)
 {
     return QScriptValue(QCoreApplication::translate(
-        argument<QString>(0, context).toAscii().data(),
+        "configuration",
         argument<QString>(1, context).toUtf8().data()));
 }
 
     QFile file(filename);
     QFileInfo info(filename);
     directory = info.dir();
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf-8"));
     QTranslator *configtr = new QTranslator;
     if(configtr->load(QString("config.%1").arg(QLocale::system().name()),
                      QString("%1/Translations").arg(directory.canonicalPath())))
 bar->setObjectName("menuBar");
 if(element.hasAttribute("name"))
 {
-    QMenu *menu = bar->addMenu(QCoreApplication::translate(targetID.toAscii().data(),
+    QMenu *menu = bar->addMenu(QCoreApplication::translate("configuration",
                                                            element.attribute("name").toUtf8().data()));
     menu->setParent(bar);
     if(element.hasAttribute("type"))
         QDomElement itemElement = item.toElement();
         if(itemElement.tagName() == "item")
         {
-            QAction *itemAction = new QAction(QCoreApplication::translate(targetID.toAscii().data(),
+            QAction *itemAction = new QAction(QCoreApplication::translate("configuration",
                                               itemElement.text().toUtf8().data()), menu);
             if(itemElement.hasAttribute("id"))
             {
 
 @<Load translation objects@>=
 QTranslator *base = new QTranslator;
-if(base->load(QString("qt_%1").arg(QLocale::system().name())))
+if(base->load(QString("qt_%1").arg(QLocale::system().name()), QString("%1/Translations").arg(QCoreApplication::applicationDirPath())))
 {
     installTranslator(base);
 }
 QTranslator *app = new QTranslator;
-if(app->load(QString("%1_%2").arg("Typica").arg(QLocale::system().name())))
+if(app->load(QString("%1_%2").arg("Typica").arg(QLocale::system().name()), QString("%1/Translations").arg(QCoreApplication::applicationDirPath())))
 {
     installTranslator(app);
 }
     if(!titleNode.isNull())
     {
         QDomElement titleElement = titleNode.toElement();
-        QString title = QCoreApplication::translate(translationContext.toAscii().data(),
+        QString title = QCoreApplication::translate("configuration",
                                                     titleElement.text().toUtf8().data());
         if(!title.isEmpty())
         {

src/units.cpp

-/*269:*/
+/*279:*/
 #line 42 "./units.w"
 
 #include "units.h"
 #include <QtDebug> 
 
-/*:269*//*270:*/
+/*:279*//*280:*/
 #line 53 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
 unit==Rankine);
 }
 
-/*:270*//*271:*/
+/*:280*//*281:*/
 #line 71 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
 return 0;
 }
 
-/*:271*//*272:*/
+/*:281*//*282:*/
 #line 169 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
 return 0;
 }
 
-/*:272*//*273:*/
+/*:282*//*283:*/
 #line 267 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
 unit==Gram);
 }
 
-/*:273*/
+/*:283*/

src/units.h

-/*268:*/
+/*278:*/
 #line 8 "./units.w"
 
 #include <QObject> 
 
 #endif
 
-/*:268*/
+/*:278*/

src/webelement.cpp

-/*563:*/
+/*573:*/
 #line 368 "./webview.w"
 
 #include "webelement.h"
 
-/*561:*/
+/*571:*/
 #line 311 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 
 }
 
-/*:561*//*562:*/
+/*:571*//*572:*/
 #line 320 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
 e.setPlainText(text);
 }
 
-/*:562*/
+/*:572*/
 #line 371 "./webview.w"
 
 
-/*:563*/
+/*:573*/

src/webelement.h

-/*556:*/
+/*566:*/
 #line 248 "./webview.w"
 
 #include <QWebElement> 
 
 #endif
 
-/*:556*/
+/*:566*/

src/webview.cpp

-/*541:*/
+/*551:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*542:*/
+/*552:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:542*//*543:*/
+/*:552*//*553:*/
 #line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*544:*/
+/*554:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
 return;
 }
 
-/*:544*/
+/*:554*/
 #line 79 "./webview.w"
 
-/*545:*/
+/*555:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
 return;
 }
 
-/*:545*/
+/*:555*/
 #line 80 "./webview.w"
 
 }
 }
 }
 
-/*:543*//*546:*/
+/*:553*//*556:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:546*//*552:*/
+/*:556*//*562:*/
 #line 205 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:552*/
+/*:562*/
 #line 53 "./webview.w"
 
 
-/*:541*/
+/*:551*/

src/webview.h

-/*540:*/
+/*550:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
 
 #endif
 
-/*:540*/
+/*:550*/

web/output/download-mac-latest.html

 	<div id="maintext">
 <h1>Thank you for downloading Typica.</h1>
 <p>Your download from:</p>
-<p><a href="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg">http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg</a></p>
+<p><a href="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg">http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg</a></p>
 <p>should begin automatically. If it does not,
 please click the above link.</p>
 <h2>Please Help Support Ongoing Development</h2>
-<p>This will likely be one of the last releases in the 1.x
-series. Typica 1.0 was released in 2007 and I've learned a
-lot from developing this, using it, and having conversations
-with others about how they're using this. While there is the
-possibility of further improvements, I believe Typica has
-reached a point of maturity with a feature set appropriate for
-many coffee roasting firms.</p>
-<p>There is a large set of features and extensions that I have
-avoided implementing because the changes would have been too
-intrusive for the code base as it currently exists, but that
-feature set has become too compelling for me to leave undone.
-I am, therefore, attempting to spend as much time as I can on
-the development of Typica 2.0. This removes many of the legacy
-considerations and modernizes the tools and techniques used. I
-hope that the result is a better and more broadly useful Typica
-that can be maintained for another several years.</p>
 <p>While Typica is free and will continue to be made freely
 available complete with all source code, there are still costs
 associated with ongoing development and keeping the software
 	</ul>
 There is also a huge commitment of time in developing, testing,
 and supporting this.</p>
-<p>Financial support to date does not come close to covering
-these costs, nor has it been enough that I could consider
-hiring people to improve the pace and quality of ongoing
-development. This is fine. I have no intention of halting work
-on the project as my work has benefitted greatly from having
-this software and I expect even greater benefit from the next
-major release. Personally I find the new feature set exciting
-to work on and am willing to cover funding shortfalls when I
-can afford to do so.</p>
-<p>That said, if you're finding this software to be useful in
-your business, if you've had a good support experience, or if
+<p>While Typica is for many uses a mature and reliable program,
+there are still a number of areas where the program can be
+improved and additional areas where I think it makes a lot of
+sense to extend the program. The limited funding for this work
+does slow progress. If you're finding this software to be useful
+in your business, if you've had a good support experience, or if
 you'd like to help me continue to develop this software, please
-consider providing some financial support to:</p>
+consider providing some financial support. Checks can be sent to:
 <p>Neal Wilson<br />
 c/o Wilson's Coffee &amp; Tea<br />
 3306 Washington Ave.<br />
 Racine, WI 53405<br />
 USA</p>
+<p>or you can visit my <a href="http://youtube.com/users/N3Roaster">YouTube
+channel</a> and click the blue Support button on the right.</p>
 <p>Another great way to help Typica right now is to reach out
 to your professional colleagues and let them know that you're
 using Typica and what you like about it.</p>
-<p>Please note that I am unable to accept money through PayPal.</p>
-<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg"></iframe>
+<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg"></iframe>
 </div></div></body></html>

web/output/download-windows-latest.html

 	<div id="maintext">
 <h1>Thank you for downloading Typica.</h1>
 <p>Your download from:</p>
-<p><a href="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip">http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip</a></p>
+<p><a href="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip">http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip</a></p>
 <p>should begin automatically. If it does not,
 please click the above link.</p>
 <h2>Please Help Support Ongoing Development</h2>
-<p>This will likely be one of the last releases in the 1.x
-series. Typica 1.0 was released in 2007 and I've learned a
-lot from developing this, using it, and having conversations
-with others about how they're using this. While there is the
-possibility of further improvements, I believe Typica has
-reached a point of maturity with a feature set appropriate for
-many coffee roasting firms.</p>
-<p>There is a large set of features and extensions that I have
-avoided implementing because the changes would have been too
-intrusive for the code base as it currently exists, but that
-feature set has become too compelling for me to leave undone.
-I am, therefore, attempting to spend as much time as I can on
-the development of Typica 2.0. This removes many of the legacy
-considerations and modernizes the tools and techniques used. I
-hope that the result is a better and more broadly useful Typica
-that can be maintained for another several years.</p>
 <p>While Typica is free and will continue to be made freely
 available complete with all source code, there are still costs
 associated with ongoing development and keeping the software
 	</ul>
 There is also a huge commitment of time in developing, testing,
 and supporting this.</p>
-<p>Financial support to date does not come close to covering
-these costs, nor has it been enough that I could consider
-hiring people to improve the pace and quality of ongoing
-development. This is fine. I have no intention of halting work
-on the project as my work has benefitted greatly from having
-this software and I expect even greater benefit from the next
-major release. Personally I find the new feature set exciting
-to work on and am willing to cover funding shortfalls when I
-can afford to do so.</p>
-<p>That said, if you're finding this software to be useful in
-your business, if you've had a good support experience, or if
+<p>While Typica is for many uses a mature and reliable program,
+there are still a number of areas where the program can be
+improved and additional areas where I think it makes a lot of
+sense to extend the program. The limited funding for this work
+does slow progress. If you're finding this software to be useful
+in your business, if you've had a good support experience, or if
 you'd like to help me continue to develop this software, please
-consider providing some financial support to:</p>
+consider providing some financial support. Checks can be sent to:
 <p>Neal Wilson<br />
 c/o Wilson's Coffee &amp; Tea<br />
 3306 Washington Ave.<br />
 Racine, WI 53405<br />
 USA</p>
+<p>or you can visit my <a href="http://youtube.com/users/N3Roaster">YouTube
+channel</a> and click the blue Support button on the right.</p>
 <p>Another great way to help Typica right now is to reach out
 to your professional colleagues and let them know that you're
 using Typica and what you like about it.</p>
-<p>Please note that I am unable to accept money through PayPal.</p>
-<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip"></iframe>
+<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip"></iframe>
 </div></div></body></html>

web/output/downloads.html

 	</div>
 	</div>
 	<div id="maintext">
-<p>The latest release of Typica is version 1.6.4, released June 7, 2015.
+<p>The latest release of Typica is version 1.7, released January 24, 2016.
 This is available for Microsoft Windows, and Intel/Mac OS X.</p>
-<p><a href="download-mac-latest.html">Typica 1.6.4 for Intel/Mac OS X</a></p>
-<p><a href="download-windows-latest.html">Typica 1.6.4 for Microsoft Windows</a></p>
+<p><a href="download-mac-latest.html">Typica 1.7 for Intel/Mac OS X</a></p>
+<p><a href="download-windows-latest.html">Typica 1.7 for Microsoft Windows</a></p>
 <p>The latest source code can always be found on
 <a href="https://github.com/N3Roaster/typica">GitHub</a>.</p>
 </div></div></body></html>

web/output/index.html

 <html><head>
 	<title>Typica - Data for Coffee Roasters</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@N3Roaster">
-<meta name="twitter:title" content="Typica 1.6.4 Now Available. Free Software for Coffee Roasters">
-<meta name="twitter:description" content="Typica is a cross-platform application for coffee roasters with features for recording your roasts, tracking green coffee inventory, product development, improving production consistency, and more.">
-<meta name="twitter:image" content="http://www.randomfield.com/programs/typica/release164tc.png">
 	</head><body><div id="page"><div id="topmatter">
 	<div id="topbanner">
 	<img src="logo96.png" height="96px" width="96px" alt="Typica logo" />
 and more.</p>
 <p>The program is free open source software available under the
 MIT license.</p>
-<h1>Typica 1.6.4 Now Available</h1>
-<p>The latest release of Typica includes bug fixes and minor
-feature updates. The most significant new feature is the
-ability to use three new types of timer in addition to the
-familiar batch timer. See the documentation for details on how to
-configure these or watch this new video describing each of the
-new timer types and why you might want to use them.</p>
-<iframe width="640" height="360" src="https://www.youtube.com/embed/2zt9XlQd9oY" frameborder="0" allowfullscreen></iframe>
+<h1>Typica 1.7 Now Available</h1>
+<iframe width="640" height="360" src="https://www.youtube.com/embed/U7xTefVLRfk" frameborder="0" allowfullscreen></iframe>
+<p>The latest release of Typica includes several new features
+such as support for more detailed roast specifications, ability
+to set reminders based on production, a new batch log with search
+and filter features, and more. This also marks the first release
+that includes a translation of the program to another language.
+People using a computer with German locale settings will see that.</p>
 <h1>Data Acquisition</h1>
 <p>Every batch of coffee you roast with Typica can be recorded for
 future reference. A practically unlimited number of target roast

web/src/pages/download-mac-latest.m4

 __PageStart
 
-__DownloadPage(`http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg')
+__DownloadPage(`http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg')
 
 __PageEnd

web/src/pages/download-windows-latest.m4

 __PageStart
 
-__DownloadPage(`http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip')
+__DownloadPage(`http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip')
 
 __PageEnd

web/src/pages/fragments/downloadfragment.m4

 please click the above link.</p>
 <h2>Please Help Support Ongoing Development</h2>
 
-<p>This will likely be one of the last releases in the 1.x
-series. Typica 1.0 was released in 2007 and I've learned a
-lot from developing this, using it, and having conversations
-with others about how they're using this. While there is the
-possibility of further improvements, I believe Typica has
-reached a point of maturity with a feature set appropriate for
-many coffee roasting firms.</p>
-
-<p>There is a large set of features and extensions that I have
-avoided implementing because the changes would have been too
-intrusive for the code base as it currently exists, but that
-feature set has become too compelling for me to leave undone.
-I am, therefore, attempting to spend as much time as I can on
-the development of Typica 2.0. This removes many of the legacy
-considerations and modernizes the tools and techniques used. I
-hope that the result is a better and more broadly useful Typica
-that can be maintained for another several years.</p>
-
 <p>While Typica is free and will continue to be made freely
 available complete with all source code, there are still costs
 associated with ongoing development and keeping the software
 There is also a huge commitment of time in developing, testing,
 and supporting this.</p>
 
-<p>Financial support to date does not come close to covering
-these costs, nor has it been enough that I could consider
-hiring people to improve the pace and quality of ongoing
-development. This is fine. I have no intention of halting work
-on the project as my work has benefitted greatly from having
-this software and I expect even greater benefit from the next
-major release. Personally I find the new feature set exciting
-to work on and am willing to cover funding shortfalls when I
-can afford to do so.</p>
-
-<p>That said, if you're finding this software to be useful in
-your business, if you've had a good support experience, or if
+<p>While Typica is for many uses a mature and reliable program,
+there are still a number of areas where the program can be
+improved and additional areas where I think it makes a lot of
+sense to extend the program. The limited funding for this work
+does slow progress. If you're finding this software to be useful
+in your business, if you've had a good support experience, or if
 you'd like to help me continue to develop this software, please
-consider providing some financial support to:</p>
+consider providing some financial support. Checks can be sent to:
 
 <p>Neal Wilson<br />
 c/o Wilson's Coffee &amp; Tea<br />
 Racine, WI 53405<br />
 USA</p>
 
+<p>or you can visit my <a href="http://youtube.com/users/N3Roaster">YouTube
+channel</a> and click the blue Support button on the right.</p>
+
 <p>Another great way to help Typica right now is to reach out
 to your professional colleagues and let them know that you're
 using Typica and what you like about it.</p>
 
-<p>Please note that I am unable to accept money through PayPal.</p>
-
 <iframe width="1" height="1" frameborder="0" src="__DownloadUrl"></iframe>

web/src/pages/index.m4

 define(`__PageType', `Main')
-define(`__TwitterCard', `
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@N3Roaster">
-<meta name="twitter:title" content="Typica 1.6.4 Now Available. Free Software for Coffee Roasters">
-<meta name="twitter:description" content="Typica is a cross-platform application for coffee roasters with features for recording your roasts, tracking green coffee inventory, product development, improving production consistency, and more.">
-<meta name="twitter:image" content="http://www.randomfield.com/programs/typica/release164tc.png">
-')
 
 __PageStart
 
 <p>The program is free open source software available under the
 MIT license.</p>
 
-<h1>Typica 1.6.4 Now Available</h1>
-<p>The latest release of Typica includes bug fixes and minor
-feature updates. The most significant new feature is the
-ability to use three new types of timer in addition to the
-familiar batch timer. See the documentation for details on how to
-configure these or watch this new video describing each of the
-new timer types and why you might want to use them.</p>
+<h1>Typica 1.7 Now Available</h1>
 
-<iframe width="640" height="360" src="https://www.youtube.com/embed/2zt9XlQd9oY" frameborder="0" allowfullscreen></iframe>
+<iframe width="640" height="360" src="https://www.youtube.com/embed/U7xTefVLRfk" frameborder="0" allowfullscreen></iframe>
+
+<p>The latest release of Typica includes several new features
+such as support for more detailed roast specifications, ability
+to set reminders based on production, a new batch log with search
+and filter features, and more. This also marks the first release
+that includes a translation of the program to another language.
+People using a computer with German locale settings will see that.</p>
 
 <h1>Data Acquisition</h1>
 <p>Every batch of coffee you roast with Typica can be recorded for