Changeset 138 in tspsg-svn for trunk/src/mainwindow.cpp

Timestamp:

Sep 24, 2010, 4:27:46 PM (14 years ago)

Author:

laleppa

Message:

+ Added more fonts to font-family css property on export.

• Graph was slightly cut on export.

File:

• trunk/src/mainwindow.cpp (modified) (5 diffs)

trunk/src/mainwindow.cpp

@@ -266 +266 @@
 QString html = solutionText->document()->toHtml("UTF-8"),
                 img =  fi.completeBaseName() + "." + format;
+                html.replace(QRegExp("font-family:([^;]*);"), "font-family:\\1, 'DejaVu Sans Mono', 'Courier New', Courier, monospace;");
                 html.replace(QRegExp("<img\\s+src=\"tspsg://graph.pic\""), QString("<img src=\"%1\" alt=\"%2\"").arg(img, tr("Solution Graph")));
 
@@ -278 +279 @@
                 if (format == "svg") {
 QSvgGenerator svg;
-                        svg.setSize(QSize(graph.width(), graph.height()));
+                        svg.setSize(QSize(graph.width() + 2, graph.height() + 2));
                         svg.setResolution(graph.logicalDpiX());
                         svg.setFileName(fi.path() + "/" + img);
@@ -289 +290 @@
                 } else {
 #endif // NOSVG
-QImage i(graph.width(), graph.height(), QImage::Format_ARGB32);
+QImage i(graph.width() + 2, graph.height() + 2, QImage::Format_ARGB32);
                         i.fill(0x00FFFFFF);
 QPainter p;
@@ -893 +894 @@
                 pic.end();
 
-QImage i(graph.width() + 1, graph.height() + 1, QImage::Format_RGB32);
+QImage i(graph.width() + 2, graph.height() + 2, QImage::Format_RGB32);
                 i.fill(0xFFFFFF);
                 pic.begin(&i);
@@ -1514 +1515 @@
         actionHelpContextual->setIcon(GET_ICON("help-contextual"));
         actionHelpAbout->setIcon(GET_ICON("help-about"));
+        actionHelpAboutQt->setIcon(QIcon(":/images/icons/"ICON_SIZE"/qtlogo."ICON_FORMAT));
 #endif
         // Buttons