From ea070abfcff313cac87dbb4d5c9410784740de21 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 28 Mar 2005 19:26:15 +0000 Subject: print fixes --- (limited to 'korganizer') diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 445fc86..dbe0668 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -75,6 +75,12 @@ 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; @@ -91,8 +97,13 @@ void KOEventViewer::printMe() 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 diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index ca5bc15..6ecc233 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -30,6 +30,59 @@ using namespace KCal; +#ifdef DESKTOP_VERSION + +#include +#include +#include +#include +#include +#include +#include + +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: diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index ec55cca..35d084d 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -93,14 +93,6 @@ void KOEventViewerDialog::showMe() } 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(); } diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 66ff75d..53fe7d0 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -41,6 +41,7 @@ #include "koglobals.h" #include "koprefs.h" #include "koeventviewerdialog.h" +#include "koeventviewer.h" #include #include "kowhatsnextview.h" using namespace KOrg; @@ -61,6 +62,11 @@ void WhatsNextTextBrowser::setSource(const QString& n) void WhatsNextTextBrowser::printMe() { #ifdef DESKTOP_VERSION + KOPrintPrefs pp ( this ); + if (!pp.exec() ) + return; + int scaleval = pp.printMode() ; + QPrinter printer; if (!printer.setup() ) return; @@ -78,7 +84,11 @@ void WhatsNextTextBrowser::printMe() 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 -- cgit v0.9.0.2