fixes

10 files changed, 86 insertions, 10 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a330414..0015bd6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3418,25 +3418,34 @@ bool CalendarView::isReadOnly()
 void CalendarView::setReadOnly(bool readOnly)
 {
     if (mReadOnly != readOnly) {
         mReadOnly = readOnly;
         emit readOnlyChanged(mReadOnly);
     }
 }
 
 bool CalendarView::isModified()
 {
     return mModified;
 }
-
+void CalendarView::slotprintSelInc()
+{
+    if ( currentSelection() == 0 ) {
+        KMessageBox::sorry(this,i18n("There is nothing selected!"));
+        return;
+    }
+    showIncidence();
+    getEventViewerDialog()->print();
+    
+}
 void CalendarView::printSetup()
 {
 #ifndef KORG_NOPRINTER
     createPrinter();
 
     mCalPrinter->setupPrinter();
 #endif
 }
 
 void CalendarView::print()
 {
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 9782ffe..05a34b4 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -167,24 +167,25 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
     /** Emitted, when the number of outgoing messages has changed. */
     void numOutgoingChanged(int);
 
     /** Send status message, which can e.g. be displayed in the status bar. */
     void statusMessage(const QString &);
     
     void calendarViewExpanded( bool );
     void updateSearchDialog();
 
 
   public slots:
+    void slotprintSelInc();
     void showNextAlarms();
     void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void addSuspendAlarm(const QDateTime &qdt, const QString &noti  );
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
     /** options dialog made a changed to the configuration. we catch this
      *  and notify all widgets which need to update their configuration. */
     void updateConfig();
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 1508638..445fc86 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -44,40 +44,69 @@
 #include "actionmanager.h"
 #endif
 
 #include "koeventviewer.h"
 //#ifndef KORG_NOKABC
 //#include <kabc/stdaddressbook.h>
 //#define size count
 //#endif
 
 #ifdef DESKTOP_VERSION
 #include <kabc/addresseedialog.h>
 #include <kabc/addresseeview.h>
+#include <qprinter.h>
+#include <qpainter.h>
+#include <qpaintdevicemetrics.h>
 #else //DESKTOP_VERSION
 #include <externalapphandler.h>
 #include <qtopia/qcopenvelope_qws.h> 
 #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 
+    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  
+
+}
 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 47cc5e9..ca5bc15 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -43,24 +43,25 @@ class KOEventViewer : public QTextBrowser {
     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 );
     
     void clearEvents(bool now=false);
     
     void addText(QString text);
     void setSyncMode( bool );
     void setColorMode( int );
     void mailToAttendees( bool all );
+    void printMe();
 
   protected:
     int mColorMode;
     void addTag(const QString & tag,const QString & text);
 
     void formatCategories(Incidence *event);
     void formatAttendees(Incidence *event);
     void formatReadOnly(Incidence *event);
     void keyPressEvent ( QKeyEvent * e );
 
   private:
     QTextBrowser *mEventTextView;
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f734696..ec55cca 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -15,24 +15,25 @@
     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.
 */
 
 #include <klocale.h>
 
 #include <libkcal/event.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
 
 #include "koeventviewer.h"
