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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/korganizer/printing
From:       Allen Winter <winter () kde ! org>
Date:       2009-07-13 21:36:09
Message-ID: 1247520969.348575.24787.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 996136 by winterz:

port SVN commit 996076 by winterz:

Print incidence locations when available, in week and month prints


 M  +17 -3     calprintpluginbase.cpp  


--- branches/kdepim/enterprise4/kdepim/korganizer/printing/calprintpluginbase.cpp #996135:996136
@@ -868,7 +868,7 @@
       int( box.top() + startPrintDate.secsTo( endTime ) * minlen / 60. ) - currentYPos;
 
     QRect eventBox( currentX, currentYPos, currentWidth, currentHeight );
-    QString str = i18nc( "starttime - endtime summary, location", 
+    QString str = i18nc( "starttime - endtime summary, location",
                          "%1-%2 %3, %4",
                          KGlobal::locale()->formatTime( startTime.time() ),
                          KGlobal::locale()->formatTime( endTime.time() ),
@@ -935,7 +935,14 @@
     } else {
       text = local->formatTime( currEvent->dtStart().time() );
     }
-    drawIncidence( p, box, text, currEvent->summary(), textY );
+    QString str;
+    if ( !currEvent->location().isEmpty() ) {
+      str = i18nc( "summary, location", "%1, %2",
+                   currEvent->summary(), currEvent->location() );
+    } else {
+      str = currEvent->summary();
+    }
+    drawIncidence( p, box, text, str, textY );
   }
 
   if ( textY < box.height() ) {
@@ -952,7 +959,14 @@
       } else {
         text = "";
       }
-      drawIncidence( p, box, text, i18n( "To-do: %1", todo->summary() ), textY );
+      QString str;
+      if ( !todo->location().isEmpty() ) {
+        str = i18nc( "summary, location", "%1, %2",
+                     todo->summary(), todo->location() );
+      } else {
+        str = todo->summary();
+      }
+      drawIncidence( p, box, text, i18n( "To-do: %1", str ), textY );
     }
   }
 
[prev in list] [next in list] [prev in thread] [next in thread]