Diagnostic logging is now controlled from settings.

src/advancedsettings.w

@@ -0,0 +1,61 @@
+@* Advanced settings configuration.
+
+\noindent Sometimes a feature has a sensible default that should be used the
+vast majority of the time but sometimes requires some other setting to be
+available in a reasonably accessible way.
+
+@<Class declarations@>=
+class AdvancedSettingsWidget : public QWidget@/
+{@/
+	@[Q_OBJECT@]@;
+	public:@/
+		AdvancedSettingsWidget();
+	@[public slots:@]@/
+		void enableDiagnosticLogging(bool enabled);
+};
+
+@ At present the advanced settings consist only of an option to redirect
+diagnostic output to a file. This should normally be disabled as it supresses
+console output and there is no mechanism within \pn{} for periodically removing
+the files generated. It is, however, useful for producing a diagnostic file
+that can be attached to an email if someone is encountering an issue that they
+are not able to resolve on their own. It is especially useful on Microsoft
+Windows where this output is not otherwise available unless Typica is run from
+software development tools most people do not have installed.
+
+@<AdvancedSettingsWidget implementation@>=
+AdvancedSettingsWidget::AdvancedSettingsWidget() : QWidget(NULL)
+{
+	QSettings settings;
+	QFormLayout *layout = new QFormLayout;
+	QCheckBox *logDiagnostics = new QCheckBox;
+	logDiagnostics->setCheckState(
+		settings.value("settings/advanced/logging", false).toBool() ?
+		Qt::Checked : Qt::Unchecked);
+	connect(logDiagnostics, SIGNAL(toggled(bool)), this, SLOT(enableDiagnosticLogging(bool)));
+	layout->addRow(tr("Enable diagnostic logging"), logDiagnostics);
+	setLayout(layout);
+}
+
+@ Changes to this setting should take effect immediately. It should also be
+written to |QSettings| so the feature can be correctly enabled or not. 
+
+@<AdvancedSettingsWidget implementation@>=
+void AdvancedSettingsWidget::enableDiagnosticLogging(bool enabled)
+{
+	QSettings settings;
+	settings.setValue("settings/advanced/logging", enabled);
+	if(enabled)
+	{
+		qInstallMsgHandler(messageFileOutput);
+	}
+	else
+	{
+		qInstallMsgHandler(0);
+	}
+}
+
+@ Currently the implementation is brought into typica.cpp.
+
+@<Class implementations@>=
+@<AdvancedSettingsWidget implementation@>

src/settings.w

@@ -31,6 +31,8 @@ SettingsWindow::SettingsWindow() : QMainWindow(NULL)
 	settingsTab->addTab(deviceSettings, tr("Roasters"));
 	GraphSettingsWidget *graphSettings = new GraphSettingsWidget;
 	settingsTab->addTab(graphSettings, tr("Graph"));
+	AdvancedSettingsWidget *advancedSettings = new AdvancedSettingsWidget;
+	settingsTab->addTab(advancedSettings, tr("Advanced"));
 	setCentralWidget(settingsTab);
 }
 
@@ -56,4 +58,6 @@ constructor = engine->newFunction(constructSettingsWindow);
 value = engine->newQMetaObject(&DeviceConfigurationWindow::staticMetaObject, constructor);
 engine->globalObject().setProperty("SettingsWindow", value);
 
-@i graphsettings.w
+@i graphsettings.w
+
+@i advancedsettings.w

src/typica.w

@@ -12719,14 +12719,13 @@ build.
 @<The main program@>=
 int main(int argc, char **argv)@/
 {@/
-	@<Set up logging@>@;
 	int *c = &argc;
 	Application app(*c, argv);
+	QSettings settings;
+	@<Set up logging@>@;
 	@<Set up icons@>@;
 	@<Set up fonts@>@;
 
-	QSettings settings;
-
 	@<Register device configuration widgets@>@;
 	@<Prepare the database connection@>@;
 	@<Load the application configuration@>@;
@@ -12739,14 +12738,15 @@ int main(int argc, char **argv)@/
 	return retval;@/
 }
 
-@ Proof of concept for the introduction of logging warnings to a file. This is
-primarily for the benefit of people using Windows without an attached debugger.
-Before this is merged to development it should allow the person using Typica
-more control over if this should be enabled (by default it should not) and
-where the output is sent.
+@ \pn{} 1.6.3 introduces optional logging of diagnostic messages to a file. By
+default this feature is not enabled. A sensible future refinement to this would
+allow specification of where this file should be created.
 
 @<Set up logging@>=
-qInstallMsgHandler(messageFileOutput);
+if(settings.value("settings/advanced/logging", false).toBool())
+{
+	qInstallMsgHandler(messageFileOutput);
+}
 
 @ This requires that we have our messageFileOutput function.
 
@@ -12761,7 +12761,7 @@ void messageFileOutput(QtMsgType type, const char *msg)
 	QFile output("Typica-"+QDate::currentDate().toString("yyyy-MM-dd")+".log");
 	output.open(QIODevice::WriteOnly | QIODevice::Append);
 	QTextStream outstream(&output);
-	outstream << msg << "\n";
+	outstream << msg << "\r\n";
 }
 
 @ \pn{} 1.4 introduces the ability to use icons in certain interface elements.