summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp67
-rw-r--r--korganizer/mainwindow.h4
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp13
3 files changed, 71 insertions, 13 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 6ddced0..ae03a09 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -519,399 +519,403 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
519 if ( msg == "-newEvent" ) { 519 if ( msg == "-newEvent" ) {
520 mView->newEvent(); 520 mView->newEvent();
521 } 521 }
522 if ( msg == "-newTodo" ) { 522 if ( msg == "-newTodo" ) {
523 mView->newTodo(); 523 mView->newTodo();
524 524
525 } 525 }
526 if ( msg == "-showWN" ) { 526 if ( msg == "-showWN" ) {
527 mView->viewManager()->showWhatsNextView(); 527 mView->viewManager()->showWhatsNextView();
528 } 528 }
529 if ( msg == "-showTodo" ) { 529 if ( msg == "-showTodo" ) {
530 mView->viewManager()->showTodoView(); 530 mView->viewManager()->showTodoView();
531 } 531 }
532 if ( msg == "-showList" ) { 532 if ( msg == "-showList" ) {
533 mView->viewManager()->showListView(); 533 mView->viewManager()->showListView();
534 } 534 }
535 else if ( msg == "-showDay" ) { 535 else if ( msg == "-showDay" ) {
536 mView->viewManager()->showDayView(); 536 mView->viewManager()->showDayView();
537 } 537 }
538 else if ( msg == "-showWWeek" ) { 538 else if ( msg == "-showWWeek" ) {
539 mView->viewManager()->showWorkWeekView(); 539 mView->viewManager()->showWorkWeekView();
540 } 540 }
541 else if ( msg == "-ringSync" ) { 541 else if ( msg == "-ringSync" ) {
542 mSyncManager->multiSync( false ); 542 mSyncManager->multiSync( false );
543 } 543 }
544 else if ( msg == "-showWeek" ) { 544 else if ( msg == "-showWeek" ) {
545 mView->viewManager()->showWeekView(); 545 mView->viewManager()->showWeekView();
546 } 546 }
547 else if ( msg == "-showTodo" ) { 547 else if ( msg == "-showTodo" ) {
548 mView->viewManager()->showTodoView(); 548 mView->viewManager()->showTodoView();
549 } 549 }
550 else if ( msg == "-showJournal" ) { 550 else if ( msg == "-showJournal" ) {
551 mView->dateNavigator()->selectDates( 1 ); 551 mView->dateNavigator()->selectDates( 1 );
552 mView->dateNavigator()->selectToday(); 552 mView->dateNavigator()->selectToday();
553 mView->viewManager()->showJournalView(); 553 mView->viewManager()->showJournalView();
554 } 554 }
555 else if ( msg == "-showKO" ) { 555 else if ( msg == "-showKO" ) {
556 mView->viewManager()->showNextXView(); 556 mView->viewManager()->showNextXView();
557 } 557 }
558 else if ( msg == "-showWNext" ) { 558 else if ( msg == "-showWNext" ) {
559 mView->viewManager()->showWhatsNextView(); 559 mView->viewManager()->showWhatsNextView();
560 } 560 }
561 else if ( msg == "nextView()" ) { 561 else if ( msg == "nextView()" ) {
562 mView->viewManager()->showNextView(); 562 mView->viewManager()->showNextView();
563 } 563 }
564 else if ( msg == "-showNextXView" ) { 564 else if ( msg == "-showNextXView" ) {
565 mView->viewManager()->showNextXView(); 565 mView->viewManager()->showNextXView();
566 } 566 }
567 567
568 568
569 } 569 }
570 570
571 showMaximized(); 571 showMaximized();
572 raise(); 572 raise();
573} 573}
574 574
575QPixmap MainWindow::loadPixmap( QString name ) 575QPixmap MainWindow::loadPixmap( QString name )
576{ 576{
577 return SmallIcon( name ); 577 return SmallIcon( name );
578 578
579} 579}
580void MainWindow::initActions() 580void MainWindow::initActions()
581{ 581{
582 //KOPrefs::instance()->mShowFullMenu 582 //KOPrefs::instance()->mShowFullMenu
583 iconToolBar->clear(); 583 iconToolBar->clear();
584 KOPrefs *p = KOPrefs::instance(); 584 KOPrefs *p = KOPrefs::instance();
585 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 585 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
586 586
587 QPopupMenu *viewMenu = new QPopupMenu( this ); 587 QPopupMenu *viewMenu = new QPopupMenu( this );
588 QPopupMenu *actionMenu = new QPopupMenu( this ); 588 QPopupMenu *actionMenu = new QPopupMenu( this );
589 QPopupMenu *importMenu = new QPopupMenu( this ); 589 QPopupMenu *importMenu = new QPopupMenu( this );
590 QPopupMenu *importMenu_X = new QPopupMenu( this ); 590 QPopupMenu *importMenu_X = new QPopupMenu( this );
591 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 591 QPopupMenu *exportMenu_X = new QPopupMenu( this );
592 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 592 QPopupMenu *beamMenu_X = new QPopupMenu( this );
593 selectFilterMenu = new QPopupMenu( this ); 593 selectFilterMenu = new QPopupMenu( this );
594 selectFilterMenu->setCheckable( true ); 594 selectFilterMenu->setCheckable( true );
595 syncMenu = new QPopupMenu( this ); 595 syncMenu = new QPopupMenu( this );
596 configureAgendaMenu = new QPopupMenu( this ); 596 configureAgendaMenu = new QPopupMenu( this );
597 configureToolBarMenu = new QPopupMenu( this ); 597 configureToolBarMenu = new QPopupMenu( this );
598 QPopupMenu *helpMenu = new QPopupMenu( this ); 598 QPopupMenu *helpMenu = new QPopupMenu( this );
599 QIconSet icon; 599 QIconSet icon;
600 int pixWid = 22, pixHei = 22; 600 int pixWid = 22, pixHei = 22;
601 QString pathString = ""; 601 QString pathString = "";
602 if ( !p->mToolBarMiniIcons ) { 602 if ( !p->mToolBarMiniIcons ) {
603 if ( QApplication::desktop()->width() < 480 ) { 603 if ( QApplication::desktop()->width() < 480 ) {
604 pathString += "icons16/"; 604 pathString += "icons16/";
605 pixWid = 18; pixHei = 16; 605 pixWid = 18; pixHei = 16;
606 } 606 }
607 } else { 607 } else {
608 pathString += "iconsmini/"; 608 pathString += "iconsmini/";
609 pixWid = 18; pixHei = 16; 609 pixWid = 18; pixHei = 16;
610 } 610 }
611 if ( KOPrefs::instance()->mShowFullMenu ) { 611 if ( KOPrefs::instance()->mShowFullMenu ) {
612 QMenuBar *menuBar1; 612 QMenuBar *menuBar1;
613 menuBar1 = menuBar(); 613 menuBar1 = menuBar();
614 menuBar1->insertItem( i18n("File"), importMenu ); 614 menuBar1->insertItem( i18n("File"), importMenu );
615 menuBar1->insertItem( i18n("View"), viewMenu ); 615 menuBar1->insertItem( i18n("View"), viewMenu );
616 menuBar1->insertItem( i18n("Actions"), actionMenu ); 616 menuBar1->insertItem( i18n("Actions"), actionMenu );
617#ifdef DESKTOP_VERSION 617#ifdef DESKTOP_VERSION
618 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 618 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
619 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 619 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
620#else 620#else
621 menuBar1->insertItem( i18n("Sync"), syncMenu ); 621 menuBar1->insertItem( i18n("Sync"), syncMenu );
622 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); 622 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu );
623#endif 623#endif
624 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 624 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
625 menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); 625 menuBar1->insertItem( i18n("Filter"),selectFilterMenu );
626 menuBar1->insertItem( i18n("Help"), helpMenu ); 626 menuBar1->insertItem( i18n("Help"), helpMenu );
627 } else { 627 } else {
628 QPEMenuBar *menuBar1; 628 QPEMenuBar *menuBar1;
629 menuBar1 = new QPEMenuBar( iconToolBar ); 629 menuBar1 = new QPEMenuBar( iconToolBar );
630 QPopupMenu *menuBar = new QPopupMenu( this ); 630 QPopupMenu *menuBar = new QPopupMenu( this );
631 icon = loadPixmap( pathString + "z_menu" ); 631 icon = loadPixmap( pathString + "z_menu" );
632 menuBar1->insertItem( icon.pixmap(), menuBar); 632 menuBar1->insertItem( icon.pixmap(), menuBar);
633 //menuBar1->insertItem( i18n("ME"), menuBar); 633 //menuBar1->insertItem( i18n("ME"), menuBar);
634 menuBar->insertItem( i18n("File"), importMenu ); 634 menuBar->insertItem( i18n("File"), importMenu );
635 menuBar->insertItem( i18n("View"), viewMenu ); 635 menuBar->insertItem( i18n("View"), viewMenu );
636 menuBar->insertItem( i18n("Actions"), actionMenu ); 636 menuBar->insertItem( i18n("Actions"), actionMenu );
637 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 637 menuBar->insertItem( i18n("Synchronize"), syncMenu );
638 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 638 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
639 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 639 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
640 menuBar->insertItem( i18n("Filter"),selectFilterMenu ); 640 menuBar->insertItem( i18n("Filter"),selectFilterMenu );
641 menuBar->insertItem( i18n("Help"), helpMenu ); 641 menuBar->insertItem( i18n("Help"), helpMenu );
642 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 642 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
643 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 643 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
644 } 644 }
645 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 645 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
646 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); 646 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
647
648
647 mWeekBgColor = iconToolBar->backgroundColor(); 649 mWeekBgColor = iconToolBar->backgroundColor();
648 mWeekPixmap.resize( pixWid , pixHei ); 650 mWeekPixmap.resize( pixWid , pixHei );
649 mWeekPixmap.fill( mWeekBgColor ); 651 mWeekPixmap.fill( mWeekBgColor );
650 icon = mWeekPixmap; 652 icon = mWeekPixmap;
651 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); 653 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
652 if ( p-> mShowIconWeekNum ) 654 if ( p-> mShowIconWeekNum )
653 mWeekAction->addTo( iconToolBar ); 655 mWeekAction->addTo( iconToolBar );
654 mWeekFont = font(); 656 mWeekFont = font();
655 657
656 int fontPoint = mWeekFont.pointSize(); 658 int fontPoint = mWeekFont.pointSize();
657 QFontMetrics f( mWeekFont ); 659 QFontMetrics f( mWeekFont );
658 int fontWid = f.width( "30" ); 660 int fontWid = f.width( "30" );
659 while ( fontWid > pixWid ) { 661 while ( fontWid > pixWid ) {
660 --fontPoint; 662 --fontPoint;
661 mWeekFont.setPointSize( fontPoint ); 663 mWeekFont.setPointSize( fontPoint );
662 QFontMetrics f( mWeekFont ); 664 QFontMetrics f( mWeekFont );
663 fontWid = f.width( "30" ); 665 fontWid = f.width( "30" );
664 //qDebug("dec-- "); 666 //qDebug("dec-- ");
665 } 667 }
666 668
667 connect( mWeekAction, SIGNAL( activated() ), 669 connect( mWeekAction, SIGNAL( activated() ),
668 this, SLOT( weekAction() ) ); 670 this, SLOT( weekAction() ) );
669 671
670 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); 672 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
673 if ( p->mShowIconFilterview ) {
674 icon = loadPixmap( pathString + "filter" );
675 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
676 connect( actionFilterMenuTB, SIGNAL( activated() ),
677 this, SLOT( fillFilterMenuTB() ) );
678 actionFilterMenuTB->addTo( iconToolBar );
679 selectFilterMenuTB = new QPopupMenu( this );
680 selectFilterMenuTB->setCheckable( true );
681 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
682 }
671 683
672 //#endif 684 //#endif
673 // ****************** 685 // ******************
674 QAction *action; 686 QAction *action;
675 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 687 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
676 configureToolBarMenu->setCheckable( true ); 688 configureToolBarMenu->setCheckable( true );
677 689
678 690
679 configureAgendaMenu->setCheckable( true ); 691 configureAgendaMenu->setCheckable( true );
680 int iii ; 692 int iii ;
681 for ( iii = 1;iii<= 10 ;++iii ){ 693 for ( iii = 1;iii<= 10 ;++iii ){
682 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 694 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
683 } 695 }
684 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 696 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
685 697
686 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 698 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
687 this, SLOT( showConfigureAgenda( ) ) ); 699 this, SLOT( showConfigureAgenda( ) ) );
688 700
689 icon = loadPixmap( pathString + "configure" ); 701 icon = loadPixmap( pathString + "configure" );
690 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); 702 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
691 action->addTo( actionMenu ); 703 action->addTo( actionMenu );
692 connect( action, SIGNAL( activated() ), 704 connect( action, SIGNAL( activated() ),
693 mView, SLOT( edit_options() ) ); 705 mView, SLOT( edit_options() ) );
694 actionMenu->insertSeparator(); 706 actionMenu->insertSeparator();
695 707
696 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 708 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
697 action->addTo( actionMenu ); 709 action->addTo( actionMenu );
698 connect( action, SIGNAL( activated() ), 710 connect( action, SIGNAL( activated() ),
699 mView, SLOT( undo_delete() ) ); 711 mView, SLOT( undo_delete() ) );
700 actionMenu->insertSeparator(); 712 actionMenu->insertSeparator();
701 713
702 icon = loadPixmap( pathString + "newevent" ); 714 icon = loadPixmap( pathString + "newevent" );
703 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 715 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
704 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 716 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
705 configureToolBarMenu->insertSeparator(); 717 configureToolBarMenu->insertSeparator();
706 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 718 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
707 configureToolBarMenu->insertSeparator(); 719 configureToolBarMenu->insertSeparator();
708 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 720 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
709 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 721 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
710 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 722 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
711 ne_action->addTo( actionMenu ); 723 ne_action->addTo( actionMenu );
712 connect( ne_action, SIGNAL( activated() ), 724 connect( ne_action, SIGNAL( activated() ),
713 mView, SLOT( newEvent() ) ); 725 mView, SLOT( newEvent() ) );
714 icon = loadPixmap( pathString + "newtodo" ); 726 icon = loadPixmap( pathString + "newtodo" );
715 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 727 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
716 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 728 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
717 nt_action->addTo( actionMenu ); 729 nt_action->addTo( actionMenu );
718 connect( nt_action, SIGNAL( activated() ), 730 connect( nt_action, SIGNAL( activated() ),
719 mView, SLOT( newTodo() ) ); 731 mView, SLOT( newTodo() ) );
720 732
721 icon = loadPixmap( pathString + "today" ); 733 icon = loadPixmap( pathString + "today" );
722 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 734 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
723 today_action->addTo( viewMenu ); 735 today_action->addTo( viewMenu );
724 connect( today_action, SIGNAL( activated() ), 736 connect( today_action, SIGNAL( activated() ),
725 mView, SLOT( goToday() ) ); 737 mView, SLOT( goToday() ) );
726 viewMenu->insertSeparator(); 738 viewMenu->insertSeparator();
727 739
728 // *********************** 740 // ***********************
729 if ( KOPrefs::instance()->mVerticalScreen ) { 741 if ( KOPrefs::instance()->mVerticalScreen ) {
730 icon = SmallIcon( "1updownarrow" ); 742 icon = SmallIcon( "1updownarrow" );
731 } else { 743 } else {
732 icon = SmallIcon("1leftrightarrow" ); 744 icon = SmallIcon("1leftrightarrow" );
733 } 745 }
734 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); 746 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
735 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); 747 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
736 FSaction->addTo( viewMenu ); 748 FSaction->addTo( viewMenu );
737 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); 749 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
738 750
739 icon = loadPixmap( pathString + "navi" ); 751 icon = loadPixmap( pathString + "navi" );
740 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); 752 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
741 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 753 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
742 action->addTo( viewMenu ); 754 action->addTo( viewMenu );
743 connect( action, SIGNAL( activated() ), 755 connect( action, SIGNAL( activated() ),
744 mView, SLOT( toggleDateNavigatorWidget() ) ); 756 mView, SLOT( toggleDateNavigatorWidget() ) );
745 mToggleNav = action ; 757 mToggleNav = action ;
746 icon = loadPixmap( pathString + "filter" ); 758 icon = loadPixmap( pathString + "filter" );
747 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); 759 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
748 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); 760 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
749 action->addTo( viewMenu ); 761 action->addTo( viewMenu );
750 connect( action, SIGNAL( activated() ), 762 connect( action, SIGNAL( activated() ),
751 mView, SLOT( toggleFilter() ) ); 763 mView, SLOT( toggleFilter() ) );
752 mToggleFilter = action; 764 mToggleFilter = action;
753 icon = loadPixmap( pathString + "allday" ); 765 icon = loadPixmap( pathString + "allday" );
754 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); 766 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
755 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 767 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
756 action->addTo( viewMenu ); 768 action->addTo( viewMenu );
757 connect( action, SIGNAL( activated() ), 769 connect( action, SIGNAL( activated() ),
758 mView, SLOT( toggleAllDaySize() ) ); 770 mView, SLOT( toggleAllDaySize() ) );
759 mToggleAllday = action; 771 mToggleAllday = action;
760 772
761 773
762 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 774 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
763 mToggleNav, SLOT( setEnabled ( bool ) ) ); 775 mToggleNav, SLOT( setEnabled ( bool ) ) );
764 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 776 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
765 mToggleFilter, SLOT( setEnabled ( bool ) ) ); 777 mToggleFilter, SLOT( setEnabled ( bool ) ) );
766 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 778 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
767 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 779 mToggleAllday, SLOT( setEnabled ( bool ) ) );
768 780
769 viewMenu->insertSeparator(); 781 viewMenu->insertSeparator();
770 icon = loadPixmap( pathString + "picker" ); 782 icon = loadPixmap( pathString + "picker" );
771 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); 783 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
772 action->addTo( viewMenu ); 784 action->addTo( viewMenu );
773 connect( action, SIGNAL( activated() ), 785 connect( action, SIGNAL( activated() ),
774 mView, SLOT( showDatePicker() ) ); 786 mView, SLOT( showDatePicker() ) );
775 action->addTo( iconToolBar ); 787 action->addTo( iconToolBar );
776 viewMenu->insertSeparator(); 788 viewMenu->insertSeparator();
777 789
778 if ( p-> mShowIconToggleFull ) 790 if ( p-> mShowIconToggleFull )
779 FSaction->addTo( iconToolBar ); 791 FSaction->addTo( iconToolBar );
780 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); 792 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
781 if ( p->mShowIconFilterview ) { 793
782 icon = loadPixmap( pathString + "filter" );
783 QPEMenuBar *menuBar111 = new QPEMenuBar( iconToolBar );
784 menuBar111->insertItem( icon.pixmap(), selectFilterMenu);
785 int isi = 24;
786 if ( QApplication::desktop()->width() < 480 )
787 isi = 18;
788 menuBar111->setFixedSize( QSize( isi, isi )) ;
789 }
790 //******************** 794 //********************
791 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); 795 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
792 796
793 797
794 icon = loadPixmap( pathString + "whatsnext" ); 798 icon = loadPixmap( pathString + "whatsnext" );
795 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 799 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
796 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 800 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
797 whatsnext_action->addTo( viewMenu ); 801 whatsnext_action->addTo( viewMenu );
798 connect( whatsnext_action, SIGNAL( activated() ), 802 connect( whatsnext_action, SIGNAL( activated() ),
799 mView->viewManager(), SLOT( showWhatsNextView() ) ); 803 mView->viewManager(), SLOT( showWhatsNextView() ) );
800 804
801 icon = loadPixmap( pathString + "xdays" ); 805 icon = loadPixmap( pathString + "xdays" );
802 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 806 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
803 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 807 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
804 xdays_action->addTo( viewMenu ); 808 xdays_action->addTo( viewMenu );
805 connect( xdays_action, SIGNAL( activated() ), 809 connect( xdays_action, SIGNAL( activated() ),
806 mView->viewManager(), SLOT( showNextXView() ) ); 810 mView->viewManager(), SLOT( showNextXView() ) );
807 811
808 812
809 icon = loadPixmap( pathString + "journal" ); 813 icon = loadPixmap( pathString + "journal" );
810 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); 814 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
811 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); 815 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
812 viewjournal_action->addTo( viewMenu ); 816 viewjournal_action->addTo( viewMenu );
813 connect( viewjournal_action, SIGNAL( activated() ), 817 connect( viewjournal_action, SIGNAL( activated() ),
814 mView->viewManager(), SLOT( showJournalView() ) ); 818 mView->viewManager(), SLOT( showJournalView() ) );
815 819
816 820
817 icon = loadPixmap( pathString + "day" ); 821 icon = loadPixmap( pathString + "day" );
818 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); 822 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
819 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); 823 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
820 day1_action->addTo( viewMenu ); 824 day1_action->addTo( viewMenu );
821 // action->addTo( toolBar ); 825 // action->addTo( toolBar );
822 connect( day1_action, SIGNAL( activated() ), 826 connect( day1_action, SIGNAL( activated() ),
823 mView->viewManager(), SLOT( showDayView() ) ); 827 mView->viewManager(), SLOT( showDayView() ) );
824 828
825 icon = loadPixmap( pathString + "workweek" ); 829 icon = loadPixmap( pathString + "workweek" );
826 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); 830 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
827 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); 831 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
828 day5_action->addTo( viewMenu ); 832 day5_action->addTo( viewMenu );
829 connect( day5_action, SIGNAL( activated() ), 833 connect( day5_action, SIGNAL( activated() ),
830 mView->viewManager(), SLOT( showWorkWeekView() ) ); 834 mView->viewManager(), SLOT( showWorkWeekView() ) );
831 835
832 icon = loadPixmap( pathString + "week" ); 836 icon = loadPixmap( pathString + "week" );
833 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); 837 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
834 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); 838 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
835 day7_action->addTo( viewMenu ); 839 day7_action->addTo( viewMenu );
836 connect( day7_action, SIGNAL( activated() ), 840 connect( day7_action, SIGNAL( activated() ),
837 mView->viewManager(), SLOT( showWeekView() ) ); 841 mView->viewManager(), SLOT( showWeekView() ) );
838 842
839 icon = loadPixmap( pathString + "workweek2" ); 843 icon = loadPixmap( pathString + "workweek2" );
840 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); 844 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
841 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); 845 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
842 day6_action->addTo( viewMenu ); 846 day6_action->addTo( viewMenu );
843 connect( day6_action, SIGNAL( activated() ), 847 connect( day6_action, SIGNAL( activated() ),
844 mView->viewManager(), SLOT( showMonthViewWeek() ) ); 848 mView->viewManager(), SLOT( showMonthViewWeek() ) );
845 849
846 icon = loadPixmap( pathString + "month" ); 850 icon = loadPixmap( pathString + "month" );
847 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); 851 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
848 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); 852 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
849 month_action->addTo( viewMenu ); 853 month_action->addTo( viewMenu );
850 connect( month_action, SIGNAL( activated() ), 854 connect( month_action, SIGNAL( activated() ),
851 mView->viewManager(), SLOT( showMonthView() ) ); 855 mView->viewManager(), SLOT( showMonthView() ) );
852 856
853 icon = loadPixmap( pathString + "list" ); 857 icon = loadPixmap( pathString + "list" );
854 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 858 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
855 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); 859 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
856 showlist_action->addTo( viewMenu ); 860 showlist_action->addTo( viewMenu );
857 connect( showlist_action, SIGNAL( activated() ), 861 connect( showlist_action, SIGNAL( activated() ),
858 mView->viewManager(), SLOT( showListView() ) ); 862 mView->viewManager(), SLOT( showListView() ) );
859 863
860 icon = loadPixmap( pathString + "todo" ); 864 icon = loadPixmap( pathString + "todo" );
861 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 865 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
862 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 866 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
863 todoview_action->addTo( viewMenu ); 867 todoview_action->addTo( viewMenu );
864 connect( todoview_action, SIGNAL( activated() ), 868 connect( todoview_action, SIGNAL( activated() ),
865 mView->viewManager(), SLOT( showTodoView() ) ); 869 mView->viewManager(), SLOT( showTodoView() ) );
866 870
867 871
868 872
869#if 0 873#if 0
870 action = new QAction( "view_timespan", "Time Span", 0, this ); 874 action = new QAction( "view_timespan", "Time Span", 0, this );
871 action->addTo( viewMenu ); 875 action->addTo( viewMenu );
872 connect( action, SIGNAL( activated() ), 876 connect( action, SIGNAL( activated() ),
873 mView->viewManager(), SLOT( showTimeSpanView() ) ); 877 mView->viewManager(), SLOT( showTimeSpanView() ) );
874#endif 878#endif
875 879
876 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 880 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
877 this ); 881 this );
878 mNewSubTodoAction->addTo( actionMenu ); 882 mNewSubTodoAction->addTo( actionMenu );
879 connect( mNewSubTodoAction, SIGNAL( activated() ), 883 connect( mNewSubTodoAction, SIGNAL( activated() ),
880 mView, SLOT( newSubTodo() ) ); 884 mView, SLOT( newSubTodo() ) );
881 885
882 actionMenu->insertSeparator(); 886 actionMenu->insertSeparator();
883 887
884 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 888 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
885 mShowAction->addTo( actionMenu ); 889 mShowAction->addTo( actionMenu );
886 connect( mShowAction, SIGNAL( activated() ), 890 connect( mShowAction, SIGNAL( activated() ),
887 mView, SLOT( showIncidence() ) ); 891 mView, SLOT( showIncidence() ) );
888 892
889 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 893 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
890 mEditAction->addTo( actionMenu ); 894 mEditAction->addTo( actionMenu );
891 connect( mEditAction, SIGNAL( activated() ), 895 connect( mEditAction, SIGNAL( activated() ),
892 mView, SLOT( editIncidence() ) ); 896 mView, SLOT( editIncidence() ) );
893 897
894 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 898 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
895 mDeleteAction->addTo( actionMenu ); 899 mDeleteAction->addTo( actionMenu );
896 connect( mDeleteAction, SIGNAL( activated() ), 900 connect( mDeleteAction, SIGNAL( activated() ),
897 mView, SLOT( deleteIncidence() ) ); 901 mView, SLOT( deleteIncidence() ) );
898 902
899 903
900 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); 904 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
901 mCloneAction->addTo( actionMenu ); 905 mCloneAction->addTo( actionMenu );
902 connect( mCloneAction, SIGNAL( activated() ), 906 connect( mCloneAction, SIGNAL( activated() ),
903 mView, SLOT( cloneIncidence() ) ); 907 mView, SLOT( cloneIncidence() ) );
904 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); 908 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
905 mMoveAction->addTo( actionMenu ); 909 mMoveAction->addTo( actionMenu );
906 connect( mMoveAction, SIGNAL( activated() ), 910 connect( mMoveAction, SIGNAL( activated() ),
907 mView, SLOT( moveIncidence() ) ); 911 mView, SLOT( moveIncidence() ) );
908 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); 912 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
909 mBeamAction->addTo( actionMenu ); 913 mBeamAction->addTo( actionMenu );
910 connect( mBeamAction, SIGNAL( activated() ), 914 connect( mBeamAction, SIGNAL( activated() ),
911 mView, SLOT( beamIncidence() ) ); 915 mView, SLOT( beamIncidence() ) );
912 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); 916 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
913 mCancelAction->addTo( actionMenu ); 917 mCancelAction->addTo( actionMenu );
914 connect( mCancelAction, SIGNAL( activated() ), 918 connect( mCancelAction, SIGNAL( activated() ),
915 mView, SLOT( toggleCancelIncidence() ) ); 919 mView, SLOT( toggleCancelIncidence() ) );
916 920
917 actionMenu->insertSeparator(); 921 actionMenu->insertSeparator();
@@ -1838,257 +1842,301 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
1838 mView->toggleFilerEnabled( ); 1842 mView->toggleFilerEnabled( );
1839 break; 1843 break;
1840 case Qt::Key_0: 1844 case Qt::Key_0:
1841 case Qt::Key_1: 1845 case Qt::Key_1:
1842 case Qt::Key_2: 1846 case Qt::Key_2:
1843 case Qt::Key_3: 1847 case Qt::Key_3:
1844 case Qt::Key_4: 1848 case Qt::Key_4:
1845 case Qt::Key_5: 1849 case Qt::Key_5:
1846 case Qt::Key_6: 1850 case Qt::Key_6:
1847 case Qt::Key_7: 1851 case Qt::Key_7:
1848 case Qt::Key_8: 1852 case Qt::Key_8:
1849 case Qt::Key_9: 1853 case Qt::Key_9:
1850 pro = e->key()-48; 1854 pro = e->key()-48;
1851 if ( pro == 0 ) 1855 if ( pro == 0 )
1852 pro = 10; 1856 pro = 10;
1853 if ( e->state() == Qt::ControlButton) 1857 if ( e->state() == Qt::ControlButton)
1854 pro += 10; 1858 pro += 10;
1855 break; 1859 break;
1856 case Qt::Key_M: 1860 case Qt::Key_M:
1857 mView->viewManager()->showMonthView(); 1861 mView->viewManager()->showMonthView();
1858 showSelectedDates = true; 1862 showSelectedDates = true;
1859 break; 1863 break;
1860 case Qt::Key_Insert: 1864 case Qt::Key_Insert:
1861 mView->newEvent(); 1865 mView->newEvent();
1862 break; 1866 break;
1863 case Qt::Key_S : 1867 case Qt::Key_S :
1864 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) 1868 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
1865 mView->newSubTodo(); 1869 mView->newSubTodo();
1866 else 1870 else
1867 mView->dialogManager()->showSearchDialog(); 1871 mView->dialogManager()->showSearchDialog();
1868 break; 1872 break;
1869 case Qt::Key_Y : 1873 case Qt::Key_Y :
1870 case Qt::Key_Z : 1874 case Qt::Key_Z :
1871 mView->viewManager()->showWorkWeekView(); 1875 mView->viewManager()->showWorkWeekView();
1872 showSelectedDates = true; 1876 showSelectedDates = true;
1873 break; 1877 break;
1874 case Qt::Key_U : 1878 case Qt::Key_U :
1875 mView->viewManager()->showWeekView(); 1879 mView->viewManager()->showWeekView();
1876 showSelectedDates = true; 1880 showSelectedDates = true;
1877 break; 1881 break;
1878 case Qt::Key_H : 1882 case Qt::Key_H :
1879 keyBindings(); 1883 keyBindings();
1880 break; 1884 break;
1881 case Qt::Key_W: 1885 case Qt::Key_W:
1882 mView->viewManager()->showWhatsNextView(); 1886 mView->viewManager()->showWhatsNextView();
1883 break; 1887 break;
1884 case Qt::Key_L: 1888 case Qt::Key_L:
1885 mView->viewManager()->showListView(); 1889 mView->viewManager()->showListView();
1886 break; 1890 break;
1887 case Qt::Key_N: 1891 case Qt::Key_N:
1888 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) 1892 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
1889 mView->viewManager()->showNextView(); 1893 mView->viewManager()->showNextView();
1890 else { 1894 else {
1891 mView->viewManager()->showNextXView(); 1895 mView->viewManager()->showNextXView();
1892 showSelectedDates = true; 1896 showSelectedDates = true;
1893 } 1897 }
1894 break; 1898 break;
1895 case Qt::Key_V: 1899 case Qt::Key_V:
1896 mView->viewManager()->showTodoView(); 1900 mView->viewManager()->showTodoView();
1897 break; 1901 break;
1898 case Qt::Key_C: 1902 case Qt::Key_C:
1899 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); 1903 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
1900 break; 1904 break;
1901 case Qt::Key_P: 1905 case Qt::Key_P:
1902 mView->showDatePicker( ); 1906 mView->showDatePicker( );
1903 break; 1907 break;
1904 case Qt::Key_F: 1908 case Qt::Key_F:
1905 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1909 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1906 mView->editFilters(); 1910 mView->editFilters();
1907 else 1911 else
1908 mView->toggleFilter(); 1912 mView->toggleFilter();
1909 break; 1913 break;
1910 case Qt::Key_X: 1914 case Qt::Key_X:
1911 mView->toggleDateNavigatorWidget(); 1915 mView->toggleDateNavigatorWidget();
1912 break; 1916 break;
1913 case Qt::Key_Space: 1917 case Qt::Key_Space:
1914 mView->toggleExpand(); 1918 mView->toggleExpand();
1915 break; 1919 break;
1916 case Qt::Key_A: 1920 case Qt::Key_A:
1917 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) 1921 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton )
1918 mView->showNextAlarms(); 1922 mView->showNextAlarms();
1919 else 1923 else
1920 mView->toggleAllDaySize(); 1924 mView->toggleAllDaySize();
1921 break; 1925 break;
1922 case Qt::Key_T: 1926 case Qt::Key_T:
1923 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1927 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1924 mView->newTodo(); 1928 mView->newTodo();
1925 else { 1929 else {
1926 mView->goToday(); 1930 mView->goToday();
1927 showSelectedDates = true; 1931 showSelectedDates = true;
1928 } 1932 }
1929 break; 1933 break;
1930 case Qt::Key_J: 1934 case Qt::Key_J:
1931 mView->viewManager()->showJournalView(); 1935 mView->viewManager()->showJournalView();
1932 break; 1936 break;
1933 case Qt::Key_B: 1937 case Qt::Key_B:
1934 mView->editIncidenceDescription();; 1938 mView->editIncidenceDescription();;
1935 break; 1939 break;
1936 // case Qt::Key_Return: 1940 // case Qt::Key_Return:
1937 case Qt::Key_E: 1941 case Qt::Key_E:
1938 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1942 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1939 mView->newEvent(); 1943 mView->newEvent();
1940 else 1944 else
1941 mView->editIncidence(); 1945 mView->editIncidence();
1942 break; 1946 break;
1943 case Qt::Key_Plus: 1947 case Qt::Key_Plus:
1944 size = p->mHourSize +2; 1948 size = p->mHourSize +2;
1945 if ( size <= 22 ) 1949 if ( size <= 22 )
1946 configureAgenda( size ); 1950 configureAgenda( size );
1947 break; 1951 break;
1948 case Qt::Key_Minus: 1952 case Qt::Key_Minus:
1949 size = p->mHourSize - 2; 1953 size = p->mHourSize - 2;
1950 if ( size >= 4 ) 1954 if ( size >= 4 )
1951 configureAgenda( size ); 1955 configureAgenda( size );
1952 break; 1956 break;
1953 1957
1954 1958
1955 default: 1959 default:
1956 e->ignore(); 1960 e->ignore();
1957 } 1961 }
1958 if ( pro > 0 ) { 1962 if ( pro > 0 ) {
1959 mView->selectFilter( pro-1 ); 1963 mView->selectFilter( pro-1 );
1960 } 1964 }
1961 if ( showSelectedDates ) { 1965 if ( showSelectedDates ) {
1962 ;// setCaptionToDates(); 1966 ;// setCaptionToDates();
1963 } 1967 }
1964 1968
1965} 1969}
1970void MainWindow::fillFilterMenuTB()
1971{
1972 selectFilterMenuTB->clear();
1973 selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ), 0 );
1974 selectFilterMenuTB->insertSeparator();
1975 selectFilterMenuTB->insertItem(i18n ( "No Filter" ), 1 );
1976
1977 selectFilterMenuTB->insertSeparator();
1978 QPtrList<CalFilter> fili = mView->filters();
1979 CalFilter *curfilter = mView->filterView()->selectedFilter();
1980 CalFilter *filter = fili.first();
1981 int iii = 2;
1982 bool checkitem = mView->filterView()->filtersEnabled();
1983 while(filter) {
1984 selectFilterMenuTB->insertItem( filter->name(), iii );
1985 if ( filter == curfilter)
1986 selectFilterMenuTB->setItemChecked( iii, checkitem );
1987 filter = fili.next();
1988 ++iii;
1989 }
1990 if ( !checkitem )
1991 selectFilterMenuTB->setItemChecked( 1, true );
1966 1992
1993 int x = 0;
1994 int y = iconToolBar->height();
1995 int dX = 0;
1996 int dY = 0;
1997 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
1998 if ( iconToolBar->y() > height()/2 ) {
1999 dY = selectFilterMenuTB->sizeHint().height()+8;
2000 y = 0;
2001 }
2002 } else {
2003 if ( iconToolBar->x() > width()/2 ) { // right side
2004 x=0;
2005 dX= selectFilterMenuTB->sizeHint().width()+8;
2006 y = 0;
2007 } else {
2008 x= iconToolBar->width();
2009 y = 0;
2010 }
2011 }
2012 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
2013 selectFilterMenuTB->popup(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)));
2014}
1967void MainWindow::fillFilterMenu() 2015void MainWindow::fillFilterMenu()
1968{ 2016{
1969 selectFilterMenu->clear(); 2017 selectFilterMenu->clear();
1970 selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); 2018 selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 );
1971 selectFilterMenu->insertSeparator(); 2019 selectFilterMenu->insertSeparator();
1972 selectFilterMenu->insertItem(i18n ( "No Filter" ), 1 ); 2020 selectFilterMenu->insertItem(i18n ( "No Filter" ), 1 );
1973 2021
1974 selectFilterMenu->insertSeparator(); 2022 selectFilterMenu->insertSeparator();
1975 QPtrList<CalFilter> fili = mView->filters(); 2023 QPtrList<CalFilter> fili = mView->filters();
1976 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2024 CalFilter *curfilter = mView->filterView()->selectedFilter();
1977 CalFilter *filter = fili.first(); 2025 CalFilter *filter = fili.first();
1978 int iii = 2; 2026 int iii = 2;
1979 bool checkitem = mView->filterView()->filtersEnabled(); 2027 bool checkitem = mView->filterView()->filtersEnabled();
1980 while(filter) { 2028 while(filter) {
1981 selectFilterMenu->insertItem( filter->name(), iii ); 2029 selectFilterMenu->insertItem( filter->name(), iii );
1982 if ( filter == curfilter) 2030 if ( filter == curfilter)
1983 selectFilterMenu->setItemChecked( iii, checkitem ); 2031 selectFilterMenu->setItemChecked( iii, checkitem );
1984 filter = fili.next(); 2032 filter = fili.next();
1985 ++iii; 2033 ++iii;
1986 } 2034 }
1987 if ( !checkitem ) 2035 if ( !checkitem )
1988 selectFilterMenu->setItemChecked( 1, true ); 2036 selectFilterMenu->setItemChecked( 1, true );
1989} 2037}
1990void MainWindow::fillFilterMenuPopup() 2038void MainWindow::fillFilterMenuPopup()
1991{ 2039{
1992 filterPopupMenu->clear(); 2040 filterPopupMenu->clear();
1993 filterPopupMenu->insertItem(i18n ( "No Filter" ), 0 ); 2041 filterPopupMenu->insertItem(i18n ( "No Filter" ), 0 );
1994 2042
1995 filterPopupMenu->insertSeparator(); 2043 filterPopupMenu->insertSeparator();
1996 QPtrList<CalFilter> fili = mView->filters(); 2044 QPtrList<CalFilter> fili = mView->filters();
1997 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2045 CalFilter *curfilter = mView->filterView()->selectedFilter();
1998 CalFilter *filter = fili.first(); 2046 CalFilter *filter = fili.first();
1999 int iii = 1; 2047 int iii = 1;
2000 bool checkitem = mView->filterView()->filtersEnabled(); 2048 bool checkitem = mView->filterView()->filtersEnabled();
2001 while(filter) { 2049 while(filter) {
2002 filterPopupMenu->insertItem( filter->name(), iii ); 2050 filterPopupMenu->insertItem( filter->name(), iii );
2003 if ( filter == curfilter) 2051 if ( filter == curfilter)
2004 filterPopupMenu->setItemChecked( iii, checkitem ); 2052 filterPopupMenu->setItemChecked( iii, checkitem );
2005 filter = fili.next(); 2053 filter = fili.next();
2006 ++iii; 2054 ++iii;
2007 } 2055 }
2008 if ( !checkitem ) 2056 if ( !checkitem )
2009 filterPopupMenu->setItemChecked( 0, true ); 2057 filterPopupMenu->setItemChecked( 0, true );
2010} 2058}
2011void MainWindow::selectFilter( int fil ) 2059void MainWindow::selectFilter( int fil )
2012{ 2060{
2013 2061
2014 if ( fil == 0 ) { 2062 if ( fil == 0 ) {
2015 mView->editFilters( ); 2063 mView->editFilters( );
2016 } else if ( fil == 1 ){ 2064 } else if ( fil == 1 ){
2017 if ( mView->filterView()->filtersEnabled() ) 2065 if ( mView->filterView()->filtersEnabled() )
2018 mView->toggleFilerEnabled( ); 2066 mView->toggleFilerEnabled( );
2019 } else { 2067 } else {
2020 if ( !mView->filterView()->filtersEnabled() ) { 2068 if ( !mView->filterView()->filtersEnabled() ) {
2021 mView->filterView()->blockSignals( true ); 2069 mView->filterView()->blockSignals( true );
2022 mView->toggleFilerEnabled( ); 2070 mView->toggleFilerEnabled( );
2023 mView->filterView()->blockSignals( false ); 2071 mView->filterView()->blockSignals( false );
2024 } 2072 }
2025 mView->selectFilter( fil-2 ); 2073 mView->selectFilter( fil-2 );
2026 } 2074 }
2027} 2075}
2028void MainWindow::updateFilterToolbar() 2076void MainWindow::updateFilterToolbar()
2029{ 2077{
2030 if ( filterMenubar ) { 2078 if ( filterMenubar ) {
2031 if ( !mView->filterView()->filtersEnabled() ) { 2079 if ( !mView->filterView()->filtersEnabled() ) {
2032 filterMenubar->changeItem( 0, i18n("No Filter") ); 2080 filterMenubar->changeItem( 0, i18n("No Filter") );
2033 } else { 2081 } else {
2034 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2082 CalFilter *curfilter = mView->filterView()->selectedFilter();
2035 if ( curfilter ) { 2083 if ( curfilter ) {
2036 filterMenubar->changeItem( 0, curfilter->name() ); 2084 filterMenubar->changeItem( 0, curfilter->name() );
2037 } 2085 }
2038 } 2086 }
2039 } 2087 }
2040} 2088}
2041void MainWindow::selectFilterPopup( int fil ) 2089void MainWindow::selectFilterPopup( int fil )
2042{ 2090{
2043 selectFilter( fil + 1 ); 2091 selectFilter( fil + 1 );
2044 2092
2045} 2093}
2046void MainWindow::configureToolBar( int item ) 2094void MainWindow::configureToolBar( int item )
2047{ 2095{
2048 2096
2049 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 2097 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
2050 KOPrefs *p = KOPrefs::instance(); 2098 KOPrefs *p = KOPrefs::instance();
2051 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 2099 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
2052 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); 2100 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
2053 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); 2101 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
2054 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); 2102 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
2055 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 2103 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
2056 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 ); 2104 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
2057 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 ); 2105 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
2058 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 ); 2106 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
2059 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 ); 2107 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
2060 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 2108 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
2061 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2109 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
2062 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2110 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
2063 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 2111 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
2064 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 2112 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
2065 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 2113 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
2066 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 2114 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
2067 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 2115 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
2068 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 2116 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
2069 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 2117 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
2070 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 2118 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
2071 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2119 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
2072 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 2120 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
2073 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 2121 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
2074 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 2122 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
2075 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 2123 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
2076 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 2124 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
2077 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); 2125 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
2078 // initActions(); 2126 // initActions();
2079} 2127}
2080void MainWindow::setCaption ( const QString & c ) 2128void MainWindow::setCaption ( const QString & c )
2081{ 2129{
2082 QString cap = c; 2130 QString cap = c;
2083 cap.replace( QRegExp("\n"), " " ); 2131 cap.replace( QRegExp("\n"), " " );
2084 cap = cap.stripWhiteSpace(); 2132 cap = cap.stripWhiteSpace();
2085 if ( cap.isEmpty() ) 2133 if ( cap.isEmpty() )
2086 cap = "KO/Pi"; 2134 cap = "KO/Pi";
2087 QWidget::setCaption( cap ); 2135 QWidget::setCaption( cap );
2088} 2136}
2089void MainWindow::setCaptionToDates() 2137void MainWindow::setCaptionToDates()
2090{ 2138{
2091 QString selDates; 2139 QString selDates;
2092 QDate date = mView->startDate(); 2140 QDate date = mView->startDate();
2093 if ( ! date.isValid() ) { 2141 if ( ! date.isValid() ) {
2094 setCaption(""); 2142 setCaption("");
@@ -2186,178 +2234,179 @@ void MainWindow::loadCalendar()
2186 mess = i18n("KO/Pi:Loaded %1").arg(fn) ; 2234 mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
2187 setCaption(mess); 2235 setCaption(mess);
2188 } 2236 }
2189 2237
2190} 2238}
2191void MainWindow::quickImportIcal() 2239void MainWindow::quickImportIcal()
2192{ 2240{
2193 importFile( KOPrefs::instance()->mLastImportFile, false ); 2241 importFile( KOPrefs::instance()->mLastImportFile, false );
2194} 2242}
2195void MainWindow::importFile( QString fn, bool quick ) 2243void MainWindow::importFile( QString fn, bool quick )
2196{ 2244{
2197 QFileInfo info; 2245 QFileInfo info;
2198 info.setFile( fn ); 2246 info.setFile( fn );
2199 QString mess; 2247 QString mess;
2200 bool loadbup = true; 2248 bool loadbup = true;
2201 if ( !info. exists() ) { 2249 if ( !info. exists() ) {
2202 mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); 2250 mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
2203 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 2251 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
2204 mess ); 2252 mess );
2205 return; 2253 return;
2206 } 2254 }
2207 int result = 0; 2255 int result = 0;
2208 if ( !quick ) { 2256 if ( !quick ) {
2209 mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 2257 mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
2210 result = QMessageBox::warning( this, "KO/Pi: Warning!", 2258 result = QMessageBox::warning( this, "KO/Pi: Warning!",
2211 mess, 2259 mess,
2212 "Import", "Cancel", 0, 2260 "Import", "Cancel", 0,
2213 0, 1 ); 2261 0, 1 );
2214 } 2262 }
2215 if ( result == 0 ) { 2263 if ( result == 0 ) {
2216 if ( mView->openCalendar( fn, true )) { 2264 if ( mView->openCalendar( fn, true )) {
2217 KOPrefs::instance()->mLastImportFile = fn; 2265 KOPrefs::instance()->mLastImportFile = fn;
2218 setCaption(i18n("Imported file successfully")); 2266 setCaption(i18n("Imported file successfully"));
2219 } else { 2267 } else {
2220 setCaption(i18n("Error importing file")); 2268 setCaption(i18n("Error importing file"));
2221 } 2269 }
2222 } 2270 }
2223} 2271}
2224 2272
2225void MainWindow::importIcal() 2273void MainWindow::importIcal()
2226{ 2274{
2227 2275
2228 QString fn =KOPrefs::instance()->mLastImportFile; 2276 QString fn =KOPrefs::instance()->mLastImportFile;
2229 2277
2230 fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this ); 2278 fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
2231 if ( fn == "" ) 2279 if ( fn == "" )
2232 return; 2280 return;
2233 importFile( fn, true ); 2281 importFile( fn, true );
2234 2282
2235} 2283}
2236 2284
2237void MainWindow::exportVCalendar() 2285void MainWindow::exportVCalendar()
2238{ 2286{
2239 QString fn = KOPrefs::instance()->mLastVcalFile; 2287 QString fn = KOPrefs::instance()->mLastVcalFile;
2240 fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); 2288 fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
2241 if ( fn == "" ) 2289 if ( fn == "" )
2242 return; 2290 return;
2243 QFileInfo info; 2291 QFileInfo info;
2244 info.setFile( fn ); 2292 info.setFile( fn );
2245 QString mes; 2293 QString mes;
2246 bool createbup = true; 2294 bool createbup = true;
2247 if ( info. exists() ) { 2295 if ( info. exists() ) {
2248 mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); 2296 mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
2249 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, 2297 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
2250 i18n("Overwrite!"), i18n("Cancel"), 0, 2298 i18n("Overwrite!"), i18n("Cancel"), 0,
2251 0, 1 ); 2299 0, 1 );
2252 if ( result != 0 ) { 2300 if ( result != 0 ) {
2253 createbup = false; 2301 createbup = false;
2254 } 2302 }
2255 } 2303 }
2256 if ( createbup ) { 2304 if ( createbup ) {
2257 if ( mView->exportVCalendar( fn ) ) { 2305 if ( mView->exportVCalendar( fn ) ) {
2258 KOPrefs::instance()->mLastVcalFile = fn; 2306 KOPrefs::instance()->mLastVcalFile = fn;
2259 if ( fn.length() > 20 ) 2307 if ( fn.length() > 20 )
2260 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; 2308 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
2261 else 2309 else
2262 mes = i18n("KO/Pi:Exported to %1").arg(fn ); 2310 mes = i18n("KO/Pi:Exported to %1").arg(fn );
2263 setCaption(mes); 2311 setCaption(mes);
2264 } 2312 }
2265 } 2313 }
2266 2314
2267} 2315}
2268QString MainWindow::sentSyncFile() 2316QString MainWindow::sentSyncFile()
2269{ 2317{
2270#ifdef DESKTOP_VERSION 2318#ifdef DESKTOP_VERSION
2271 return locateLocal( "tmp", "copysynccal.ics" ); 2319 return locateLocal( "tmp", "copysynccal.ics" );
2272#else 2320#else
2273 return QString( "/tmp/copysynccal.ics" ); 2321 return QString( "/tmp/copysynccal.ics" );
2274#endif 2322#endif
2275} 2323}
2276 2324
2277void MainWindow::syncFileRequest() 2325void MainWindow::syncFileRequest()
2278{ 2326{
2279 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2327 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2280 mSyncManager->slotSyncMenu( 999 ); 2328 mSyncManager->slotSyncMenu( 999 );
2281 } 2329 }
2282 2330
2283 setCaption(i18n("Saving Data to temp file ..." )); 2331 setCaption(i18n("Saving Data to temp file ..." ));
2284 mView->saveCalendar( sentSyncFile() ); 2332 mView->saveCalendar( sentSyncFile() );
2285 setCaption(i18n("Data saved to temp file!" )); 2333 setCaption(i18n("Data saved to temp file!" ));
2286 2334
2287} 2335}
2288void MainWindow::getFile( bool success ) 2336void MainWindow::getFile( bool success )
2289{ 2337{
2290 if ( ! success ) { 2338 if ( ! success ) {
2291 setCaption( i18n("Error receiving file. Nothing changed!") ); 2339 setCaption( i18n("Error receiving file. Nothing changed!") );
2292 return; 2340 return;
2293 } 2341 }
2294 mView->openCalendar( sentSyncFile() ); 2342 mView->openCalendar( sentSyncFile() );
2295 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2343 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2296 mSyncManager->slotSyncMenu( 999 ); 2344 mSyncManager->slotSyncMenu( 999 );
2297 } 2345 }
2298 setCaption( i18n("Pi-Sync successful!") ); 2346 setCaption( i18n("Pi-Sync successful!") );
2299} 2347}
2300 2348
2301void MainWindow::printSel( ) 2349void MainWindow::printSel( )
2302{ 2350{
2303 mView->viewManager()->agendaView()->agenda()->printSelection(); 2351 mView->viewManager()->agendaView()->agenda()->printSelection();
2304} 2352}
2305 2353
2306void MainWindow::printCal() 2354void MainWindow::printCal()
2307{ 2355{
2308 mView->print();//mCp->showDialog(); 2356 mView->print();//mCp->showDialog();
2309} 2357}
2310 2358
2311 2359
2312#include "libkdepim/kdatepicker.h" 2360#include "libkdepim/kdatepicker.h"
2313#include <kdatetbl.h> 2361#include <kdatetbl.h>
2362
2314void MainWindow::weekAction() 2363void MainWindow::weekAction()
2315{ 2364{
2316 int month; 2365 int month;
2317 KPopupFrame* popup = new KPopupFrame(this); 2366 KPopupFrame* popup = new KPopupFrame(this);
2318 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); 2367 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
2319 // ----- 2368 // -----
2320 picker->resize(picker->sizeHint()); 2369 picker->resize(picker->sizeHint());
2321 popup->setMainWidget(picker); 2370 popup->setMainWidget(picker);
2322 picker->setFocus(); 2371 picker->setFocus();
2323 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); 2372 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
2324 int x = 0; 2373 int x = 0;
2325 int y = iconToolBar->height(); 2374 int y = iconToolBar->height();
2326 int dX = 0; 2375 int dX = 0;
2327 int dY = 0; 2376 int dY = 0;
2328 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 2377 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
2329 if ( iconToolBar->y() > height()/2 ) { 2378 if ( iconToolBar->y() > height()/2 ) {
2330 dY = picker->sizeHint().height()+8; 2379 dY = picker->sizeHint().height()+8;
2331 y = 0; 2380 y = 0;
2332 } 2381 }
2333 } else { 2382 } else {
2334 if ( iconToolBar->x() > width()/2 ) { // right side 2383 if ( iconToolBar->x() > width()/2 ) { // right side
2335 x=0; 2384 x=0;
2336 dX= picker->sizeHint().width()+8; 2385 dX= picker->sizeHint().width()+8;
2337 y = 0; 2386 y = 0;
2338 } else { 2387 } else {
2339 x= iconToolBar->width(); 2388 x= iconToolBar->width();
2340 y = 0; 2389 y = 0;
2341 } 2390 }
2342 } 2391 }
2343 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); 2392 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
2344 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) 2393 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
2345 { 2394 {
2346 month = picker->getResult(); 2395 month = picker->getResult();
2347 emit selectWeek ( month ); 2396 emit selectWeek ( month );
2348 //qDebug("weekSelected %d ", month); 2397 //qDebug("weekSelected %d ", month);
2349 } 2398 }
2350 delete popup; 2399 delete popup;
2351} 2400}
2352 2401
2353void MainWindow::hideEvent ( QHideEvent * ) 2402void MainWindow::hideEvent ( QHideEvent * )
2354{ 2403{
2355 QString message; 2404 QString message;
2356 QDateTime nextA = mCalendar->nextAlarmEventDateTime(); 2405 QDateTime nextA = mCalendar->nextAlarmEventDateTime();
2357 if ( nextA.isValid() ) { 2406 if ( nextA.isValid() ) {
2358 QString sum = mCalendar->nextSummary(); 2407 QString sum = mCalendar->nextSummary();
2359 2408
2360 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); 2409 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
2361 setCaption( message ); 2410 setCaption( message );
2362 } 2411 }
2363} 2412}
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 79fb305..7c16aeb 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,170 +1,172 @@
1#ifndef KORGE_MAINWINDOW_H 1#ifndef KORGE_MAINWINDOW_H
2#define KORGE_MAINWINDOW_H 2#define KORGE_MAINWINDOW_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5#include <qtimer.h> 5#include <qtimer.h>
6#include <qdict.h> 6#include <qdict.h>
7#include <qfile.h> 7#include <qfile.h>
8#include <qmenubar.h> 8#include <qmenubar.h>
9#include <qtextstream.h> 9#include <qtextstream.h>
10#include <qregexp.h> 10#include <qregexp.h>
11 11
12#include <libkcal/incidence.h> 12#include <libkcal/incidence.h>
13#include "simplealarmclient.h" 13#include "simplealarmclient.h"
14#include <ksyncmanager.h> 14#include <ksyncmanager.h>
15#ifndef DESKTOP_VERSION 15#ifndef DESKTOP_VERSION
16#include <qcopchannel_qws.h> 16#include <qcopchannel_qws.h>
17#endif 17#endif
18class QAction; 18class QAction;
19class CalendarView; 19class CalendarView;
20class KSyncProfile; 20class KSyncProfile;
21#ifdef DESKTOP_VERSION 21#ifdef DESKTOP_VERSION
22 22
23#define QPEToolBar QToolBar 23#define QPEToolBar QToolBar
24#define QPEMenuBar QMenuBar 24#define QPEMenuBar QMenuBar
25#endif 25#endif
26class QPEToolBar; 26class QPEToolBar;
27class QPEMenuBar; 27class QPEMenuBar;
28 28
29 29
30namespace KCal { 30namespace KCal {
31class CalendarLocal; 31class CalendarLocal;
32} 32}
33 33
34class KOMenuBar : public QMenuBar 34class KOMenuBar : public QMenuBar
35{ 35{
36 public: 36 public:
37 KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} 37 KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;}
38 QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} 38 QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );}
39}; 39};
40 40
41using namespace KCal; 41using namespace KCal;
42 42
43class MainWindow : public QMainWindow 43class MainWindow : public QMainWindow
44{ 44{
45 Q_OBJECT 45 Q_OBJECT
46 public: 46 public:
47 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); 47 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
48 ~MainWindow(); 48 ~MainWindow();
49 bool beamReceiveEnabled(); 49 bool beamReceiveEnabled();
50 static QString defaultFileName(); 50 static QString defaultFileName();
51 static QString syncFileName(); 51 static QString syncFileName();
52 static QString resourcePath(); 52 static QString resourcePath();
53 public slots: 53 public slots:
54 void setCaption ( const QString & ); 54 void setCaption ( const QString & );
55 void updateWeekNum(const KCal::DateList &); 55 void updateWeekNum(const KCal::DateList &);
56 void updateWeek(QDate); 56 void updateWeek(QDate);
57 void updateFilterToolbar(); 57 void updateFilterToolbar();
58 virtual void showMaximized (); 58 virtual void showMaximized ();
59 void configureAgenda( int ); 59 void configureAgenda( int );
60 void recieve( const QCString& msg, const QByteArray& data ); 60 void recieve( const QCString& msg, const QByteArray& data );
61 protected slots: 61 protected slots:
62 void setCaptionToDates(); 62 void setCaptionToDates();
63 void weekAction(); 63 void weekAction();
64 void about(); 64 void about();
65 void licence(); 65 void licence();
66 void faq(); 66 void faq();
67 void usertrans(); 67 void usertrans();
68 void features(); 68 void features();
69 void synchowto(); 69 void synchowto();
70 void kdesynchowto(); 70 void kdesynchowto();
71 void multisynchowto(); 71 void multisynchowto();
72 void whatsNew(); 72 void whatsNew();
73 void keyBindings(); 73 void keyBindings();
74 void aboutAutoSaving();; 74 void aboutAutoSaving();;
75 void aboutKnownBugs(); 75 void aboutKnownBugs();
76 76
77 void processIncidenceSelection( Incidence * ); 77 void processIncidenceSelection( Incidence * );
78 78
79 void importQtopia(); 79 void importQtopia();
80 void importBday(); 80 void importBday();
81 void importOL(); 81 void importOL();
82 void importIcal(); 82 void importIcal();
83 void importFile( QString, bool ); 83 void importFile( QString, bool );
84 void quickImportIcal(); 84 void quickImportIcal();
85 85
86 void slotModifiedChanged( bool ); 86 void slotModifiedChanged( bool );
87 87
88 void save(); 88 void save();
89 void saveStopTimer(); 89 void saveStopTimer();
90 void configureToolBar( int ); 90 void configureToolBar( int );
91 void printSel(); 91 void printSel();
92 void printCal(); 92 void printCal();
93 void saveCalendar(); 93 void saveCalendar();
94 void loadCalendar(); 94 void loadCalendar();
95 void exportVCalendar(); 95 void exportVCalendar();
96 void fillFilterMenu(); 96 void fillFilterMenu();
97 void fillFilterMenuTB();
97 void selectFilter( int ); 98 void selectFilter( int );
98 void fillFilterMenuPopup(); 99 void fillFilterMenuPopup();
99 void selectFilterPopup( int ); 100 void selectFilterPopup( int );
100 void exportToPhone( int ); 101 void exportToPhone( int );
101 void toggleBeamReceive(); 102 void toggleBeamReceive();
102 void disableBR(bool); 103 void disableBR(bool);
103 signals: 104 signals:
104 void selectWeek ( int ); 105 void selectWeek ( int );
105 private slots: 106 private slots:
106 void showConfigureAgenda(); 107 void showConfigureAgenda();
107 void getFile( bool ); 108 void getFile( bool );
108 void syncFileRequest(); 109 void syncFileRequest();
109 110
110 protected: 111 protected:
111 void hideEvent ( QHideEvent * ); 112 void hideEvent ( QHideEvent * );
112 QString sentSyncFile(); 113 QString sentSyncFile();
113 void displayText( QString, QString); 114 void displayText( QString, QString);
114 void enableIncidenceActions( bool ); 115 void enableIncidenceActions( bool );
115 116
116 private: 117 private:
117 bool mBRdisabled; 118 bool mBRdisabled;
118#ifndef DESKTOP_VERSION 119#ifndef DESKTOP_VERSION
119 QCopChannel* infrared; 120 QCopChannel* infrared;
120#endif 121#endif
121 QAction* brAction; 122 QAction* brAction;
122 KSyncManager* mSyncManager; 123 KSyncManager* mSyncManager;
123 bool mClosed; 124 bool mClosed;
124 void saveOnClose(); 125 void saveOnClose();
125 bool mFlagKeyPressed; 126 bool mFlagKeyPressed;
126 bool mBlockAtStartup; 127 bool mBlockAtStartup;
127 QPEToolBar *iconToolBar; 128 QPEToolBar *iconToolBar;
128 QPEToolBar *viewToolBar; 129 QPEToolBar *viewToolBar;
129 QPEToolBar *navigatorToolBar; 130 QPEToolBar *navigatorToolBar;
130 QPEToolBar *filterToolBar; 131 QPEToolBar *filterToolBar;
131 QPEMenuBar *filterMenubar; 132 QPEMenuBar *filterMenubar;
132 QPopupMenu * filterPopupMenu; 133 QPopupMenu * filterPopupMenu;
133 void initActions(); 134 void initActions();
134 void setDefaultPreferences(); 135 void setDefaultPreferences();
135 void keyPressEvent ( QKeyEvent * ) ; 136 void keyPressEvent ( QKeyEvent * ) ;
136 void keyReleaseEvent ( QKeyEvent * ) ; 137 void keyReleaseEvent ( QKeyEvent * ) ;
137 QPopupMenu *configureToolBarMenu; 138 QPopupMenu *configureToolBarMenu;
138 QPopupMenu *selectFilterMenu; 139 QPopupMenu *selectFilterMenu;
140 QPopupMenu *selectFilterMenuTB;
139 QPopupMenu *configureAgendaMenu, *syncMenu; 141 QPopupMenu *configureAgendaMenu, *syncMenu;
140 CalendarLocal *mCalendar; 142 CalendarLocal *mCalendar;
141 CalendarView *mView; 143 CalendarView *mView;
142 QAction *mNewSubTodoAction; 144 QAction *mNewSubTodoAction;
143 QAction *mWeekAction; 145 QAction *mWeekAction;
144 QFont mWeekFont; 146 QFont mWeekFont;
145 QPixmap mWeekPixmap; 147 QPixmap mWeekPixmap;
146 QColor mWeekBgColor; 148 QColor mWeekBgColor;
147 149
148 QAction *mShowAction; 150 QAction *mShowAction;
149 QAction *mEditAction; 151 QAction *mEditAction;
150 QAction *mDeleteAction; 152 QAction *mDeleteAction;
151 QAction *mCloneAction; 153 QAction *mCloneAction;
152 QAction *mMoveAction; 154 QAction *mMoveAction;
153 QAction *mBeamAction; 155 QAction *mBeamAction;
154 QAction *mCancelAction; 156 QAction *mCancelAction;
155 157
156 QAction *mToggleNav; 158 QAction *mToggleNav;
157 QAction *mToggleFilter; 159 QAction *mToggleFilter;
158 QAction *mToggleAllday; 160 QAction *mToggleAllday;
159 161 QAction *actionFilterMenuTB;
160 162
161 void closeEvent( QCloseEvent* ce ); 163 void closeEvent( QCloseEvent* ce );
162 SimpleAlarmClient mAlarmClient; 164 SimpleAlarmClient mAlarmClient;
163 QTimer mSaveTimer; 165 QTimer mSaveTimer;
164 //bool mBlockSaveFlag; 166 //bool mBlockSaveFlag;
165 bool mCalendarModifiedFlag; 167 bool mCalendarModifiedFlag;
166 QPixmap loadPixmap( QString ); 168 QPixmap loadPixmap( QString );
167}; 169};
168 170
169 171
170#endif 172#endif
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index bbed38d..5cd845e 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -18,260 +18,267 @@
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24/* 24/*
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (c) 2004 Ulf Schenk
27 27
28$Id$ 28$Id$
29*/ 29*/
30 30
31#include <qlayout.h> 31#include <qlayout.h>
32#include <qtabwidget.h> 32#include <qtabwidget.h>
33#include <qcombobox.h> 33#include <qcombobox.h>
34#include <qgroupbox.h> 34#include <qgroupbox.h>
35#include <qlabel.h> 35#include <qlabel.h>
36#include <qlineedit.h> 36#include <qlineedit.h>
37#include <qbuttongroup.h> 37#include <qbuttongroup.h>
38#include <qfile.h> 38#include <qfile.h>
39#include <qvbox.h> 39#include <qvbox.h>
40#include <qdir.h> 40#include <qdir.h>
41#include <qregexp.h> 41#include <qregexp.h>
42 42
43#include <kdialog.h> 43#include <kdialog.h>
44#include <kprefsdialog.h> 44#include <kprefsdialog.h>
45#include <klocale.h> 45#include <klocale.h>
46#include <kdateedit.h> 46#include <kdateedit.h>
47#include <kglobal.h> 47#include <kglobal.h>
48#include <stdlib.h> 48#include <stdlib.h>
49 49
50/*US 50/*US
51#include <qcheckbox.h> 51#include <qcheckbox.h>
52#include <qframe.h> 52#include <qframe.h>
53#include <qpushbutton.h> 53#include <qpushbutton.h>
54#include <qcombobox.h> 54#include <qcombobox.h>
55#include <qlineedit.h> 55#include <qlineedit.h>
56#include <qlabel.h> 56#include <qlabel.h>
57#include <qfile.h> 57#include <qfile.h>
58 58
59#include <kconfig.h> 59#include <kconfig.h>
60#include <kdebug.h> 60#include <kdebug.h>
61#include <kdialog.h> 61#include <kdialog.h>
62#include <klistview.h> 62#include <klistview.h>
63#include <klocale.h> 63#include <klocale.h>
64#include <kglobal.h> 64#include <kglobal.h>
65#include <kmessagebox.h> 65#include <kmessagebox.h>
66#include <kstandarddirs.h> 66#include <kstandarddirs.h>
67 67
68#ifndef KAB_EMBEDDED 68#ifndef KAB_EMBEDDED
69#include <ktrader.h> 69#include <ktrader.h>
70#else // KAB_EMBEDDED 70#else // KAB_EMBEDDED
71#include <mergewidget.h> 71#include <mergewidget.h>
72#include <distributionlistwidget.h> 72#include <distributionlistwidget.h>
73#endif // KAB_EMBEDDED 73#endif // KAB_EMBEDDED
74 74
75#include "addresseewidget.h" 75#include "addresseewidget.h"
76#include "extensionconfigdialog.h" 76#include "extensionconfigdialog.h"
77#include "extensionwidget.h" 77#include "extensionwidget.h"
78*/ 78*/
79 79
80#include "qapplication.h" 80#include "qapplication.h"
81 81
82#include "kpimglobalprefs.h" 82#include "kpimglobalprefs.h"
83 83
84#include "kdepimconfigwidget.h" 84#include "kdepimconfigwidget.h"
85#include <kprefs.h> 85#include <kprefs.h>
86 86
87 87
88KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) 88KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
89 : KPrefsWidget(prefs, parent, name ) 89 : KPrefsWidget(prefs, parent, name )
90{ 90{
91 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); 91 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
92 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); 92 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
93 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); 93 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
94 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); 94 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
95 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); 95 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
96 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); 96 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
97 97
98 98
99 QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 99 QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
100 KDialog::spacingHint() ); 100 KDialog::spacingHint() );
101 101
102 tabWidget = new QTabWidget( this ); 102 tabWidget = new QTabWidget( this );
103 topLayout->addWidget( tabWidget ); 103 topLayout->addWidget( tabWidget );
104 104
105 105
106 setupLocaleTab(); 106 setupLocaleTab();
107 setupLocaleDateTab(); 107 setupLocaleDateTab();
108 setupTimeZoneTab(); 108 setupTimeZoneTab();
109 setupExternalAppTab(); 109 setupExternalAppTab();
110 setupStoreTab(); 110 setupStoreTab();
111 111
112} 112}
113void KDEPIMConfigWidget::showTimeZoneTab() 113void KDEPIMConfigWidget::showTimeZoneTab()
114{ 114{
115 tabWidget->setCurrentPage ( 3 ) ; 115 tabWidget->setCurrentPage ( 3 ) ;
116} 116}
117void KDEPIMConfigWidget::setupStoreTab() 117void KDEPIMConfigWidget::setupStoreTab()
118{ 118{
119 QVBox *storePage = new QVBox( this ); 119 QVBox *storePage = new QVBox( this );
120 new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); 120 new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage );
121 new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); 121 new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
122 mStoreUrl = new KURLRequester( storePage ); 122 mStoreUrl = new KURLRequester( storePage );
123 mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); 123 mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
124 new QLabel( i18n("New dirs are created automatically"), storePage ); 124 new QLabel( i18n("New dirs are created automatically"), storePage );
125 QHBox *bb = new QHBox( storePage ); 125 QHBox *bb = new QHBox( storePage );
126 QPushButton * pb; 126 QPushButton * pb;
127 if ( QApplication::desktop()->width() < 640 ) 127 if ( QApplication::desktop()->width() < 640 )
128 pb = new QPushButton ( i18n("Save"), bb ); 128 pb = new QPushButton ( i18n("Save"), bb );
129 else 129 else
130 pb = new QPushButton ( i18n("Save settings"), bb ); 130 pb = new QPushButton ( i18n("Save settings"), bb );
131 connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); 131 connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
132 pb = new QPushButton ( i18n("Save standard"), bb ); 132 pb = new QPushButton ( i18n("Save standard"), bb );
133 connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); 133 connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
134 new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage ); 134 new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
135 new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage ); 135 new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage );
136 tabWidget->addTab( storePage, i18n( "Data storage path" ) ); 136 tabWidget->addTab( storePage, i18n( "Data storage path" ) );
137} 137}
138void KDEPIMConfigWidget::setStandardStore() 138void KDEPIMConfigWidget::setStandardStore()
139{ 139{
140 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); 140 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" );
141 saveStoreSettings(); 141 saveStoreSettings();
142} 142}
143void KDEPIMConfigWidget::saveStoreSettings() 143void KDEPIMConfigWidget::saveStoreSettings()
144{ 144{
145 if ( !mStoreUrl->url().isEmpty() ) { 145 if ( !mStoreUrl->url().isEmpty() ) {
146 KConfig cfg ( QDir::homeDirPath() + "/.microkdehome" ); 146 QString path = QDir::homeDirPath();
147 QString url = mStoreUrl->url();
148#ifdef DESKTOP_VERSION
149 if ( url.startsWith( "LOCAL:" ) ) {
150 path = qApp->applicationDirPath () ;
151 }
152#endif
153 KConfig cfg ( path + "/.microkdehome" );
147 cfg.setGroup("Global"); 154 cfg.setGroup("Global");
148 cfg.writeEntry( "MICROKDEHOME", mStoreUrl->url() ); 155 cfg.writeEntry( "MICROKDEHOME", url );
149 qDebug("cfg.writeEntry( MICROKDEHOME, mStoreUrl->url() ); "); 156 qDebug("cfg.writeEntry( MICROKDEHOME, %s ", url.latin1());
150 cfg.sync(); 157 cfg.sync();
151 } else { 158 } else {
152 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); 159 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" );
153 saveStoreSettings(); 160 saveStoreSettings();
154 } 161 }
155} 162}
156void KDEPIMConfigWidget::setupExternalAppTab() 163void KDEPIMConfigWidget::setupExternalAppTab()
157{ 164{
158 QWidget *externalAppsPage = new QWidget( this ); 165 QWidget *externalAppsPage = new QWidget( this );
159 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), 166 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
160 KDialog::spacingHintSmall() ); 167 KDialog::spacingHintSmall() );
161 168
162 mExternalApps = new QComboBox( externalAppsPage ); 169 mExternalApps = new QComboBox( externalAppsPage );
163 170
164 QMap<ExternalAppHandler::Types, QString>::Iterator it; 171 QMap<ExternalAppHandler::Types, QString>::Iterator it;
165 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) 172 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
166 mExternalApps->insertItem( it.data(), it.key() ); 173 mExternalApps->insertItem( it.data(), it.key() );
167 174
168 layout->addWidget( mExternalApps ); 175 layout->addWidget( mExternalApps );
169 176
170 connect( mExternalApps, SIGNAL( activated( int ) ), 177 connect( mExternalApps, SIGNAL( activated( int ) ),
171 this, SLOT (externalapp_changed( int ) ) ); 178 this, SLOT (externalapp_changed( int ) ) );
172 179
173 180
174 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); 181 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
175 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); 182 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" );
176 mExternalAppGroupBox->layout()->setMargin(5); 183 mExternalAppGroupBox->layout()->setMargin(5);
177 184
178 mClient = new QComboBox( mExternalAppGroupBox ); 185 mClient = new QComboBox( mExternalAppGroupBox );
179 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); 186 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
180 187
181 connect( mClient, SIGNAL( activated( int ) ), 188 connect( mClient, SIGNAL( activated( int ) ),
182 this, SLOT (client_changed( int ) ) ); 189 this, SLOT (client_changed( int ) ) );
183 190
184 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); 191 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
185 boxLayout->addWidget( lab, 1, 0 ); 192 boxLayout->addWidget( lab, 1, 0 );
186 mChannel = new QLineEdit(mExternalAppGroupBox); 193 mChannel = new QLineEdit(mExternalAppGroupBox);
187 mChannel->setReadOnly(true); 194 mChannel->setReadOnly(true);
188 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); 195 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
189 196
190 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); 197 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
191 boxLayout->addWidget( lab, 3, 0 ); 198 boxLayout->addWidget( lab, 3, 0 );
192 mMessage = new QLineEdit(mExternalAppGroupBox); 199 mMessage = new QLineEdit(mExternalAppGroupBox);
193 mMessage->setReadOnly(true); 200 mMessage->setReadOnly(true);
194 boxLayout->addWidget( mMessage , 4, 0); 201 boxLayout->addWidget( mMessage , 4, 0);
195 202
196 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox); 203 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
197 boxLayout->addWidget( lab, 3, 1 ); 204 boxLayout->addWidget( lab, 3, 1 );
198 mParameters = new QLineEdit(mExternalAppGroupBox); 205 mParameters = new QLineEdit(mExternalAppGroupBox);
199 mParameters->setReadOnly(true); 206 mParameters->setReadOnly(true);
200 boxLayout->addWidget( mParameters, 4, 1 ); 207 boxLayout->addWidget( mParameters, 4, 1 );
201 208
202 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); 209 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
203 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); 210 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
204 211
205 212
206 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); 213 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
207 boxLayout->addWidget( lab, 6, 0 ); 214 boxLayout->addWidget( lab, 6, 0 );
208 mMessage2 = new QLineEdit(mExternalAppGroupBox); 215 mMessage2 = new QLineEdit(mExternalAppGroupBox);
209 mMessage2->setReadOnly(true); 216 mMessage2->setReadOnly(true);
210 boxLayout->addWidget( mMessage2 , 7, 0); 217 boxLayout->addWidget( mMessage2 , 7, 0);
211 218
212 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); 219 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
213 boxLayout->addWidget( lab, 6, 1 ); 220 boxLayout->addWidget( lab, 6, 1 );
214 mParameters2 = new QLineEdit(mExternalAppGroupBox); 221 mParameters2 = new QLineEdit(mExternalAppGroupBox);
215 mParameters2->setReadOnly(true); 222 mParameters2->setReadOnly(true);
216 boxLayout->addWidget( mParameters2, 7, 1 ); 223 boxLayout->addWidget( mParameters2, 7, 1 );
217 224
218 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); 225 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
219 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); 226 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
220 227
221 228
222 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 229 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
223 connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 230 connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
224 connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 231 connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
225 connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 232 connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
226 connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 233 connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
227 234
228 235
229 layout->addWidget( mExternalAppGroupBox ); 236 layout->addWidget( mExternalAppGroupBox );
230 tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) ); 237 tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
231 238
232} 239}
233 240
234 241
235void KDEPIMConfigWidget::setupLocaleDateTab() 242void KDEPIMConfigWidget::setupLocaleDateTab()
236{ 243{
237 QWidget *topFrame = new QWidget( this ); 244 QWidget *topFrame = new QWidget( this );
238 QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); 245 QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
239 246
240 topLayout->setSpacing(KDialog::spacingHintSmall()); 247 topLayout->setSpacing(KDialog::spacingHintSmall());
241 topLayout->setMargin(KDialog::marginHintSmall()); 248 topLayout->setMargin(KDialog::marginHintSmall());
242 int iii = 0; 249 int iii = 0;
243 250
244 251
245 KPrefsWidRadios *syncPrefsGroup = 252 KPrefsWidRadios *syncPrefsGroup =
246 addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); 253 addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame);
247 QString format; 254 QString format;
248 if ( QApplication::desktop()->width() < 480 ) 255 if ( QApplication::desktop()->width() < 480 )
249 format = "(%d.%m.%Y)"; 256 format = "(%d.%m.%Y)";
250 else 257 else
251 format = "(%d.%m.%Y|%A %d %B %Y)"; 258 format = "(%d.%m.%Y|%A %d %B %Y)";
252 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); 259 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
253 if ( QApplication::desktop()->width() < 480 ) 260 if ( QApplication::desktop()->width() < 480 )
254 format = "(%m.%d.%Y)"; 261 format = "(%m.%d.%Y)";
255 else 262 else
256 format = "(%m.%d.%Y|%A %B %d %Y)"; 263 format = "(%m.%d.%Y|%A %B %d %Y)";
257 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); 264 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
258 if ( QApplication::desktop()->width() < 480 ) 265 if ( QApplication::desktop()->width() < 480 )
259 format = "(%Y-%m-%d)"; 266 format = "(%Y-%m-%d)";
260 else 267 else
261 format = "(%Y-%m-%d|%A %Y %B %d)"; 268 format = "(%Y-%m-%d|%A %Y %B %d)";
262 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); 269 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
263 syncPrefsGroup->addRadio(i18n("User defined")); 270 syncPrefsGroup->addRadio(i18n("User defined"));
264 if ( QApplication::desktop()->width() < 480 ) { 271 if ( QApplication::desktop()->width() < 480 ) {
265 syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); 272 syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
266 syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); 273 syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
267 } 274 }
268 topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); 275 topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
269 ++iii; 276 ++iii;
270 ++iii; 277 ++iii;
271 QLabel * lab; 278 QLabel * lab;
272 mUserDateFormatLong = new QLineEdit(topFrame); 279 mUserDateFormatLong = new QLineEdit(topFrame);
273 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); 280 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
274 topLayout->addWidget(lab ,iii,0); 281 topLayout->addWidget(lab ,iii,0);
275 topLayout->addWidget(mUserDateFormatLong,iii,1); 282 topLayout->addWidget(mUserDateFormatLong,iii,1);
276 ++iii; 283 ++iii;
277 mUserDateFormatShort = new QLineEdit(topFrame); 284 mUserDateFormatShort = new QLineEdit(topFrame);