Changeset 160 in tspsg-svn

Timestamp:

Apr 9, 2011, 3:38:21 AM (14 years ago)

Author:

laleppa

Message:

• Somehow, I overlooked the documentation. There is a way to get page margins from printer. Implemented saving of marings after running print preview dialog (see ticket #5).
• Renamed Printer/PageSize? setting in tspsg.ini to Printer/PaperSize?.
• If a file nime doesn't have an extension after running Save As dialog, .tspt is automatically appended.

File:

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

trunk/src/mainwindow.cpp

@@ -62 +62 @@
     printer = new QPrinter(QPrinter::HighResolution);
     settings->beginGroup("Printer");
-    printer->setPageSize(qvariant_cast<QPrinter::PageSize>(settings->value("PageSize", DEF_PAGE_SIZE)));
+    printer->setPaperSize(qvariant_cast<QPrinter::PaperSize>(settings->value("PaperSize", DEF_PAGE_SIZE)));
     printer->setOrientation(qvariant_cast<QPrinter::Orientation>(settings->value("PageOrientation", DEF_PAGE_ORIENTATION)));
     printer->setPageMargins(
@@ -357 +357 @@
     connect(&ppd,SIGNAL(paintRequested(QPrinter *)),SLOT(printPreview(QPrinter *)));
     ppd.exec();
+
+qreal l, t, r, b;
+    printer->getPageMargins(&l, &t, &r, &b, QPrinter::Millimeter);
+
     settings->beginGroup("Printer");
-    settings->setValue("PageSize", printer->pageSize());
+    settings->setValue("PaperSize", printer->paperSize());
     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->setValue("MarginLeft", l);
+    settings->setValue("MarginTop", t);
+    settings->setValue("MarginRight", r);
+    settings->setValue("MarginBottom", b);
     settings->endGroup();
 }
@@ -1122 +1128 @@
 void MainWindow::drawNode(QPainter &pic, int nstep, bool left, SStep *step)
 {
-int r;
+qreal r;
     if (settings->value("Output/HQGraph", DEF_HQ_GRAPH).toBool())
         r = logicalDpiX() / 1.27;
@@ -1128 +1134 @@
         r = logicalDpiX() / 2.54;
 #ifdef Q_WS_S60
-        /*! \hack HACK: Solution graph on Symbian is visually larger than on
+    /*! \hack HACK: Solution graph on Symbian is visually larger than on
      *   Windows Mobile. This coefficient makes it about the same size.
      */
@@ -1530 +1536 @@
     else if (settings->value("SaveLastUsed", DEF_SAVE_LAST_USED).toBool())
         settings->setValue(OS"/LastUsed/TaskSavePath", QFileInfo(file).path());
+    if (QFileInfo(file).suffix().isEmpty()) {
+        file.append(".tspt");
+    }
 
     if (tspmodel->saveTask(file)) {