Add svg checkboxes and radio-buttons

src/lib/utilities.cc

@@ -34,7 +34,73 @@ Q_IMPORT_PLUGIN(qtiff)
 Q_IMPORT_PLUGIN(qmng)
 #endif
 
-MyLooksStyle::MyLooksStyle(): weAreDrawingForms(false) {}
+MyLooksStyle::MyLooksStyle(): weAreDrawingForms(false) {
+	if (checkbox == 0)
+		checkbox = new QSvgRenderer(QByteArray(
+"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"
+"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
+"     version=\"1.1\" baseProfile=\"full\" width=\"12px\" height=\"12px\" viewBox=\"0 0 12px 12px\">\n"
+"  <rect x=\"0\" y=\"0\" width=\"1\" height=\"12\" fill=\"#808080\" />\n"
+"  <rect x=\"1\" y=\"0\" width=\"11\" height=\"1\" fill=\"#808080\" />\n"
+"  <rect x=\"1\" y=\"11\" width=\"11\" height=\"1\" fill=\"#d4d0c8\" />\n"
+"  <rect x=\"11\" y=\"1\" width=\"1\" height=\"11\" fill=\"#d4d0c8\" />\n"
+"  <rect x=\"1\" y=\"1\" width=\"1\" height=\"10\" fill=\"#404040\" />\n"
+"  <rect x=\"2\" y=\"1\" width=\"9\" height=\"1\" fill=\"#404040\" />\n"
+"  <rect x=\"2\" y=\"10\" width=\"9\" height=\"1\" fill=\"white\" />\n"
+"  <rect x=\"10\" y=\"2\" width=\"1\" height=\"9\" fill=\"white\" />\n"
+"  <rect x=\"2\" y=\"2\" width=\"8\" height=\"8\" fill=\"white\" />\n"
+"</svg>\n"));
+	if (checkbox_checked == 0)
+		checkbox_checked = new QSvgRenderer(QByteArray(
+"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"
+"<svg xmlns=\"http://www.w3.org/2000/svg\"\n"
+"     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
+"     version=\"1.1\" baseProfile=\"full\" width=\"12px\" height=\"12px\" viewBox=\"0 0 12px 12px\">\n"
+"  <rect x=\"0\" y=\"0\" width=\"1\" height=\"12\" fill=\"#808080\" />\n"
+"  <rect x=\"1\" y=\"0\" width=\"11\" height=\"1\" fill=\"#808080\" />\n"
+"  <rect x=\"1\" y=\"11\" width=\"11\" height=\"1\" fill=\"#d4d0c8\" />\n"
+"  <rect x=\"11\" y=\"1\" width=\"1\" height=\"11\" fill=\"#d4d0c8\" />\n"
+"  <rect x=\"1\" y=\"1\" width=\"1\" height=\"10\" fill=\"#404040\" />\n"
+"  <rect x=\"2\" y=\"1\" width=\"9\" height=\"1\" fill=\"#404040\" />\n"
+"  <rect x=\"2\" y=\"10\" width=\"9\" height=\"1\" fill=\"white\" />\n"
+"  <rect x=\"10\" y=\"2\" width=\"1\" height=\"9\" fill=\"white\" />\n"
+"  <rect x=\"2\" y=\"2\" width=\"8\" height=\"8\" fill=\"white\" />\n"
+"  <path d=\"M 3 5.5 L 3 8 L 5.5 10.5 L 10 5.5 L 10 2.5 L 5.5 7.5\" fill=\"black\" />\n"
+"</svg>\n"));
+	if (radiobutton == 0)
+		radiobutton = new QSvgRenderer(QByteArray(
+"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"
+"<svg xmlns=\"http://www.w3.org/2000/svg\"\n"
+"     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
+"     version=\"1.1\" baseProfile=\"full\" width=\"11px\" height=\"11px\" viewBox=\"0 0 11px 11px\">\n"
+"  <clipPath id=\"upleftclip\"><path d=\"M 11 0 L 0 0 L 0 11\"/></clipPath>\n"
+"  <clipPath id=\"downrightclip\"><path d=\"M 11 0 L 11 11 L 0 11\"/></clipPath>\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"5.5\" fill=\"#808080\" clip-path=\"url(#upleftclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"5.5\" fill=\"white\" clip-path=\"url(#downrightclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"4.5\" fill=\"#404040\" clip-path=\"url(#upleftclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"4.5\" fill=\"#d4d0c8\" clip-path=\"url(#downrightclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"3.5\" fill=\"white\"/>\n"
+"</svg>\n"));
+	if (radiobutton_checked == 0)
+		radiobutton_checked = new QSvgRenderer(QByteArray(
+"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"
+"<svg xmlns=\"http://www.w3.org/2000/svg\"\n"
+"     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
+"     version=\"1.1\" baseProfile=\"full\" width=\"11px\" height=\"11px\" viewBox=\"0 0 11px 11px\">\n"
+"  <clipPath id=\"upleftclip\"><path d=\"M 11 0 L 0 0 L 0 11\"/></clipPath>\n"
+"  <clipPath id=\"downrightclip\"><path d=\"M 11 0 L 11 11 L 0 11\"/></clipPath>\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"5.5\" fill=\"#808080\" clip-path=\"url(#upleftclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"5.5\" fill=\"white\" clip-path=\"url(#downrightclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"4.5\" fill=\"#404040\" clip-path=\"url(#upleftclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"4.5\" fill=\"#d4d0c8\" clip-path=\"url(#downrightclip)\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"3.5\" fill=\"white\" />\n"
+"  <circle cx=\"5.5\" cy=\"5.5\" r=\"1.5\" fill=\"black\" />\n"
+"</svg>\n"));
+}
 
 void MyLooksStyle::producingForms(bool f) {
 	weAreDrawingForms=f;
@@ -43,25 +109,25 @@ void MyLooksStyle::producingForms(bool f) {
 void MyLooksStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget) const {
 	painter->setBrush(Qt::white);
 	painter->setPen(QPen(Qt::black, 0.7));
+	painter->setBackground(Qt::NoBrush);
+	painter->setBackgroundMode(Qt::TransparentMode);
 	QRect r = option->rect;
 	if (element == QStyle::PE_PanelLineEdit) {
 		painter->drawRect(r);
 	} else if (element == QStyle::PE_IndicatorCheckBox) {
-		painter->drawRect(r);
-		if (!weAreDrawingForms && (option->state & QStyle::State_On)) {
-			r.translate(int(r.width()*0.075), int(r.width()*0.075));
-			painter->drawLine(r.topLeft(), r.bottomRight());
-			painter->drawLine(r.topRight(), r.bottomLeft());
-		}
+		if (weAreDrawingForms)
+			painter->drawRect(r);
+		else if (option->state & QStyle::State_On)
+			checkbox_checked->render(painter, r);
+		else
+			checkbox->render(painter, r);
 	} else if (element == QStyle::PE_IndicatorRadioButton) {
-		painter->drawEllipse(r);
-		if (!weAreDrawingForms && (option->state & QStyle::State_On)) {
-			r.translate(int(r.width()*0.20), int(r.width()*0.20));
-			r.setWidth(int(r.width()*0.70));
-			r.setHeight(int(r.height()*0.70));
-			painter->setBrush(Qt::black);
+		if (weAreDrawingForms)
 			painter->drawEllipse(r);
-		}
+		else if (option->state & QStyle::State_On)
+			radiobutton_checked->render(painter, r);
+		else
+			radiobutton->render(painter, r);
 	} else {
 		parent_t::drawPrimitive(element, option, painter, widget);
 	}
@@ -93,6 +159,10 @@ int handleError(bool success, int errorCode) {
 	return success?EXIT_SUCCESS:EXIT_FAILURE;
 }
 
+QSvgRenderer * MyLooksStyle::checkbox = 0;
+QSvgRenderer * MyLooksStyle::checkbox_checked = 0;
+QSvgRenderer * MyLooksStyle::radiobutton = 0;
+QSvgRenderer * MyLooksStyle::radiobutton_checked = 0;
 
 // void printSupportedWriteformats() {
 //   QList<QByteArray> formats = QImageWriter::supportedImageFormats();

src/lib/utilities.hh

@@ -33,6 +33,7 @@
 #include <QImageWriter>
 #include <QPainter>
 #include <QStyleOption>
+#include <QSvgRenderer>
 #include <QUrl>
 
 #include <wkhtmltox/dllbegin.inc>
@@ -46,6 +47,11 @@ public:
 	MyLooksStyle();
 	void drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = 0 ) const;
 	bool weAreDrawingForms;
+
+	static QSvgRenderer * checkbox;
+	static QSvgRenderer * checkbox_checked;
+	static QSvgRenderer * radiobutton;
+	static QSvgRenderer * radiobutton_checked;
 public slots:
 	void producingForms(bool f);
 };