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

List:       kde-commits
Subject:    KDE/kdepim/korganizer/printing
From:       Allen Winter <winter () kde ! org>
Date:       2009-07-13 20:00:56
Message-ID: 1247515256.730216.14118.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 996076 by winterz:

Print incidence locations when available, in week and month prints
DO_NOT_BACKPORT: new strings
MERGE: e35,e4


 M  +16 -2     calprintpluginbase.cpp  


--- trunk/KDE/kdepim/korganizer/printing/calprintpluginbase.cpp #996075:996076
@@ -1041,8 +1041,15 @@
     }
     p.save();
     setCategoryColors( p, currEvent );
+    QString str;
+    if ( !currEvent->location().isEmpty() ) {
+      str = i18nc( "summary, location", "%1, %2",
+                   currEvent->summary(), currEvent->location() );
+    } else {
+      str = currEvent->summary();
+    }
     drawIncidence( p, box, timeText,
-                   currEvent->summary(), currEvent->description(),
+                   str, currEvent->description(),
                    textY, singleLineLimit, includeDescription,
                    currEvent->descriptionIsRich() );
     p.restore();
@@ -1068,8 +1075,15 @@
       }
       p.save();
       setCategoryColors( p, todo );
+      QString str;
+      if ( !todo->location().isEmpty() ) {
+        str = i18nc( "summary, location", "%1, %2",
+                     todo->summary(), todo->location() );
+      } else {
+        str = todo->summary();
+      }
       drawIncidence( p, box, timeText,
-                     i18n( "To-do: %1", todo->summary() ), todo->description(),
+                     i18n( "To-do: %1", str ), todo->description(),
                      textY, singleLineLimit, includeDescription,
                      todo->descriptionIsRich() );
       p.restore();
[prev in list] [next in list] [prev in thread] [next in thread]