summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a5d8824..b6ce7d5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -561,347 +561,341 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
561 msg = allmsg; 561 msg = allmsg;
562 allmsg = ""; 562 allmsg = "";
563 } else{ 563 } else{
564 msg = allmsg.left( nextC ); 564 msg = allmsg.left( nextC );
565 allmsg = allmsg.mid( nextC, allmsg.length()-nextC ); 565 allmsg = allmsg.mid( nextC, allmsg.length()-nextC );
566 } 566 }
567 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); 567 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() );
568 if ( msg == "-newEvent" ) { 568 if ( msg == "-newEvent" ) {
569 QTimer::singleShot( 0, mView, SLOT ( newEvent())); 569 QTimer::singleShot( 0, mView, SLOT ( newEvent()));
570 } 570 }
571 if ( msg == "-newTodo" ) { 571 if ( msg == "-newTodo" ) {
572 QTimer::singleShot( 0, mView, SLOT ( newTodo())); 572 QTimer::singleShot( 0, mView, SLOT ( newTodo()));
573 } 573 }
574 if ( msg == "-showWN" ) { 574 if ( msg == "-showWN" ) {
575 mView->viewManager()->showWhatsNextView(); 575 mView->viewManager()->showWhatsNextView();
576 } 576 }
577 if ( msg == "-showTodo" ) { 577 if ( msg == "-showTodo" ) {
578 mView->viewManager()->showTodoView(); 578 mView->viewManager()->showTodoView();
579 } 579 }
580 if ( msg == "-showList" ) { 580 if ( msg == "-showList" ) {
581 mView->viewManager()->showListView(); 581 mView->viewManager()->showListView();
582 } 582 }
583 else if ( msg == "-showDay" ) { 583 else if ( msg == "-showDay" ) {
584 mView->viewManager()->showDayView(); 584 mView->viewManager()->showDayView();
585 } 585 }
586 else if ( msg == "-showWWeek" ) { 586 else if ( msg == "-showWWeek" ) {
587 mView->viewManager()->showWorkWeekView(); 587 mView->viewManager()->showWorkWeekView();
588 } 588 }
589 else if ( msg == "-ringSync" ) { 589 else if ( msg == "-ringSync" ) {
590 QTimer::singleShot( 0, this, SLOT (startMultiSync())); 590 QTimer::singleShot( 0, this, SLOT (startMultiSync()));
591 } 591 }
592 else if ( msg == "-showWeek" ) { 592 else if ( msg == "-showWeek" ) {
593 mView->viewManager()->showWeekView(); 593 mView->viewManager()->showWeekView();
594 } 594 }
595 else if ( msg == "-showTodo" ) { 595 else if ( msg == "-showTodo" ) {
596 mView->viewManager()->showTodoView(); 596 mView->viewManager()->showTodoView();
597 } 597 }
598 else if ( msg == "-showJournal" ) { 598 else if ( msg == "-showJournal" ) {
599 mView->dateNavigator()->selectDates( 1 ); 599 mView->dateNavigator()->selectDates( 1 );
600 mView->dateNavigator()->selectToday(); 600 mView->dateNavigator()->selectToday();
601 mView->viewManager()->showJournalView(); 601 mView->viewManager()->showJournalView();
602 } 602 }
603 else if ( msg == "-showKO" ) { 603 else if ( msg == "-showKO" ) {
604 mView->viewManager()->showNextXView(); 604 mView->viewManager()->showNextXView();
605 } 605 }
606 else if ( msg == "-showWNext" ) { 606 else if ( msg == "-showWNext" ) {
607 mView->viewManager()->showWhatsNextView(); 607 mView->viewManager()->showWhatsNextView();
608 } 608 }
609 else if ( msg == "nextView()" ) { 609 else if ( msg == "nextView()" ) {
610 mView->viewManager()->showNextView(); 610 mView->viewManager()->showNextView();
611 } 611 }
612 else if ( msg == "-showNextXView" ) { 612 else if ( msg == "-showNextXView" ) {
613 mView->viewManager()->showNextXView(); 613 mView->viewManager()->showNextXView();
614 } 614 }
615 615
616 616
617 } 617 }
618 618
619 showMaximized(); 619 showMaximized();
620 raise(); 620 raise();
621} 621}
622void MainWindow::startMultiSync() 622void MainWindow::startMultiSync()
623{ 623{
624 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); 624 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
625 if ( QMessageBox::information( this, i18n("KDE-Pim Sync"), 625 if ( QMessageBox::information( this, i18n("KDE-Pim Sync"),
626 question, 626 question,
627 i18n("Yes"), i18n("No"), 627 i18n("Yes"), i18n("No"),
628 0, 0 ) != 0 ) { 628 0, 0 ) != 0 ) {
629 setCaption(i18n("Aborted! Nothing synced!")); 629 setCaption(i18n("Aborted! Nothing synced!"));
630 return; 630 return;
631 } 631 }
632 mSyncManager->multiSync( false ); 632 mSyncManager->multiSync( false );
633#ifndef DESKTOP_VERSION 633#ifndef DESKTOP_VERSION
634 QCopEnvelope e("QPE/Application/kapi", "doRingSync"); 634 QCopEnvelope e("QPE/Application/kapi", "doRingSync");
635#endif 635#endif
636} 636}
637QPixmap MainWindow::loadPixmap( QString name ) 637QPixmap MainWindow::loadPixmap( QString name )
638{ 638{
639 return SmallIcon( name ); 639 return SmallIcon( name );
640 640
641} 641}
642void MainWindow::setUsesBigPixmaps ( bool b ) 642void MainWindow::setUsesBigPixmaps ( bool b )
643{ 643{
644 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); 644 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
645 if ( b ) 645 if ( b )
646 qDebug("KO: BigPixmaps are not supported "); 646 qDebug("KO: BigPixmaps are not supported ");
647} 647}
648void MainWindow::initActions() 648void MainWindow::initActions()
649{ 649{
650 //KOPrefs::instance()->mShowFullMenu 650 //KOPrefs::instance()->mShowFullMenu
651 iconToolBar->clear(); 651 iconToolBar->clear();
652 KOPrefs *p = KOPrefs::instance(); 652 KOPrefs *p = KOPrefs::instance();
653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
654 654
655 QPopupMenu *viewMenu = new QPopupMenu( this ); 655 QPopupMenu *viewMenu = new QPopupMenu( this );
656 QPopupMenu *actionMenu = new QPopupMenu( this ); 656 QPopupMenu *actionMenu = new QPopupMenu( this );
657#ifdef DESKTOP_VERSION
658 mCurrentItemMenu = actionMenu;
659#else
660 mCurrentItemMenu = new QPopupMenu ( this ); 657 mCurrentItemMenu = new QPopupMenu ( this );
661#endif
662 QPopupMenu *importMenu = new QPopupMenu( this ); 658 QPopupMenu *importMenu = new QPopupMenu( this );
663 QPopupMenu *importMenu_X = new QPopupMenu( this ); 659 QPopupMenu *importMenu_X = new QPopupMenu( this );
664 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 660 QPopupMenu *exportMenu_X = new QPopupMenu( this );
665 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 661 QPopupMenu *beamMenu_X = new QPopupMenu( this );
666 selectFilterMenu = new QPopupMenu( this ); 662 selectFilterMenu = new QPopupMenu( this );
667 selectFilterMenu->setCheckable( true ); 663 selectFilterMenu->setCheckable( true );
668 syncMenu = new QPopupMenu( this ); 664 syncMenu = new QPopupMenu( this );
669 configureAgendaMenu = new QPopupMenu( this ); 665 configureAgendaMenu = new QPopupMenu( this );
670 configureToolBarMenu = new QPopupMenu( this ); 666 configureToolBarMenu = new QPopupMenu( this );
671 QPopupMenu *helpMenu = new QPopupMenu( this ); 667 QPopupMenu *helpMenu = new QPopupMenu( this );
672 QIconSet icon; 668 QIconSet icon;
673 int pixWid = 22, pixHei = 22; 669 int pixWid = 22, pixHei = 22;
674 QString pathString = ""; 670 QString pathString = "";
675 if ( !p->mToolBarMiniIcons ) { 671 if ( !p->mToolBarMiniIcons ) {
676 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { 672 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
677 pathString += "icons16/"; 673 pathString += "icons16/";
678 pixWid = 18; pixHei = 16; 674 pixWid = 18; pixHei = 16;
679 } 675 }
680 } else { 676 } else {
681 pathString += "iconsmini/"; 677 pathString += "iconsmini/";
682 pixWid = 18; pixHei = 16; 678 pixWid = 18; pixHei = 16;
683 } 679 }
684 if ( KOPrefs::instance()->mShowFullMenu ) { 680 if ( KOPrefs::instance()->mShowFullMenu ) {
685 QMenuBar *menuBar1; 681 QMenuBar *menuBar1;
686 menuBar1 = menuBar(); 682 menuBar1 = menuBar();
687 menuBar1->insertItem( i18n("File"), importMenu ); 683 menuBar1->insertItem( i18n("File"), importMenu );
688 menuBar1->insertItem( i18n("View"), viewMenu ); 684 menuBar1->insertItem( i18n("View"), viewMenu );
689 menuBar1->insertItem( i18n("Actions"), actionMenu ); 685 menuBar1->insertItem( i18n("Actions"), actionMenu );
690#ifdef DESKTOP_VERSION 686#ifdef DESKTOP_VERSION
691 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 687 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
692 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 688 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
693#else 689#else
694 menuBar1->insertItem( i18n("Sync"), syncMenu ); 690 menuBar1->insertItem( i18n("Sync"), syncMenu );
695 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); 691 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu );
696#endif 692#endif
697 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 693 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
698 menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); 694 menuBar1->insertItem( i18n("Filter"),selectFilterMenu );
699 menuBar1->insertItem( i18n("Help"), helpMenu ); 695 menuBar1->insertItem( i18n("Help"), helpMenu );
700 } else { 696 } else {
701 QPEMenuBar *menuBar1; 697 QPEMenuBar *menuBar1;
702 menuBar1 = new QPEMenuBar( iconToolBar ); 698 menuBar1 = new QPEMenuBar( iconToolBar );
703 QPopupMenu *menuBar = new QPopupMenu( this ); 699 QPopupMenu *menuBar = new QPopupMenu( this );
704 icon = loadPixmap( pathString + "z_menu" ); 700 icon = loadPixmap( pathString + "z_menu" );
705 menuBar1->insertItem( icon.pixmap(), menuBar); 701 menuBar1->insertItem( icon.pixmap(), menuBar);
706 //menuBar1->insertItem( i18n("ME"), menuBar); 702 //menuBar1->insertItem( i18n("ME"), menuBar);
707 menuBar->insertItem( i18n("File"), importMenu ); 703 menuBar->insertItem( i18n("File"), importMenu );
708 menuBar->insertItem( i18n("View"), viewMenu ); 704 menuBar->insertItem( i18n("View"), viewMenu );
709 menuBar->insertItem( i18n("Actions"), actionMenu ); 705 menuBar->insertItem( i18n("Actions"), actionMenu );
710 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 706 menuBar->insertItem( i18n("Synchronize"), syncMenu );
711 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 707 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
712 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 708 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
713 menuBar->insertItem( i18n("Filter"),selectFilterMenu ); 709 menuBar->insertItem( i18n("Filter"),selectFilterMenu );
714 menuBar->insertItem( i18n("Help"), helpMenu ); 710 menuBar->insertItem( i18n("Help"), helpMenu );
715 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 711 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
716 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 712 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
717 } 713 }
718 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 714 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
719 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); 715 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
720 716
721 717
722 mWeekBgColor = iconToolBar->backgroundColor(); 718 mWeekBgColor = iconToolBar->backgroundColor();
723 mWeekPixmap.resize( pixWid , pixHei ); 719 mWeekPixmap.resize( pixWid , pixHei );
724 mWeekPixmap.fill( mWeekBgColor ); 720 mWeekPixmap.fill( mWeekBgColor );
725 icon = mWeekPixmap; 721 icon = mWeekPixmap;
726 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); 722 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
727 if ( p-> mShowIconWeekNum ) 723 if ( p-> mShowIconWeekNum )
728 mWeekAction->addTo( iconToolBar ); 724 mWeekAction->addTo( iconToolBar );
729 mWeekFont = font(); 725 mWeekFont = font();
730 726
731 int fontPoint = mWeekFont.pointSize(); 727 int fontPoint = mWeekFont.pointSize();
732 QFontMetrics f( mWeekFont ); 728 QFontMetrics f( mWeekFont );
733 int fontWid = f.width( "30" ); 729 int fontWid = f.width( "30" );
734 while ( fontWid > pixWid ) { 730 while ( fontWid > pixWid ) {
735 --fontPoint; 731 --fontPoint;
736 mWeekFont.setPointSize( fontPoint ); 732 mWeekFont.setPointSize( fontPoint );
737 QFontMetrics f( mWeekFont ); 733 QFontMetrics f( mWeekFont );
738 fontWid = f.width( "30" ); 734 fontWid = f.width( "30" );
739 //qDebug("dec-- "); 735 //qDebug("dec-- ");
740 } 736 }
741 737
742 connect( mWeekAction, SIGNAL( activated() ), 738 connect( mWeekAction, SIGNAL( activated() ),
743 this, SLOT( weekAction() ) ); 739 this, SLOT( weekAction() ) );
744 740
745 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); 741 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
746 if ( p->mShowIconFilterview ) { 742 if ( p->mShowIconFilterview ) {
747 icon = loadPixmap( pathString + "filter" ); 743 icon = loadPixmap( pathString + "filter" );
748 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this ); 744 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
749 connect( actionFilterMenuTB, SIGNAL( activated() ), 745 connect( actionFilterMenuTB, SIGNAL( activated() ),
750 this, SLOT( fillFilterMenuTB() ) ); 746 this, SLOT( fillFilterMenuTB() ) );
751 actionFilterMenuTB->addTo( iconToolBar ); 747 actionFilterMenuTB->addTo( iconToolBar );
752 selectFilterMenuTB = new QPopupMenu( this ); 748 selectFilterMenuTB = new QPopupMenu( this );
753 selectFilterMenuTB->setCheckable( true ); 749 selectFilterMenuTB->setCheckable( true );
754 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 750 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
755 } 751 }
756 752
757 //#endif 753 //#endif
758 // ****************** 754 // ******************
759 QAction *action; 755 QAction *action;
760 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 756 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
761 configureToolBarMenu->setCheckable( true ); 757 configureToolBarMenu->setCheckable( true );
762 758
763 759
764 configureAgendaMenu->setCheckable( true ); 760 configureAgendaMenu->setCheckable( true );
765 int iii ; 761 int iii ;
766 for ( iii = 1;iii<= 10 ;++iii ){ 762 for ( iii = 1;iii<= 10 ;++iii ){
767 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 763 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
768 } 764 }
769 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 765 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
770 766
771 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 767 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
772 this, SLOT( showConfigureAgenda( ) ) ); 768 this, SLOT( showConfigureAgenda( ) ) );
773 icon = loadPixmap( pathString + "today" ); 769 icon = loadPixmap( pathString + "today" );
774 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 770 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
775 today_action->addTo( actionMenu ); 771 today_action->addTo( actionMenu );
776 connect( today_action, SIGNAL( activated() ), 772 connect( today_action, SIGNAL( activated() ),
777 mView, SLOT( goToday() ) ); 773 mView, SLOT( goToday() ) );
778 774
779 icon = loadPixmap( pathString + "picker" ); 775 icon = loadPixmap( pathString + "picker" );
780 QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); 776 QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
781 dPickerAction->addTo( actionMenu ); 777 dPickerAction->addTo( actionMenu );
782 connect( dPickerAction, SIGNAL( activated() ), 778 connect( dPickerAction, SIGNAL( activated() ),
783 mView, SLOT( showDatePicker() ) ); 779 mView, SLOT( showDatePicker() ) );
784 780
785 icon = loadPixmap( pathString + "search" ); 781 icon = loadPixmap( pathString + "search" );
786 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 782 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
787 search_action->addTo( actionMenu ); 783 search_action->addTo( actionMenu );
788 connect( search_action, SIGNAL( activated() ), 784 connect( search_action, SIGNAL( activated() ),
789 mView->dialogManager(), SLOT( showSearchDialog() ) ); 785 mView->dialogManager(), SLOT( showSearchDialog() ) );
790 786
791 actionMenu->insertSeparator(); 787 actionMenu->insertSeparator();
792 788
793 789
794 790
795 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 791 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
796 action->addTo( actionMenu ); 792 action->addTo( actionMenu );
797 connect( action, SIGNAL( activated() ), 793 connect( action, SIGNAL( activated() ),
798 mView, SLOT( undo_delete() ) ); 794 mView, SLOT( undo_delete() ) );
799 795
800 icon = loadPixmap( pathString + "newevent" ); 796 icon = loadPixmap( pathString + "newevent" );
801 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 797 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
802 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 798 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
803 configureToolBarMenu->insertSeparator(); 799 configureToolBarMenu->insertSeparator();
804 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 800 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
805 configureToolBarMenu->insertSeparator(); 801 configureToolBarMenu->insertSeparator();
806 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 802 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
807 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 803 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
808 804
809#ifndef DESKTOP_VERSION
810 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 805 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
811#endif
812 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 806 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
813 mShowAction->addTo( mCurrentItemMenu ); 807 mShowAction->addTo( mCurrentItemMenu );
814 connect( mShowAction, SIGNAL( activated() ), 808 connect( mShowAction, SIGNAL( activated() ),
815 mView, SLOT( showIncidence() ) ); 809 mView, SLOT( showIncidence() ) );
816 810
817 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 811 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
818 mEditAction->addTo( mCurrentItemMenu ); 812 mEditAction->addTo( mCurrentItemMenu );
819 connect( mEditAction, SIGNAL( activated() ), 813 connect( mEditAction, SIGNAL( activated() ),
820 mView, SLOT( editIncidence() ) ); 814 mView, SLOT( editIncidence() ) );
821 815
822 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 816 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
823 mDeleteAction->addTo( mCurrentItemMenu ); 817 mDeleteAction->addTo( mCurrentItemMenu );
824 connect( mDeleteAction, SIGNAL( activated() ), 818 connect( mDeleteAction, SIGNAL( activated() ),
825 mView, SLOT( deleteIncidence() ) ); 819 mView, SLOT( deleteIncidence() ) );
826 820
827 821
828 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); 822 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
829 mCloneAction->addTo( mCurrentItemMenu ); 823 mCloneAction->addTo( mCurrentItemMenu );
830 connect( mCloneAction, SIGNAL( activated() ), 824 connect( mCloneAction, SIGNAL( activated() ),
831 mView, SLOT( cloneIncidence() ) ); 825 mView, SLOT( cloneIncidence() ) );
832 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); 826 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
833 mMoveAction->addTo( mCurrentItemMenu ); 827 mMoveAction->addTo( mCurrentItemMenu );
834 connect( mMoveAction, SIGNAL( activated() ), 828 connect( mMoveAction, SIGNAL( activated() ),
835 mView, SLOT( moveIncidence() ) ); 829 mView, SLOT( moveIncidence() ) );
836 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); 830 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
837 mBeamAction->addTo(mCurrentItemMenu ); 831 mBeamAction->addTo(mCurrentItemMenu );
838 connect( mBeamAction, SIGNAL( activated() ), 832 connect( mBeamAction, SIGNAL( activated() ),
839 mView, SLOT( beamIncidence() ) ); 833 mView, SLOT( beamIncidence() ) );
840 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); 834 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
841 mCancelAction->addTo( mCurrentItemMenu ); 835 mCancelAction->addTo( mCurrentItemMenu );
842 connect( mCancelAction, SIGNAL( activated() ), 836 connect( mCancelAction, SIGNAL( activated() ),
843 mView, SLOT( toggleCancelIncidence() ) ); 837 mView, SLOT( toggleCancelIncidence() ) );
844#ifdef DESKTOP_VERSION 838#ifdef DESKTOP_VERSION
845 actionMenu->insertSeparator(); 839 actionMenu->insertSeparator();
846#endif 840#endif
847 841
848 842
849 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 843 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
850 ne_action->addTo( actionMenu ); 844 ne_action->addTo( actionMenu );
851 connect( ne_action, SIGNAL( activated() ), 845 connect( ne_action, SIGNAL( activated() ),
852 mView, SLOT( newEvent() ) ); 846 mView, SLOT( newEvent() ) );
853 icon = loadPixmap( pathString + "newtodo" ); 847 icon = loadPixmap( pathString + "newtodo" );
854 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 848 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
855 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 849 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
856 nt_action->addTo( actionMenu ); 850 nt_action->addTo( actionMenu );
857 connect( nt_action, SIGNAL( activated() ), 851 connect( nt_action, SIGNAL( activated() ),
858 mView, SLOT( newTodo() ) ); 852 mView, SLOT( newTodo() ) );
859 853
860 854
861 855
862 // *********************** 856 // ***********************
863 if ( KOPrefs::instance()->mVerticalScreen ) { 857 if ( KOPrefs::instance()->mVerticalScreen ) {
864 icon = SmallIcon( "1updownarrow" ); 858 icon = SmallIcon( "1updownarrow" );
865 } else { 859 } else {
866 icon = SmallIcon("1leftrightarrow" ); 860 icon = SmallIcon("1leftrightarrow" );
867 } 861 }
868 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); 862 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
869 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); 863 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
870 FSaction->addTo( viewMenu ); 864 FSaction->addTo( viewMenu );
871 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); 865 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
872 866
873 867
874 icon = loadPixmap( pathString + "filter" ); 868 icon = loadPixmap( pathString + "filter" );
875 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); 869 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
876 icon = loadPixmap( pathString + "configure" ); 870 icon = loadPixmap( pathString + "configure" );
877 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); 871 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
878 action->addTo( viewMenu ); 872 action->addTo( viewMenu );
879 connect( action, SIGNAL( activated() ), 873 connect( action, SIGNAL( activated() ),
880 mView, SLOT( toggleFilter() ) ); 874 mView, SLOT( toggleFilter() ) );
881 mToggleFilter = action; 875 mToggleFilter = action;
882 icon = loadPixmap( pathString + "navi" ); 876 icon = loadPixmap( pathString + "navi" );
883 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); 877 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
884 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 878 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
885 action->addTo( viewMenu ); 879 action->addTo( viewMenu );
886 connect( action, SIGNAL( activated() ), 880 connect( action, SIGNAL( activated() ),
887 mView, SLOT( toggleDateNavigatorWidget() ) ); 881 mView, SLOT( toggleDateNavigatorWidget() ) );
888 mToggleNav = action ; 882 mToggleNav = action ;
889 icon = loadPixmap( pathString + "allday" ); 883 icon = loadPixmap( pathString + "allday" );
890 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); 884 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
891 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 885 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
892 action->addTo( viewMenu ); 886 action->addTo( viewMenu );
893 connect( action, SIGNAL( activated() ), 887 connect( action, SIGNAL( activated() ),
894 mView, SLOT( toggleAllDaySize() ) ); 888 mView, SLOT( toggleAllDaySize() ) );
895 mToggleAllday = action; 889 mToggleAllday = action;
896 890
897 891
898 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 892 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
899 mToggleNav, SLOT( setEnabled ( bool ) ) ); 893 mToggleNav, SLOT( setEnabled ( bool ) ) );
900 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 894 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
901 // mToggleFilter, SLOT( setEnabled ( bool ) ) ); 895 // mToggleFilter, SLOT( setEnabled ( bool ) ) );
902 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 896 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
903 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 897 mToggleAllday, SLOT( setEnabled ( bool ) ) );
904 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 898 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
905 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); 899 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
906 900
907 901
@@ -985,193 +979,193 @@ void MainWindow::initActions()
985 icon = loadPixmap( pathString + "todo" ); 979 icon = loadPixmap( pathString + "todo" );
986 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 980 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
987 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 981 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
988 todoview_action->addTo( viewMenu ); 982 todoview_action->addTo( viewMenu );
989 connect( todoview_action, SIGNAL( activated() ), 983 connect( todoview_action, SIGNAL( activated() ),
990 mView->viewManager(), SLOT( showTodoView() ) ); 984 mView->viewManager(), SLOT( showTodoView() ) );
991 985
992 986
993 987
994#if 0 988#if 0
995 action = new QAction( "view_timespan", "Time Span", 0, this ); 989 action = new QAction( "view_timespan", "Time Span", 0, this );
996 action->addTo( viewMenu ); 990 action->addTo( viewMenu );
997 connect( action, SIGNAL( activated() ), 991 connect( action, SIGNAL( activated() ),
998 mView->viewManager(), SLOT( showTimeSpanView() ) ); 992 mView->viewManager(), SLOT( showTimeSpanView() ) );
999#endif 993#endif
1000 994
1001 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 995 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
1002 this ); 996 this );
1003 mNewSubTodoAction->addTo( actionMenu ); 997 mNewSubTodoAction->addTo( actionMenu );
1004 connect( mNewSubTodoAction, SIGNAL( activated() ), 998 connect( mNewSubTodoAction, SIGNAL( activated() ),
1005 mView, SLOT( newSubTodo() ) ); 999 mView, SLOT( newSubTodo() ) );
1006 1000
1007 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, 1001 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
1008 this ); 1002 this );
1009 action->addTo( actionMenu ); 1003 action->addTo( actionMenu );
1010 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 1004 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
1011 1005
1012 1006
1013 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1007 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
1014 1008
1015 1009
1016 1010
1017 actionMenu->insertSeparator(); 1011 actionMenu->insertSeparator();
1018 action = new QAction( "manage cat", i18n("Edit category list..."), 0, 1012 action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1019 this ); 1013 this );
1020 action->addTo( actionMenu ); 1014 action->addTo( actionMenu );
1021 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); 1015 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1022 1016
1023 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 1017 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1024 this ); 1018 this );
1025 action->addTo( actionMenu ); 1019 action->addTo( actionMenu );
1026 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 1020 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1027 1021
1028 1022
1029 actionMenu->insertSeparator(); 1023 actionMenu->insertSeparator();
1030 icon = loadPixmap( pathString + "configure" ); 1024 icon = loadPixmap( pathString + "configure" );
1031 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); 1025 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
1032 action->addTo( actionMenu ); 1026 action->addTo( actionMenu );
1033 connect( action, SIGNAL( activated() ), 1027 connect( action, SIGNAL( activated() ),
1034 mView, SLOT( edit_options() ) ); 1028 mView, SLOT( edit_options() ) );
1035 icon = loadPixmap( pathString + "configure" ); 1029 icon = loadPixmap( pathString + "configure" );
1036 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); 1030 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
1037 action->addTo( actionMenu ); 1031 action->addTo( actionMenu );
1038 connect( action, SIGNAL( activated() ), 1032 connect( action, SIGNAL( activated() ),
1039 mView, SLOT( edit_global_options() ) ); 1033 mView, SLOT( edit_global_options() ) );
1040 if ( KOPrefs::instance()->mShowFullMenu ) { 1034 if ( KOPrefs::instance()->mShowFullMenu ) {
1041 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 1035 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
1042 1036
1043 } 1037 }
1044 // actionMenu->insertSeparator(); 1038 // actionMenu->insertSeparator();
1045 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 1039 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
1046 this ); 1040 this );
1047 action->addTo( importMenu_X ); 1041 action->addTo( importMenu_X );
1048 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 1042 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
1049 action = new QAction( "import_quick", i18n("Import last file"), 0, 1043 action = new QAction( "import_quick", i18n("Import last file"), 0,
1050 this ); 1044 this );
1051 action->addTo( importMenu_X ); 1045 action->addTo( importMenu_X );
1052 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 1046 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
1053 importMenu_X->insertSeparator(); 1047 importMenu_X->insertSeparator();
1054 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 1048 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
1055 this ); 1049 this );
1056 action->addTo( importMenu_X ); 1050 action->addTo( importMenu_X );
1057 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 1051 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
1058 //#ifndef DESKTOP_VERSION 1052 //#ifndef DESKTOP_VERSION
1059 importMenu_X->insertSeparator(); 1053 importMenu_X->insertSeparator();
1060 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 1054 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
1061 this ); 1055 this );
1062 action->addTo( importMenu_X ); 1056 action->addTo( importMenu_X );
1063 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 1057 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
1064 //#else 1058 //#else
1065#ifdef _OL_IMPORT_ 1059#ifdef _OL_IMPORT_
1066 importMenu_X->insertSeparator(); 1060 importMenu_X->insertSeparator();
1067 action = new QAction( "import_ol", i18n("Import from OL"), 0, 1061 action = new QAction( "import_ol", i18n("Import from OL"), 0,
1068 this ); 1062 this );
1069 action->addTo( importMenu_X ); 1063 action->addTo( importMenu_X );
1070 connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); 1064 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
1071#endif 1065#endif
1072 //#endif 1066 //#endif
1073 1067
1074 //importMenu->insertSeparator(); 1068 //importMenu->insertSeparator();
1075#if 0 1069#if 0
1076 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 1070 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
1077 this ); 1071 this );
1078 action->addTo( importMenu ); 1072 action->addTo( importMenu );
1079 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 1073 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
1080#endif 1074#endif
1081 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, 1075 action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0,
1082 this ); 1076 this );
1083 action->addTo( importMenu ); 1077 action->addTo( importMenu );
1084 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 1078 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
1085 importMenu->insertSeparator(); 1079 importMenu->insertSeparator();
1086 importMenu->insertItem( i18n("Import"), importMenu_X ); 1080 importMenu->insertItem( i18n("Import"), importMenu_X );
1087 //importMenu->insertSeparator(); 1081 //importMenu->insertSeparator();
1088 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, 1082 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
1089 this ); 1083 this );
1090 action->addTo( exportMenu_X ); 1084 action->addTo( exportMenu_X );
1091 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 1085 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
1092 1086
1093 1087
1094 //LR 1088 //LR
1095 QPopupMenu *ex2phone = new QPopupMenu( this ); 1089 QPopupMenu *ex2phone = new QPopupMenu( this );
1096 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1090 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1097 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1091 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1098 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1092 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1099 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1093 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1100 1094
1101 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1095 importMenu->insertItem( i18n("Export"), exportMenu_X );
1102#ifndef DESKTOP_VERSION 1096#ifndef DESKTOP_VERSION
1103 //importMenu->insertSeparator(); 1097 //importMenu->insertSeparator();
1104 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1098 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1105 this ); 1099 this );
1106 brAction->addTo( beamMenu_X ); 1100 brAction->addTo( beamMenu_X );
1107 brAction->setToggleAction (true ) ; 1101 brAction->setToggleAction (true ) ;
1108 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 1102 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
1109 1103
1110 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 1104 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
1111 this ); 1105 this );
1112 action->addTo( beamMenu_X ); 1106 action->addTo( beamMenu_X );
1113 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 1107 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
1114 1108
1115 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, 1109 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
1116 this ); 1110 this );
1117 action->addTo( beamMenu_X ); 1111 action->addTo( beamMenu_X );
1118 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 1112 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
1119 importMenu->insertItem( i18n("Beam"), beamMenu_X ); 1113 importMenu->insertItem( i18n("Beam"), beamMenu_X );
1120#else 1114#else
1121 //importMenu->insertSeparator(); 1115 //importMenu->insertSeparator();
1122 icon = loadPixmap( pathString + "print" ); 1116 icon = loadPixmap( pathString + "print" );
1123 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 1117 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
1124 action->addTo( beamMenu_X ); 1118 action->addTo( beamMenu_X );
1125 connect( action, SIGNAL( activated() ), 1119 connect( action, SIGNAL( activated() ),
1126 this, SLOT( printCal() ) ); 1120 this, SLOT( printCal() ) );
1127 1121
1128 icon = loadPixmap( pathString + "print" ); 1122 icon = loadPixmap( pathString + "print" );
1129 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1123 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1130 action->addTo( beamMenu_X ); 1124 action->addTo( beamMenu_X );
1131 connect( action, SIGNAL( activated() ), 1125 connect( action, SIGNAL( activated() ),
1132 this, SLOT( printSel() ) ); 1126 this, SLOT( printSel() ) );
1133 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1127 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1134 action->addTo( beamMenu_X ); 1128 action->addTo( beamMenu_X );
1135 connect( action, SIGNAL( activated() ), 1129 connect( action, SIGNAL( activated() ),
1136 mView->viewManager(), SLOT( slotprintWNV() ) ); 1130 mView->viewManager(), SLOT( slotprintWNV() ) );
1137 1131
1138 1132
1139 icon = loadPixmap( pathString + "print" ); 1133 icon = loadPixmap( pathString + "print" );
1140 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1134 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1141 action->addTo( beamMenu_X ); 1135 action->addTo( beamMenu_X );
1142 connect( action, SIGNAL( activated() ), 1136 connect( action, SIGNAL( activated() ),
1143 this, SLOT( printListView() ) ); 1137 this, SLOT( printListView() ) );
1144 1138
1145 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1139 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1146 action->addTo( beamMenu_X ); 1140 action->addTo( beamMenu_X );
1147 connect( action, SIGNAL( activated() ), 1141 connect( action, SIGNAL( activated() ),
1148 mView, SLOT( slotprintSelInc() ) ); 1142 mView, SLOT( slotprintSelInc() ) );
1149 1143
1150 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1144 importMenu->insertItem( i18n("Print"), beamMenu_X );
1151#endif 1145#endif
1152 1146
1153 importMenu->insertSeparator(); 1147 importMenu->insertSeparator();
1154 action = new QAction( "beam all", i18n("Save"), 0, 1148 action = new QAction( "beam all", i18n("Save"), 0,
1155 this ); 1149 this );
1156 action->addTo( importMenu ); 1150 action->addTo( importMenu );
1157 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1151 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1158 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1152 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1159 this ); 1153 this );
1160 action->addTo( importMenu ); 1154 action->addTo( importMenu );
1161 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1155 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1162 1156
1163 //menuBar->insertItem( "Configure",configureMenu ); 1157 //menuBar->insertItem( "Configure",configureMenu );
1164 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1158 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1165 icon = loadPixmap( "korganizer/korganizer" ); 1159 icon = loadPixmap( "korganizer/korganizer" );
1166 1160
1167 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1161 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1168 action->addTo( helpMenu ); 1162 action->addTo( helpMenu );
1169 connect( action, SIGNAL( activated() ), 1163 connect( action, SIGNAL( activated() ),
1170 SLOT( whatsNew() ) ); 1164 SLOT( whatsNew() ) );
1171 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1165 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
1172 action->addTo( helpMenu ); 1166 action->addTo( helpMenu );
1173 connect( action, SIGNAL( activated() ), 1167 connect( action, SIGNAL( activated() ),
1174 SLOT( features() ) ); 1168 SLOT( features() ) );
1175 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1169 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
1176 action->addTo( helpMenu ); 1170 action->addTo( helpMenu );
1177 connect( action, SIGNAL( activated() ), 1171 connect( action, SIGNAL( activated() ),