author | zautrix <zautrix> | 2005-07-03 14:15:13 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-03 14:15:13 (UTC) |
commit | 3be76edf08827e1e00206399469904fe69887854 (patch) (unidiff) | |
tree | 02e2d16a6f133afcd3c54be1f4fe9f2bd424b177 /korganizer | |
parent | 971bfd3cf502fbbafc96bef70e21beb545e450b5 (diff) | |
download | kdepimpi-3be76edf08827e1e00206399469904fe69887854.zip kdepimpi-3be76edf08827e1e00206399469904fe69887854.tar.gz kdepimpi-3be76edf08827e1e00206399469904fe69887854.tar.bz2 |
fixes
-rw-r--r-- | korganizer/koeventviewer.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 42 |
2 files changed, 14 insertions, 30 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index d3b2ccf..f6c252b 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -656,97 +656,97 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
656 | mText += "<IMG src=\"" + NOiconPath + "\">"; | 656 | mText += "<IMG src=\"" + NOiconPath + "\">"; |
657 | } | 657 | } |
658 | mText += "</a>\n"; | 658 | mText += "</a>\n"; |
659 | } | 659 | } |
660 | } | 660 | } |
661 | if (a->status() != Attendee::NeedsAction ) | 661 | if (a->status() != Attendee::NeedsAction ) |
662 | mText +="[" + a->statusStr() + "] "; | 662 | mText +="[" + a->statusStr() + "] "; |
663 | if (a->role() == Attendee::Chair ) | 663 | if (a->role() == Attendee::Chair ) |
664 | mText +="(" + a->roleStr().left(1) + ".)"; | 664 | mText +="(" + a->roleStr().left(1) + ".)"; |
665 | } | 665 | } |
666 | mText.append("</li></ul>"); | 666 | mText.append("</li></ul>"); |
667 | if ( (a_count+a_count_nr) > 1 ) { | 667 | if ( (a_count+a_count_nr) > 1 ) { |
668 | mText += "<a href=\"mailto:ALL\">"; | 668 | mText += "<a href=\"mailto:ALL\">"; |
669 | mText += i18n( "Mail to all" ); | 669 | mText += i18n( "Mail to all" ); |
670 | mText += "</a> ( "; | 670 | mText += "</a> ( "; |
671 | mText += "<IMG src=\"" + iconPath + "\">"; | 671 | mText += "<IMG src=\"" + iconPath + "\">"; |
672 | mText += i18n( " and " ); | 672 | mText += i18n( " and " ); |
673 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; | 673 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; |
674 | mText += "<br>\n"; | 674 | mText += "<br>\n"; |
675 | 675 | ||
676 | 676 | ||
677 | } | 677 | } |
678 | if ( a_count_nr > 1 ) { | 678 | if ( a_count_nr > 1 ) { |
679 | mText += "<a href=\"mailto:RSVP\">"; | 679 | mText += "<a href=\"mailto:RSVP\">"; |
680 | mText += i18n( "Mail to selected" ); | 680 | mText += i18n( "Mail to selected" ); |
681 | mText += "</a> ( "; | 681 | mText += "</a> ( "; |
682 | mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); | 682 | mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); |
683 | mText += "<br>\n"; | 683 | mText += "<br>\n"; |
684 | } | 684 | } |
685 | } | 685 | } |
686 | 686 | ||
687 | } | 687 | } |
688 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 688 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
689 | { | 689 | { |
690 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 690 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
691 | QString text_d = i18n("Journal from: "); | 691 | QString text_d = i18n("Journal from: "); |
692 | if ( !jour->summary().isEmpty() ) | 692 | if ( !jour->summary().isEmpty() ) |
693 | text_d = jour->summary(); | 693 | text_d = jour->summary(); |
694 | if (mode == 0 ) { | 694 | if (mode == 0 ) { |
695 | addTag("h2", text_d ); | 695 | addTag("h2", text_d ); |
696 | } | 696 | } |
697 | else { | 697 | else { |
698 | if ( mode == 1 ) { | 698 | if ( mode == 1 ) { |
699 | addTag("h3",i18n( "Local: " ) + text_d ); | 699 | addTag("h3",i18n( "Local: " ) + text_d ); |
700 | } else { | 700 | } else { |
701 | addTag("h3",i18n( "Remote: " ) + text_d ); | 701 | addTag("h3",i18n( "Remote: " ) + text_d ); |
702 | } | 702 | } |
703 | } | 703 | } |
704 | topLevelWidget()->setCaption("Journal Viewer"); | 704 | topLevelWidget()->setCaption(i18n("Journal viewer")); |
705 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); | 705 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); |
706 | formatReadOnly(jour); | 706 | formatReadOnly(jour); |
707 | addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | 707 | addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); |
708 | 708 | ||
709 | if (!jour->description().isEmpty()) { | 709 | if (!jour->description().isEmpty()) { |
710 | addTag("p",deTag(jour->description())); | 710 | addTag("p",deTag(jour->description())); |
711 | } | 711 | } |
712 | setText(mText); | 712 | setText(mText); |
713 | } | 713 | } |
714 | 714 | ||
715 | void KOEventViewer::formatReadOnly(Incidence *event) | 715 | void KOEventViewer::formatReadOnly(Incidence *event) |
716 | { | 716 | { |
717 | int id = event->calID(); | 717 | int id = event->calID(); |
718 | if ( id > 1 ) { | 718 | if ( id > 1 ) { |
719 | addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>"); | 719 | addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>"); |
720 | } | 720 | } |
721 | if (event->isReadOnly()) { | 721 | if (event->isReadOnly()) { |
722 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); | 722 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); |
723 | } | 723 | } |
724 | } | 724 | } |
725 | void KOEventViewer::setSyncMode( bool b ) | 725 | void KOEventViewer::setSyncMode( bool b ) |
726 | { | 726 | { |
727 | mSyncMode = b; | 727 | mSyncMode = b; |
728 | } | 728 | } |
729 | 729 | ||
730 | void KOEventViewer::setTodo(Todo *event, bool clearV ) | 730 | void KOEventViewer::setTodo(Todo *event, bool clearV ) |
731 | { | 731 | { |
732 | if ( clearV ) | 732 | if ( clearV ) |
733 | clearEvents(); | 733 | clearEvents(); |
734 | if ( mSyncMode ) { | 734 | if ( mSyncMode ) { |
735 | if ( clearV ) | 735 | if ( clearV ) |
736 | appendTodo(event,1 ); | 736 | appendTodo(event,1 ); |
737 | else | 737 | else |
738 | appendTodo(event,2); | 738 | appendTodo(event,2); |
739 | } else | 739 | } else |
740 | appendTodo(event); | 740 | appendTodo(event); |
741 | } | 741 | } |
742 | void KOEventViewer::setJournal(Journal *event, bool clearV ) | 742 | void KOEventViewer::setJournal(Journal *event, bool clearV ) |
743 | { | 743 | { |
744 | if ( clearV ) | 744 | if ( clearV ) |
745 | clearEvents(); | 745 | clearEvents(); |
746 | if ( mSyncMode ) { | 746 | if ( mSyncMode ) { |
747 | if ( clearV ) | 747 | if ( clearV ) |
748 | appendJournal(event, 1); | 748 | appendJournal(event, 1); |
749 | else | 749 | else |
750 | appendJournal(event, 2); | 750 | appendJournal(event, 2); |
751 | } else | 751 | } else |
752 | appendJournal(event); | 752 | appendJournal(event); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5d26d35..88dbd4f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -753,124 +753,126 @@ void MainWindow::initActions() | |||
753 | 753 | ||
754 | 754 | ||
755 | configureAgendaMenu->setCheckable( true ); | 755 | configureAgendaMenu->setCheckable( true ); |
756 | int iii ; | 756 | int iii ; |
757 | for ( iii = 1;iii<= 10 ;++iii ){ | 757 | for ( iii = 1;iii<= 10 ;++iii ){ |
758 | configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); | 758 | configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); |
759 | } | 759 | } |
760 | //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); | 760 | //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); |
761 | 761 | ||
762 | connect( configureAgendaMenu, SIGNAL( aboutToShow()), | 762 | connect( configureAgendaMenu, SIGNAL( aboutToShow()), |
763 | this, SLOT( showConfigureAgenda( ) ) ); | 763 | this, SLOT( showConfigureAgenda( ) ) ); |
764 | icon = loadPixmap( pathString + "today" ); | 764 | icon = loadPixmap( pathString + "today" ); |
765 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); | 765 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); |
766 | today_action->addTo( actionMenu ); | 766 | today_action->addTo( actionMenu ); |
767 | connect( today_action, SIGNAL( activated() ), | 767 | connect( today_action, SIGNAL( activated() ), |
768 | mView, SLOT( goToday() ) ); | 768 | mView, SLOT( goToday() ) ); |
769 | 769 | ||
770 | icon = loadPixmap( pathString + "picker" ); | 770 | icon = loadPixmap( pathString + "picker" ); |
771 | QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); | 771 | QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); |
772 | dPickerAction->addTo( actionMenu ); | 772 | dPickerAction->addTo( actionMenu ); |
773 | connect( dPickerAction, SIGNAL( activated() ), | 773 | connect( dPickerAction, SIGNAL( activated() ), |
774 | mView, SLOT( showDatePicker() ) ); | 774 | mView, SLOT( showDatePicker() ) ); |
775 | 775 | ||
776 | icon = loadPixmap( pathString + "search" ); | 776 | icon = loadPixmap( pathString + "search" ); |
777 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 777 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); |
778 | search_action->addTo( actionMenu ); | 778 | search_action->addTo( actionMenu ); |
779 | connect( search_action, SIGNAL( activated() ), | 779 | connect( search_action, SIGNAL( activated() ), |
780 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | 780 | mView->dialogManager(), SLOT( showSearchDialog() ) ); |
781 | 781 | ||
782 | actionMenu->insertSeparator(); | 782 | actionMenu->insertSeparator(); |
783 | 783 | ||
784 | 784 | ||
785 | 785 | ||
786 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 786 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
787 | action->addTo( mCurrentItemMenu ); | 787 | action->addTo( mCurrentItemMenu ); |
788 | connect( action, SIGNAL( activated() ), | 788 | connect( action, SIGNAL( activated() ), |
789 | mView, SLOT( undo_delete() ) ); | 789 | mView, SLOT( undo_delete() ) ); |
790 | mCurrentItemMenu->insertSeparator(); | 790 | mCurrentItemMenu->insertSeparator(); |
791 | icon = loadPixmap( pathString + "newevent" ); | 791 | icon = loadPixmap( pathString + "newevent" ); |
792 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 792 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
793 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); | 793 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); |
794 | configureToolBarMenu->insertSeparator(); | 794 | configureToolBarMenu->insertSeparator(); |
795 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); | 795 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); |
796 | configureToolBarMenu->insertSeparator(); | 796 | configureToolBarMenu->insertSeparator(); |
797 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | 797 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); |
798 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 798 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
799 | 799 | ||
800 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); | 800 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); |
801 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | 801 | mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this ); |
802 | mShowAction->addTo( mCurrentItemMenu ); | 802 | mShowAction->addTo( mCurrentItemMenu ); |
803 | connect( mShowAction, SIGNAL( activated() ), | 803 | connect( mShowAction, SIGNAL( activated() ), |
804 | mView, SLOT( showIncidence() ) ); | 804 | mView, SLOT( showIncidence() ) ); |
805 | 805 | ||
806 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | 806 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); |
807 | mEditAction->addTo( mCurrentItemMenu ); | 807 | mEditAction->addTo( mCurrentItemMenu ); |
808 | connect( mEditAction, SIGNAL( activated() ), | 808 | connect( mEditAction, SIGNAL( activated() ), |
809 | mView, SLOT( editIncidence() ) ); | 809 | mView, SLOT( editIncidence() ) ); |
810 | 810 | ||
811 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | 811 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); |
812 | mDeleteAction->addTo( mCurrentItemMenu ); | 812 | mDeleteAction->addTo( mCurrentItemMenu ); |
813 | connect( mDeleteAction, SIGNAL( activated() ), | 813 | connect( mDeleteAction, SIGNAL( activated() ), |
814 | mView, SLOT( deleteIncidence() ) ); | 814 | mView, SLOT( deleteIncidence() ) ); |
815 | 815 | ||
816 | 816 | ||
817 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); | 817 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); |
818 | mCloneAction->addTo( mCurrentItemMenu ); | 818 | mCloneAction->addTo( mCurrentItemMenu ); |
819 | connect( mCloneAction, SIGNAL( activated() ), | 819 | connect( mCloneAction, SIGNAL( activated() ), |
820 | mView, SLOT( cloneIncidence() ) ); | 820 | mView, SLOT( cloneIncidence() ) ); |
821 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); | 821 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); |
822 | mMoveAction->addTo( mCurrentItemMenu ); | 822 | mMoveAction->addTo( mCurrentItemMenu ); |
823 | connect( mMoveAction, SIGNAL( activated() ), | 823 | connect( mMoveAction, SIGNAL( activated() ), |
824 | mView, SLOT( moveIncidence() ) ); | 824 | mView, SLOT( moveIncidence() ) ); |
825 | #ifndef DESKTOP_VERSION | ||
825 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | 826 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); |
826 | mBeamAction->addTo(mCurrentItemMenu ); | 827 | mBeamAction->addTo(mCurrentItemMenu ); |
827 | connect( mBeamAction, SIGNAL( activated() ), | 828 | connect( mBeamAction, SIGNAL( activated() ), |
828 | mView, SLOT( beamIncidence() ) ); | 829 | mView, SLOT( beamIncidence() ) ); |
830 | #endif | ||
829 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | 831 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); |
830 | mCancelAction->addTo( mCurrentItemMenu ); | 832 | mCancelAction->addTo( mCurrentItemMenu ); |
831 | connect( mCancelAction, SIGNAL( activated() ), | 833 | connect( mCancelAction, SIGNAL( activated() ), |
832 | mView, SLOT( toggleCancelIncidence() ) ); | 834 | mView, SLOT( toggleCancelIncidence() ) ); |
833 | 835 | ||
834 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 836 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
835 | ne_action->addTo( actionMenu ); | 837 | ne_action->addTo( actionMenu ); |
836 | connect( ne_action, SIGNAL( activated() ), | 838 | connect( ne_action, SIGNAL( activated() ), |
837 | mView, SLOT( newEvent() ) ); | 839 | mView, SLOT( newEvent() ) ); |
838 | icon = loadPixmap( pathString + "newtodo" ); | 840 | icon = loadPixmap( pathString + "newtodo" ); |
839 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); | 841 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); |
840 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 842 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |
841 | nt_action->addTo( actionMenu ); | 843 | nt_action->addTo( actionMenu ); |
842 | connect( nt_action, SIGNAL( activated() ), | 844 | connect( nt_action, SIGNAL( activated() ), |
843 | mView, SLOT( newTodo() ) ); | 845 | mView, SLOT( newTodo() ) ); |
844 | 846 | ||
845 | 847 | ||
846 | 848 | ||
847 | // *********************** | 849 | // *********************** |
848 | if ( KOPrefs::instance()->mVerticalScreen ) { | 850 | if ( KOPrefs::instance()->mVerticalScreen ) { |
849 | icon = SmallIcon( "1updownarrow" ); | 851 | icon = SmallIcon( "1updownarrow" ); |
850 | } else { | 852 | } else { |
851 | icon = SmallIcon("1leftrightarrow" ); | 853 | icon = SmallIcon("1leftrightarrow" ); |
852 | } | 854 | } |
853 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); | 855 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); |
854 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); | 856 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); |
855 | FSaction->addTo( viewMenu ); | 857 | FSaction->addTo( viewMenu ); |
856 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); | 858 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); |
857 | 859 | ||
858 | 860 | ||
859 | icon = loadPixmap( pathString + "filter" ); | 861 | icon = loadPixmap( pathString + "filter" ); |
860 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); | 862 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); |
861 | icon = loadPixmap( pathString + "configure" ); | 863 | icon = loadPixmap( pathString + "configure" ); |
862 | action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); | 864 | action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); |
863 | action->addTo( viewMenu ); | 865 | action->addTo( viewMenu ); |
864 | connect( action, SIGNAL( activated() ), | 866 | connect( action, SIGNAL( activated() ), |
865 | mView, SLOT( toggleFilter() ) ); | 867 | mView, SLOT( toggleFilter() ) ); |
866 | mToggleFilter = action; | 868 | mToggleFilter = action; |
867 | icon = loadPixmap( pathString + "navi" ); | 869 | icon = loadPixmap( pathString + "navi" ); |
868 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); | 870 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); |
869 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); | 871 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); |
870 | action->addTo( viewMenu ); | 872 | action->addTo( viewMenu ); |
871 | connect( action, SIGNAL( activated() ), | 873 | connect( action, SIGNAL( activated() ), |
872 | mView, SLOT( toggleDateNavigatorWidget() ) ); | 874 | mView, SLOT( toggleDateNavigatorWidget() ) ); |
873 | mToggleNav = action ; | 875 | mToggleNav = action ; |
874 | icon = loadPixmap( pathString + "allday" ); | 876 | icon = loadPixmap( pathString + "allday" ); |
875 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); | 877 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); |
876 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | 878 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); |
@@ -1602,176 +1604,158 @@ void MainWindow::aboutKnownBugs() | |||
1602 | QMessageBox* msg; | 1604 | QMessageBox* msg; |
1603 | msg = new QMessageBox( i18n("Known Problems in KOrganizer/Pi"), | 1605 | msg = new QMessageBox( i18n("Known Problems in KOrganizer/Pi"), |
1604 | i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+ | 1606 | i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+ |
1605 | i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+ | 1607 | i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+ |
1606 | i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") + | 1608 | i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") + |
1607 | i18n("\nor report them in the bugtracker on\n") + | 1609 | i18n("\nor report them in the bugtracker on\n") + |
1608 | i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), | 1610 | i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), |
1609 | QMessageBox::NoIcon, | 1611 | QMessageBox::NoIcon, |
1610 | QMessageBox::Ok, | 1612 | QMessageBox::Ok, |
1611 | QMessageBox::NoButton, | 1613 | QMessageBox::NoButton, |
1612 | QMessageBox::NoButton); | 1614 | QMessageBox::NoButton); |
1613 | msg->exec(); | 1615 | msg->exec(); |
1614 | delete msg; | 1616 | delete msg; |
1615 | 1617 | ||
1616 | } | 1618 | } |
1617 | 1619 | ||
1618 | QString MainWindow::defaultFileName() | 1620 | QString MainWindow::defaultFileName() |
1619 | { | 1621 | { |
1620 | return locateLocal( "data", "korganizer/mycalendar.ics" ); | 1622 | return locateLocal( "data", "korganizer/mycalendar.ics" ); |
1621 | } | 1623 | } |
1622 | QString MainWindow::syncFileName() | 1624 | QString MainWindow::syncFileName() |
1623 | { | 1625 | { |
1624 | #ifdef DESKTOP_VERSION | 1626 | #ifdef DESKTOP_VERSION |
1625 | return locateLocal( "tmp", "synccalendar.ics" ); | 1627 | return locateLocal( "tmp", "synccalendar.ics" ); |
1626 | #else | 1628 | #else |
1627 | return QString( "/tmp/synccalendar.ics" ); | 1629 | return QString( "/tmp/synccalendar.ics" ); |
1628 | #endif | 1630 | #endif |
1629 | } | 1631 | } |
1630 | #include "koglobals.h" | 1632 | #include "koglobals.h" |
1631 | #include <kcalendarsystem.h> | 1633 | #include <kcalendarsystem.h> |
1632 | void MainWindow::updateWeek(QDate seda) | 1634 | void MainWindow::updateWeek(QDate seda) |
1633 | { | 1635 | { |
1634 | int weekNum = KGlobal::locale()->weekNum ( seda ); | 1636 | int weekNum = KGlobal::locale()->weekNum ( seda ); |
1635 | mWeekPixmap.fill( mWeekBgColor ); | 1637 | mWeekPixmap.fill( mWeekBgColor ); |
1636 | QPainter p ( &mWeekPixmap ); | 1638 | QPainter p ( &mWeekPixmap ); |
1637 | p.setFont( mWeekFont ); | 1639 | p.setFont( mWeekFont ); |
1638 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); | 1640 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); |
1639 | p.end(); | 1641 | p.end(); |
1640 | QIconSet icon3 ( mWeekPixmap ); | 1642 | QIconSet icon3 ( mWeekPixmap ); |
1641 | mWeekAction->setIconSet ( icon3 ); | 1643 | mWeekAction->setIconSet ( icon3 ); |
1642 | 1644 | ||
1643 | } | 1645 | } |
1644 | void MainWindow::updateWeekNum(const DateList &selectedDates) | 1646 | void MainWindow::updateWeekNum(const DateList &selectedDates) |
1645 | { | 1647 | { |
1646 | updateWeek( selectedDates.first() ); | 1648 | updateWeek( selectedDates.first() ); |
1647 | } | 1649 | } |
1648 | void MainWindow::processIncidenceSelection( Incidence *incidence ) | 1650 | void MainWindow::processIncidenceSelection( Incidence *incidence ) |
1649 | { | 1651 | { |
1650 | |||
1651 | if ( !incidence ) { | 1652 | if ( !incidence ) { |
1653 | mShowAction->setMenuText( i18n("Show") ); | ||
1652 | enableIncidenceActions( false ); | 1654 | enableIncidenceActions( false ); |
1653 | |||
1654 | mNewSubTodoAction->setEnabled( false ); | 1655 | mNewSubTodoAction->setEnabled( false ); |
1655 | setCaptionToDates(); | 1656 | setCaptionToDates(); |
1656 | return; | 1657 | return; |
1657 | |||
1658 | } | 1658 | } |
1659 | |||
1660 | //KGlobal::locale()->formatDateTime(nextA, true); | ||
1661 | QString startString = ""; | 1659 | QString startString = ""; |
1662 | if ( incidence->typeID() != todoID ) { | 1660 | if ( incidence->typeID() != todoID ) { |
1663 | if ( incidence->dtStart().date() < incidence->dtEnd().date() ) { | 1661 | if ( incidence->dtStart().date() < incidence->dtEnd().date() ) { |
1664 | if ( incidence->doesFloat() ) { | 1662 | if ( incidence->doesFloat() ) { |
1665 | startString += ": "+incidence->dtStartDateStr( true ); | 1663 | startString += ": "+incidence->dtStartDateStr( true ); |
1666 | startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); | 1664 | startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); |
1667 | |||
1668 | } else { | 1665 | } else { |
1669 | startString = ": "+incidence->dtStartStr(true); | 1666 | startString = ": "+incidence->dtStartStr(true); |
1670 | startString += " --- "+((Event*)incidence)->dtEndStr(true); | 1667 | startString += " --- "+((Event*)incidence)->dtEndStr(true); |
1671 | |||
1672 | } | 1668 | } |
1673 | |||
1674 | } else { | 1669 | } else { |
1675 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) | 1670 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) |
1676 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ | 1671 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ |
1677 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); | 1672 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); |
1678 | |||
1679 | if ( incidence->isBirthday() || incidence->isAnniversary() ) { | 1673 | if ( incidence->isBirthday() || incidence->isAnniversary() ) { |
1680 | bool ok; | 1674 | bool ok; |
1681 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); | 1675 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); |
1682 | if ( ok ) { | 1676 | if ( ok ) { |
1683 | int years = noc.date().year() - incidence->dtStart().date().year(); | 1677 | int years = noc.date().year() - incidence->dtStart().date().year(); |
1684 | startString += i18n(" (%1 y.)"). arg( years ); | 1678 | startString += i18n(" (%1 y.)"). arg( years ); |
1685 | } | 1679 | } |
1686 | } | 1680 | } |
1687 | else | 1681 | else |
1688 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); | 1682 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); |
1689 | } | 1683 | } |
1690 | |||
1691 | } | 1684 | } |
1692 | else | 1685 | else |
1693 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); | 1686 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); |
1694 | if ( !incidence->location().isEmpty() ) | 1687 | if ( !incidence->location().isEmpty() ) |
1695 | startString += " (" +incidence->location()+")"; | 1688 | startString += " (" +incidence->location()+")"; |
1696 | setCaption( incidence->summary()+startString); | 1689 | setCaption( incidence->summary()+startString); |
1697 | |||
1698 | enableIncidenceActions( true ); | 1690 | enableIncidenceActions( true ); |
1699 | |||
1700 | if ( incidence->typeID() == eventID ) { | 1691 | if ( incidence->typeID() == eventID ) { |
1701 | mShowAction->setText( i18n("Show Event...") ); | 1692 | mShowAction->setMenuText( i18n("Show Event") ); |
1702 | mEditAction->setText( i18n("Edit Event...") ); | ||
1703 | mDeleteAction->setText( i18n("Delete Event...") ); | ||
1704 | |||
1705 | mNewSubTodoAction->setEnabled( false ); | 1693 | mNewSubTodoAction->setEnabled( false ); |
1706 | } else if ( incidence->typeID() == todoID ) { | 1694 | } else if ( incidence->typeID() == todoID ) { |
1707 | mShowAction->setText( i18n("Show Todo...") ); | 1695 | mShowAction->setMenuText( i18n("Show Todo") ); |
1708 | mEditAction->setText( i18n("Edit Todo...") ); | ||
1709 | mDeleteAction->setText( i18n("Delete Todo...") ); | ||
1710 | |||
1711 | mNewSubTodoAction->setEnabled( true ); | 1696 | mNewSubTodoAction->setEnabled( true ); |
1712 | } else { | 1697 | } else { |
1713 | mShowAction->setText( i18n("Show...") ); | 1698 | mShowAction->setMenuText( i18n("Show") ); |
1714 | mShowAction->setText( i18n("Edit...") ); | ||
1715 | mShowAction->setText( i18n("Delete...") ); | ||
1716 | |||
1717 | mNewSubTodoAction->setEnabled( false ); | 1699 | mNewSubTodoAction->setEnabled( false ); |
1718 | } | 1700 | } |
1719 | } | 1701 | } |
1720 | 1702 | ||
1721 | void MainWindow::enableIncidenceActions( bool enabled ) | 1703 | void MainWindow::enableIncidenceActions( bool enabled ) |
1722 | { | 1704 | { |
1723 | mShowAction->setEnabled( enabled ); | 1705 | mShowAction->setEnabled( enabled ); |
1724 | mEditAction->setEnabled( enabled ); | 1706 | mEditAction->setEnabled( enabled ); |
1725 | mDeleteAction->setEnabled( enabled ); | 1707 | mDeleteAction->setEnabled( enabled ); |
1726 | 1708 | ||
1727 | mCloneAction->setEnabled( enabled ); | 1709 | mCloneAction->setEnabled( enabled ); |
1728 | mMoveAction->setEnabled( enabled ); | 1710 | mMoveAction->setEnabled( enabled ); |
1711 | #ifndef DESKTOP_VERSION | ||
1729 | mBeamAction->setEnabled( enabled ); | 1712 | mBeamAction->setEnabled( enabled ); |
1713 | #endif | ||
1730 | mCancelAction->setEnabled( enabled ); | 1714 | mCancelAction->setEnabled( enabled ); |
1731 | } | 1715 | } |
1732 | 1716 | ||
1733 | void MainWindow::importOL() | 1717 | void MainWindow::importOL() |
1734 | { | 1718 | { |
1735 | #ifdef _OL_IMPORT_ | 1719 | #ifdef _OL_IMPORT_ |
1736 | mView->clearAllViews(); | 1720 | mView->clearAllViews(); |
1737 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1721 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1738 | id->exec(); | 1722 | id->exec(); |
1739 | delete id; | 1723 | delete id; |
1740 | mView->calendar()->checkAlarmForIncidence( 0, true ); | 1724 | mView->calendar()->checkAlarmForIncidence( 0, true ); |
1741 | mView->updateView(); | 1725 | mView->updateView(); |
1742 | #endif | 1726 | #endif |
1743 | } | 1727 | } |
1744 | void MainWindow::importBday() | 1728 | void MainWindow::importBday() |
1745 | { | 1729 | { |
1746 | int result = QMessageBox::warning( this, i18n("KO/Pi import information!"), | 1730 | int result = QMessageBox::warning( this, i18n("KO/Pi import information!"), |
1747 | i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), | 1731 | i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), |
1748 | i18n("Import!"), i18n("Cancel"), 0, | 1732 | i18n("Import!"), i18n("Cancel"), 0, |
1749 | 0, 1 ); | 1733 | 0, 1 ); |
1750 | if ( result == 0 ) { | 1734 | if ( result == 0 ) { |
1751 | mView->importBday(); | 1735 | mView->importBday(); |
1752 | 1736 | ||
1753 | } | 1737 | } |
1754 | 1738 | ||
1755 | 1739 | ||
1756 | } | 1740 | } |
1757 | void MainWindow::importQtopia() | 1741 | void MainWindow::importQtopia() |
1758 | { | 1742 | { |
1759 | //#ifndef DESKTOP_VERSION | 1743 | //#ifndef DESKTOP_VERSION |
1760 | QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); | 1744 | QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); |
1761 | #ifdef DESKTOP_VERSION | 1745 | #ifdef DESKTOP_VERSION |
1762 | mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); | 1746 | mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); |
1763 | #endif | 1747 | #endif |
1764 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, | 1748 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, |
1765 | i18n("Import!"), i18n("Cancel"), 0, | 1749 | i18n("Import!"), i18n("Cancel"), 0, |
1766 | 0, 1 ); | 1750 | 0, 1 ); |
1767 | if ( result == 0 ) { | 1751 | if ( result == 0 ) { |
1768 | #ifndef DESKTOP_VERSION | 1752 | #ifndef DESKTOP_VERSION |
1769 | QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); | 1753 | QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); |
1770 | QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); | 1754 | QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); |
1771 | QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; | 1755 | QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; |
1772 | #else | 1756 | #else |
1773 | QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; | 1757 | QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; |
1774 | QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; | 1758 | QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; |
1775 | QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; | 1759 | QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; |
1776 | #endif | 1760 | #endif |
1777 | mView->importQtopia( categories, datebook, todolist ); | 1761 | mView->importQtopia( categories, datebook, todolist ); |