[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kwordquiz/src
From:       Peter Hedlund <peter () peterandlinda ! com>
Date:       2010-12-15 23:26:33
Message-ID: 20101215232633.EA01CAC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1206807 by hedlund:

Correct codec for html export. Printing enhancements

 M  +7 -4      kwqtableview.cpp  
 M  +1 -1      kwqtableview.h  


--- trunk/KDE/kdeedu/kwordquiz/src/kwqtableview.cpp #1206806:1206807
@@ -80,7 +80,7 @@
   if (printDialog->exec() == QDialog::Accepted) {
     Prefs::setPrintStyle(p->printStyle());
     QTextDocument td;
-    createPages(&printer, &td);
+    createPages(&printer, &td, true);
   }
   delete printDialog;
 }
@@ -90,7 +90,7 @@
   QPrinter printer;
   KPrintPreview preview(&printer, this);
   QTextDocument td;
-  createPages(&printer, &td);
+  createPages(&printer, &td, true);
   preview.exec();
 }
 
@@ -105,7 +105,8 @@
     QTextDocument td;
     td.setMetaInformation(QTextDocument::DocumentTitle, model()->sourceModel()->document()->title());
     QTextStream out(&data);
-    createPages(&printer, &td);
+    out.setCodec("utf-8");
+    createPages(&printer, &td, false);
     out << td.toHtml("utf-8");
     data.close();
     success = true;
@@ -113,7 +114,7 @@
   return success;
 }
 
-void KWQTableView::createPages(QPrinter *printer, QTextDocument *textDoc)
+void KWQTableView::createPages(QPrinter *printer, QTextDocument *textDoc, bool sendToPrinter)
 {
   printer->setFullPage(true);
   int myDpi = printer->logicalDpiY();
@@ -206,6 +207,7 @@
     constraints.append(QTextLength(QTextLength::FixedLength, verticalHeader()->width()));
     constraints.append(QTextLength(QTextLength::FixedLength, columnWidth(0)));
     constraints.append(QTextLength(QTextLength::FixedLength, columnWidth(1)));
+    if (Prefs::printStyle() == Prefs::EnumPrintStyle::Exam)
     constraints.append(QTextLength(QTextLength::FixedLength, 50));
     tableFormat.setColumnWidthConstraints(constraints);
 
@@ -247,6 +249,7 @@
     }
   }
 
+  if (sendToPrinter)
   textDoc->print(printer);
 }
 
--- trunk/KDE/kdeedu/kwordquiz/src/kwqtableview.h #1206806:1206807
@@ -82,7 +82,7 @@
   void horizontalHeaderDataChanged(Qt::Orientation, int, int);
 
 private:
-  void createPages(QPrinter *, QTextDocument *);
+  void createPages(QPrinter *, QTextDocument *, bool);
   bool selectionHasMoreThanText();
 
   QString m_currentText;
[prev in list] [next in list] [prev in thread] [next in thread]