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

List:       kde-commits
Subject:    KDE/kdepim/korganizer/printing
From:       Laurent Montel <montel () kde ! org>
Date:       2010-03-31 7:29:22
Message-ID: 20100331072922.4606AAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1109475 by mlaurent:

Forwardport
Fix Bug 230502 -  Wrong information layout when printing a journal entry


 M  +8 -4      calprintdefaultplugins.cpp  


--- trunk/KDE/kdepim/korganizer/printing/calprintdefaultplugins.cpp #1109474:1109475
@@ -5,6 +5,7 @@
   Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
   Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
   Copyright (c) 2008 Ron Goodheart <rong.dev@gmail.com>
+  Copyright (c) 2010 Laurent Montel <montel@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -388,9 +389,12 @@
     QRect locationBox( timesBox );
     locationBox.setTop( timesBox.bottom() + padding() );
     locationBox.setHeight( 0 );
-    int locationBottom = drawBoxWithCaption( p, locationBox, i18n( "Location: " ),
-                                             (*it)->location(), /*sameLine=*/true,
-                                             /*expand=*/true, captionFont, textFont \
); +    int locationBottom = 0;
+    if ( !isJournal ) {
+      locationBottom = drawBoxWithCaption( p, locationBox, i18n( "Location: " ),
+                                           (*it)->location(), /*sameLine=*/true,
+                                           /*expand=*/true, captionFont, textFont );
+    }
     locationBox.setBottom( locationBottom );
 
     // Now start constructing the boxes from the bottom:
@@ -408,7 +412,7 @@
     QRect optionsBox( isJournal ? box.left() :  attachmentsBox.right() + padding(), \
attachmentsBox.top(), 0, 0 );  optionsBox.setRight( box.right() );
     optionsBox.setBottom( attachmentsBox.bottom() );
-    QRect notesBox( optionsBox.left(), locationBox.bottom() + padding(),
+    QRect notesBox( optionsBox.left(), isJournal ? ( timesBox.bottom() + padding() ) \
: ( locationBox.bottom() + padding() ),  optionsBox.width(), 0 );
     notesBox.setBottom( optionsBox.top() - padding() );
     QRect descriptionBox( notesBox );


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