Changeset 138 in tspsg-svn

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.

Location:

trunk

Files:

• resources/common.qrc (modified) (1 diff)
• resources/desktop.qrc (modified) (1 diff)
• resources/icons/128x128/qtlogo.png (added)
• resources/icons/qtlogo-64.png (deleted)
• src/mainwindow.cpp (modified) (5 diffs)
• tspsg.pro (modified) (1 diff)
• ui/mainwindow.ui (modified) (1 diff)

trunk/resources/common.qrc

@@ -2 +2 @@
     <qresource prefix="/images">
         <file>tspsg.png</file>
-        <file>icons/qtlogo-64.png</file>
     </qresource>
     <qresource prefix="/files">

trunk/resources/desktop.qrc

@@ -24 +24 @@
         <file>icons/128x128/preferences-desktop-theme.png</file>
         <file>icons/128x128/preferences-system.png</file>
+        <file>icons/128x128/qtlogo.png</file>
         <file>icons/128x128/roll.png</file>
         <file>icons/128x128/system-software-update.png</file>

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

trunk/tspsg.pro

@@ -70 +70 @@
 CONFIG(release, debug|release) {
         OBJECTS_DIR = release
-        DESTDIR = release
         D =
 } else {
         OBJECTS_DIR = debug
-        DESTDIR = debug
         DEFINES += DEBUG
 #       CONFIG += console
         D = d
 }
+DESTDIR = bin
 TARGET = tspsg$${D}
 
 # Saving all intermediate files to tmp directory.
-MOC_DIR = ./tmp
-RCC_DIR = ./tmp
-UI_DIR = ./tmp
+MOC_DIR = tmp
+RCC_DIR = tmp
+UI_DIR = tmp
 
 # Include 3rd party libraries

trunk/ui/mainwindow.ui

@@ -481 +481 @@
   </action>
   <action name="actionHelpAboutQt">
-   <property name="icon">
-    <iconset resource="../resources/common.qrc">
-     <normaloff>:/images/icons/qtlogo-64.png</normaloff>:/images/icons/qtlogo-64.png</iconset>
-   </property>
    <property name="text">
     <string>About &amp;Qt...</string>