print AB

3 files changed, 33 insertions, 16 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index cee0466..5de667e 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -87,7 +87,7 @@ void KOEventViewer::setSource(const QString& n)
                 QDialog dia( this,"dia123", true );
                 dia.setCaption( i18n("Details of attendee") );
                 QVBoxLayout lay ( &dia );
-                KPIM::AddresseeView av ( &dia );
+                KABC::AddresseeView av ( &dia );
                 av.setAddressee( (*it) );
                 lay.addWidget( &av );
                 if ( QApplication::desktop()->width() < 480 )
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 219f7c3..7166a01 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -24,7 +24,9 @@
 #include <qlabel.h>
 
 #include <qapplication.h>
-
+#ifdef DESKTOP_VERSION 
+#include <qpaintdevicemetrics.h>
+#endif
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -56,6 +58,31 @@ void WhatsNextTextBrowser::setSource(const QString& n)
         QTextBrowser::setSource(n);
     }
 }
+void WhatsNextTextBrowser::printMe()
+{
+#ifdef DESKTOP_VERSION 
+    QPrinter printer;
+    if (!printer.setup() )
+        return;
+    QPainter p;
+    p.begin ( &printer  );
+    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    float dx, dy;
+    int wid = (m.width() * 9)/10;
+    dx = (float) wid/(float)contentsWidth ();
+    dy  = (float)(m.height()) / (float)contentsHeight ();
+    float scale;
+    // scale to fit the width or height of the paper
+    if ( dx < dy )
+        scale = dx;
+    else
+        scale = dy;
+    p.translate( m.width()/10,0 );
+    p.scale( scale, scale );
+    drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
+    p.end();
+#endif  
+}
 
 KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
                                  const char *name)
@@ -114,18 +141,7 @@ QPtrList<Incidence> KOWhatsNextView::selectedIncidences()
 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."));
+    mView->printMe();
 #endif
 }
 void KOWhatsNextView::printPreview(CalPrinter *calPrinter, const QDate &fd,
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 0231cf2..715037f 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -34,9 +34,10 @@ class KOEventViewerDialog;
 class WhatsNextTextBrowser : public QTextBrowser {
     Q_OBJECT
   public:
-    WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) {}
+    WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) {};
 
     void setSource(const QString &);
+    void printMe();
 
   signals:
     void showIncidence(const QString &uid);
@@ -88,7 +89,7 @@ class KOWhatsNextView : public KOrg::BaseView
   private:
   //void createEventViewer();
     QTimer* mTimer;
-    QTextBrowser *mView;
+    WhatsNextTextBrowser *mView;
     QString mText;
     // QLabel *mDateLabel;
     KOEventViewerDialog *mEventViewer;