A more general settings window. Fixes #97

config/Windows/navigation.xml

@@ -172,7 +172,7 @@ type="push" />
         });
 		var configurebutton = findChildObject(this, 'configure');
 		configurebutton.clicked.connect(function() {
-			var confwindow = new DeviceConfigurationWindow;
+			var confwindow = new SettingsWindow;
 			confwindow.show();
 		});
         <![CDATA[

src/settings.w

@@ -0,0 +1,52 @@
+@** A window for program configuration.
+
+\noindent A previous version of Typica introduced a window specifically for
+configuring the measurement pipeline in Typica. This is a fairly limited subset
+of things that should be more easily configurable in Typica. Starting with
+version 1.6 that window has been converted into a widget that is available
+through a tab in a more general configuration window with other tabs available
+for settings that do not logically belong with a single part of the measurement
+pipeline.
+
+@<Class declarations@>=
+class SettingsWindow : public QMainWindow
+{
+	Q_OBJECT
+	public:
+		SettingsWindow();
+};
+
+@ The constructor takes care of the initial interface setup. Most of the
+functionality is delegated to more specialized widgets that are available
+through a set of tabs.
+
+@<SettingsWindow implementation@>=
+SettingsWindow::SettingsWindow() : QMainWindow(NULL)
+{
+	QTabWidget *settingsTab = new QTabWidget;
+	DeviceConfigurationWindow *deviceSettings = new DeviceConfigurationWindow;
+	settingsTab->addTab(deviceSettings, tr("Roasters"));
+	setCentralWidget(settingsTab);
+}
+
+@ This widget is made available to the host environment for access wherever
+appropriate.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructSettingsWindow(QScriptContext *context, QScriptEngine *engine);
+
+@ The constructor is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructSettingsWindow(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new SettingsWindow);
+	return object;
+}
+
+@ The host environment is informed of this as usual.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructSettingsWindow);
+value = engine->newQMetaObject(&DeviceConfigurationWindow::staticMetaObject, constructor);
+engine->globalObject().setProperty("SettingsWindow", value);

src/typica.w

@@ -836,6 +836,7 @@ generated file empty.
 @<TranslationConfWidget implementation@>@/
 @<FreeAnnotationConfWidget implementation@>@/
 @<RateOfChange implementation@>@/
+@<SettingsWindow implementation@>@/
 
 @ A few headers are required for various parts of \pn{}. These allow the use of
 various Qt modules.
@@ -7653,7 +7654,8 @@ class GraphView : public QGraphicsView@/
 	QMap<int, QPointF> *prevPoints;
 	QMap<int, double> *translations;
 	QList<QGraphicsItem *> *gridLinesF;
-	QList<QGraphicsItem *> *gridLinesC;@/
+	QList<QGraphicsItem *> *gridLinesC;
+	QList<QGraphicsItem *> *relativeGridLines;@/
 	public:@/
 		GraphView(QWidget *parent = NULL);
 		void removeSeries(int column);@/
@@ -7695,7 +7697,8 @@ GraphView::GraphView(QWidget *parent) : QGraphicsView(parent),
 	prevPoints(new QMap<int, QPointF>),
 	translations(new QMap<int, double>),
 	gridLinesF(new QList<QGraphicsItem *>),
-	gridLinesC(new QList<QGraphicsItem *>)@/
+	gridLinesC(new QList<QGraphicsItem *>),
+	relativeGridLines(new QList<QGraphicsItem *>)@/
 {
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -14763,8 +14766,12 @@ QList<NodeInserter *> topLevelNodeInserters;
 @ With this done, we can now produce a window which allows someone to easily
 edit the device configuration.
 
+As of version 1.6 this class is no longer a window but just a |QWidget| which
+is inserted into another more general settings window. The name of the class
+should be changed in a future version to reflect this change.
+
 @<Class declarations@>=
-class DeviceConfigurationWindow : public QMainWindow
+class DeviceConfigurationWindow : public QWidget
 {
 	@[Q_OBJECT@]@;
 	public:@/
@@ -14797,7 +14804,7 @@ this) is expanded to show the new child node if it has not already been
 expanded.
 
 @<DeviceConfigurationWindow implementation@>=
-DeviceConfigurationWindow::DeviceConfigurationWindow() : QMainWindow(NULL),
+DeviceConfigurationWindow::DeviceConfigurationWindow() : QWidget(NULL),
 	view(new QTreeView), configArea(new QScrollArea)
 {
 	QSplitter *splitter = new QSplitter;
@@ -14832,7 +14839,9 @@ DeviceConfigurationWindow::DeviceConfigurationWindow() : QMainWindow(NULL),
 	configArea->setMinimumWidth(580);
 	configArea->setMinimumHeight(460);
 	splitter->addWidget(configArea);
-	setCentralWidget(splitter);
+	QVBoxLayout *centralLayout = new QVBoxLayout;
+	centralLayout->addWidget(splitter);
+	setLayout(centralLayout);
 	connect(view, SIGNAL(activated(QModelIndex)),
 	        this, SLOT(newSelection(QModelIndex)));
 	connect(view, SIGNAL(clicked(QModelIndex)),
@@ -14899,6 +14908,9 @@ void DeviceConfigurationWindow::resizeColumn()
 instantiate this from the host environment. For this we at least require a
 constructor.
 
+Now that this widget is available through a more general settings window it may
+be better to remove direct access to this class from the host environment.
+
 @<Function prototypes for scripting@>=
 QScriptValue constructDeviceConfigurationWindow(QScriptContext *context,
                                                 QScriptEngine *engine);
@@ -16817,6 +16829,8 @@ app.registerDeviceConfigurationWidget("annotationspinbox", NoteSpinConfWidget::s
 
 @i freeannotation.w
 
+@i settings.w
+
 @** Communicating with a Device through Modbus RTU.
 
 \noindent The classes described here need to be further generalized to support