File r893481.diff of Package kdepim4
Subject: korganizer: fix printing
From: wstephenson@suse.de
Bug:
Patch-upstream: 893481
--- korganizer/journalview.cpp (revision 893480)
+++ korganizer/journalview.cpp (revision 893481)
@@ -99,6 +99,7 @@ void JournalDateView::addJournal( Journa
JournalView *entry = new JournalView( j, this );
entry->show();
+ entry->setCalendar( mCalendar );
entry->setDate( mDate );
entry->setIncidenceChanger( mChanger );
@@ -237,16 +238,15 @@ void JournalView::printItem()
{
#ifndef KORG_NOPRINTER
if ( mJournal ) {
- Calendar *cal = 0;
KOCoreHelper helper;
- CalPrinter printer( this, cal, &helper );
+ CalPrinter printer( this, mCalendar, &helper );
connect( this, SIGNAL(configChanged()), &printer, SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mJournal );
printer.print( KOrg::CalPrinterBase::Incidence,
- QDate(), QDate(), selectedIncidences );
+ mDate, mDate, selectedIncidences );
}
#endif
}
@@ -258,6 +258,10 @@ void JournalView::setReadOnly( bool read
mDeleteButton->setEnabled( !mReadOnly );
}
+void JournalView::setCalendar( Calendar *cal )
+{
+ mCalendar = cal;
+}
void JournalView::setDate(const QDate &date)
{
--- korganizer/journalview.h (revision 893480)
+++ korganizer/journalview.h (revision 893481)
@@ -65,6 +65,7 @@ class JournalView : public QWidget {
void setJournal(Journal *);
Journal *journal() const { return mJournal; }
+ void setCalendar( Calendar *cal );
QDate date() const { return mDate; }
void clear();
@@ -93,6 +94,7 @@ class JournalView : public QWidget {
private:
Journal *mJournal;
+ Calendar *mCalendar;
QDate mDate;
bool mReadOnly;
Index: korganizer/journalview.cpp
===================================================================
Index: korganizer/journalview.h
===================================================================