author | zautrix <zautrix> | 2004-10-06 19:41:10 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-06 19:41:10 (UTC) |
commit | be3a5ea82c9a160eeeaad187a357c9a085fdb20a (patch) (unidiff) | |
tree | 933c685c84430f5c19a0657239b5c8b50a88de05 /kaddressbook | |
parent | 656636acfb8c607901c97c4f55129e29e1df9913 (diff) | |
download | kdepimpi-be3a5ea82c9a160eeeaad187a357c9a085fdb20a.zip kdepimpi-be3a5ea82c9a160eeeaad187a357c9a085fdb20a.tar.gz kdepimpi-be3a5ea82c9a160eeeaad187a357c9a085fdb20a.tar.bz2 |
bugfixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 7bec90a..b014cba 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -14,48 +14,49 @@ | |||
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /*s | 24 | /*s |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "kabcore.h" | 31 | #include "kabcore.h" |
32 | 32 | ||
33 | #include <stdaddressbook.h> | 33 | #include <stdaddressbook.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kfiledialog.h> | 35 | #include <kfiledialog.h> |
36 | #include <qtimer.h> | 36 | #include <qtimer.h> |
37 | #include <qlabel.h> | 37 | #include <qlabel.h> |
38 | #include <qregexp.h> | ||
38 | #include <qlineedit.h> | 39 | #include <qlineedit.h> |
39 | #include <qcheckbox.h> | 40 | #include <qcheckbox.h> |
40 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
41 | #include <qprogressbar.h> | 42 | #include <qprogressbar.h> |
42 | #include <libkdepim/phoneaccess.h> | 43 | #include <libkdepim/phoneaccess.h> |
43 | 44 | ||
44 | #ifndef KAB_EMBEDDED | 45 | #ifndef KAB_EMBEDDED |
45 | #include <qclipboard.h> | 46 | #include <qclipboard.h> |
46 | #include <qdir.h> | 47 | #include <qdir.h> |
47 | #include <qfile.h> | 48 | #include <qfile.h> |
48 | #include <qapplicaton.h> | 49 | #include <qapplicaton.h> |
49 | #include <qprogressbar.h> | 50 | #include <qprogressbar.h> |
50 | #include <qlayout.h> | 51 | #include <qlayout.h> |
51 | #include <qregexp.h> | 52 | #include <qregexp.h> |
52 | #include <qvbox.h> | 53 | #include <qvbox.h> |
53 | #include <kabc/addresseelist.h> | 54 | #include <kabc/addresseelist.h> |
54 | #include <kabc/errorhandler.h> | 55 | #include <kabc/errorhandler.h> |
55 | #include <kabc/resource.h> | 56 | #include <kabc/resource.h> |
56 | #include <kabc/vcardconverter.h> | 57 | #include <kabc/vcardconverter.h> |
57 | #include <kapplication.h> | 58 | #include <kapplication.h> |
58 | #include <kactionclasses.h> | 59 | #include <kactionclasses.h> |
59 | #include <kcmultidialog.h> | 60 | #include <kcmultidialog.h> |
60 | #include <kdebug.h> | 61 | #include <kdebug.h> |
61 | #include <kdeversion.h> | 62 | #include <kdeversion.h> |
@@ -705,48 +706,53 @@ void KABCore::export2phone() | |||
705 | converter.addresseeToVCard( a, vcard ); | 706 | converter.addresseeToVCard( a, vcard ); |
706 | int start = 0; | 707 | int start = 0; |
707 | int next; | 708 | int next; |
708 | while ( (next = vcard.find("TYPE=", start) )>= 0 ) { | 709 | while ( (next = vcard.find("TYPE=", start) )>= 0 ) { |
709 | int semi = vcard.find(";", next); | 710 | int semi = vcard.find(";", next); |
710 | int dopp = vcard.find(":", next); | 711 | int dopp = vcard.find(":", next); |
711 | int sep; | 712 | int sep; |
712 | if ( semi < dopp && semi >= 0 ) | 713 | if ( semi < dopp && semi >= 0 ) |
713 | sep = semi ; | 714 | sep = semi ; |
714 | else | 715 | else |
715 | sep = dopp; | 716 | sep = dopp; |
716 | datastream +=vcard.mid( start, next - start); | 717 | datastream +=vcard.mid( start, next - start); |
717 | datastream +=vcard.mid( next+5,sep -next -5 ).upper(); | 718 | datastream +=vcard.mid( next+5,sep -next -5 ).upper(); |
718 | start = sep; | 719 | start = sep; |
719 | } | 720 | } |
720 | datastream += vcard.mid( start,vcard.length() ); | 721 | datastream += vcard.mid( start,vcard.length() ); |
721 | } | 722 | } |
722 | QFile outFile(fileName); | 723 | QFile outFile(fileName); |
723 | if ( outFile.open(IO_WriteOnly) ) { | 724 | if ( outFile.open(IO_WriteOnly) ) { |
724 | datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); | 725 | datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); |
725 | QTextStream t( &outFile ); // use a text stream | 726 | QTextStream t( &outFile ); // use a text stream |
726 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 727 | t.setEncoding( QTextStream::UnicodeUTF8 ); |
727 | t <<datastream; | 728 | t <<datastream; |
728 | outFile.close(); | 729 | outFile.close(); |
730 | if ( PhoneAccess::writeToPhone( fileName ) ) | ||
731 | qDebug("Export okay "); | ||
732 | else | ||
733 | qDebug("Error export contacts "); | ||
734 | |||
729 | } else { | 735 | } else { |
730 | qDebug("Error open temp file "); | 736 | qDebug("Error open temp file "); |
731 | return; | 737 | return; |
732 | } | 738 | } |
733 | 739 | ||
734 | 740 | ||
735 | #if 0 | 741 | #if 0 |
736 | 742 | ||
737 | setCaption( i18n("Writing to phone...")); | 743 | setCaption( i18n("Writing to phone...")); |
738 | if ( PhoneFormat::writeToPhone( cal ) ) | 744 | if ( PhoneFormat::writeToPhone( cal ) ) |
739 | setCaption( i18n("Export to phone successful!")); | 745 | setCaption( i18n("Export to phone successful!")); |
740 | else | 746 | else |
741 | setCaption( i18n("Error exporting to phone!")); | 747 | setCaption( i18n("Error exporting to phone!")); |
742 | #endif | 748 | #endif |
743 | 749 | ||
744 | 750 | ||
745 | } | 751 | } |
746 | void KABCore::beamVCard() | 752 | void KABCore::beamVCard() |
747 | { | 753 | { |
748 | QStringList uids = mViewManager->selectedUids(); | 754 | QStringList uids = mViewManager->selectedUids(); |
749 | if ( !uids.isEmpty() ) | 755 | if ( !uids.isEmpty() ) |
750 | beamVCard( uids ); | 756 | beamVCard( uids ); |
751 | } | 757 | } |
752 | 758 | ||