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

List:       kde-commits
Subject:    playground/office/kraft
From:       Klaas Freitag <klaas () freisturz ! de>
Date:       2011-10-24 20:40:39
Message-ID: 20111024204039.DF859AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1260467 by freitag:

- added support for python2 named python2 interpreters
- some more column widths tweaking in the reports


 M  +2 -2      reports/de/invoice.trml  
 M  +3 -3      reports/invoice.trml  
 M  +2 -0      src/defaultprovider.cpp  
 M  +0 -1      src/headertemplateprovider.cpp  
 M  +5 -1      src/reportgenerator.cpp  


--- trunk/playground/office/kraft/reports/de/invoice.trml #1260466:1260467
@@ -120,7 +120,7 @@
 
     <spacer length="18mm" width="1mm"/>
 
-    <blockTable colWidths="8mm,8.8cm,1.2cm,1cm,2.5cm,2.5cm" style="items" repeatRows="0">
+    <blockTable colWidths="8mm,8.8cm,0.8cm,1.2cm,2.7cm,2.5cm" style="items" repeatRows="0">
     <tr>
         <td><para style="text">Pos.</para></td>
         <td><para style="text">Posten</para></td>
@@ -141,7 +141,7 @@
     {{/POSITIONS}}
     </blockTable>
     <condPageBreak height="4cm"/> 
-    <blockTable colWidths="10.8cm,3.5cm,2.5cm" style="sums" repeatRows="0">
+    <blockTable colWidths="9.8cm,4cm,3cm" style="sums" repeatRows="0">
     <tr><td></td>
         <td><para style="text">Netto</para></td>
         <td><para style="rtext">{{NETTOSUM}}</para></td>
--- trunk/playground/office/kraft/reports/invoice.trml #1260466:1260467
@@ -57,7 +57,7 @@
       <alias id="style.normal" value="style.Normal"/>
     </initialize>
 
-    <blockTableStyle id="products">
+    <blockTableStyle id="items">
       <blockFont name="Helvetica-BoldOblique" size="24" start="0,0" stop="-1,0"/>
       <blockBackground colorName="lightgrey" start="0,0" stop="-1,0"/>
       <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
@@ -125,7 +125,7 @@
 
     <spacer length="18mm" width="1mm"/>
 
-    <blockTable colWidths="8mm,9cm,1.0cm,1cm,2.5cm,2.5cm" style="products" repeatRows="0">
+    <blockTable colWidths="8mm,8.8cm,0.8cm,1.2cm,2.7cm,2.5cm" style="items" repeatRows="0">
     <tr>
         <td><para style="text">Pos.</para></td>
         <td><para style="text">Item</para></td>
@@ -147,7 +147,7 @@
   </blockTable>
 
   <condPageBreak height="4cm"/>
-  <blockTable colWidths="10.8cm,3.5cm,2.5cm" style="sums" repeatRows="0">
+  <blockTable colWidths="9.8cm,4cm,3cm" style="sums" repeatRows="0">
     <tr><td></td>
         <td><para style="text">Net</para></td>
         <td><para style="rtext">{{NETTOSUM}}</para></td>
--- trunk/playground/office/kraft/src/defaultprovider.cpp #1260466:1260467
@@ -156,6 +156,8 @@
     QSqlQuery q;
     q.prepare("DELETE FROM DocTexts WHERE docTextID=" + dt.dbId().toString() ) ;
     q.exec();
+  } else {
+    kDebug() << "Delete document text not ok: " << dt.text();
   }
 }
 
--- trunk/playground/office/kraft/src/headertemplateprovider.cpp #1260466:1260467
@@ -58,7 +58,6 @@
 {
   kDebug() << "SlotEditTemplate called!" << endl;
 
-
   TextEditDialog dia( mParent, KraftDoc::Header );
 
   /* mCurrentText is set through the slot slotSetCurrentDocText */
--- trunk/playground/office/kraft/src/reportgenerator.cpp #1260466:1260467
@@ -362,8 +362,12 @@
     kDebug() << "Ermlpy: " << ermlpy;
     if( ! ermlpy.isEmpty() ) {
       // need the python interpreter
-      QString python = KStandardDirs::findExe("python");
+      // First check for python2 in python3 times. 
+      QString python = KStandardDirs::findExe("python2");
       if( python.isEmpty() ) {
+	python = KStandardDirs::findExe("python");
+      }
+      if( python.isEmpty() ) {
         kError() << "ERR: Unable to find python, thats a problem";
       } else {
         kDebug() << "Using python: " << python;
[prev in list] [next in list] [prev in thread] [next in thread]