| -rw-r--r-- | korganizer/mainwindow.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index bfae1b5..5249300 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1117,8 +1117,9 @@ void MainWindow::initActions() connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); importMenu->insertItem( i18n("Export"), exportMenu_X ); + mPrintSelAction = 0; #ifndef DESKTOP_VERSION //importMenu->insertSeparator(); brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, this ); @@ -1143,30 +1144,32 @@ void MainWindow::initActions() action->addTo( beamMenu_X ); connect( action, SIGNAL( activated() ), this, SLOT( printCal() ) ); - icon = loadPixmap( pathString + "print" ); + icon = loadPixmap( pathString + "week" ); 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() ) ); + icon = loadPixmap( pathString + "whatsnext" ); 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(), SLOT( slotprintWNV() ) ); - icon = loadPixmap( pathString + "print" ); + icon = loadPixmap( pathString + "list" ); action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); action->addTo( beamMenu_X ); connect( action, SIGNAL( activated() ), this, SLOT( printListView() ) ); + icon = loadPixmap( pathString + "newevent" ); 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() ) ); - + mPrintSelAction = action; importMenu->insertItem( i18n("Print"), beamMenu_X ); #endif importMenu->insertSeparator(); @@ -1739,8 +1742,21 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) } else { mShowAction->setMenuText( i18n("Show") ); mNewSubTodoAction->setEnabled( false ); } + static QPixmap jP = SmallIcon( "journal" ); + static QPixmap eP = SmallIcon( "newevent" ); + static QPixmap tP = SmallIcon( "newtodo" ); +#ifdef DESKTOP_VERSION + QIconSet icon; + if ( incidence->typeID() == todoID ) + icon = QIconSet ( tP ); + else if ( incidence->typeID() == eventID ) + icon = QIconSet ( eP ); + else if ( incidence->typeID() == journalID ) + icon = QIconSet ( jP ); + mPrintSelAction->setIconSet ( icon ); +#endif } void MainWindow::enableIncidenceActions( bool enabled ) { @@ -1751,9 +1767,11 @@ void MainWindow::enableIncidenceActions( bool enabled ) mCloneAction->setEnabled( enabled ); mMoveAction->setEnabled( enabled ); #ifndef DESKTOP_VERSION mBeamAction->setEnabled( enabled ); -#endif +#else + mPrintSelAction->setEnabled( enabled ); +#endif mCancelAction->setEnabled( enabled ); } void MainWindow::importOL() |