print fixes

4 files changed, 76 insertions, 10 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 445fc86..dbe0668 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -62,50 +62,61 @@
 #endif //DESKTOP_VERSION
 
 KOEventViewer::KOEventViewer(QWidget *parent,const char *name)
   : QTextBrowser(parent,name)
 {
     mSyncMode = false;
     mColorMode = 0;
 }
 
 KOEventViewer::~KOEventViewer()
 {
 }
 
 void KOEventViewer::printMe()
 {
 #ifdef DESKTOP_VERSION 
+
+    KOPrintPrefs pp ( this );
+    if (!pp.exec() )
+        return;
+    int scaleval = pp.printMode() ;
+
     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 );
+    qDebug("Scale: %f ", scale );
+    if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
+        qDebug("SCALE ");
+        p.scale( scale, scale );
+    }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 
 }
 void KOEventViewer::setSource(const QString& n)
 {
 
     if ( n.left(3) == "uid" ) 
 #ifdef DESKTOP_VERSION
         {
         KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
         KABC::AddressBook::Iterator it;
         for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) {
             // LR I do not understand, why the uid string is different on zaurus and desktop
             QString uid = "uid://"+(*it).uid();
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index ca5bc15..6ecc233 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -17,32 +17,85 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
 //
 // Viewer widget for events.
 //
 
 #include <qtextbrowser.h>
 
 #include <libkcal/event.h>
 #include <libkcal/journal.h>
 
 
 using namespace KCal;
 
+#ifdef DESKTOP_VERSION
+
+#include <qradiobutton.h>
+#include <qpushbutton.h>
+#include <qlayout.h>
+#include <qdialog.h>
+#include <qlabel.h>
+#include <qbuttongroup.h>
+#include <kglobal.h>
+
+class KOPrintPrefs : public QDialog
+{
+  public:
+    KOPrintPrefs( QWidget *parent=0, const char *name=0 ) :
+      QDialog( parent, name, true ) 
+    {
+        setCaption( i18n("KO/Pi Printout") );
+        QVBoxLayout* lay = new QVBoxLayout( this );
+        lay->setSpacing( 3 );
+        lay->setMargin( 3 );
+        QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog."), this );
+        lay->addWidget( lab ); 
+        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this );
+        lay->addWidget( format ); 
+        format->setExclusive ( true ) ;
+        pmNo = new QRadioButton(i18n("Print unscaled"), format );
+        pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format );
+        new QRadioButton(i18n("Print scaled up/down to fit one page"), format );
+        pmScaledDown->setChecked( true );
+        QPushButton * ok = new QPushButton( i18n("OK"), this );
+        lay->addWidget( ok );
+        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
+        lay->addWidget( cancel );
+        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
+        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
+        resize( 200, 200 );
+    }
+      
+    int printMode() 
+    {
+        if ( pmNo->isChecked() )
+            return 0;
+        if ( pmScaledDown->isChecked() )
+            return 1;
+        return 2;
+    }
+private:
+    QRadioButton* pmNo;
+    QRadioButton* pmScaledDown;
+};
+
+#endif
+
 class KOEventViewer : public QTextBrowser {
     Q_OBJECT
   public:
     KOEventViewer(QWidget *parent=0,const char *name=0);
     virtual ~KOEventViewer();
 
     void setSource(const QString &);
     void setEvent(Event *event);
     void addEvent(Event *event);
     void setTodo(Todo *event, bool clearV = true );
     void setJournal(Journal *jour, bool clearV = true );
 
     void appendEvent(Event *event, int mode = 0 );
     void appendTodo(Todo *event, int mode = 0 );
     void appendJournal(Journal *jour, int mode = 0 );
     
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index ec55cca..35d084d 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -80,40 +80,32 @@ void KOEventViewerDialog::showMe()
     y = geometry().y();
     w = width();
     h = height();
     show();
     setGeometry(x,y,w,h);
 #else
     showMaximized();
 #endif
     raise();
     setActiveWindow();
     mEventViewer->setFocus(); 
     //raise();
 
 }
 void KOEventViewerDialog::print()
 {
-    qDebug("PRINT ");
-    int km = KMessageBox::warningContinueCancel(this,mIncidence->summary().left(35) +
-                                                        i18n("\n\nDo you really want to print this item?"),
-                                                        i18n("KO/Pi Print Confirmation"),i18n("Print"));
-    if ( km != KMessageBox::Continue ) {
-        qDebug("cancel "); 
-        return;
-    }
     mEventViewer->printMe();
 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
 {
   mSyncMode = b;
   //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode );
   if ( mSyncMode ) {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
   } else {
     findButton( Close )->setText( i18n("Close"));
     findButton( Ok )->setText( i18n("Edit"));
     findButton( User1 )->setText( i18n("Agenda"));
   }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 66ff75d..53fe7d0 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -28,70 +28,80 @@
 #include <qpaintdevicemetrics.h>
 #endif
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include <libkcal/calendar.h>
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koglobals.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
+#include "koeventviewer.h"
 #include <qstylesheet.h> 
 #include "kowhatsnextview.h"
 using namespace KOrg;
 
 void WhatsNextTextBrowser::setSource(const QString& n)
 {
 
     if (n.startsWith("event:")) {
         emit showIncidence(n);
         return;
     } else if (n.startsWith("todo:")) {
         emit showIncidence(n);
         return;
     } else {
         QTextBrowser::setSource(n);
     }
 }
 void WhatsNextTextBrowser::printMe()
 {
 #ifdef DESKTOP_VERSION 
+     KOPrintPrefs pp ( this );
+    if (!pp.exec() )
+        return;
+    int scaleval = pp.printMode() ;
+
     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 );
+    qDebug("Scale: %f ", scale );
+    if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
+        qDebug("SCALE ");
+        p.scale( scale, scale );
+    }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 }
 
 KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
                                  const char *name)
     : KOrg::BaseView(calendar, parent, name)
 {
     //  mDateLabel =
     //       new QLabel(KGlobal::locale()->formatDate(QDate::currentDate()),this);
     //   mDateLabel->setMargin(2);
     //   mDateLabel->setAlignment(AlignCenter);
     setFont( KOPrefs::instance()->mWhatsNextFont );
     mView = new WhatsNextTextBrowser(this);
     connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));