-rw-r--r-- | kaddressbook/kabcore.cpp | 22 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 15 | ||||
-rw-r--r-- | microkde/kdeui/ktoolbar.cpp | 4 |
4 files changed, 29 insertions, 16 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index af12f2b..4e2523e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -519,193 +519,193 @@ void KABCore::restoreSettings() | |||
519 | bool state; | 519 | bool state; |
520 | 520 | ||
521 | if (mMultipleViewsAtOnce) | 521 | if (mMultipleViewsAtOnce) |
522 | state = KABPrefs::instance()->mDetailsPageVisible; | 522 | state = KABPrefs::instance()->mDetailsPageVisible; |
523 | else | 523 | else |
524 | state = false; | 524 | state = false; |
525 | 525 | ||
526 | mActionDetails->setChecked( state ); | 526 | mActionDetails->setChecked( state ); |
527 | setDetailsVisible( state ); | 527 | setDetailsVisible( state ); |
528 | 528 | ||
529 | state = KABPrefs::instance()->mJumpButtonBarVisible; | 529 | state = KABPrefs::instance()->mJumpButtonBarVisible; |
530 | 530 | ||
531 | mActionJumpBar->setChecked( state ); | 531 | mActionJumpBar->setChecked( state ); |
532 | setJumpButtonBarVisible( state ); | 532 | setJumpButtonBarVisible( state ); |
533 | /*US | 533 | /*US |
534 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; | 534 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; |
535 | if ( splitterSize.count() == 0 ) { | 535 | if ( splitterSize.count() == 0 ) { |
536 | splitterSize.append( width() / 2 ); | 536 | splitterSize.append( width() / 2 ); |
537 | splitterSize.append( width() / 2 ); | 537 | splitterSize.append( width() / 2 ); |
538 | } | 538 | } |
539 | mMiniSplitter->setSizes( splitterSize ); | 539 | mMiniSplitter->setSizes( splitterSize ); |
540 | if ( mExtensionBarSplitter ) { | 540 | if ( mExtensionBarSplitter ) { |
541 | splitterSize = KABPrefs::instance()->mExtensionsSplitter; | 541 | splitterSize = KABPrefs::instance()->mExtensionsSplitter; |
542 | if ( splitterSize.count() == 0 ) { | 542 | if ( splitterSize.count() == 0 ) { |
543 | splitterSize.append( width() / 2 ); | 543 | splitterSize.append( width() / 2 ); |
544 | splitterSize.append( width() / 2 ); | 544 | splitterSize.append( width() / 2 ); |
545 | } | 545 | } |
546 | mExtensionBarSplitter->setSizes( splitterSize ); | 546 | mExtensionBarSplitter->setSizes( splitterSize ); |
547 | 547 | ||
548 | } | 548 | } |
549 | */ | 549 | */ |
550 | mViewManager->restoreSettings(); | 550 | mViewManager->restoreSettings(); |
551 | mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); | 551 | mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); |
552 | mExtensionManager->restoreSettings(); | 552 | mExtensionManager->restoreSettings(); |
553 | #ifdef DESKTOP_VERSION | 553 | #ifdef DESKTOP_VERSION |
554 | int wid = width(); | 554 | int wid = width(); |
555 | if ( wid < 10 ) | 555 | if ( wid < 10 ) |
556 | wid = 400; | 556 | wid = 400; |
557 | #else | 557 | #else |
558 | int wid = QApplication::desktop()->width(); | 558 | int wid = QApplication::desktop()->width(); |
559 | if ( wid < 640 ) | 559 | if ( wid < 640 ) |
560 | wid = QApplication::desktop()->height(); | 560 | wid = QApplication::desktop()->height(); |
561 | #endif | 561 | #endif |
562 | QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter; | 562 | QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter; |
563 | if ( true /*splitterSize.count() == 0*/ ) { | 563 | if ( true /*splitterSize.count() == 0*/ ) { |
564 | splitterSize.append( wid / 2 ); | 564 | splitterSize.append( wid / 2 ); |
565 | splitterSize.append( wid / 2 ); | 565 | splitterSize.append( wid / 2 ); |
566 | } | 566 | } |
567 | mMiniSplitter->setSizes( splitterSize ); | 567 | mMiniSplitter->setSizes( splitterSize ); |
568 | if ( mExtensionBarSplitter ) { | 568 | if ( mExtensionBarSplitter ) { |
569 | //splitterSize = KABPrefs::instance()->mExtensionsSplitter; | 569 | //splitterSize = KABPrefs::instance()->mExtensionsSplitter; |
570 | if ( true /*splitterSize.count() == 0*/ ) { | 570 | if ( true /*splitterSize.count() == 0*/ ) { |
571 | splitterSize.append( wid / 2 ); | 571 | splitterSize.append( wid / 2 ); |
572 | splitterSize.append( wid / 2 ); | 572 | splitterSize.append( wid / 2 ); |
573 | } | 573 | } |
574 | mExtensionBarSplitter->setSizes( splitterSize ); | 574 | mExtensionBarSplitter->setSizes( splitterSize ); |
575 | 575 | ||
576 | } | 576 | } |
577 | #ifdef DESKTOP_VERSION | 577 | #ifdef DESKTOP_VERSION |
578 | KConfig *config = KABPrefs::instance()->getConfig(); | 578 | KConfig *config = KABPrefs::instance()->getConfig(); |
579 | config->setGroup("WidgetLayout"); | 579 | config->setGroup("WidgetLayout"); |
580 | QStringList list; | 580 | QStringList list; |
581 | list = config->readListEntry("MainLayout"); | 581 | list = config->readListEntry("MainLayout"); |
582 | int x,y,w,h; | 582 | int x,y,w,h; |
583 | if ( ! list.isEmpty() ) { | 583 | if ( ! list.isEmpty() ) { |
584 | x = list[0].toInt(); | 584 | x = list[0].toInt(); |
585 | y = list[1].toInt(); | 585 | y = list[1].toInt(); |
586 | w = list[2].toInt(); | 586 | w = list[2].toInt(); |
587 | h = list[3].toInt(); | 587 | h = list[3].toInt(); |
588 | KApplication::testCoords( &x,&y,&w,&h ); | 588 | KApplication::testCoords( &x,&y,&w,&h ); |
589 | topLevelWidget()->setGeometry(x,y,w,h); | 589 | topLevelWidget()->setGeometry(x,y,w,h); |
590 | 590 | ||
591 | } else { | 591 | } else { |
592 | topLevelWidget()->setGeometry( 40 ,40 , 640, 440); | 592 | topLevelWidget()->setGeometry( 40 ,40 , 640, 440); |
593 | } | 593 | } |
594 | #endif | 594 | #endif |
595 | } | 595 | } |
596 | 596 | ||
597 | void KABCore::saveSettings() | 597 | void KABCore::saveSettings() |
598 | { | 598 | { |
599 | KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked(); | 599 | KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked(); |
600 | if ( mExtensionBarSplitter ) | 600 | if ( mExtensionBarSplitter ) |
601 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); | 601 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); |
602 | KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked(); | 602 | KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked(); |
603 | KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes(); | 603 | KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes(); |
604 | #ifndef KAB_EMBEDDED | 604 | #ifndef KAB_EMBEDDED |
605 | 605 | ||
606 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); | 606 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); |
607 | KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); | 607 | KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); |
608 | #endif //KAB_EMBEDDED | 608 | #endif //KAB_EMBEDDED |
609 | mExtensionManager->saveSettings(); | 609 | mExtensionManager->saveSettings(); |
610 | mViewManager->saveSettings(); | 610 | mViewManager->saveSettings(); |
611 | 611 | ||
612 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); | 612 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); |
613 | 613 | ||
614 | KABPrefs::instance()->writeConfig(); | 614 | KABPrefs::instance()->writeConfig(); |
615 | qDebug("KA: KABCore::saveSettings() "); | 615 | //qDebug("KA: KABCore::saveSettings() "); |
616 | } | 616 | } |
617 | 617 | ||
618 | KABC::AddressBook *KABCore::addressBook() const | 618 | KABC::AddressBook *KABCore::addressBook() const |
619 | { | 619 | { |
620 | return mAddressBook; | 620 | return mAddressBook; |
621 | } | 621 | } |
622 | 622 | ||
623 | KConfig *KABCore::config() | 623 | KConfig *KABCore::config() |
624 | { | 624 | { |
625 | #ifndef KAB_EMBEDDED | 625 | #ifndef KAB_EMBEDDED |
626 | return KABPrefs::instance()->config(); | 626 | return KABPrefs::instance()->config(); |
627 | #else //KAB_EMBEDDED | 627 | #else //KAB_EMBEDDED |
628 | return KABPrefs::instance()->getConfig(); | 628 | return KABPrefs::instance()->getConfig(); |
629 | #endif //KAB_EMBEDDED | 629 | #endif //KAB_EMBEDDED |
630 | } | 630 | } |
631 | 631 | ||
632 | KActionCollection *KABCore::actionCollection() const | 632 | KActionCollection *KABCore::actionCollection() const |
633 | { | 633 | { |
634 | return mGUIClient->actionCollection(); | 634 | return mGUIClient->actionCollection(); |
635 | } | 635 | } |
636 | 636 | ||
637 | KABC::Field *KABCore::currentSearchField() const | 637 | KABC::Field *KABCore::currentSearchField() const |
638 | { | 638 | { |
639 | if (mIncSearchWidget) | 639 | if (mIncSearchWidget) |
640 | return mIncSearchWidget->currentField(); | 640 | return mIncSearchWidget->currentField(); |
641 | else | 641 | else |
642 | return 0; | 642 | return 0; |
643 | } | 643 | } |
644 | 644 | ||
645 | QStringList KABCore::selectedUIDs() const | 645 | QStringList KABCore::selectedUIDs() const |
646 | { | 646 | { |
647 | return mViewManager->selectedUids(); | 647 | return mViewManager->selectedUids(); |
648 | } | 648 | } |
649 | 649 | ||
650 | KABC::Resource *KABCore::requestResource( QWidget *parent ) | 650 | KABC::Resource *KABCore::requestResource( QWidget *parent ) |
651 | { | 651 | { |
652 | QPtrList<KABC::Resource> kabcResources = addressBook()->resources(); | 652 | QPtrList<KABC::Resource> kabcResources = addressBook()->resources(); |
653 | 653 | ||
654 | QPtrList<KRES::Resource> kresResources; | 654 | QPtrList<KRES::Resource> kresResources; |
655 | QPtrListIterator<KABC::Resource> resIt( kabcResources ); | 655 | QPtrListIterator<KABC::Resource> resIt( kabcResources ); |
656 | KABC::Resource *resource; | 656 | KABC::Resource *resource; |
657 | while ( ( resource = resIt.current() ) != 0 ) { | 657 | while ( ( resource = resIt.current() ) != 0 ) { |
658 | ++resIt; | 658 | ++resIt; |
659 | if ( !resource->readOnly() ) { | 659 | if ( !resource->readOnly() ) { |
660 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); | 660 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); |
661 | if ( res ) | 661 | if ( res ) |
662 | kresResources.append( res ); | 662 | kresResources.append( res ); |
663 | } | 663 | } |
664 | } | 664 | } |
665 | 665 | ||
666 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); | 666 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); |
667 | return static_cast<KABC::Resource*>( res ); | 667 | return static_cast<KABC::Resource*>( res ); |
668 | } | 668 | } |
669 | 669 | ||
670 | #ifndef KAB_EMBEDDED | 670 | #ifndef KAB_EMBEDDED |
671 | KAboutData *KABCore::createAboutData() | 671 | KAboutData *KABCore::createAboutData() |
672 | #else //KAB_EMBEDDED | 672 | #else //KAB_EMBEDDED |
673 | void KABCore::createAboutData() | 673 | void KABCore::createAboutData() |
674 | #endif //KAB_EMBEDDED | 674 | #endif //KAB_EMBEDDED |
675 | { | 675 | { |
676 | 676 | ||
677 | 677 | ||
678 | QString version; | 678 | QString version; |
679 | #include <../version> | 679 | #include <../version> |
680 | QMessageBox::about( this, "About KAddressbook/Pi", | 680 | QMessageBox::about( this, "About KAddressbook/Pi", |
681 | "KAddressbook/Platform-independent\n" | 681 | "KAddressbook/Platform-independent\n" |
682 | "(KA/Pi) " +version + " - " + | 682 | "(KA/Pi) " +version + " - " + |
683 | #ifdef DESKTOP_VERSION | 683 | #ifdef DESKTOP_VERSION |
684 | "Desktop Edition\n" | 684 | "Desktop Edition\n" |
685 | #else | 685 | #else |
686 | "PDA-Edition\n" | 686 | "PDA-Edition\n" |
687 | "for: Zaurus 5500 / 7x0 / 8x0\n" | 687 | "for: Zaurus 5500 / 7x0 / 8x0\n" |
688 | #endif | 688 | #endif |
689 | 689 | ||
690 | "(c) 2004 Ulf Schenk\n" | 690 | "(c) 2004 Ulf Schenk\n" |
691 | "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n" | 691 | "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n" |
692 | "(c) 1997-2003, The KDE PIM Team\n" | 692 | "(c) 1997-2003, The KDE PIM Team\n" |
693 | "Tobias Koenig Maintainer\n" | 693 | "Tobias Koenig Maintainer\n" |
694 | "Don Sanders Original author\n" | 694 | "Don Sanders Original author\n" |
695 | "Cornelius Schumacher Co-maintainer\n" | 695 | "Cornelius Schumacher Co-maintainer\n" |
696 | "Mike Pilone GUI and framework redesign\n" | 696 | "Mike Pilone GUI and framework redesign\n" |
697 | "Greg Stern DCOP interface\n" | 697 | "Greg Stern DCOP interface\n" |
698 | "Mark Westcot Contact pinning\n" | 698 | "Mark Westcot Contact pinning\n" |
699 | "Michel Boyer de la Giroday LDAP Lookup\n" | 699 | "Michel Boyer de la Giroday LDAP Lookup\n" |
700 | "Steffen Hansen LDAP Lookup" | 700 | "Steffen Hansen LDAP Lookup" |
701 | #ifdef _WIN32_ | 701 | #ifdef _WIN32_ |
702 | "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n" | 702 | "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n" |
703 | #endif | 703 | #endif |
704 | ); | 704 | ); |
705 | } | 705 | } |
706 | 706 | ||
707 | void KABCore::setContactSelected( const QString &uid ) | 707 | void KABCore::setContactSelected( const QString &uid ) |
708 | { | 708 | { |
709 | KABC::Addressee addr = mAddressBook->findByUid( uid ); | 709 | KABC::Addressee addr = mAddressBook->findByUid( uid ); |
710 | if ( !mDetails->isHidden() ) | 710 | if ( !mDetails->isHidden() ) |
711 | mDetails->setAddressee( addr ); | 711 | mDetails->setAddressee( addr ); |
@@ -751,234 +751,244 @@ void KABCore::sendMail() | |||
751 | { | 751 | { |
752 | sendMail( mViewManager->selectedEmails().join( ", " ) ); | 752 | sendMail( mViewManager->selectedEmails().join( ", " ) ); |
753 | } | 753 | } |
754 | 754 | ||
755 | void KABCore::sendMail( const QString& emaillist ) | 755 | void KABCore::sendMail( const QString& emaillist ) |
756 | { | 756 | { |
757 | // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " | 757 | // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " |
758 | if (emaillist.contains(",") > 0) | 758 | if (emaillist.contains(",") > 0) |
759 | ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); | 759 | ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); |
760 | else | 760 | else |
761 | ExternalAppHandler::instance()->mailToOneContact( emaillist ); | 761 | ExternalAppHandler::instance()->mailToOneContact( emaillist ); |
762 | } | 762 | } |
763 | 763 | ||
764 | 764 | ||
765 | 765 | ||
766 | void KABCore::mailVCard() | 766 | void KABCore::mailVCard() |
767 | { | 767 | { |
768 | QStringList uids = mViewManager->selectedUids(); | 768 | QStringList uids = mViewManager->selectedUids(); |
769 | if ( !uids.isEmpty() ) | 769 | if ( !uids.isEmpty() ) |
770 | mailVCard( uids ); | 770 | mailVCard( uids ); |
771 | } | 771 | } |
772 | 772 | ||
773 | void KABCore::mailVCard( const QStringList& uids ) | 773 | void KABCore::mailVCard( const QStringList& uids ) |
774 | { | 774 | { |
775 | QStringList urls; | 775 | QStringList urls; |
776 | 776 | ||
777 | // QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); | 777 | // QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); |
778 | 778 | ||
779 | QString dirName = "/tmp/" + KApplication::randomString( 8 ); | 779 | QString dirName = "/tmp/" + KApplication::randomString( 8 ); |
780 | 780 | ||
781 | 781 | ||
782 | 782 | ||
783 | QDir().mkdir( dirName, true ); | 783 | QDir().mkdir( dirName, true ); |
784 | 784 | ||
785 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 785 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
786 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 786 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
787 | 787 | ||
788 | if ( a.isEmpty() ) | 788 | if ( a.isEmpty() ) |
789 | continue; | 789 | continue; |
790 | 790 | ||
791 | QString name = a.givenName() + "_" + a.familyName() + ".vcf"; | 791 | QString name = a.givenName() + "_" + a.familyName() + ".vcf"; |
792 | 792 | ||
793 | QString fileName = dirName + "/" + name; | 793 | QString fileName = dirName + "/" + name; |
794 | 794 | ||
795 | QFile outFile(fileName); | 795 | QFile outFile(fileName); |
796 | 796 | ||
797 | if ( outFile.open(IO_WriteOnly) ) { // file opened successfully | 797 | if ( outFile.open(IO_WriteOnly) ) { // file opened successfully |
798 | KABC::VCardConverter converter; | 798 | KABC::VCardConverter converter; |
799 | QString vcard; | 799 | QString vcard; |
800 | 800 | ||
801 | converter.addresseeToVCard( a, vcard ); | 801 | converter.addresseeToVCard( a, vcard ); |
802 | 802 | ||
803 | QTextStream t( &outFile ); // use a text stream | 803 | QTextStream t( &outFile ); // use a text stream |
804 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 804 | t.setEncoding( QTextStream::UnicodeUTF8 ); |
805 | t << vcard; | 805 | t << vcard; |
806 | 806 | ||
807 | outFile.close(); | 807 | outFile.close(); |
808 | 808 | ||
809 | urls.append( fileName ); | 809 | urls.append( fileName ); |
810 | } | 810 | } |
811 | } | 811 | } |
812 | 812 | ||
813 | bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") ); | 813 | bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") ); |
814 | 814 | ||
815 | 815 | ||
816 | /*US | 816 | /*US |
817 | kapp->invokeMailer( QString::null, QString::null, QString::null, | 817 | kapp->invokeMailer( QString::null, QString::null, QString::null, |
818 | QString::null, // subject | 818 | QString::null, // subject |
819 | QString::null, // body | 819 | QString::null, // body |
820 | QString::null, | 820 | QString::null, |
821 | urls ); // attachments | 821 | urls ); // attachments |
822 | */ | 822 | */ |
823 | 823 | ||
824 | } | 824 | } |
825 | 825 | ||
826 | /** | 826 | /** |
827 | Beams the "WhoAmI contact. | 827 | Beams the "WhoAmI contact. |
828 | */ | 828 | */ |
829 | void KABCore::beamMySelf() | 829 | void KABCore::beamMySelf() |
830 | { | 830 | { |
831 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); | 831 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); |
832 | if (!a.isEmpty()) | 832 | if (!a.isEmpty()) |
833 | { | 833 | { |
834 | QStringList uids; | 834 | QStringList uids; |
835 | uids << a.uid(); | 835 | uids << a.uid(); |
836 | 836 | ||
837 | beamVCard(uids); | 837 | beamVCard(uids); |
838 | } else { | 838 | } else { |
839 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); | 839 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); |
840 | 840 | ||
841 | 841 | ||
842 | } | 842 | } |
843 | } | 843 | } |
844 | void KABCore::updateMainWindow() | 844 | void KABCore::updateMainWindow() |
845 | { | 845 | { |
846 | mMainWindow->showMaximized(); | 846 | mMainWindow->showMaximized(); |
847 | mMainWindow->update(); | 847 | //mMainWindow->repaint(); |
848 | } | 848 | } |
849 | void KABCore::resizeEvent(QResizeEvent* e ) | 849 | void KABCore::resizeEvent(QResizeEvent* e ) |
850 | { | 850 | { |
851 | if ( !mMiniSplitter ) | 851 | if ( !mMiniSplitter ) |
852 | return; | 852 | return; |
853 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); | 853 | static int desktop_width = 0; |
854 | if ( e->oldSize().width() != e->size().width() ) | 854 | //qDebug("KABCore::resizeEvent %d %d ",desktop_width,QApplication::desktop()->width() ); |
855 | if ( desktop_width != QApplication::desktop()->width() ) | ||
855 | if ( QApplication::desktop()->width() >= 480 ) { | 856 | if ( QApplication::desktop()->width() >= 480 ) { |
856 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 | 857 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 |
858 | //qDebug("640 "); | ||
857 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { | 859 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { |
860 | //qDebug("switch V->H "); | ||
858 | mMiniSplitter->setOrientation( Qt::Horizontal); | 861 | mMiniSplitter->setOrientation( Qt::Horizontal); |
859 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 862 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
860 | } | 863 | } |
861 | if ( QApplication::desktop()->width() <= 640 ) { | 864 | if ( QApplication::desktop()->width() <= 640 ) { |
865 | bool shot = mMainWindow->isVisible(); | ||
862 | mMainWindow->showMinimized(); | 866 | mMainWindow->showMinimized(); |
863 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 867 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
864 | mViewManager->getFilterAction()->setComboWidth( 150 ); | 868 | mViewManager->getFilterAction()->setComboWidth( 150 ); |
865 | if ( mIncSearchWidget ) | 869 | if ( mIncSearchWidget ) |
866 | mIncSearchWidget->setSize(); | 870 | mIncSearchWidget->setSize(); |
867 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 871 | if ( shot ) |
872 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | ||
868 | } | 873 | } |
869 | 874 | ||
870 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 | 875 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 |
876 | //qDebug("480 "); | ||
871 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { | 877 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { |
878 | //qDebug("switch H->V "); | ||
872 | mMiniSplitter->setOrientation( Qt::Vertical ); | 879 | mMiniSplitter->setOrientation( Qt::Vertical ); |
873 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 880 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
874 | } | 881 | } |
875 | if ( QApplication::desktop()->width() <= 640 ) { | 882 | if ( QApplication::desktop()->width() <= 640 ) { |
876 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 883 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
884 | bool shot = mMainWindow->isVisible(); | ||
877 | mMainWindow->showMinimized(); | 885 | mMainWindow->showMinimized(); |
878 | if ( KABPrefs::instance()->mHideSearchOnSwitch ) { | 886 | if ( KABPrefs::instance()->mHideSearchOnSwitch ) { |
879 | if ( mIncSearchWidget ) { | 887 | if ( mIncSearchWidget ) { |
880 | mIncSearchWidget->setSize(); | 888 | mIncSearchWidget->setSize(); |
881 | } | 889 | } |
882 | } else { | 890 | } else { |
883 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 891 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
884 | } | 892 | } |
885 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 893 | if ( shot ) |
894 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | ||
886 | } | 895 | } |
887 | } | 896 | } |
888 | } | 897 | } |
898 | desktop_width = QApplication::desktop()->width(); | ||
889 | QWidget::resizeEvent( e ); | 899 | QWidget::resizeEvent( e ); |
890 | 900 | ||
891 | } | 901 | } |
892 | void KABCore::export2phone() | 902 | void KABCore::export2phone() |
893 | { | 903 | { |
894 | 904 | ||
895 | QStringList uids; | 905 | QStringList uids; |
896 | XXPortSelectDialog dlg( this, false, this ); | 906 | XXPortSelectDialog dlg( this, false, this ); |
897 | if ( dlg.exec() ) | 907 | if ( dlg.exec() ) |
898 | uids = dlg.uids(); | 908 | uids = dlg.uids(); |
899 | else | 909 | else |
900 | return; | 910 | return; |
901 | if ( uids.isEmpty() ) | 911 | if ( uids.isEmpty() ) |
902 | return; | 912 | return; |
903 | // qDebug("count %d ", uids.count()); | 913 | // qDebug("count %d ", uids.count()); |
904 | 914 | ||
905 | KAex2phonePrefs ex2phone; | 915 | KAex2phonePrefs ex2phone; |
906 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 916 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
907 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 917 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
908 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 918 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
909 | 919 | ||
910 | if ( !ex2phone.exec() ) { | 920 | if ( !ex2phone.exec() ) { |
911 | return; | 921 | return; |
912 | } | 922 | } |
913 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 923 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
914 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | 924 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); |
915 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | 925 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); |
916 | 926 | ||
917 | 927 | ||
918 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, | 928 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, |
919 | KPimGlobalPrefs::instance()->mEx2PhoneConnection, | 929 | KPimGlobalPrefs::instance()->mEx2PhoneConnection, |
920 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 930 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
921 | 931 | ||
922 | QString fileName = getPhoneFile(); | 932 | QString fileName = getPhoneFile(); |
923 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) | 933 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) |
924 | return; | 934 | return; |
925 | 935 | ||
926 | message(i18n("Exporting to phone...")); | 936 | message(i18n("Exporting to phone...")); |
927 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); | 937 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); |
928 | 938 | ||
929 | } | 939 | } |
930 | QString KABCore::getPhoneFile() | 940 | QString KABCore::getPhoneFile() |
931 | { | 941 | { |
932 | #ifdef DESKTOP_VERSION | 942 | #ifdef DESKTOP_VERSION |
933 | return locateLocal("tmp", "phonefile.vcf"); | 943 | return locateLocal("tmp", "phonefile.vcf"); |
934 | #else | 944 | #else |
935 | return "/tmp/phonefile.vcf"; | 945 | return "/tmp/phonefile.vcf"; |
936 | #endif | 946 | #endif |
937 | 947 | ||
938 | } | 948 | } |
939 | void KABCore::writeToPhone( ) | 949 | void KABCore::writeToPhone( ) |
940 | { | 950 | { |
941 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) | 951 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) |
942 | message(i18n("Export to phone finished!")); | 952 | message(i18n("Export to phone finished!")); |
943 | else | 953 | else |
944 | qDebug(i18n("KA: Error exporting to phone")); | 954 | qDebug(i18n("KA: Error exporting to phone")); |
945 | } | 955 | } |
946 | void KABCore::beamVCard() | 956 | void KABCore::beamVCard() |
947 | { | 957 | { |
948 | QStringList uids; | 958 | QStringList uids; |
949 | XXPortSelectDialog dlg( this, false, this ); | 959 | XXPortSelectDialog dlg( this, false, this ); |
950 | if ( dlg.exec() ) | 960 | if ( dlg.exec() ) |
951 | uids = dlg.uids(); | 961 | uids = dlg.uids(); |
952 | else | 962 | else |
953 | return; | 963 | return; |
954 | if ( uids.isEmpty() ) | 964 | if ( uids.isEmpty() ) |
955 | return; | 965 | return; |
956 | beamVCard( uids ); | 966 | beamVCard( uids ); |
957 | } | 967 | } |
958 | 968 | ||
959 | 969 | ||
960 | void KABCore::beamVCard(const QStringList& uids) | 970 | void KABCore::beamVCard(const QStringList& uids) |
961 | { | 971 | { |
962 | 972 | ||
963 | // LR: we should use the /tmp dir on the Zaurus, | 973 | // LR: we should use the /tmp dir on the Zaurus, |
964 | // because: /tmp = RAM, (HOME)/kdepim = flash memory | 974 | // because: /tmp = RAM, (HOME)/kdepim = flash memory |
965 | 975 | ||
966 | #ifdef DESKTOP_VERSION | 976 | #ifdef DESKTOP_VERSION |
967 | QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); | 977 | QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); |
968 | #else | 978 | #else |
969 | QString fileName = "/tmp/kapibeamfile.vcf"; | 979 | QString fileName = "/tmp/kapibeamfile.vcf"; |
970 | #endif | 980 | #endif |
971 | 981 | ||
972 | KABC::VCardConverter converter; | 982 | KABC::VCardConverter converter; |
973 | QString description; | 983 | QString description; |
974 | QString datastream; | 984 | QString datastream; |
975 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 985 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
976 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 986 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
977 | 987 | ||
978 | if ( a.isEmpty() ) | 988 | if ( a.isEmpty() ) |
979 | continue; | 989 | continue; |
980 | 990 | ||
981 | if (description.isEmpty()) | 991 | if (description.isEmpty()) |
982 | description = a.formattedName(); | 992 | description = a.formattedName(); |
983 | 993 | ||
984 | QString vcard; | 994 | QString vcard; |
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 02fc40a..272f2eb 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -241,196 +241,198 @@ void KAddressBookTableView::readConfig(KConfig *config) | |||
241 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); | 241 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); |
242 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); | 242 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); |
243 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); | 243 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); |
244 | #ifndef KAB_EMBEDDED | 244 | #ifndef KAB_EMBEDDED |
245 | c = KGlobalSettings::alternateBackgroundColor(); | 245 | c = KGlobalSettings::alternateBackgroundColor(); |
246 | #else //KAB_EMBEDDED | 246 | #else //KAB_EMBEDDED |
247 | c = QColor(240, 240, 240); | 247 | c = QColor(240, 240, 240); |
248 | #endif //KAB_EMBEDDED | 248 | #endif //KAB_EMBEDDED |
249 | c = config->readColorEntry ("AlternatingBackgroundColor", &c); | 249 | c = config->readColorEntry ("AlternatingBackgroundColor", &c); |
250 | mListView->setAlternateColor(c); | 250 | mListView->setAlternateColor(c); |
251 | 251 | ||
252 | 252 | ||
253 | //US mListView->viewport()->setPalette( p ); | 253 | //US mListView->viewport()->setPalette( p ); |
254 | mListView->setPalette( p ); | 254 | mListView->setPalette( p ); |
255 | } | 255 | } |
256 | else | 256 | else |
257 | { | 257 | { |
258 | // needed if turned off during a session. | 258 | // needed if turned off during a session. |
259 | //US mListView->viewport()->setPalette( mListView->palette() ); | 259 | //US mListView->viewport()->setPalette( mListView->palette() ); |
260 | mListView->setPalette( mListView->palette() ); | 260 | mListView->setPalette( mListView->palette() ); |
261 | } | 261 | } |
262 | 262 | ||
263 | //custom fonts? | 263 | //custom fonts? |
264 | QFont f( font() ); | 264 | QFont f( font() ); |
265 | if ( config->readBoolEntry( "EnableCustomFonts", false ) ) | 265 | if ( config->readBoolEntry( "EnableCustomFonts", false ) ) |
266 | { | 266 | { |
267 | mListView->setFont( config->readFontEntry( "TextFont", &f) ); | 267 | mListView->setFont( config->readFontEntry( "TextFont", &f) ); |
268 | f.setBold( true ); | 268 | f.setBold( true ); |
269 | //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); | 269 | //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); |
270 | mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) ); | 270 | mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) ); |
271 | } | 271 | } |
272 | else | 272 | else |
273 | { | 273 | { |
274 | mListView->setFont( f ); | 274 | mListView->setFont( f ); |
275 | f.setBold( true ); | 275 | f.setBold( true ); |
276 | //US mListView->setHeaderFont( f ); | 276 | //US mListView->setHeaderFont( f ); |
277 | mListView->header()->setFont( f ); | 277 | mListView->header()->setFont( f ); |
278 | } | 278 | } |
279 | 279 | ||
280 | // Set the list view options | 280 | // Set the list view options |
281 | mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground", | 281 | mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground", |
282 | true)); | 282 | true)); |
283 | mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false)); | 283 | mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false)); |
284 | mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true)); | 284 | mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true)); |
285 | 285 | ||
286 | if (config->readBoolEntry("Background", false)) | 286 | if (config->readBoolEntry("Background", false)) |
287 | mListView->setBackgroundPixmap(config->readEntry("BackgroundName")); | 287 | mListView->setBackgroundPixmap(config->readEntry("BackgroundName")); |
288 | 288 | ||
289 | // Restore the layout of the listview | 289 | // Restore the layout of the listview |
290 | mListView->restoreLayout(config, config->group()); | 290 | mListView->restoreLayout(config, config->group()); |
291 | } | 291 | } |
292 | 292 | ||
293 | void KAddressBookTableView::refresh(QString uid) | 293 | void KAddressBookTableView::refresh(QString uid) |
294 | { | 294 | { |
295 | // For now just repopulate. In reality this method should | 295 | // For now just repopulate. In reality this method should |
296 | // check the value of uid, and if valid iterate through | 296 | // check the value of uid, and if valid iterate through |
297 | // the listview to find the entry, then tell it to refresh. | 297 | // the listview to find the entry, then tell it to refresh. |
298 | 298 | ||
299 | if (uid.isNull()) { | 299 | if (uid.isNull()) { |
300 | // Clear the list view | 300 | // Clear the list view |
301 | QString currentUID, nextUID; | 301 | QString currentUID, nextUID; |
302 | #ifndef KAB_EMBEDDED | 302 | #ifndef KAB_EMBEDDED |
303 | ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() ); | 303 | ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() ); |
304 | #else //KAB_EMBEDDED | 304 | #else //KAB_EMBEDDED |
305 | ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() ); | 305 | ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() ); |
306 | #endif //KAB_EMBEDDED | 306 | #endif //KAB_EMBEDDED |
307 | 307 | ||
308 | if ( currentItem ) { | 308 | if ( currentItem ) { |
309 | #ifndef KAB_EMBEDDED | 309 | #ifndef KAB_EMBEDDED |
310 | ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() ); | 310 | ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() ); |
311 | #else //KAB_EMBEDDED | 311 | #else //KAB_EMBEDDED |
312 | ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() ); | 312 | ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() ); |
313 | #endif //KAB_EMBEDDED | 313 | #endif //KAB_EMBEDDED |
314 | if ( nextItem ) | 314 | if ( nextItem ) |
315 | nextUID = nextItem->addressee().uid(); | 315 | nextUID = nextItem->addressee().uid(); |
316 | currentUID = currentItem->addressee().uid(); | 316 | currentUID = currentItem->addressee().uid(); |
317 | } | 317 | } |
318 | 318 | ||
319 | mListView->clear(); | 319 | mListView->clear(); |
320 | 320 | ||
321 | currentItem = 0; | 321 | currentItem = 0; |
322 | KABC::Addressee::List addresseeList = addressees(); | 322 | KABC::Addressee::List addresseeList = addressees(); |
323 | KABC::Addressee::List::Iterator it; | 323 | KABC::Addressee::List::Iterator it; |
324 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 324 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
325 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 325 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
326 | continue; | 326 | continue; |
327 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | 327 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); |
328 | if ( (*it).uid() == currentUID ) | 328 | if ( (*it).uid() == currentUID ) |
329 | currentItem = item; | 329 | currentItem = item; |
330 | else if ( (*it).uid() == nextUID && !currentItem ) | 330 | else if ( (*it).uid() == nextUID && !currentItem ) |
331 | currentItem = item; | 331 | currentItem = item; |
332 | } | 332 | } |
333 | 333 | ||
334 | // Sometimes the background pixmap gets messed up when we add lots | 334 | // Sometimes the background pixmap gets messed up when we add lots |
335 | // of items. | 335 | // of items. |
336 | mListView->repaint(); | 336 | mListView->repaint(); |
337 | 337 | if ( !currentItem ) | |
338 | currentItem = (ContactListViewItem *)mListView->firstChild(); | ||
338 | if ( currentItem ) { | 339 | if ( currentItem ) { |
339 | mListView->setCurrentItem( currentItem ); | 340 | mListView->setCurrentItem( currentItem ); |
340 | mListView->ensureItemVisible( currentItem ); | 341 | mListView->ensureItemVisible( currentItem ); |
342 | mListView->setSelected( currentItem, true ); | ||
341 | } | 343 | } |
342 | } else { | 344 | } else { |
343 | // Only need to update on entry. Iterate through and try to find it | 345 | // Only need to update on entry. Iterate through and try to find it |
344 | ContactListViewItem *ceItem; | 346 | ContactListViewItem *ceItem; |
345 | QListViewItemIterator it( mListView ); | 347 | QListViewItemIterator it( mListView ); |
346 | while ( it.current() ) { | 348 | while ( it.current() ) { |
347 | #ifndef KAB_EMBEDDED | 349 | #ifndef KAB_EMBEDDED |
348 | ceItem = dynamic_cast<ContactListViewItem*>( it.current() ); | 350 | ceItem = dynamic_cast<ContactListViewItem*>( it.current() ); |
349 | #else //KAB_EMBEDDED | 351 | #else //KAB_EMBEDDED |
350 | ceItem = (ContactListViewItem*)( it.current() ); | 352 | ceItem = (ContactListViewItem*)( it.current() ); |
351 | #endif //KAB_EMBEDDED | 353 | #endif //KAB_EMBEDDED |
352 | 354 | ||
353 | if ( ceItem && ceItem->addressee().uid() == uid ) { | 355 | if ( ceItem && ceItem->addressee().uid() == uid ) { |
354 | ceItem->refresh(); | 356 | ceItem->refresh(); |
355 | return; | 357 | return; |
356 | } | 358 | } |
357 | ++it; | 359 | ++it; |
358 | } | 360 | } |
359 | 361 | ||
360 | refresh( QString::null ); | 362 | refresh( QString::null ); |
361 | } | 363 | } |
362 | } | 364 | } |
363 | 365 | ||
364 | QStringList KAddressBookTableView::selectedUids() | 366 | QStringList KAddressBookTableView::selectedUids() |
365 | { | 367 | { |
366 | QStringList uidList; | 368 | QStringList uidList; |
367 | QListViewItem *item; | 369 | QListViewItem *item; |
368 | ContactListViewItem *ceItem; | 370 | ContactListViewItem *ceItem; |
369 | 371 | ||
370 | for(item = mListView->firstChild(); item; item = item->itemBelow()) | 372 | for(item = mListView->firstChild(); item; item = item->itemBelow()) |
371 | { | 373 | { |
372 | if (mListView->isSelected( item )) | 374 | if (mListView->isSelected( item )) |
373 | { | 375 | { |
374 | #ifndef KAB_EMBEDDED | 376 | #ifndef KAB_EMBEDDED |
375 | ceItem = dynamic_cast<ContactListViewItem*>(item); | 377 | ceItem = dynamic_cast<ContactListViewItem*>(item); |
376 | #else //KAB_EMBEDDED | 378 | #else //KAB_EMBEDDED |
377 | ceItem = (ContactListViewItem*)(item); | 379 | ceItem = (ContactListViewItem*)(item); |
378 | #endif //KAB_EMBEDDED | 380 | #endif //KAB_EMBEDDED |
379 | 381 | ||
380 | if (ceItem != 0L) | 382 | if (ceItem != 0L) |
381 | uidList << ceItem->addressee().uid(); | 383 | uidList << ceItem->addressee().uid(); |
382 | } | 384 | } |
383 | } | 385 | } |
384 | if ( uidList.count() == 0 ) | 386 | if ( uidList.count() == 0 ) |
385 | if ( mListView->currentItem() ) { | 387 | if ( mListView->currentItem() ) { |
386 | ceItem = (ContactListViewItem*)(mListView->currentItem()) ; | 388 | ceItem = (ContactListViewItem*)(mListView->currentItem()) ; |
387 | uidList << ceItem->addressee().uid(); | 389 | uidList << ceItem->addressee().uid(); |
388 | } | 390 | } |
389 | 391 | ||
390 | return uidList; | 392 | return uidList; |
391 | } | 393 | } |
392 | 394 | ||
393 | void KAddressBookTableView::setSelected(QString uid, bool selected) | 395 | void KAddressBookTableView::setSelected(QString uid, bool selected) |
394 | { | 396 | { |
395 | QListViewItem *item; | 397 | QListViewItem *item; |
396 | ContactListViewItem *ceItem; | 398 | ContactListViewItem *ceItem; |
397 | 399 | ||
398 | if (uid.isNull()) | 400 | if (uid.isNull()) |
399 | { | 401 | { |
400 | mListView->selectAll(selected); | 402 | mListView->selectAll(selected); |
401 | } | 403 | } |
402 | else | 404 | else |
403 | { | 405 | { |
404 | for(item = mListView->firstChild(); item; item = item->itemBelow()) | 406 | for(item = mListView->firstChild(); item; item = item->itemBelow()) |
405 | { | 407 | { |
406 | #ifndef KAB_EMBEDDED | 408 | #ifndef KAB_EMBEDDED |
407 | ceItem = dynamic_cast<ContactListViewItem*>(item); | 409 | ceItem = dynamic_cast<ContactListViewItem*>(item); |
408 | #else //KAB_EMBEDDED | 410 | #else //KAB_EMBEDDED |
409 | ceItem = (ContactListViewItem*)(item); | 411 | ceItem = (ContactListViewItem*)(item); |
410 | #endif //KAB_EMBEDDED | 412 | #endif //KAB_EMBEDDED |
411 | 413 | ||
412 | 414 | ||
413 | if ((ceItem != 0L) && (ceItem->addressee().uid() == uid)) | 415 | if ((ceItem != 0L) && (ceItem->addressee().uid() == uid)) |
414 | { | 416 | { |
415 | mListView->setSelected(item, selected); | 417 | mListView->setSelected(item, selected); |
416 | 418 | ||
417 | if (selected) | 419 | if (selected) |
418 | mListView->ensureItemVisible(item); | 420 | mListView->ensureItemVisible(item); |
419 | } | 421 | } |
420 | } | 422 | } |
421 | } | 423 | } |
422 | } | 424 | } |
423 | 425 | ||
424 | void KAddressBookTableView::addresseeSelected() | 426 | void KAddressBookTableView::addresseeSelected() |
425 | { | 427 | { |
426 | // We need to try to find the first selected item. This might not be the | 428 | // We need to try to find the first selected item. This might not be the |
427 | // last selected item, but when QListView is in multiselection mode, | 429 | // last selected item, but when QListView is in multiselection mode, |
428 | // there is no way to figure out which one was | 430 | // there is no way to figure out which one was |
429 | // selected last. | 431 | // selected last. |
430 | QListViewItem *item; | 432 | QListViewItem *item; |
431 | bool found =false; | 433 | bool found =false; |
432 | for (item = mListView->firstChild(); item && !found; | 434 | for (item = mListView->firstChild(); item && !found; |
433 | item = item->nextSibling()) | 435 | item = item->nextSibling()) |
434 | { | 436 | { |
435 | if (item->isSelected()) | 437 | if (item->isSelected()) |
436 | { | 438 | { |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 8c72d89..70baf5c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -196,266 +196,267 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
196 | tbd = Right; | 196 | tbd = Right; |
197 | else | 197 | else |
198 | tbd = Left; | 198 | tbd = Left; |
199 | } | 199 | } |
200 | if ( KOPrefs::instance()->mUseAppColors ) | 200 | if ( KOPrefs::instance()->mUseAppColors ) |
201 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 201 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
202 | globalFlagBlockStartup = 1; | 202 | globalFlagBlockStartup = 1; |
203 | iconToolBar = new QPEToolBar( this ); | 203 | iconToolBar = new QPEToolBar( this ); |
204 | addToolBar (iconToolBar , tbd ); | 204 | addToolBar (iconToolBar , tbd ); |
205 | 205 | ||
206 | #ifdef DESKTOP_VERSION | 206 | #ifdef DESKTOP_VERSION |
207 | if ( KOPrefs::instance()->mShowIconFilter ) | 207 | if ( KOPrefs::instance()->mShowIconFilter ) |
208 | #else | 208 | #else |
209 | if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) ) | 209 | if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) ) |
210 | #endif | 210 | #endif |
211 | 211 | ||
212 | { | 212 | { |
213 | if ( p->mToolBarHorF ) { | 213 | if ( p->mToolBarHorF ) { |
214 | if ( p->mToolBarUpF ) | 214 | if ( p->mToolBarUpF ) |
215 | tbd = Bottom; | 215 | tbd = Bottom; |
216 | else | 216 | else |
217 | tbd = Top; | 217 | tbd = Top; |
218 | } | 218 | } |
219 | else { | 219 | else { |
220 | if ( p->mToolBarUpF ) | 220 | if ( p->mToolBarUpF ) |
221 | tbd = Right; | 221 | tbd = Right; |
222 | else | 222 | else |
223 | tbd = Left; | 223 | tbd = Left; |
224 | } | 224 | } |
225 | filterToolBar = new QPEToolBar ( this ); | 225 | filterToolBar = new QPEToolBar ( this ); |
226 | filterMenubar = new KMenuBar( 0 ); | 226 | filterMenubar = new KMenuBar( 0 ); |
227 | QFontMetrics fm ( filterMenubar->font() ); | 227 | QFontMetrics fm ( filterMenubar->font() ); |
228 | #ifndef DESKTOP_VERSION | 228 | #ifndef DESKTOP_VERSION |
229 | filterToolBar->setFocusPolicy( NoFocus ); | 229 | filterToolBar->setFocusPolicy( NoFocus ); |
230 | filterMenubar->setFocusPolicy( NoFocus ); | 230 | filterMenubar->setFocusPolicy( NoFocus ); |
231 | #endif | 231 | #endif |
232 | filterPopupMenu = new QPopupMenu( this ); | 232 | filterPopupMenu = new QPopupMenu( this ); |
233 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | 233 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); |
234 | QString addTest = "A"; | 234 | QString addTest = "A"; |
235 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); | 235 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); |
236 | #ifdef DESKTOP_VERSION | 236 | #ifdef DESKTOP_VERSION |
237 | addTest = "AAAAAABBBCCCx"; | 237 | addTest = "AAAAAABBBCCCx"; |
238 | #else | 238 | #else |
239 | addTest = "AAAAAx"; | 239 | addTest = "AAAAAx"; |
240 | #endif | 240 | #endif |
241 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); | 241 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); |
242 | addToolBar (filterToolBar , tbd ); | 242 | addToolBar (filterToolBar , tbd ); |
243 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); | 243 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); |
244 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); | 244 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); |
245 | if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) | 245 | if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) |
246 | filterToolBar->hide(); | 246 | filterToolBar->hide(); |
247 | } else { | 247 | } else { |
248 | filterToolBar = 0; | 248 | filterToolBar = 0; |
249 | filterMenubar = 0; | 249 | filterMenubar = 0; |
250 | filterPopupMenu = 0; | 250 | filterPopupMenu = 0; |
251 | } | 251 | } |
252 | if ( p->mShowIconOnetoolbar ) { | 252 | if ( p->mShowIconOnetoolbar ) { |
253 | viewToolBar = iconToolBar ; | 253 | viewToolBar = iconToolBar ; |
254 | navigatorToolBar = iconToolBar ; | 254 | navigatorToolBar = iconToolBar ; |
255 | } else { | 255 | } else { |
256 | #ifndef DESKTOP_VERSION | 256 | #ifndef DESKTOP_VERSION |
257 | setToolBarsMovable( false ); | 257 | setToolBarsMovable( false ); |
258 | #endif | 258 | #endif |
259 | if ( p->mToolBarHorV ) { | 259 | if ( p->mToolBarHorV ) { |
260 | if ( p->mToolBarUpV ) | 260 | if ( p->mToolBarUpV ) |
261 | tbd = Bottom; | 261 | tbd = Bottom; |
262 | else | 262 | else |
263 | tbd = Top; | 263 | tbd = Top; |
264 | } | 264 | } |
265 | else { | 265 | else { |
266 | if ( p->mToolBarUpV ) | 266 | if ( p->mToolBarUpV ) |
267 | tbd = Right; | 267 | tbd = Right; |
268 | else | 268 | else |
269 | tbd = Left; | 269 | tbd = Left; |
270 | } | 270 | } |
271 | viewToolBar = new QPEToolBar( this ); | 271 | viewToolBar = new QPEToolBar( this ); |
272 | addToolBar (viewToolBar , tbd ); | 272 | addToolBar (viewToolBar , tbd ); |
273 | if ( p->mToolBarHorN ) { | 273 | if ( p->mToolBarHorN ) { |
274 | if ( p->mToolBarUpN ) | 274 | if ( p->mToolBarUpN ) |
275 | tbd = Bottom; | 275 | tbd = Bottom; |
276 | else | 276 | else |
277 | tbd = Top; | 277 | tbd = Top; |
278 | } | 278 | } |
279 | else { | 279 | else { |
280 | if ( p->mToolBarUpN ) | 280 | if ( p->mToolBarUpN ) |
281 | tbd = Right; | 281 | tbd = Right; |
282 | else | 282 | else |
283 | tbd = Left; | 283 | tbd = Left; |
284 | } | 284 | } |
285 | navigatorToolBar = new QPEToolBar( this ); | 285 | navigatorToolBar = new QPEToolBar( this ); |
286 | addToolBar (navigatorToolBar , tbd ); | 286 | addToolBar (navigatorToolBar , tbd ); |
287 | } | 287 | } |
288 | 288 | ||
289 | 289 | ||
290 | 290 | ||
291 | mCalendarModifiedFlag = false; | 291 | mCalendarModifiedFlag = false; |
292 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 292 | // QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
293 | splash->setAlignment ( AlignCenter ); | 293 | //splash->setAlignment ( AlignCenter ); |
294 | setCentralWidget( splash ); | 294 | //setCentralWidget( splash ); |
295 | #ifndef DESKTOP_VERSION | 295 | #ifndef DESKTOP_VERSION |
296 | showMaximized(); | 296 | //showMaximized(); |
297 | #endif | 297 | #endif |
298 | 298 | ||
299 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); | 299 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); |
300 | setDefaultPreferences(); | 300 | setDefaultPreferences(); |
301 | mCalendar = new CalendarLocal(); | 301 | mCalendar = new CalendarLocal(); |
302 | mView = new CalendarView( mCalendar, this,"mCalendar " ); | 302 | mView = new CalendarView( mCalendar, this,"mCalendar " ); |
303 | mView->hide(); | 303 | setCentralWidget( mView ); |
304 | //mView->hide(); | ||
304 | //mView->resize(splash->size() ); | 305 | //mView->resize(splash->size() ); |
305 | initActions(); | 306 | initActions(); |
306 | mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); | 307 | mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); |
307 | mSyncManager->setBlockSave(false); | 308 | mSyncManager->setBlockSave(false); |
308 | mView->setSyncManager(mSyncManager); | 309 | mView->setSyncManager(mSyncManager); |
309 | #ifndef DESKTOP_VERSION | 310 | #ifndef DESKTOP_VERSION |
310 | iconToolBar->show(); | 311 | iconToolBar->show(); |
311 | qApp->processEvents(); | 312 | qApp->processEvents(); |
312 | #endif | 313 | #endif |
313 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); | 314 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); |
314 | int vh = height() ; | 315 | int vh = height() ; |
315 | int vw = width(); | 316 | int vw = width(); |
316 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); | 317 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); |
317 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 318 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
318 | vh -= iconToolBar->height(); | 319 | vh -= iconToolBar->height(); |
319 | } else { | 320 | } else { |
320 | vw -= iconToolBar->height(); | 321 | vw -= iconToolBar->height(); |
321 | } | 322 | } |
322 | //mView->setMaximumSize( splash->size() ); | 323 | //mView->setMaximumSize( splash->size() ); |
323 | //mView->resize( splash->size() ); | 324 | //mView->resize( splash->size() ); |
324 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 325 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
325 | mView->readSettings(); | 326 | mView->readSettings(); |
326 | bool newFile = false; | 327 | bool newFile = false; |
327 | if( !QFile::exists( defaultFileName() ) ) { | 328 | if( !QFile::exists( defaultFileName() ) ) { |
328 | QFileInfo finfo ( defaultFileName() ); | 329 | QFileInfo finfo ( defaultFileName() ); |
329 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 330 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
330 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 331 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
331 | finfo.setFile( oldFile ); | 332 | finfo.setFile( oldFile ); |
332 | if (finfo.exists() ) { | 333 | if (finfo.exists() ) { |
333 | KMessageBox::information( this, message); | 334 | KMessageBox::information( this, message); |
334 | mView->openCalendar( oldFile ); | 335 | mView->openCalendar( oldFile ); |
335 | qApp->processEvents(); | 336 | qApp->processEvents(); |
336 | } else { | 337 | } else { |
337 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); | 338 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); |
338 | finfo.setFile( oldFile ); | 339 | finfo.setFile( oldFile ); |
339 | if (finfo.exists() ) { | 340 | if (finfo.exists() ) { |
340 | KMessageBox::information( this, message); | 341 | KMessageBox::information( this, message); |
341 | mView->openCalendar( oldFile ); | 342 | mView->openCalendar( oldFile ); |
342 | qApp->processEvents(); | 343 | qApp->processEvents(); |
343 | } | 344 | } |
344 | } | 345 | } |
345 | mView->saveCalendar( defaultFileName() ); | 346 | mView->saveCalendar( defaultFileName() ); |
346 | newFile = true; | 347 | newFile = true; |
347 | } | 348 | } |
348 | 349 | ||
349 | //QTime neededSaveTime = QDateTime::currentDateTime().time(); | 350 | //QTime neededSaveTime = QDateTime::currentDateTime().time(); |
350 | //mView->loadCalendars(); | 351 | //mView->loadCalendars(); |
351 | //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 352 | //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
352 | //qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 353 | //qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
353 | 354 | ||
354 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { | 355 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { |
355 | KOPrefs::instance()->setAllDefaults(); | 356 | KOPrefs::instance()->setAllDefaults(); |
356 | } | 357 | } |
357 | 358 | ||
358 | 359 | ||
359 | connect( mView, SIGNAL( tempDisableBR(bool) ), | 360 | connect( mView, SIGNAL( tempDisableBR(bool) ), |
360 | SLOT( disableBR(bool) ) ); | 361 | SLOT( disableBR(bool) ) ); |
361 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 362 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
362 | setCentralWidget( mView ); | 363 | setCentralWidget( mView ); |
363 | globalFlagBlockStartup = 0; | 364 | globalFlagBlockStartup = 0; |
364 | mView->show(); | 365 | //mView->show(); |
365 | delete splash; | 366 | //delete splash; |
366 | if ( newFile ) | 367 | if ( newFile ) |
367 | mView->updateConfig(); | 368 | mView->updateConfig(); |
368 | // qApp->processEvents(); | 369 | // qApp->processEvents(); |
369 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 370 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
370 | //fillSyncMenu(); | 371 | //fillSyncMenu(); |
371 | 372 | ||
372 | 373 | ||
373 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 374 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
374 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); | 375 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); |
375 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 376 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
376 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 377 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
377 | mSyncManager->setDefaultFileName( sentSyncFile()); | 378 | mSyncManager->setDefaultFileName( sentSyncFile()); |
378 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 379 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
379 | mSyncManager->fillSyncMenu(); | 380 | mSyncManager->fillSyncMenu(); |
380 | 381 | ||
381 | 382 | ||
382 | 383 | ||
383 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 384 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
384 | if ( showWarning ) { | 385 | if ( showWarning ) { |
385 | KMessageBox::information( this, | 386 | KMessageBox::information( this, |
386 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 387 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
387 | qApp->processEvents(); | 388 | qApp->processEvents(); |
388 | mView->dialogManager()->showSyncOptions(); | 389 | mView->dialogManager()->showSyncOptions(); |
389 | } | 390 | } |
390 | 391 | ||
391 | //US listen for result adressed from Ka/Pi | 392 | //US listen for result adressed from Ka/Pi |
392 | 393 | ||
393 | #ifndef DESKTOP_VERSION | 394 | #ifndef DESKTOP_VERSION |
394 | infrared = 0; | 395 | infrared = 0; |
395 | #endif | 396 | #endif |
396 | updateFilterToolbar(); | 397 | updateFilterToolbar(); |
397 | updateWeek( mView->startDate() ); | 398 | updateWeek( mView->startDate() ); |
398 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 399 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
399 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 400 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
400 | mBRdisabled = false; | 401 | mBRdisabled = false; |
401 | //toggleBeamReceive(); | 402 | //toggleBeamReceive(); |
402 | 403 | ||
403 | setCaption(i18n("Loading calendar files ... please wait" )); | 404 | setCaption(i18n("Loading calendar files ... please wait" )); |
404 | QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() )); | 405 | QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() )); |
405 | } | 406 | } |
406 | MainWindow::~MainWindow() | 407 | MainWindow::~MainWindow() |
407 | { | 408 | { |
408 | //qDebug("MainWindow::~MainWindow() "); | 409 | //qDebug("MainWindow::~MainWindow() "); |
409 | //save toolbar location | 410 | //save toolbar location |
410 | delete mCalendar; | 411 | delete mCalendar; |
411 | delete mSyncManager; | 412 | delete mSyncManager; |
412 | #ifndef DESKTOP_VERSION | 413 | #ifndef DESKTOP_VERSION |
413 | if ( infrared ) | 414 | if ( infrared ) |
414 | delete infrared; | 415 | delete infrared; |
415 | #endif | 416 | #endif |
416 | 417 | ||
417 | 418 | ||
418 | } | 419 | } |
419 | 420 | ||
420 | void MainWindow::loadDataAfterStart() | 421 | void MainWindow::loadDataAfterStart() |
421 | { | 422 | { |
422 | 423 | ||
423 | qDebug("KO: Start loading files..." ); | 424 | qDebug("KO: Start loading files..." ); |
424 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 425 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
425 | mView->loadCalendars(); | 426 | mView->loadCalendars(); |
426 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 427 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
427 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 428 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
428 | //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); | 429 | //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); |
429 | mView->setModified( false ); | 430 | mView->setModified( false ); |
430 | mBlockAtStartup = false; | 431 | mBlockAtStartup = false; |
431 | mView->setModified( false ); | 432 | mView->setModified( false ); |
432 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); | 433 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); |
433 | processIncidenceSelection( 0 ); | 434 | processIncidenceSelection( 0 ); |
434 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 435 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
435 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 436 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
436 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 437 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
437 | SLOT( slotModifiedChanged( bool ) ) ); | 438 | SLOT( slotModifiedChanged( bool ) ) ); |
438 | 439 | ||
439 | #ifndef DESKTOP_VERSION | 440 | #ifndef DESKTOP_VERSION |
440 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 441 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
441 | connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); | 442 | connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); |
442 | disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); | 443 | disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); |
443 | if ( !mCStringMess.isEmpty() ) | 444 | if ( !mCStringMess.isEmpty() ) |
444 | recieve( mCStringMess, mByteData ); | 445 | recieve( mCStringMess, mByteData ); |
445 | #endif | 446 | #endif |
446 | 447 | ||
447 | 448 | ||
448 | QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); | 449 | QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); |
449 | } | 450 | } |
450 | 451 | ||
451 | void MainWindow::slotResetFocus() | 452 | void MainWindow::slotResetFocus() |
452 | { | 453 | { |
453 | //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); | 454 | //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); |
454 | mFocusLoop = 3; | 455 | mFocusLoop = 3; |
455 | QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); | 456 | QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); |
456 | } | 457 | } |
457 | void MainWindow::slotResetFocusLoop() | 458 | void MainWindow::slotResetFocusLoop() |
458 | { | 459 | { |
459 | --mFocusLoop; | 460 | --mFocusLoop; |
460 | QWidget* fw = mView->viewManager()->currentView(); | 461 | QWidget* fw = mView->viewManager()->currentView(); |
461 | if ( fw ) { | 462 | if ( fw ) { |
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp index 36ede81..df2aad8 100644 --- a/microkde/kdeui/ktoolbar.cpp +++ b/microkde/kdeui/ktoolbar.cpp | |||
@@ -1322,199 +1322,199 @@ void KToolBar::rebuildLayout() | |||
1322 | } | 1322 | } |
1323 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { | 1323 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { |
1324 | if ( w == rightAligned ) { | 1324 | if ( w == rightAligned ) { |
1325 | continue; | 1325 | continue; |
1326 | } | 1326 | } |
1327 | if ( w->inherits( "KToolBarSeparator" ) && | 1327 | if ( w->inherits( "KToolBarSeparator" ) && |
1328 | !( (KToolBarSeparator*)w )->showLine() ) { | 1328 | !( (KToolBarSeparator*)w )->showLine() ) { |
1329 | l->addSpacing( 6 ); | 1329 | l->addSpacing( 6 ); |
1330 | w->hide(); | 1330 | w->hide(); |
1331 | continue; | 1331 | continue; |
1332 | } | 1332 | } |
1333 | if ( w->inherits( "QPopupMenu" ) ) | 1333 | if ( w->inherits( "QPopupMenu" ) ) |
1334 | continue; | 1334 | continue; |
1335 | l->addWidget( w ); | 1335 | l->addWidget( w ); |
1336 | w->show(); | 1336 | w->show(); |
1337 | } | 1337 | } |
1338 | if ( rightAligned ) { | 1338 | if ( rightAligned ) { |
1339 | l->addStretch(); | 1339 | l->addStretch(); |
1340 | l->addWidget( rightAligned ); | 1340 | l->addWidget( rightAligned ); |
1341 | rightAligned->show(); | 1341 | rightAligned->show(); |
1342 | } | 1342 | } |
1343 | 1343 | ||
1344 | if ( fullSize() ) { | 1344 | if ( fullSize() ) { |
1345 | // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword). | 1345 | // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword). |
1346 | //if ( !stretchableWidget && widgets.last() && | 1346 | //if ( !stretchableWidget && widgets.last() && |
1347 | // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) ) | 1347 | // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) ) |
1348 | // setStretchableWidget( widgets.last() ); | 1348 | // setStretchableWidget( widgets.last() ); |
1349 | if ( !rightAligned ) | 1349 | if ( !rightAligned ) |
1350 | l->addStretch(); | 1350 | l->addStretch(); |
1351 | if ( stretchableWidget ) | 1351 | if ( stretchableWidget ) |
1352 | l->setStretchFactor( stretchableWidget, 10 ); | 1352 | l->setStretchFactor( stretchableWidget, 10 ); |
1353 | } | 1353 | } |
1354 | l->invalidate(); | 1354 | l->invalidate(); |
1355 | QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) ); | 1355 | QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) ); |
1356 | //#endif //DESKTOP_VERSION | 1356 | //#endif //DESKTOP_VERSION |
1357 | } | 1357 | } |
1358 | 1358 | ||
1359 | void KToolBar::childEvent( QChildEvent *e ) | 1359 | void KToolBar::childEvent( QChildEvent *e ) |
1360 | { | 1360 | { |
1361 | 1361 | ||
1362 | if ( e->child()->isWidgetType() ) { | 1362 | if ( e->child()->isWidgetType() ) { |
1363 | QWidget * w = (QWidget*)e->child(); | 1363 | QWidget * w = (QWidget*)e->child(); |
1364 | if ( e->type() == QEvent::ChildInserted ) { | 1364 | if ( e->type() == QEvent::ChildInserted ) { |
1365 | if ( !e->child()->inherits( "QPopupMenu" ) && | 1365 | if ( !e->child()->inherits( "QPopupMenu" ) && |
1366 | ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) { | 1366 | ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) { |
1367 | 1367 | ||
1368 | // prevent items that have been explicitly inserted by insert*() from | 1368 | // prevent items that have been explicitly inserted by insert*() from |
1369 | // being inserted again | 1369 | // being inserted again |
1370 | if ( !widget2id.contains( w ) ) | 1370 | if ( !widget2id.contains( w ) ) |
1371 | { | 1371 | { |
1372 | int dummy = -1; | 1372 | int dummy = -1; |
1373 | insertWidgetInternal( w, dummy, -1 ); | 1373 | insertWidgetInternal( w, dummy, -1 ); |
1374 | } | 1374 | } |
1375 | } | 1375 | } |
1376 | } else { | 1376 | } else { |
1377 | removeWidgetInternal( w ); | 1377 | removeWidgetInternal( w ); |
1378 | } | 1378 | } |
1379 | if ( isVisibleTo( 0 ) ) | 1379 | if ( isVisibleTo( 0 ) ) |
1380 | { | 1380 | { |
1381 | QBoxLayout *l = boxLayout(); | 1381 | QBoxLayout *l = boxLayout(); |
1382 | // QLayout *l = layout(); | 1382 | // QLayout *l = layout(); |
1383 | 1383 | ||
1384 | // clear the old layout so that we don't get unnecassery layout | 1384 | // clear the old layout so that we don't get unnecassery layout |
1385 | // changes till we have rebuild the thing | 1385 | // changes till we have rebuild the thing |
1386 | QLayoutIterator it = l->iterator(); | 1386 | QLayoutIterator it = l->iterator(); |
1387 | while ( it.current() ) { | 1387 | while ( it.current() ) { |
1388 | it.deleteCurrent(); | 1388 | it.deleteCurrent(); |
1389 | } | 1389 | } |
1390 | layoutTimer->start( 50, TRUE ); | 1390 | layoutTimer->start( 50, TRUE ); |
1391 | } | 1391 | } |
1392 | } | 1392 | } |
1393 | QToolBar::childEvent( e ); | 1393 | QToolBar::childEvent( e ); |
1394 | } | 1394 | } |
1395 | 1395 | ||
1396 | void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id ) | 1396 | void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id ) |
1397 | { | 1397 | { |
1398 | // we can't have it in widgets, or something is really wrong | 1398 | // we can't have it in widgets, or something is really wrong |
1399 | //widgets.removeRef( w ); | 1399 | //widgets.removeRef( w ); |
1400 | 1400 | ||
1401 | connect( w, SIGNAL( destroyed() ), | 1401 | connect( w, SIGNAL( destroyed() ), |
1402 | this, SLOT( widgetDestroyed() ) ); | 1402 | this, SLOT( widgetDestroyed() ) ); |
1403 | if ( index == -1 || index > (int)widgets.count() ) { | 1403 | if ( index == -1 || index > (int)widgets.count() ) { |
1404 | widgets.append( w ); | 1404 | widgets.append( w ); |
1405 | index = (int)widgets.count(); | 1405 | index = (int)widgets.count(); |
1406 | } | 1406 | } |
1407 | else | 1407 | else |
1408 | widgets.insert( index, w ); | 1408 | widgets.insert( index, w ); |
1409 | if ( id == -1 ) | 1409 | if ( id == -1 ) |
1410 | id = id2widget.count(); | 1410 | id = id2widget.count(); |
1411 | id2widget.insert( id, w ); | 1411 | id2widget.insert( id, w ); |
1412 | widget2id.insert( w, id ); | 1412 | widget2id.insert( w, id ); |
1413 | } | 1413 | } |
1414 | void KToolBar::repaintMe() | 1414 | void KToolBar::repaintMe() |
1415 | { | 1415 | { |
1416 | setUpdatesEnabled( true ); | 1416 | setUpdatesEnabled( true ); |
1417 | QToolBar::repaint( true ); | 1417 | QToolBar::repaint( true ); |
1418 | //qDebug(" KToolBar::repaintMe() "); | 1418 | qDebug(" KToolBar::repaintMe() "); |
1419 | } | 1419 | } |
1420 | 1420 | ||
1421 | void KToolBar::showEvent( QShowEvent *e ) | 1421 | void KToolBar::showEvent( QShowEvent *e ) |
1422 | { | 1422 | { |
1423 | QToolBar::showEvent( e ); | ||
1424 | rebuildLayout(); | 1423 | rebuildLayout(); |
1424 | QToolBar::showEvent( e ); | ||
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | void KToolBar::setStretchableWidget( QWidget *w ) | 1427 | void KToolBar::setStretchableWidget( QWidget *w ) |
1428 | { | 1428 | { |
1429 | QToolBar::setStretchableWidget( w ); | 1429 | QToolBar::setStretchableWidget( w ); |
1430 | stretchableWidget = w; | 1430 | stretchableWidget = w; |
1431 | } | 1431 | } |
1432 | 1432 | ||
1433 | QSizePolicy KToolBar::sizePolicy() const | 1433 | QSizePolicy KToolBar::sizePolicy() const |
1434 | { | 1434 | { |
1435 | if ( orientation() == Horizontal ) | 1435 | if ( orientation() == Horizontal ) |
1436 | return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); | 1436 | return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); |
1437 | else | 1437 | else |
1438 | return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); | 1438 | return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); |
1439 | } | 1439 | } |
1440 | 1440 | ||
1441 | QSize KToolBar::sizeHint() const | 1441 | QSize KToolBar::sizeHint() const |
1442 | { | 1442 | { |
1443 | return QToolBar::sizeHint(); | 1443 | return QToolBar::sizeHint(); |
1444 | #if 0 | 1444 | #if 0 |
1445 | QWidget::polish(); | 1445 | QWidget::polish(); |
1446 | static int iii = 0; | 1446 | static int iii = 0; |
1447 | ++iii; | 1447 | ++iii; |
1448 | qDebug("++++++++ KToolBar::sizeHint() %d ", iii ); | 1448 | qDebug("++++++++ KToolBar::sizeHint() %d ", iii ); |
1449 | int margin = static_cast<QWidget*>(ncThis)->layout()->margin(); | 1449 | int margin = static_cast<QWidget*>(ncThis)->layout()->margin(); |
1450 | switch( barPos() ) | 1450 | switch( barPos() ) |
1451 | { | 1451 | { |
1452 | case KToolBar::Top: | 1452 | case KToolBar::Top: |
1453 | case KToolBar::Bottom: | 1453 | case KToolBar::Bottom: |
1454 | for ( QWidget *w = widgets.first(); w; w =widgets.next() ) | 1454 | for ( QWidget *w = widgets.first(); w; w =widgets.next() ) |
1455 | { | 1455 | { |
1456 | if ( w->inherits( "KToolBarSeparator" ) && | 1456 | if ( w->inherits( "KToolBarSeparator" ) && |
1457 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) | 1457 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) |
1458 | { | 1458 | { |
1459 | minSize += QSize(6, 0); | 1459 | minSize += QSize(6, 0); |
1460 | } | 1460 | } |
1461 | else | 1461 | else |
1462 | { | 1462 | { |
1463 | QSize sh = w->sizeHint(); | 1463 | QSize sh = w->sizeHint(); |
1464 | if (!sh.isValid()) | 1464 | if (!sh.isValid()) |
1465 | sh = w->minimumSize(); | 1465 | sh = w->minimumSize(); |
1466 | minSize = minSize.expandedTo(QSize(0, sh.height())); | 1466 | minSize = minSize.expandedTo(QSize(0, sh.height())); |
1467 | minSize += QSize(sh.width()+1, 0); | 1467 | minSize += QSize(sh.width()+1, 0); |
1468 | } | 1468 | } |
1469 | } | 1469 | } |
1470 | /*US | 1470 | /*US |
1471 | minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0); | 1471 | minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0); |
1472 | */ | 1472 | */ |
1473 | minSize += QSize(margin*2, margin*2); | 1473 | minSize += QSize(margin*2, margin*2); |
1474 | break; | 1474 | break; |
1475 | 1475 | ||
1476 | case KToolBar::Left: | 1476 | case KToolBar::Left: |
1477 | case KToolBar::Right: | 1477 | case KToolBar::Right: |
1478 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) | 1478 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) |
1479 | { | 1479 | { |
1480 | if ( w->inherits( "KToolBarSeparator" ) && | 1480 | if ( w->inherits( "KToolBarSeparator" ) && |
1481 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) | 1481 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) |
1482 | { | 1482 | { |
1483 | minSize += QSize(0, 6); | 1483 | minSize += QSize(0, 6); |
1484 | } | 1484 | } |
1485 | else | 1485 | else |
1486 | { | 1486 | { |
1487 | QSize sh = w->sizeHint(); | 1487 | QSize sh = w->sizeHint(); |
1488 | if (!sh.isValid()) | 1488 | if (!sh.isValid()) |
1489 | sh = w->minimumSize(); | 1489 | sh = w->minimumSize(); |
1490 | minSize = minSize.expandedTo(QSize(sh.width(), 0)); | 1490 | minSize = minSize.expandedTo(QSize(sh.width(), 0)); |
1491 | minSize += QSize(0, sh.height()+1); | 1491 | minSize += QSize(0, sh.height()+1); |
1492 | } | 1492 | } |
1493 | } | 1493 | } |
1494 | /*US | 1494 | /*US |
1495 | minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent )); | 1495 | minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent )); |
1496 | */ | 1496 | */ |
1497 | minSize += QSize(margin*2, margin*2); | 1497 | minSize += QSize(margin*2, margin*2); |
1498 | break; | 1498 | break; |
1499 | 1499 | ||
1500 | default: | 1500 | default: |
1501 | minSize = QToolBar::sizeHint(); | 1501 | minSize = QToolBar::sizeHint(); |
1502 | break; | 1502 | break; |
1503 | } | 1503 | } |
1504 | return minSize; | 1504 | return minSize; |
1505 | #endif | 1505 | #endif |
1506 | } | 1506 | } |
1507 | 1507 | ||
1508 | QSize KToolBar::minimumSize() const | 1508 | QSize KToolBar::minimumSize() const |
1509 | { | 1509 | { |
1510 | return minimumSizeHint(); | 1510 | return minimumSizeHint(); |
1511 | } | 1511 | } |
1512 | 1512 | ||
1513 | QSize KToolBar::minimumSizeHint() const | 1513 | QSize KToolBar::minimumSizeHint() const |
1514 | { | 1514 | { |
1515 | return sizeHint(); | 1515 | return sizeHint(); |
1516 | } | 1516 | } |
1517 | 1517 | ||
1518 | bool KToolBar::highlight() const | 1518 | bool KToolBar::highlight() const |
1519 | { | 1519 | { |
1520 | return d->m_highlight; | 1520 | return d->m_highlight; |