[Phoneorder-commits] SF.net SVN: phoneorder:[53] trunk/src

[<hur...@us...>]

Revision: 53
          http://phoneorder.svn.sourceforge.net/phoneorder/?rev=53&view=rev
Author:   hurikhan
Date:     2010-06-13 12:46:02 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Fix reading settings file

This fixes reading the settings file by adjusting the encoding to UTF-8.

Modified Paths:
--------------
    trunk/src/main.cpp
    trunk/src/orderwidget.ui.h

Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp	2010-06-13 08:48:13 UTC (rev 52)
+++ trunk/src/main.cpp	2010-06-13 12:46:02 UTC (rev 53)
@@ -82,7 +82,11 @@
 
     QPrintDialog *dialog = new QPrintDialog(mw->printer, mw);
     dialog->setWindowTitle(QObject::tr("Printer Setup"));
-    if (dialog->exec() == QDialog::Accepted) return a.exec ();
+    if (dialog->exec() == QDialog::Accepted)
+    {
+        mw->printer->setFullPage(TRUE);
+        return a.exec ();
+    }
 
     return 1;
 }

Modified: trunk/src/orderwidget.ui.h
===================================================================
--- trunk/src/orderwidget.ui.h	2010-06-13 08:48:13 UTC (rev 52)
+++ trunk/src/orderwidget.ui.h	2010-06-13 12:46:02 UTC (rev 53)
@@ -19,6 +19,7 @@
 #include <Q3SimpleRichText>
 #include <QSettings>
 #include <QDateTime>
+#include <QTextCodec>
 
 #include "templatereader.h"
 #include "mainform.h"
@@ -653,6 +654,7 @@
 
     /* load static template settings */
     QSettings settings("kaishome.de", "PhoneOrder"); // FS#14
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
 
     settings.beginGroup("Template");
     QString companyName   = settings.value("CompanyName",   tr("Example Company")).toString();
@@ -691,7 +693,6 @@
     invoiceNumber.sprintf("RN%8s-%04d", day.ascii(), number);
 
     qDebug("Printing");
-    printer->setFullPage(TRUE);
     QPainter p;
     if (!p.begin(printer))
     {
@@ -849,6 +850,8 @@
         page++;
     } while (TRUE);
 
+    if (!p.end()) qDebug("Print painter yielded failure");
+
     qDebug("Closing form");
     this->cancelButton_clicked();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.