1 files changed, 2 insertions, 2 deletions

diff --git a/korganizer/calprintplugins.cpp b/korganizer/calprintplugins.cpp
index bc35ca4..9b6dc6e 100644
--- a/korganizer/calprintplugins.cpp
+++ b/korganizer/calprintplugins.cpp
@@ -1,416 +1,416 @@
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qpainter.h>
-#include <qdatetimeedit.h>
+#include <q3datetimeedit.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kconfig.h>
 #include <kcalendarsystem.h>
 
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
 
 #include <libkdepim/kdateedit.h>
 
 #include "koprefs.h"
 #include "koglobals.h"
 #include "calprintplugins.h"
 #ifndef KORG_NOPRINTER
 
 //#include "calprintplugins.moc"
 
 #define LEFT_DISTANCE 45
 
 /**************************************************************
  *           Print Day
  **************************************************************/
 
 CalPrintDay::CalPrintDay( KPrinter *printer, Calendar *cal, KConfig *cfg )
   : CalPrintBase( printer, cal, cfg )
 {
 }
 
 CalPrintDay::~CalPrintDay()
 {
 }
 
 QWidget *CalPrintDay::configWidget( QWidget *w )
 {
   mConfigWidget = new CalPrintDayConfig_Base( w );
   setSettingsWidget();
   return mConfigWidget;
 }
 
 void CalPrintDay::readSettingsWidget()
 {
   CalPrintDayConfig_Base *cfg = mConfigWidget;
   if ( cfg ) {
     mFromDate = cfg->mFromDate->date();
     mToDate = cfg->mToDate->date();
 
     mStartTime = cfg->mFromTime->time();
     mEndTime = cfg->mToTime->time();
     mIncludeAllEvents = cfg->mIncludeAllEvents->isChecked();
 
     mIncludeTodos = cfg->mIncludeTodos->isChecked();
     mUseColors = cfg->mColors->isChecked();
   }
 }
 
 void CalPrintDay::setSettingsWidget()
 {
   CalPrintDayConfig_Base *cfg =( mConfigWidget );
   if ( cfg ) {
     cfg->mFromDate->setDate( mFromDate );
     cfg->mToDate->setDate( mToDate );
 
     cfg->mFromTime->setTime( mStartTime );
     cfg->mToTime->setTime( mEndTime );
     cfg->mIncludeAllEvents->setChecked( mIncludeAllEvents );
 
     cfg->mIncludeTodos->setChecked( mIncludeTodos );
     cfg->mColors->setChecked( mUseColors );
   }
 }
 
 void CalPrintDay::loadConfig()
 {
   if ( mConfig ) {
     QDate dt;
     QTime tm1 = QTime( KOPrefs::instance()->mDayBegins, 0,0 );
     QDateTime startTm( dt, tm1  );
     QDateTime endTm( dt, tm1.addSecs( 12 * 60 * 60 ) );
     mStartTime = mConfig->readDateTimeEntry( "Start time", &startTm ).time();
     mEndTime = mConfig->readDateTimeEntry( "End time", &endTm ).time();
     mIncludeTodos = mConfig->readBoolEntry( "Include todos", false );
     mIncludeAllEvents = mConfig->readBoolEntry( "Include all events", false );
   }
   setSettingsWidget();
 }
 
 void CalPrintDay::saveConfig()
 {
   readSettingsWidget();
   if ( mConfig ) {
     mConfig->writeEntry( "Start time", QDateTime( QDate(), mStartTime ) );
     mConfig->writeEntry( "End time", QDateTime( QDate(), mEndTime ) );
     mConfig->writeEntry( "Include todos", mIncludeTodos );
     mConfig->writeEntry( "Include all events", mIncludeAllEvents );
   }
 }
 
 void CalPrintDay::setDateRange( const QDate& from, const QDate& to )
 {
   CalPrintBase::setDateRange( from, to );
   CalPrintDayConfig_Base *cfg = mConfigWidget ;
   if ( cfg ) {
     cfg->mFromDate->setDate( from );
     cfg->mToDate->setDate( to );
   }
 }
 
 void CalPrintDay::print( QPainter &p, int width, int height )
 {
     QDate curDay( mFromDate );
     int yoffset = 0, xoffset = 0;
     if ( width > height ) {
         yoffset += LEFT_DISTANCE;
     } else {
         xoffset += LEFT_DISTANCE;
     }
     width -= xoffset;
     height -= yoffset;
     do {
         int x = 0;
         int y = 0; 
    
    
     int currHeight=( height - y ) / 20;
     QTime curStartTime( mStartTime );
     QTime curEndTime( mEndTime );
     if ( curStartTime.secsTo( curEndTime ) <= 3600 ) {
       if ( curStartTime.hour() == 0 ) {
         curStartTime = QTime( 0, 0, 0 );
         curEndTime = curStartTime.addSecs( 3600 );
       } else if ( curEndTime.hour() == 23 ) {
         curEndTime=QTime( 23, 59, 59 );
         if ( curStartTime > QTime( 23, 0, 0 ) ) {
           curStartTime = QTime( 23, 0, 0 );
         }
       } else {
         curStartTime = curStartTime.addSecs( -1200 );
       }
       curEndTime = curEndTime.addSecs( 1200 );
     }
 
     KLocale *local = KGlobal::locale();
     drawHeader( p, local->formatDate( curDay, false ),
                 curDay, QDate(), xoffset, yoffset, width, mHeaderHeight );
 
     y += mHeaderHeight + 5;
     x = 80;
     Event::List eventList;  eventList.fill( mCalendar->events( curDay, true ));
 
     p.setFont( QFont( "helvetica", 10 ) );
     currHeight = p.fontMetrics().lineSpacing()*3/2;
     drawAllDayBox( p, eventList, curDay, true, x+xoffset, y+yoffset, width - x, currHeight );
     y += currHeight;
     drawAgendaDayBox( p, eventList, curDay, mIncludeAllEvents,
                       curStartTime, curEndTime, x+xoffset, y+yoffset, width - x, height - y );
     drawTimeLine( p, curStartTime, curEndTime, xoffset, y+yoffset, x - 5, height - y );
     curDay = curDay.addDays( 1 );
     if ( curDay <= mToDate ) mPrinter->newPage();
   } while ( curDay <= mToDate );
 }
 
 
 
 /**************************************************************
  *           Print Week
  **************************************************************/
 
 CalPrintWeek::CalPrintWeek(KPrinter *printer, Calendar *cal, KConfig *cfg)
   :CalPrintBase(printer,cal,cfg)
 {
 }
 
 CalPrintWeek::~CalPrintWeek()
 {
 }
 
 QWidget *CalPrintWeek::configWidget( QWidget *w )
 {
   mConfigWidget = new CalPrintWeekConfig_Base( w );
   setSettingsWidget();
   return mConfigWidget;
 }
 
 void CalPrintWeek::readSettingsWidget()
 {
   CalPrintWeekConfig_Base *cfg =( mConfigWidget );
   if ( cfg ) {
     mFromDate = cfg->mFromDate->date();
     mToDate = cfg->mToDate->date();
 
     mWeekPrintType = (eWeekPrintType)( cfg->mPrintType->id(
       cfg->mPrintType->selected() ) );
 
     mStartTime = cfg->mFromTime->time();
     mEndTime = cfg->mToTime->time();
 
     mIncludeTodos = cfg->mIncludeTodos->isChecked();
     mUseColors = cfg->mColors->isChecked();
   }
 }
 
 void CalPrintWeek::setSettingsWidget()
 {
   CalPrintWeekConfig_Base *cfg =( mConfigWidget );
   if ( cfg ) {
     cfg->mFromDate->setDate( mFromDate );
     cfg->mToDate->setDate( mToDate );
 
     cfg->mPrintType->setButton( mWeekPrintType );
 
     cfg->mFromTime->setTime( mStartTime );
     cfg->mToTime->setTime( mEndTime );
 
     cfg->mIncludeTodos->setChecked( mIncludeTodos );
     cfg->mColors->setChecked( mUseColors );
   }
 }
 
 void CalPrintWeek::loadConfig()
 {
   if ( mConfig ) {
     QDate dt;
     QTime tm1 = QTime( KOPrefs::instance()->mDayBegins, 0,0);
     QDateTime startTm( dt, tm1  );
     QDateTime endTm( dt, tm1.addSecs( 43200 ) );
     mStartTime = mConfig->readDateTimeEntry( "Start time", &startTm ).time();
     mEndTime = mConfig->readDateTimeEntry( "End time", &endTm ).time();
     mIncludeTodos = mConfig->readBoolEntry( "Include todos", false );
     mWeekPrintType =(eWeekPrintType)( mConfig->readNumEntry( "Print type", (int)Filofax ) );
   }
   setSettingsWidget();
 }
 
 void CalPrintWeek::saveConfig()
 {
   readSettingsWidget();
   if ( mConfig ) {
     mConfig->writeEntry( "Start time", QDateTime( QDate(), mStartTime ) );
     mConfig->writeEntry( "End time", QDateTime( QDate(), mEndTime ) );
     mConfig->writeEntry( "Include todos", mIncludeTodos );
     mConfig->writeEntry( "Print type", int( mWeekPrintType ) );
   }
 }
 
 KPrinter::Orientation CalPrintWeek::orientation()
 {
   if ( mWeekPrintType == Filofax ||  mWeekPrintType == SplitWeek ) return KPrinter::Portrait;
   else return KPrinter::Landscape;
 }
 
 void CalPrintWeek::setDateRange( const QDate &from, const QDate &to )
 {
   CalPrintBase::setDateRange( from, to );
   CalPrintWeekConfig_Base *cfg =( mConfigWidget );
   if ( cfg ) {
     cfg->mFromDate->setDate( from );
     cfg->mToDate->setDate( to );
   }
 }
 
 void CalPrintWeek::print( QPainter &p, int width, int height )
 {
   QDate curWeek, fromWeek, toWeek;
   int yoffset = 0, xoffset = 0;
   //width = height -1;//test only
   if ( width > height ) {
       yoffset += LEFT_DISTANCE;
   } else {
       xoffset += LEFT_DISTANCE;
   }
   width -= xoffset;
   height -= yoffset;
   // correct begin and end to first and last day of week
   int weekdayCol = weekdayColumn( mFromDate.dayOfWeek() );
   fromWeek = mFromDate.addDays( -weekdayCol );
   weekdayCol = weekdayColumn( mFromDate.dayOfWeek() );
   toWeek = mToDate.addDays( 6 - weekdayCol );
 
   curWeek = fromWeek.addDays( 6 );
   KLocale *local = KGlobal::locale();
 
   switch ( mWeekPrintType ) {
     case Filofax:
       do {
         QString line1( local->formatDate( curWeek.addDays( -6 ) ) );
         QString line2( local->formatDate( curWeek ) );
         drawHeader( p, line1 + "\n" + line2, curWeek.addDays( -6 ), QDate(),
                     0+xoffset, 0+yoffset, width, mHeaderHeight );
         int top = mHeaderHeight + 10;
         drawWeek( p, curWeek, 0+xoffset, top+yoffset, width, height - top );
         curWeek = curWeek.addDays( 7 );
         if ( curWeek <= toWeek )
           mPrinter->newPage();
       } while ( curWeek <= toWeek );
       break;
 
     case Timetable:
     default:
       do {
         QString line1( local->formatDate( curWeek.addDays( -6 ) ) );
         QString line2( local->formatDate( curWeek ) );
         //int hh = int(mHeaderHeight * 2./3.);
         int hh = mHeaderHeight;
         if (  yoffset )
             drawHeader( p, i18n("date from - to", "%1 - %2").arg( line1 ).arg( line2 ),
                         curWeek, QDate(), 0+xoffset, 0+yoffset, width, hh );
         else
             drawHeader( p, i18n("date from - to", "%1 -\n%2").arg( line1 ).arg( line2 ),
                         curWeek, QDate(), 0+xoffset, 0+yoffset, width, hh );
         drawTimeTable( p, fromWeek, curWeek,
                        mStartTime, mEndTime, 0+xoffset, hh + 5+yoffset,
                        width, height - hh - 5 );
         fromWeek = fromWeek.addDays( 7 );
         curWeek = fromWeek.addDays( 6 );
         if ( curWeek <= toWeek )
           mPrinter->newPage();
       } while ( curWeek <= toWeek );
       break;
 
     case SplitWeek: 
       drawSplitWeek( p, fromWeek, toWeek );
       break;
   }
 }
 
 
 
 
 /**************************************************************
  *           Print Month
  **************************************************************/
 
 CalPrintMonth::CalPrintMonth( KPrinter *printer, Calendar *cal, KConfig *cfg )
   : CalPrintBase( printer, cal, cfg )
 {
 }
 
 CalPrintMonth::~CalPrintMonth()
 {
 }
 
 QWidget *CalPrintMonth::configWidget( QWidget *w )
 {
   mConfigWidget = new CalPrintMonthConfig_Base( w );
   return mConfigWidget;
 }
 
 void CalPrintMonth::readSettingsWidget()
 {
   CalPrintMonthConfig_Base *cfg =( mConfigWidget );
   if ( cfg ) {
     mFromDate = cfg->mFromDate->date();
     mToDate = cfg->mToDate->date();
 
     mWeekNumbers =  cfg->mWeekNumbers->isChecked();
 
     mIncludeTodos = cfg->mIncludeTodos->isChecked();
 //    mUseColors = cfg->mColors->isChecked();
   }
 }
 
 void CalPrintMonth::setSettingsWidget()
 {
   CalPrintMonthConfig_Base *cfg =( mConfigWidget );
   if ( cfg ) {
     cfg->mFromDate->setDate( mFromDate );
     cfg->mToDate->setDate( mToDate );
 
     cfg->mWeekNumbers->setChecked( mWeekNumbers );
 
     cfg->mIncludeTodos->setChecked( mIncludeTodos );
 //    cfg->mColors->setChecked( mUseColors );
   }
 }
 
 void CalPrintMonth::loadConfig()
 {
   if ( mConfig ) {
     mWeekNumbers = mConfig->readBoolEntry( "Print week numbers", true );
     mIncludeTodos = mConfig->readBoolEntry( "Include todos", false );
   }