Improvements to direct printing

src/printerselector.w

@@ -61,11 +61,15 @@ PrinterSelector::PrinterSelector() : QComboBox(NULL)
 }
 
 @ The host environment is informed of this class in the usual way starting with
-a constructor function prototype.
+a constructor function prototype. Another prototype is also needed for adding
+this to a layout from XML.
 
 @<Function prototypes for scripting@>=
 QScriptValue constructPrinterSelector(QScriptContext *context,
                                       QScriptEngine *engine);
+void addPrinterSelectorToLayout(QDomElement element,
+                                QStack<QWidget *> *widgetStack,
+                                QStack<QLayout *> *layoutStack);
 
 @ The engine is informed of this function.
 
@@ -85,3 +89,28 @@ QScriptValue constructPrinterSelector(QScriptContext *, QScriptEngine *engine)
 	setQComboBoxProperties(object, engine);
 	return object;
 }
+
+@ It should also be possible to add this to a layout from the XML portion of
+the configuration document.
+
+@<Functions for scripting@>=
+void addPrinterSelectorToLayout(QDomElement element, QStack<QWidget *> *,
+                                QStack<QLayout *> *layoutStack)
+{
+	PrinterSelector *selector = new PrinterSelector;
+	if(element.hasAttribute("id"))
+	{
+		selector->setObjectName(element.attribute("id"));
+	}
+	QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
+	layout->addWidget(selector);
+}
+
+@ This is added in the usual way.
+
+@<Additional box layout elements@>=
+else if(currentElement.tagName() == "printerselector")
+{
+	addPrinterSelectorToLayout(currentElement, widgetStack, layoutStack);
+}
+

src/typica.w

@@ -6477,6 +6477,10 @@ else if(className == "QTabBar")
 {
 	setQTabBarProperties(value, engine);
 }
+else if(className == "PrinterSelector")
+{
+	setQComboBoxProperties(value, engine);
+}
 
 @ In the list of classes, the SaltTable entry is for a class which does not
 strictly exist on its own. It is, however, useful to provide some custom

src/webview.w

@@ -135,7 +135,11 @@ QString TypicaWebView::saveXml()
 }
 
 @ Print functionality has been extended to allow an optional argument. If the
-name of a printer is passed in, the print dialog will be bypassed.
+name of a printer is passed in, the print dialog will be bypassed. Note that
+when bypassing the print dialog, page margins are set to 0. This is intentional
+as the use case is for printing to more specialized printers where default page
+margins are not appropriate and CSS can be customized to ensure that all
+information fits in the printable area with the assumption of no margin.
 
 @<TypicaWebView implementation@>=
 void TypicaWebView::print(const QString &printerName)
@@ -144,6 +148,7 @@ void TypicaWebView::print(const QString &printerName)
 	if(!printerName.isEmpty())
 	{
 		printer->setPrinterName(printerName);
+		printer->setFullPage(true);
 		QWebView::print(printer);
 		return;
 	}