12 files changed, 97 insertions, 16 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index da27fea..ce68a1d 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,24 +1,27 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.22 ************
 
 KO/Pi:
 Fix for creating events/todos via the abgenda context menu.
 Added option to split toolbar to 3 toolbars.
 Added option to show one small filter-view-toolbar.
+Added a print option to the desktop version:
+Now you can print out the view of the "Event Viewer".
+That means you can print all data of one particular event/todo.
 
 ********** VERSION 2.0.21 ************
 
 Fixed another SMTP problem in OM/Pi.
 Some small changed in the new datenavigator in KO/Pi.
 Changed default setting for new filter in KA/Pi to "exclude categories".
 Changed the default font size for 640x480 display .
 Changed popup menu behaviour in agenda and list view.
 Fixed some layout problems of the date label size in the month view.
 Made month view update faster.
 Made first datenavigator repainting faster.
 Changed the title of the event/todo edit dialogs.
 Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course).
 Many small usebility fixes in KO/Pi.
 Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi.
 The set of possible "next views" are the views you have toolbar buttons for.
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 732bb3f..546c32e 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -732,33 +732,33 @@
 { "KO/Pi config error","KO/Pi Konfig. Fehler" },
 { "Local device name undefined!\nPlease define device name!","Name dieses Gerätes undefiniert!\nBitte Namen angeben!" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile haben denselben Namen!\nBitte unterschiedliche Namen wählen!" },
 { "Access: ","Zugriff: " },
 { "Needs Action","Aktion notwendig" },
 { "Accepted","Akzeptiert" },
 { "Declined","Abgelehnt" },
 { "Tentative","Vorläufig" },
 { "Delegated","Beauftragt" },
 { "Completed","Vollständig" },
 { "In Process","In Bearbeitung" },
 { "Participant","Teilnehmer" },
 { "Optional Participant","Möglicher Teilnehmer" },
 { "Observer","Beobachter" },
 { "Chair","Vorsitzender" },
 { "Not supported \non desktop!\n","" },
-{ "Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. ","Es ist nichts selektiert!\nDieses druckt die volle Breite der Agenda View, so wie man sie sieht.\nUm die verticale Auswahl zum Drucken zu bestimmen,\nbitte einen verticalen Zeitraum (mit gedrückter linker Maustaste)\nin einer Spalte auswählen. " },
+{ "Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. ","Es ist nichts selektiert!\nDieses druckt die volle Breite der Agenda View, so wie man sie sieht.\nUm die vertikale Auswahl zum Drucken zu bestimmen,\nbitte einen vertikalen Zeitraum (mit gedrückter linker Maustaste)\nin einer Spalte auswählen.\n(Es wird danach direkt der Termin Dialog angezeigt\n  -  dort bitte auf Abbrechen klicken) " },
 { "Date range: ","Datums Zeitspanne: " },
 { "Not supported \non  PDA!\n","Nicht verfügbar\nauf dem PDA. " },
 { "Syncing - close to abort!","Syncing-schließe um abzubrechen." },
 { "Add / remove events","Add./entferne Termine" },
 { "File does not exist:\n '%1'.","Datei existiert nicht:\n '%1'." },
 { "Couldn't load calendar\n '%1'.","Kann Kalender nicht laden:\n '%1'." },
 { "\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie gepeicherte Datei wurde verändert!\nDatei Grösse: %1 Bytes.\nZuletzt geändert: %2\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Overwrite","Überschreiben" },
 { "Sync+save","Syncen+speichern" },
 { "Default","Standard" },
 { " Categories added to list! "," Kategorien zur Liste hinzugefügt! " },
 { "  %d items?","  %d Einträge?" },
 { "\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?","\nDieses ist ein\nwiederholender Termin!.\nSind Sie sicher, dass Sie\ndiesen Termin und alle\nWiederholungen löschen möchten?" },
 { " ?\n\nDelete:\n"," ?\n\nLösche:\n" },
 { "Current","Aktuelle" },
 { "\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n","\nDieses ist ein\nwiederholender Termin!\nMöchten sie alle Wiederholungen\nlöschen, oder nur die aktuelle am:\n" }, 
@@ -1301,25 +1301,27 @@
 { "As vCal (vcs) file...","Als vCal (vcs) Datei..." },
 { "Journal/Details...","Journale/Details..." },
 { "Agenda View","Agenda Ansicht" },
 { "Show current time","Zeige aktuelle Zeit" },
 { "Edit new item","Bearbeite neuen Eintrag" },
 { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" },
 { "There is no next alarm.","Es gibt keinen nächsten Alarm." },
 { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" },
 { "The next alarm is in:\n","Der nächste Alarm ist in:\n" },
 { "%1 days\n","%1 Tagen\n" },
 { "1 day\n","1 Tag\n" },
 { "%1 hours\n","%1 Stunden\n" },
 { "1 hour\n","1 Stunde\n" },
 { "%1 minutes\n","%1 Minuten\n" },
 { "1 minute\n","1 Minute\n" },
 { "Only one toolbar","Nur eine Toolbar" },
+{ "Print","Drucke" },
+{ "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." },
+{ "There is nothing selected!","Es ist nichts ausgewählt!" },
+{ "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " },
+{ "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
-{ "","" },
-{ "","" },
-{ "","" },
-{ "","" },
-{ "","" },
\ No newline at end of file
+
+
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a330414..0015bd6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3414,33 +3414,42 @@ bool CalendarView::isReadOnly()
 {
     return mReadOnly;
 }
 
 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
     createPrinter();
 
     DateList tmpDateList = mNavigator->selectedDates();
     mCalPrinter->print(CalPrinter::Month,
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 9782ffe..05a34b4 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -163,32 +163,33 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void pasteEnabled(bool);
     
     /** Emitted, when the number of incoming messages has changed. */
     void numIncomingChanged(int);
 
     /** 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();
 
     void insertBirthdays(const QString& uid, const QStringList& birthdayList, 
                          const QStringList& anniversaryList, const QStringList& realNameList,
                          const QStringList& emailList, const QStringList& assembledNameList,
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 1508638..445fc86 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -40,48 +40,77 @@
 #ifndef KORG_NODCOP
 #include <dcopclient.h>
 #include "korganizer.h"
 #include "koprefs.h"
 #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();
 
             //qDebug("for *%s*          +%s+ ", n.latin1(), uid.latin1());
             if (n == uid ) {
                 //qDebug("found %s ",(*it).mobileHomePhone().latin1() );
                 QDialog dia( this,"dia123", true );
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 47cc5e9..ca5bc15 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -39,32 +39,33 @@ class KOEventViewer : public QTextBrowser {
     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 );
     
     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;
     bool mSyncMode;
     QString deTag(QString text);
 
     QString mText;
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f734696..ec55cca 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -11,32 +11,33 @@
     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.
 */
 
 #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
                 false,
 #endif
                 i18n("Event Viewer"),Ok|User1|Close,Close, false,  i18n("Agenda"))
 {
@@ -77,32 +78,45 @@ void KOEventViewerDialog::showMe()
     int x,y,w,h;
     x = geometry().x();
     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"));
   }
   mEventViewer->setSyncMode( b );
 }
 void KOEventViewerDialog::setColorMode( int m )
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 36431ad..8e1cd44 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -38,32 +38,33 @@ class KOEventViewerDialog : public KDialogBase {
     KOEventViewerDialog(QWidget *parent=0,const char *name=0);
     virtual ~KOEventViewerDialog();
 
     void setEvent(Event *event);
     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 );
   private:
     bool sendSignalViewerClosed;  
     bool mSyncMode;
     int mSyncResult;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e80b3fc..8752636 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -369,32 +369,39 @@ void KOViewManager::showWhatsNextView()
 {
     if (!mWhatsNextView) {
         mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(),
                                              "KOViewManager::WhatsNextView");
         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 *)));
         connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
         connect( mListView, SIGNAL( signalNewEvent() ),
                  mMainView, SLOT( newEvent() ) );
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index d829f14..1d565a6 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -69,32 +69,33 @@ class KOViewManager : public QObject
     void updateView( const QDate &start, const QDate &end );
 
     void raiseCurrentView( bool fullScreen = false , bool updateView = false);
 
     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();
     void showMonthViewWeek();
     void showTodoView();
     void showJournalView();
     void showTimeSpanView();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a4e0834..ad1c0cd 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -172,33 +172,37 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         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 {
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
                 tbd = Bottom;
             else
@@ -335,32 +339,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
 
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "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;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
@@ -979,33 +984,40 @@ void MainWindow::initActions()
 #else
     //importMenu->insertSeparator();
  icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
     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() ) );
     action = new QAction( "beam all", i18n("Exit (+save)"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 49149f2..0610d55 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -100,32 +100,39 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   QToolTip::add( mNextYear, i18n("Next Year") );
   mSelectMonth = new QPushButton( mCtrlFrame );
   // Create month name label
   //selectMonth->setFont( tfont );
   // 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 );
   ctrlLayout->addWidget( mPrevWeek, 3 );
   //ctrlLayout->addStretch( 1 );
   // ctrlLayout->addSpacing( 1 );
   // ctrlLayout->addWidget( mDateLabel );
@@ -138,39 +145,33 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
 
   connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) );
   connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) );
   connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) );
   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;
     if ( mPrevWeek->isVisible() )
         wid += mCurrentButtonMinWid;
     if ( mNextMonth->isVisible() )
         wid += mCurrentButtonMinWid;