+#include <kmessagebox.h>
 #include "koprefs.h"
 #include <libkcal/todo.h>
 #include "qapp.h"
 
 #include "koeventviewerdialog.h"
 extern int globalFlagBlockAgenda;
 
 KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name)
   : KDialogBase(parent,name,
 #ifndef DESKTOP_VERSION
                 true ,
 #else
@@ -81,24 +82,37 @@ void KOEventViewerDialog::showMe()
     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/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 36431ad..8e1cd44 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -42,24 +42,25 @@ class KOEventViewerDialog : public KDialogBase {
     void addEvent(Event *event);
     void setTodo(Todo *event);
     void setJournal(Journal *journal);
     void setIncidence(Incidence *inc);
     void addIncidence(Incidence *inc);
     void addText(QString text);
     void showMe();
     void setSyncMode( bool );
     void setColorMode( int m );
     int executeS( bool );
   public slots:
      void  updateConfig();
+     void print();
  signals:
     void editIncidence( Incidence* );
     void jumpToTime( const QDate &);
     void showAgendaView( bool );
     void todoCompleted(Todo*); 
     void signalViewerClosed();  
 private slots:
     void slotViewerClosed();
     void editIncidence();
     void showIncidence();
  protected:
     void hideEvent ( QHideEvent * e );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e80b3fc..8752636 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -373,24 +373,31 @@ void KOViewManager::showWhatsNextView()
         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();
  
 }
 
+void  KOViewManager::slotprintWNV()
+{
+    if (!mWhatsNextView) 
+        showWhatsNextView();
+    emit  printWNV();
+
+}
 void KOViewManager::showListView()
 {
     if (!mListView) {
         mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
         addView(mListView);
 
         connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index d829f14..1d565a6 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -73,24 +73,25 @@ class KOViewManager : public QObject
     void addView(KOrg::BaseView *);
 
     Incidence *currentSelection();
     QDate currentSelectionDate();
 
     KOAgendaView *agendaView() const { return mAgendaView; }
 
  signals:
     void printWNV();
     void signalFullScreen( bool );
     void signalAgendaView( bool );
   public slots: 
+    void slotprintWNV();
     void showNextView();
     void showMonth( const QDate & );
     void showDateView( int, QDate );
     void updateView();
     void showWhatsNextView();
     void showListView();
     void showAgendaView( bool fullScreen = false );
     void showDayView();
     void showWorkWeekView();
     void showWeekView();
     void showNextXView();
     void showMonthView();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a4e0834..ad1c0cd 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -176,25 +176,29 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         else {
             if ( p->mToolBarUpF )
             tbd = Right;
             else
                 tbd = Left;
         }
         filterToolBar = new QPEToolBar ( this );
         filterMenubar = new QPEMenuBar( filterToolBar );
         QFontMetrics fm ( filterMenubar->font() );
             
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
-        filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+"Ax" ) );
+        QString addTest = "Ax";  
+#ifdef DESKTOP_VERSION
+        addTest = "AAAx"; 
+#endif
+        filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
     } else {
         filterToolBar = 0;
         filterMenubar  = 0;
         filterPopupMenu = 0;
     }
     if ( p->mShowIconOnetoolbar ) {
         viewToolBar = iconToolBar ;
         navigatorToolBar = iconToolBar ;
     } else {
@@ -339,24 +343,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
+    updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
@@ -983,25 +988,32 @@ void MainWindow::initActions()
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printCal() ) );
 
     icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
     action->addTo( beamMenu_X );
     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( beamMenu_X );
     connect( action, SIGNAL( activated() ),
-             mView->viewManager(), SIGNAL( printWNV() ) );
+             mView->viewManager(), SLOT( slotprintWNV() ) );
+
+    action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
+    action->addTo( beamMenu_X );
+    connect( action, SIGNAL( activated() ),
+             mView, SLOT( slotprintSelInc() ) );
+
+
     importMenu->insertItem( i18n("Print"), beamMenu_X );
 #endif
     importMenu->insertSeparator();
     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
     importMenu->insertSeparator();
     action = new QAction( "beam all", i18n("Save"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 49149f2..0610d55 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -104,24 +104,31 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   // selectMonth->setAlignment( AlignCenter );
   //mDateLabel = new QLabel( selectMonth );
   //mDateLabel->setFont( tfont );
   //mDateLabel->setAlignment( AlignCenter );
   if ( QString ( name ) == QString("useBigPixmaps") ) {
       mNextMonth->setFlat( true);
       mNextWeek->setFlat( true);
       mNextYear->setFlat( true);
       mSelectMonth->setFlat( true);
       mPrevYear->setFlat( true);
       mPrevMonth->setFlat( true);
       mPrevWeek->setFlat( true);
+
+      mPrevYear->setAutoRepeat( true );
+      mPrevMonth->setAutoRepeat( true );
+      mNextMonth->setAutoRepeat( true );
+      mPrevWeek->setAutoRepeat( true );
+      mNextWeek->setAutoRepeat( true );
+      mNextYear->setAutoRepeat( true );
   } else {
       mPrevWeek->hide();
       mNextWeek->hide();
   }
 
   resetFont( font() );
 
   
   // set up control frame layout
   QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
   ctrlLayout->addWidget( mPrevYear, 3 );
   ctrlLayout->addWidget( mPrevMonth, 3 );
@@ -142,31 +149,25 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   connect( mPrevWeek, SIGNAL( clicked() ), SIGNAL( goPrevWeek() ) );
   connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) );
   connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
   connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
   mPrevYear->setFocusPolicy(NoFocus);
   mPrevMonth->setFocusPolicy(NoFocus);
   mNextMonth->setFocusPolicy(NoFocus);
   mPrevWeek->setFocusPolicy(NoFocus);
   mNextWeek->setFocusPolicy(NoFocus);
   mNextYear->setFocusPolicy(NoFocus);
   mSelectMonth->setFocusPolicy(NoFocus);
   setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
-  mPrevYear->setAutoRepeat( true );
-  mPrevMonth->setAutoRepeat( true );
-  mNextMonth->setAutoRepeat( true );
-  mPrevWeek->setAutoRepeat( true );
-  mNextWeek->setAutoRepeat( true );
-  mNextYear->setAutoRepeat( true );
-
+   
 }
 
 NavigatorBar::~NavigatorBar()
 {
 }
 QSize NavigatorBar::sizeHint() const
 {
     int wid = mCurrentMinWid ;
     if ( mPrevYear->isVisible() )
         wid += mCurrentButtonMinWid;
     if ( mPrevMonth->isVisible() )
         wid += mCurrentButtonMinWid;