added wnv printing

6 files changed, 32 insertions, 2 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 6a9a200..b66062c 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,15 +7,17 @@ Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
-Fixed some minor problems. (Like word wrap in help text windows).
+Added possibility of printing the What's Next View on the desktop
+(i.e. Windows and Linux).
 
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
 But the alarm applet should work again.
 
+Fixed some minor problems. (Like word wrap in help text windows).
 
 ********** VERSION 1.9.15 ************
 
 Usebilty enhancements in KO/Pi:
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index b2dd266..cf56fcf 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -237,8 +237,10 @@ void KOViewManager::showWhatsNextView()
                                              "KOViewManager::WhatsNextView");
         mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog());
         connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig()));
         addView(mWhatsNextView);
+         connect(this, SIGNAL( printWNV() ),
+             mWhatsNextView, SLOT( printMe() ) );
     }
     globalFlagBlockAgenda = 1;
     showView(mWhatsNextView, true );
     //mWhatsNextView->updateView();
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 26b22be..6f76e2c 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -77,8 +77,10 @@ class KOViewManager : public QObject
     QDate currentSelectionDate();
 
     KOAgendaView *agendaView() const { return mAgendaView; }
 
+ signals:
+    void printWNV();
   public slots:
     void showWhatsNextView();
     void showListView();
     void showAgendaView( bool fullScreen = false );
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 5f14bfa..219f7c3 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -110,9 +110,25 @@ QPtrList<Incidence> KOWhatsNextView::selectedIncidences()
 
     return eventList;
 }
 
-
+void KOWhatsNextView::printMe()
+{
+#ifdef DESKTOP_VERSION 
+    QPrinter printer;
+    if (!printer.setup() )
+        return;
+    QTextBrowser tb;
+    tb.setFixedSize( 600, 4000 );
+    QPainter::redirect ( tb.viewport(), &printer );
+    updateView();
+    tb.setText( mText );
+    tb.show();
+    tb.repaint();
+    tb.hide();
+    KMessageBox::information( this, i18n("Printing What's Next View!\n\nPlease close after\nprinting is finished."));
+#endif
+}
 void KOWhatsNextView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                    const QDate &td)
 {
 #ifndef KORG_NOPRINTER
@@ -673,8 +689,9 @@ void KOWhatsNextView::setEventViewer(KOEventViewerDialog* v )
 
 // TODO: Create this function in CalendarView and remove it from here
 void KOWhatsNextView::showIncidence(const QString &uid)
 {
+ 
     if ( !mEventViewer  ) {
         qDebug("KOWhatsNextView::showIncidence::sorry, no event viewer set ");
         return;
     }
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 9049268..0231cf2 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -28,8 +28,10 @@ class QListView;
 class QLabel;
 
 class KOEventViewerDialog;
 
+#include <qpainter.h>
+#include <qwidget.h>
 class WhatsNextTextBrowser : public QTextBrowser {
     Q_OBJECT
   public:
     WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) {}
@@ -63,8 +65,9 @@ class KOWhatsNextView : public KOrg::BaseView
                               const QDate &, const QDate &);
   
   public slots:
     virtual void updateView();
+    void printMe();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
     void updateConfig();
     void changeEventDisplay(Event *, int);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 6bc5b3a..def8431 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -845,8 +845,12 @@ void MainWindow::initActions()
     action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printSel() ) );
+    action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
+    action->addTo( importMenu );
+    connect( action, SIGNAL( activated() ),
+             mView->viewManager(), SIGNAL( printWNV() ) );
 #endif
     importMenu->insertSeparator();
     action = new QAction( "beam all", i18n("Save"), 0,
                           this );