Changeset 158 in tspsg-svn for trunk

Timestamp:

Mar 24, 2011, 8:06:01 PM (14 years ago)

Author:

laleppa

Message:

• Default page setup for printing can now be configured through the config file (tspsg.ini), also see ticket #5.
• Some very slight improvements to the solution output.

Location:

trunk/src

Files:

• defaults.h (modified) (1 diff)
• globals.h (modified) (1 diff)
• mainwindow.cpp (modified) (6 diffs)

trunk/src/defaults.h

@@ -103 +103 @@
 #define DEF_ALTERNATE_COLOR QColor(0xA00000)
 
+#ifndef QT_NO_PRINTER
+#   define DEF_PAGE_SIZE QPrinter::A4
+#   define DEF_PAGE_ORIENTATION QPrinter::Portrait
+#   define DEF_MARGIN_LEFT 25
+#   define DEF_MARGIN_TOP 15
+#   define DEF_MARGIN_RIGHT DEF_MARGIN_TOP
+#   define DEF_MARGIN_BOTTOM DEF_MARGIN_TOP
+#endif
+
 #endif // DEFAULTS_H

trunk/src/globals.h

@@ -142 +142 @@
 #ifndef DOXYGEN_EXCLUDE
 
+#ifndef QT_NO_PRINTER
+    Q_DECLARE_METATYPE(QPrinter::PageSize)
+    Q_DECLARE_METATYPE(QPrinter::Orientation)
+#endif
+
 #ifdef HANDHELD
 #   define ICON_SIZE "48x48"

trunk/src/mainwindow.cpp

@@ -61 +61 @@
 #ifndef QT_NO_PRINTER
     printer = new QPrinter(QPrinter::HighResolution);
+    settings->beginGroup("Printer");
+    printer->setPageSize(qvariant_cast<QPrinter::PageSize>(settings->value("PageSize", DEF_PAGE_SIZE)));
+    printer->setOrientation(qvariant_cast<QPrinter::Orientation>(settings->value("PageOrientation", DEF_PAGE_ORIENTATION)));
+    printer->setPageMargins(
+        settings->value("MarginLeft", DEF_MARGIN_LEFT).toDouble(),
+        settings->value("MarginTop", DEF_MARGIN_TOP).toDouble(),
+        settings->value("MarginRight", DEF_MARGIN_RIGHT).toDouble(),
+        settings->value("MarginBottom", DEF_MARGIN_BOTTOM).toDouble(),
+        QPrinter::Millimeter);
+    settings->endGroup();
 #endif // QT_NO_PRINTER
 
@@ -347 +357 @@
     connect(&ppd,SIGNAL(paintRequested(QPrinter *)),SLOT(printPreview(QPrinter *)));
     ppd.exec();
+    settings->beginGroup("Printer");
+    settings->setValue("PageSize", printer->pageSize());
+    settings->setValue("PageOrientation", printer->orientation());
+    /*! \todo TODO: There's no way to get printer margins set with QPrinter::setPageMargins()
+         for now. Have to figure out a workaround for this (calculate it from other metrics?). */
+    settings->endGroup();
 }
 
@@ -783 +799 @@
     cur.insertText(tr("Variant #%1 Task").arg(spinVariant->value()), fmt_default);
     cur.insertBlock(fmt_paragraph);
-    cur.insertText(tr("Task:"));
+    cur.insertText(tr("Task:"), fmt_default);
     outputMatrix(cur, matrix);
     if (settings->value("Output/ShowGraph", DEF_SHOW_GRAPH).toBool()) {
@@ -838 +854 @@
         cur.beginEditBlock();
         cur.insertBlock(fmt_paragraph);
-        cur.insertText(tr("Step #%1").arg(n));
+        cur.insertText(tr("Step #%1").arg(n), fmt_default);
         if (settings->value("Output/ShowMatrix", DEF_SHOW_MATRIX).toBool() && (!settings->value("Output/UseShowMatrixLimit", DEF_USE_SHOW_MATRIX_LIMIT).toBool() || (settings->value("Output/UseShowMatrixLimit", DEF_USE_SHOW_MATRIX_LIMIT).toBool() && (spinCities->value() <= settings->value("Output/ShowMatrixLimit", DEF_SHOW_MATRIX_LIMIT).toInt())))) {
             outputMatrix(cur, *step);
@@ -1173 +1189 @@
     solutionText->document()->setDefaultFont(qvariant_cast<QFont>(settings->value("Output/Font", QFont(DEF_FONT_FACE, DEF_FONT_SIZE))));
 
-    fmt_paragraph.setTopMargin(0);
+    fmt_paragraph.setTopMargin(5);
     fmt_paragraph.setRightMargin(10);
     fmt_paragraph.setBottomMargin(0);
@@ -1180 +1196 @@
     fmt_table.setTopMargin(5);
     fmt_table.setRightMargin(10);
-    fmt_table.setBottomMargin(5);
+    fmt_table.setBottomMargin(0);
     fmt_table.setLeftMargin(10);
     fmt_table.setBorder(0);