author | zautrix <zautrix> | 2004-09-07 22:51:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-07 22:51:29 (UTC) |
commit | 2676646d4744ccceab1063dc02d772a26a203c61 (patch) (unidiff) | |
tree | 0a0d5261b9a804a29b61a38f68339979051282e2 | |
parent | 64a8ef1629f523df3006de5cb2b9882a50d96a05 (diff) | |
download | kdepimpi-2676646d4744ccceab1063dc02d772a26a203c61.zip kdepimpi-2676646d4744ccceab1063dc02d772a26a203c61.tar.gz kdepimpi-2676646d4744ccceab1063dc02d772a26a203c61.tar.bz2 |
Implemented Ompi - kapi connection
-rw-r--r-- | kabc/stdaddressbook.cpp | 12 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 20 | ||||
-rw-r--r-- | kmicromail/composemail.cpp | 93 | ||||
-rw-r--r-- | kmicromail/composemail.h | 6 | ||||
-rw-r--r-- | kmicromail/main.cpp | 3 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 1 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 2 |
8 files changed, 115 insertions, 24 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 9f38f08..ec47a4e 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -18,143 +18,131 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include "resource.h" | 29 | #include "resource.h" |
30 | #include <kresources/manager.h> | 30 | #include <kresources/manager.h> |
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <klocale.h> | 32 | #include <klocale.h> |
33 | #include <kstaticdeleter.h> | 33 | #include <kstaticdeleter.h> |
34 | #include <kstandarddirs.h> | 34 | #include <kstandarddirs.h> |
35 | 35 | ||
36 | #include "stdaddressbook.h" | 36 | #include "stdaddressbook.h" |
37 | 37 | ||
38 | using namespace KABC; | 38 | using namespace KABC; |
39 | 39 | ||
40 | StdAddressBook *StdAddressBook::mSelf = 0; | 40 | StdAddressBook *StdAddressBook::mSelf = 0; |
41 | bool StdAddressBook::mAutomaticSave = true; | 41 | bool StdAddressBook::mAutomaticSave = true; |
42 | 42 | ||
43 | static KStaticDeleter<StdAddressBook> addressBookDeleter; | 43 | static KStaticDeleter<StdAddressBook> addressBookDeleter; |
44 | 44 | ||
45 | QString StdAddressBook::fileName() | 45 | QString StdAddressBook::fileName() |
46 | { | 46 | { |
47 | return locateLocal( "data", "kabc/std.vcf" ); | 47 | return locateLocal( "data", "kabc/std.vcf" ); |
48 | } | 48 | } |
49 | 49 | ||
50 | QString StdAddressBook::directoryName() | 50 | QString StdAddressBook::directoryName() |
51 | { | 51 | { |
52 | return locateLocal( "data", "kabc/stdvcf" ); | 52 | return locateLocal( "data", "kabc/stdvcf" ); |
53 | } | 53 | } |
54 | 54 | ||
55 | void StdAddressBook::handleCrash() | 55 | void StdAddressBook::handleCrash() |
56 | { | 56 | { |
57 | StdAddressBook::self()->cleanUp(); | 57 | StdAddressBook::self()->cleanUp(); |
58 | } | 58 | } |
59 | 59 | ||
60 | StdAddressBook *StdAddressBook::self() | 60 | StdAddressBook *StdAddressBook::self() |
61 | { | 61 | { |
62 | 62 | ||
63 | if ( !mSelf ) | 63 | if ( !mSelf ) |
64 | { | 64 | { |
65 | QString appdir = StdAddressBook::setTempAppDir(); | 65 | QString appdir = StdAddressBook::setTempAppDir(); |
66 | qDebug("****************************************************** "); | ||
67 | qDebug("****************************************************** "); | ||
68 | qDebug("****************************************************** "); | ||
69 | qDebug("****************************************************** "); | ||
70 | qDebug("****************************************************** "); | ||
71 | // US im am not sure why I have to use the other format here?? | 66 | // US im am not sure why I have to use the other format here?? |
72 | #ifdef KAB_EMBEDDED | 67 | #ifdef KAB_EMBEDDED |
73 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); | 68 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); |
74 | #else //KAB_EMBEDDED | 69 | #else //KAB_EMBEDDED |
75 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); | 70 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); |
76 | #endif //KAB_EMBEDDED | 71 | #endif //KAB_EMBEDDED |
77 | KStandardDirs::setAppDir( appdir ); | 72 | KStandardDirs::setAppDir( appdir ); |
78 | } | 73 | } |
79 | 74 | ||
80 | return mSelf; | 75 | return mSelf; |
81 | } | 76 | } |
82 | 77 | ||
83 | QString StdAddressBook::setTempAppDir() | 78 | QString StdAddressBook::setTempAppDir() |
84 | { | 79 | { |
85 | QString appDIR = KStandardDirs::appDir(); | 80 | QString appDIR = KStandardDirs::appDir(); |
86 | #ifdef DESKTOP_VERSION | 81 | #ifdef DESKTOP_VERSION |
87 | QString appdir = QDir::homeDirPath(); | 82 | QString appdir = QDir::homeDirPath(); |
88 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) | 83 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) |
89 | appdir += "kaddressbook/"; | 84 | appdir += "kaddressbook/"; |
90 | else | 85 | else |
91 | appdir += "/kaddressbook/"; | 86 | appdir += "/kaddressbook/"; |
92 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); | 87 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); |
93 | #else | 88 | #else |
94 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; | 89 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; |
95 | 90 | ||
96 | KStandardDirs::setAppDir( appdir ); | 91 | KStandardDirs::setAppDir( appdir ); |
97 | #endif | 92 | #endif |
98 | 93 | ||
99 | return appDIR; | 94 | return appDIR; |
100 | } | 95 | } |
101 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | 96 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) |
102 | { | 97 | { |
103 | 98 | ||
104 | if ( !mSelf ) | 99 | if ( !mSelf ) |
105 | { | 100 | { |
106 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
107 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
108 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
109 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
110 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
111 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
112 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
113 | QString appdir =StdAddressBook::setTempAppDir(); | 101 | QString appdir =StdAddressBook::setTempAppDir(); |
114 | #ifdef KAB_EMBEDDED | 102 | #ifdef KAB_EMBEDDED |
115 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); | 103 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); |
116 | #else //KAB_EMBEDDED | 104 | #else //KAB_EMBEDDED |
117 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); | 105 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); |
118 | #endif //KAB_EMBEDDED | 106 | #endif //KAB_EMBEDDED |
119 | KStandardDirs::setAppDir( appdir ); | 107 | KStandardDirs::setAppDir( appdir ); |
120 | } | 108 | } |
121 | return mSelf; | 109 | return mSelf; |
122 | } | 110 | } |
123 | 111 | ||
124 | StdAddressBook::StdAddressBook() | 112 | StdAddressBook::StdAddressBook() |
125 | : AddressBook( "kabcrc" ) | 113 | : AddressBook( "kabcrc" ) |
126 | { | 114 | { |
127 | 115 | ||
128 | init( false ); | 116 | init( false ); |
129 | } | 117 | } |
130 | 118 | ||
131 | StdAddressBook::StdAddressBook( bool onlyFastResources ) | 119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) |
132 | : AddressBook( "kabcrc" ) | 120 | : AddressBook( "kabcrc" ) |
133 | { | 121 | { |
134 | 122 | ||
135 | init( onlyFastResources ); | 123 | init( onlyFastResources ); |
136 | } | 124 | } |
137 | 125 | ||
138 | StdAddressBook::~StdAddressBook() | 126 | StdAddressBook::~StdAddressBook() |
139 | { | 127 | { |
140 | if ( mAutomaticSave ) | 128 | if ( mAutomaticSave ) |
141 | save(); | 129 | save(); |
142 | } | 130 | } |
143 | 131 | ||
144 | void StdAddressBook::init( bool ) | 132 | void StdAddressBook::init( bool ) |
145 | { | 133 | { |
146 | KRES::Manager<Resource> *manager = resourceManager(); | 134 | KRES::Manager<Resource> *manager = resourceManager(); |
147 | KRES::Manager<Resource>::ActiveIterator it; | 135 | KRES::Manager<Resource>::ActiveIterator it; |
148 | 136 | ||
149 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 137 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
150 | (*it)->setAddressBook( this ); | 138 | (*it)->setAddressBook( this ); |
151 | if ( !(*it)->open() ) | 139 | if ( !(*it)->open() ) |
152 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); | 140 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); |
153 | } | 141 | } |
154 | 142 | ||
155 | Resource *res = standardResource(); | 143 | Resource *res = standardResource(); |
156 | if ( !res ) { | 144 | if ( !res ) { |
157 | res = manager->createResource( "file" ); | 145 | res = manager->createResource( "file" ); |
158 | if ( res ) | 146 | if ( res ) |
159 | { | 147 | { |
160 | addResource( res ); | 148 | addResource( res ); |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2f9f1df..6522ccc 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1999,97 +1999,115 @@ void KABCore::configureKeyBindings() | |||
1999 | #ifndef KAB_EMBEDDED | 1999 | #ifndef KAB_EMBEDDED |
2000 | KKeyDialog::configure( actionCollection(), true ); | 2000 | KKeyDialog::configure( actionCollection(), true ); |
2001 | #else //KAB_EMBEDDED | 2001 | #else //KAB_EMBEDDED |
2002 | qDebug("KABCore::configureKeyBindings() not implemented"); | 2002 | qDebug("KABCore::configureKeyBindings() not implemented"); |
2003 | #endif //KAB_EMBEDDED | 2003 | #endif //KAB_EMBEDDED |
2004 | } | 2004 | } |
2005 | 2005 | ||
2006 | #ifdef KAB_EMBEDDED | 2006 | #ifdef KAB_EMBEDDED |
2007 | void KABCore::configureResources() | 2007 | void KABCore::configureResources() |
2008 | { | 2008 | { |
2009 | KRES::KCMKResources dlg( this, "" , 0 ); | 2009 | KRES::KCMKResources dlg( this, "" , 0 ); |
2010 | 2010 | ||
2011 | if ( !dlg.exec() ) | 2011 | if ( !dlg.exec() ) |
2012 | return; | 2012 | return; |
2013 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); | 2013 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); |
2014 | } | 2014 | } |
2015 | #endif //KAB_EMBEDDED | 2015 | #endif //KAB_EMBEDDED |
2016 | 2016 | ||
2017 | 2017 | ||
2018 | /* this method will be called through the QCop interface from Ko/Pi to select addresses | 2018 | /* this method will be called through the QCop interface from Ko/Pi to select addresses |
2019 | * for the attendees list of an event. | 2019 | * for the attendees list of an event. |
2020 | */ | 2020 | */ |
2021 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) | 2021 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) |
2022 | { | 2022 | { |
2023 | QStringList nameList; | 2023 | QStringList nameList; |
2024 | QStringList emailList; | 2024 | QStringList emailList; |
2025 | QStringList uidList; | 2025 | QStringList uidList; |
2026 | 2026 | ||
2027 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | 2027 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); |
2028 | uint i=0; | 2028 | uint i=0; |
2029 | for (i=0; i < list.count(); i++) | 2029 | for (i=0; i < list.count(); i++) |
2030 | { | 2030 | { |
2031 | nameList.append(list[i].realName()); | 2031 | nameList.append(list[i].realName()); |
2032 | emailList.append(list[i].preferredEmail()); | 2032 | emailList.append(list[i].preferredEmail()); |
2033 | uidList.append(list[i].uid()); | 2033 | uidList.append(list[i].uid()); |
2034 | } | 2034 | } |
2035 | 2035 | ||
2036 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); | 2036 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); |
2037 | 2037 | ||
2038 | } | 2038 | } |
2039 | 2039 | ||
2040 | /* this method will be called through the QCop interface from other apps to show details of a contact. | 2040 | /* this method will be called through the QCop interface from other apps to show details of a contact. |
2041 | */ | 2041 | */ |
2042 | void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid) | 2042 | void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid) |
2043 | { | 2043 | { |
2044 | //qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); | 2044 | //qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); |
2045 | 2045 | ||
2046 | QString foundUid = QString::null; | 2046 | QString foundUid = QString::null; |
2047 | if (uid.isEmpty()) | 2047 | if ( ! uid.isEmpty() ) { |
2048 | Addressee adrr = mAddressBook->findByUid( uid ); | ||
2049 | if ( !adrr.isEmpty() ) { | ||
2050 | foundUid = uid; | ||
2051 | if ( email == "sendbacklist" ) { | ||
2052 | QStringList nameList; | ||
2053 | QStringList emailList; | ||
2054 | QStringList uidList; | ||
2055 | nameList.append(adrr.realName()); | ||
2056 | emailList = adrr.emails(); | ||
2057 | uidList.append( adrr.preferredEmail()); | ||
2058 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList); | ||
2059 | } | ||
2060 | } | ||
2061 | } | ||
2062 | |||
2063 | if ( email == "sendback" ) | ||
2064 | return; | ||
2065 | if (foundUid.isEmpty()) | ||
2048 | { | 2066 | { |
2049 | //find the uid of the person first | 2067 | //find the uid of the person first |
2050 | Addressee::List namelist; | 2068 | Addressee::List namelist; |
2051 | Addressee::List emaillist; | 2069 | Addressee::List emaillist; |
2052 | 2070 | ||
2053 | if (!name.isEmpty()) | 2071 | if (!name.isEmpty()) |
2054 | namelist = mAddressBook->findByName( name ); | 2072 | namelist = mAddressBook->findByName( name ); |
2055 | 2073 | ||
2056 | if (!email.isEmpty()) | 2074 | if (!email.isEmpty()) |
2057 | emaillist = mAddressBook->findByEmail( email ); | 2075 | emaillist = mAddressBook->findByEmail( email ); |
2058 | qDebug("count %d %d ", namelist.count(),emaillist.count() ); | 2076 | qDebug("count %d %d ", namelist.count(),emaillist.count() ); |
2059 | //check if we have a match in Namelist and Emaillist | 2077 | //check if we have a match in Namelist and Emaillist |
2060 | if ((namelist.count() == 0) && (emaillist.count() > 0)) { | 2078 | if ((namelist.count() == 0) && (emaillist.count() > 0)) { |
2061 | foundUid = emaillist[0].uid(); | 2079 | foundUid = emaillist[0].uid(); |
2062 | } | 2080 | } |
2063 | else if ((namelist.count() > 0) && (emaillist.count() == 0)) | 2081 | else if ((namelist.count() > 0) && (emaillist.count() == 0)) |
2064 | foundUid = namelist[0].uid(); | 2082 | foundUid = namelist[0].uid(); |
2065 | else | 2083 | else |
2066 | { | 2084 | { |
2067 | for (int i = 0; i < namelist.count(); i++) | 2085 | for (int i = 0; i < namelist.count(); i++) |
2068 | { | 2086 | { |
2069 | for (int j = 0; j < emaillist.count(); j++) | 2087 | for (int j = 0; j < emaillist.count(); j++) |
2070 | { | 2088 | { |
2071 | if (namelist[i] == emaillist[j]) | 2089 | if (namelist[i] == emaillist[j]) |
2072 | { | 2090 | { |
2073 | foundUid = namelist[i].uid(); | 2091 | foundUid = namelist[i].uid(); |
2074 | } | 2092 | } |
2075 | } | 2093 | } |
2076 | } | 2094 | } |
2077 | } | 2095 | } |
2078 | } | 2096 | } |
2079 | else | 2097 | else |
2080 | { | 2098 | { |
2081 | foundUid = uid; | 2099 | foundUid = uid; |
2082 | } | 2100 | } |
2083 | 2101 | ||
2084 | if (!foundUid.isEmpty()) | 2102 | if (!foundUid.isEmpty()) |
2085 | { | 2103 | { |
2086 | 2104 | ||
2087 | // raise Ka/Pi if it is in the background | 2105 | // raise Ka/Pi if it is in the background |
2088 | #ifndef DESKTOP_VERSION | 2106 | #ifndef DESKTOP_VERSION |
2089 | #ifndef KORG_NODCOP | 2107 | #ifndef KORG_NODCOP |
2090 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); | 2108 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); |
2091 | #endif | 2109 | #endif |
2092 | #endif | 2110 | #endif |
2093 | 2111 | ||
2094 | mMainWindow->showMaximized(); | 2112 | mMainWindow->showMaximized(); |
2095 | mMainWindow-> raise(); | 2113 | mMainWindow-> raise(); |
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 654cfc0..5f446fa 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -1,253 +1,330 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | 2 | ||
3 | #include "composemail.h" | 3 | #include "composemail.h" |
4 | 4 | ||
5 | #include <libmailwrapper/smtpwrapper.h> | 5 | #include <libmailwrapper/smtpwrapper.h> |
6 | #include <libmailwrapper/storemail.h> | 6 | #include <libmailwrapper/storemail.h> |
7 | #include <libmailwrapper/abstractmail.h> | 7 | #include <libmailwrapper/abstractmail.h> |
8 | #include <libmailwrapper/mailtypes.h> | 8 | #include <libmailwrapper/mailtypes.h> |
9 | 9 | ||
10 | /* OPIE */ | 10 | /* OPIE */ |
11 | //#include <opie2/ofiledialog.h> | 11 | //#include <opie2/ofiledialog.h> |
12 | //#include <opie2/odebug.h> | 12 | //#include <opie2/odebug.h> |
13 | #include <kfiledialog.h> | 13 | #include <kfiledialog.h> |
14 | //#include <qpe/resource.h> | 14 | //#include <qpe/resource.h> |
15 | #include <qpe/config.h> | 15 | #include <qpe/config.h> |
16 | #include <qpe/global.h> | 16 | #include <qpe/global.h> |
17 | //#include <qpe/contact.h> | 17 | //#include <qpe/contact.h> |
18 | 18 | ||
19 | 19 | ||
20 | #include <qcombobox.h> | 20 | #include <qcombobox.h> |
21 | #include <qcheckbox.h> | 21 | #include <qcheckbox.h> |
22 | #include <qtimer.h> | 22 | #include <qtimer.h> |
23 | #include <qmessagebox.h> | 23 | #include <qmessagebox.h> |
24 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
25 | #include <qmultilineedit.h> | 25 | #include <qmultilineedit.h> |
26 | #include <qlabel.h> | 26 | #include <qlabel.h> |
27 | #include <qtabwidget.h> | 27 | #include <qtabwidget.h> |
28 | #include <qlistview.h> | 28 | #include <qlistview.h> |
29 | #include <kabc/addresseedialog.h> | 29 | #include <kabc/addresseedialog.h> |
30 | #include <kabc/stdaddressbook.h> | 30 | #include <kabc/stdaddressbook.h> |
31 | #include <kabc/addressee.h> | 31 | #include <kabc/addressee.h> |
32 | 32 | #ifdef DESKTOP_VERSION | |
33 | #include <kabc/addresseedialog.h> | ||
34 | #else //DESKTOP_VERSION | ||
35 | #include <libkdepim/externalapphandler.h> | ||
36 | #endif //DESKTOP_VERSION | ||
33 | 37 | ||
34 | 38 | ||
35 | //using namespace Opie::Core; | 39 | //using namespace Opie::Core; |
36 | //using namespace Opie::Ui; | 40 | //using namespace Opie::Ui; |
37 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 41 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
38 | : ComposeMailUI( parent, name, modal, flags ) | 42 | : ComposeMailUI( parent, name, modal, flags ) |
39 | { | 43 | { |
40 | 44 | ||
45 | mPickLineEdit = 0; | ||
46 | connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), | ||
47 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); | ||
41 | settings = s; | 48 | settings = s; |
42 | m_replyid = ""; | 49 | m_replyid = ""; |
50 | KConfig config( locateLocal("config", "kabcrc") ); | ||
51 | config.setGroup( "General" ); | ||
52 | QString whoami_uid = config.readEntry( "WhoAmI" ); | ||
53 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid); | ||
54 | #ifdef DESKTOP_VERSION | ||
43 | KABC::Addressee con = KABC::StdAddressBook::self()->whoAmI( ); | 55 | KABC::Addressee con = KABC::StdAddressBook::self()->whoAmI( ); |
44 | QStringList mails = con.emails(); | 56 | QStringList mails = con.emails(); |
45 | QString defmail = con.preferredEmail(); | 57 | QString defmail = con.preferredEmail(); |
46 | if ( mails.count() == 0) | 58 | if ( mails.count() == 0) |
47 | QMessageBox::information( 0, tr( "Hint" ), | 59 | QMessageBox::information( 0, tr( "Hint" ), |
48 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), | 60 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), |
49 | tr( "Ok" ) ); | 61 | tr( "Ok" ) ); |
50 | if (defmail.length()!=0) { | 62 | if (defmail.length()!=0) { |
51 | fromBox->insertItem(defmail); | 63 | fromBox->insertItem(defmail); |
52 | } | 64 | } |
53 | QStringList::ConstIterator sit = mails.begin(); | 65 | QStringList::ConstIterator sit = mails.begin(); |
54 | for (;sit!=mails.end();++sit) { | 66 | for (;sit!=mails.end();++sit) { |
55 | if ( (*sit)==defmail) | 67 | if ( (*sit)==defmail) |
56 | continue; | 68 | continue; |
57 | fromBox->insertItem((*sit)); | 69 | fromBox->insertItem((*sit)); |
58 | } | 70 | } |
59 | senderNameEdit->setText(con.formattedName()); | 71 | senderNameEdit->setText(con.formattedName()); |
72 | #endif | ||
60 | Config cfg( "mail" ); | 73 | Config cfg( "mail" ); |
61 | cfg.setGroup( "Compose" ); | 74 | cfg.setGroup( "Compose" ); |
62 | checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); | 75 | checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); |
63 | 76 | ||
64 | attList->addColumn( tr( "Name" ) ); | 77 | attList->addColumn( tr( "Name" ) ); |
65 | attList->addColumn( tr( "Size" ) ); | 78 | attList->addColumn( tr( "Size" ) ); |
66 | 79 | ||
67 | QList<Account> accounts = settings->getAccounts(); | 80 | QList<Account> accounts = settings->getAccounts(); |
68 | 81 | ||
69 | Account *it; | 82 | Account *it; |
70 | for ( it = accounts.first(); it; it = accounts.next() ) { | 83 | for ( it = accounts.first(); it; it = accounts.next() ) { |
71 | if ( it->getType()==MAILLIB::A_SMTP ) { | 84 | if ( it->getType()==MAILLIB::A_SMTP ) { |
72 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); | 85 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); |
73 | smtpAccountBox->insertItem( smtp->getAccountName() ); | 86 | smtpAccountBox->insertItem( smtp->getAccountName() ); |
74 | smtpAccounts.append( smtp ); | 87 | smtpAccounts.append( smtp ); |
75 | } | 88 | } |
76 | } | 89 | } |
77 | if ( smtpAccounts.count() > 0 ) { | 90 | if ( smtpAccounts.count() > 0 ) { |
78 | fillValues( smtpAccountBox->currentItem() ); | 91 | fillValues( smtpAccountBox->currentItem() ); |
79 | } else { | 92 | } else { |
80 | QMessageBox::information( 0, tr( "Problem" ), | 93 | QMessageBox::information( 0, tr( "Problem" ), |
81 | tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ), | 94 | tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ), |
82 | tr( "Ok" ) ); | 95 | tr( "Ok" ) ); |
83 | return; | 96 | return; |
84 | } | 97 | } |
85 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); | 98 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); |
86 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); | 99 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); |
87 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); | 100 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); |
88 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); | 101 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); |
89 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); | 102 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); |
90 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); | 103 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); |
91 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); | 104 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); |
92 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); | 105 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); |
93 | mMail = 0; | 106 | mMail = 0; |
94 | warnAttach = true; | 107 | warnAttach = true; |
95 | 108 | ||
96 | } | 109 | } |
110 | |||
111 | |||
112 | |||
97 | void ComposeMail::saveAsDraft() | 113 | void ComposeMail::saveAsDraft() |
98 | { | 114 | { |
99 | 115 | ||
100 | Opie::Core::OSmartPointer<Mail> mail= new Mail(); | 116 | Opie::Core::OSmartPointer<Mail> mail= new Mail(); |
101 | mail->setMail(fromBox->currentText()); | 117 | mail->setMail(fromBox->currentText()); |
102 | mail->setTo( toLine->text() ); | 118 | mail->setTo( toLine->text() ); |
103 | mail->setName(senderNameEdit->text()); | 119 | mail->setName(senderNameEdit->text()); |
104 | mail->setCC( ccLine->text() ); | 120 | mail->setCC( ccLine->text() ); |
105 | mail->setBCC( bccLine->text() ); | 121 | mail->setBCC( bccLine->text() ); |
106 | mail->setReply( replyLine->text() ); | 122 | mail->setReply( replyLine->text() ); |
107 | mail->setSubject( subjectLine->text() ); | 123 | mail->setSubject( subjectLine->text() ); |
108 | if (!m_replyid.isEmpty()) { | 124 | if (!m_replyid.isEmpty()) { |
109 | QStringList ids; | 125 | QStringList ids; |
110 | ids.append(m_replyid); | 126 | ids.append(m_replyid); |
111 | mail->setInreply(ids); | 127 | mail->setInreply(ids); |
112 | } | 128 | } |
113 | QString txt = message->text(); | 129 | QString txt = message->text(); |
114 | if ( !sigMultiLine->text().isEmpty() ) { | 130 | if ( !sigMultiLine->text().isEmpty() ) { |
115 | txt.append( "\n--\n" ); | 131 | txt.append( "\n--\n" ); |
116 | txt.append( sigMultiLine->text() ); | 132 | txt.append( sigMultiLine->text() ); |
117 | } | 133 | } |
118 | mail->setMessage( txt ); | 134 | mail->setMessage( txt ); |
119 | 135 | ||
120 | /* only use the default drafts folder name! */ | 136 | /* only use the default drafts folder name! */ |
121 | Storemail wrapper(AbstractMail::draftFolder()); | 137 | Storemail wrapper(AbstractMail::draftFolder()); |
122 | wrapper.storeMail(mail); | 138 | wrapper.storeMail(mail); |
123 | 139 | ||
124 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 140 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
125 | /* attachments we will ignore! */ | 141 | /* attachments we will ignore! */ |
126 | if ( it != 0 ) { | 142 | if ( it != 0 ) { |
127 | if ( warnAttach ) | 143 | if ( warnAttach ) |
128 | QMessageBox::warning(0,tr("Store message"), | 144 | QMessageBox::warning(0,tr("Store message"), |
129 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); | 145 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); |
130 | warnAttach = false; | 146 | warnAttach = false; |
131 | } | 147 | } |
132 | setStatus( tr("Mail saved as draft!") ); | 148 | setStatus( tr("Mail saved as draft!") ); |
133 | } | 149 | } |
134 | void ComposeMail::clearStatus() | 150 | void ComposeMail::clearStatus() |
135 | { | 151 | { |
136 | topLevelWidget()->setCaption( tr("Compose mail") ); | 152 | topLevelWidget()->setCaption( tr("Compose mail") ); |
137 | } | 153 | } |
138 | void ComposeMail::setStatus( QString status ) | 154 | void ComposeMail::setStatus( QString status ) |
139 | { | 155 | { |
140 | topLevelWidget()->setCaption( status ); | 156 | topLevelWidget()->setCaption( status ); |
141 | QTimer::singleShot ( 10000, this, SLOT( clearStatus() ) ) ; | 157 | QTimer::singleShot ( 10000, this, SLOT( clearStatus() ) ) ; |
142 | } | 158 | } |
143 | void ComposeMail::pickAddress( QLineEdit *line ) | 159 | void ComposeMail::pickAddress( ) |
144 | { | 160 | { |
161 | |||
162 | QLineEdit *line = mPickLineEdit; | ||
163 | if ( line == 0 ) | ||
164 | return; | ||
165 | #ifdef DESKTOP_VERSION | ||
145 | //qDebug(" ComposeMail::pickAddress "); | 166 | //qDebug(" ComposeMail::pickAddress "); |
146 | QString names ;//= AddressPicker::getNames(); | 167 | QString names ;//= AddressPicker::getNames(); |
147 | 168 | ||
148 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | 169 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); |
149 | uint i=0; | 170 | uint i=0; |
150 | for (i=0; i < list.count(); i++) { | 171 | for (i=0; i < list.count(); i++) { |
151 | if ( !list[i].preferredEmail().isEmpty()) { | 172 | if ( !list[i].preferredEmail().isEmpty()) { |
152 | names+= "\""+list[i].realName() +"\"<" +list[i].preferredEmail() +">"; | 173 | if ( ! names.isEmpty() ) |
153 | if ( i < list.count() -1 ) | ||
154 | names+= ","; | 174 | names+= ","; |
175 | names+= "\""+list[i].realName() +"\"<" +list[i].preferredEmail() +">"; | ||
176 | |||
155 | } | 177 | } |
156 | } | 178 | } |
157 | 179 | ||
158 | 180 | ||
159 | if ( line->text().isEmpty() ) { | 181 | if ( line->text().isEmpty() ) { |
160 | line->setText( names ); | 182 | line->setText( names ); |
161 | } else if ( !names.isEmpty() ) { | 183 | } else if ( !names.isEmpty() ) { |
162 | line->setText( line->text() + ", " + names ); | 184 | line->setText( line->text() + ", " + names ); |
163 | } | 185 | } |
186 | #else | ||
187 | bool res = ExternalAppHandler::instance()->requestNameEmailUidListFromKAPI("QPE/Application/ompi", this->name() /* name is here the unique uid*/); | ||
188 | // the result should now arrive through method insertAttendees | ||
189 | #endif | ||
164 | } | 190 | } |
191 | //the map includes name/email pairs, that comes from Ka/Pi | ||
192 | void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) | ||
193 | { | ||
194 | qDebug("ComposeMail::insertAttendees "); | ||
195 | raise(); | ||
165 | 196 | ||
197 | if ( mPickLineEdit == 0 ) { //whoami received | ||
198 | |||
199 | QString defmail = uidList[0]; | ||
200 | if ( emailList.count() == 0 ) | ||
201 | QMessageBox::information( 0, tr( "Hint" ), | ||
202 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), | ||
203 | tr( "Ok" ) ); | ||
204 | if (defmail.length()!=0) { | ||
205 | fromBox->insertItem(defmail); | ||
206 | } | ||
207 | QStringList::ConstIterator sit = emailList.begin(); | ||
208 | int pref = 0; | ||
209 | for (;sit!=emailList.end();++sit) { | ||
210 | if ( (*sit)==defmail) | ||
211 | continue; | ||
212 | fromBox->insertItem((*sit)); | ||
213 | } | ||
214 | senderNameEdit->setText(nameList[0]); | ||
215 | return; | ||
216 | } | ||
217 | QString names ; | ||
218 | QLineEdit *line = mPickLineEdit; | ||
219 | if (uid == this->name()) | ||
220 | { | ||
221 | for ( int i = 0; i < nameList.count(); i++) | ||
222 | { | ||
223 | QString _name = nameList[i]; | ||
224 | QString _email = emailList[i]; | ||
225 | QString _uid = uidList[i]; | ||
226 | if ( ! _email.isEmpty() ) { | ||
227 | if ( ! names.isEmpty() ) | ||
228 | names+= ","; | ||
229 | names+= "\""+_name +"\"<" +_email +">"; | ||
230 | } | ||
231 | } | ||
232 | } | ||
233 | if ( line->text().isEmpty() ) { | ||
234 | line->setText( names ); | ||
235 | } else if ( !names.isEmpty() ) { | ||
236 | line->setText( line->text() + ", " + names ); | ||
237 | } | ||
238 | } | ||
166 | 239 | ||
167 | void ComposeMail::setTo( const QString & to ) | 240 | void ComposeMail::setTo( const QString & to ) |
168 | { | 241 | { |
169 | toLine->setText( to ); | 242 | toLine->setText( to ); |
170 | } | 243 | } |
171 | 244 | ||
172 | void ComposeMail::setSubject( const QString & subject ) | 245 | void ComposeMail::setSubject( const QString & subject ) |
173 | { | 246 | { |
174 | subjectLine->setText( subject ); | 247 | subjectLine->setText( subject ); |
175 | } | 248 | } |
176 | 249 | ||
177 | void ComposeMail::setInReplyTo( const QString & messageId ) | 250 | void ComposeMail::setInReplyTo( const QString & messageId ) |
178 | { | 251 | { |
179 | m_replyid = messageId; | 252 | m_replyid = messageId; |
180 | } | 253 | } |
181 | 254 | ||
182 | void ComposeMail::setMessage( const QString & text ) | 255 | void ComposeMail::setMessage( const QString & text ) |
183 | { | 256 | { |
184 | message->setText( text ); | 257 | message->setText( text ); |
185 | } | 258 | } |
186 | 259 | ||
187 | 260 | ||
188 | void ComposeMail::pickAddressTo() | 261 | void ComposeMail::pickAddressTo() |
189 | { | 262 | { |
190 | pickAddress( toLine ); | 263 | mPickLineEdit = toLine; |
264 | pickAddress( ); | ||
191 | } | 265 | } |
192 | 266 | ||
193 | void ComposeMail::pickAddressCC() | 267 | void ComposeMail::pickAddressCC() |
194 | { | 268 | { |
195 | pickAddress( ccLine ); | 269 | mPickLineEdit = ccLine; |
270 | pickAddress( ); | ||
196 | } | 271 | } |
197 | 272 | ||
198 | void ComposeMail::pickAddressBCC() | 273 | void ComposeMail::pickAddressBCC() |
199 | { | 274 | { |
200 | pickAddress( bccLine ); | 275 | mPickLineEdit = bccLine; |
276 | pickAddress( ); | ||
201 | } | 277 | } |
202 | 278 | ||
203 | void ComposeMail::pickAddressReply() | 279 | void ComposeMail::pickAddressReply() |
204 | { | 280 | { |
205 | pickAddress( replyLine ); | 281 | mPickLineEdit = replyLine; |
282 | pickAddress( ); | ||
206 | } | 283 | } |
207 | 284 | ||
208 | void ComposeMail::fillValues( int ) | 285 | void ComposeMail::fillValues( int ) |
209 | { | 286 | { |
210 | #if 0 | 287 | #if 0 |
211 | SMTPaccount *smtp = smtpAccounts.at( current ); | 288 | SMTPaccount *smtp = smtpAccounts.at( current ); |
212 | ccLine->clear(); | 289 | ccLine->clear(); |
213 | if ( smtp->getUseCC() ) { | 290 | if ( smtp->getUseCC() ) { |
214 | ccLine->setText( smtp->getCC() ); | 291 | ccLine->setText( smtp->getCC() ); |
215 | } | 292 | } |
216 | bccLine->clear(); | 293 | bccLine->clear(); |
217 | if ( smtp->getUseBCC() ) { | 294 | if ( smtp->getUseBCC() ) { |
218 | bccLine->setText( smtp->getBCC() ); | 295 | bccLine->setText( smtp->getBCC() ); |
219 | } | 296 | } |
220 | replyLine->clear(); | 297 | replyLine->clear(); |
221 | if ( smtp->getUseReply() ) { | 298 | if ( smtp->getUseReply() ) { |
222 | replyLine->setText( smtp->getReply() ); | 299 | replyLine->setText( smtp->getReply() ); |
223 | } | 300 | } |
224 | sigMultiLine->setText( smtp->getSignature() ); | 301 | sigMultiLine->setText( smtp->getSignature() ); |
225 | #endif | 302 | #endif |
226 | } | 303 | } |
227 | 304 | ||
228 | void ComposeMail::slotAdjustColumns() | 305 | void ComposeMail::slotAdjustColumns() |
229 | { | 306 | { |
230 | int currPage = tabWidget->currentPageIndex(); | 307 | int currPage = tabWidget->currentPageIndex(); |
231 | 308 | ||
232 | tabWidget->showPage( attachTab ); | 309 | tabWidget->showPage( attachTab ); |
233 | attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); | 310 | attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); |
234 | attList->setColumnWidth( 1, 80 ); | 311 | attList->setColumnWidth( 1, 80 ); |
235 | 312 | ||
236 | tabWidget->setCurrentPage( currPage ); | 313 | tabWidget->setCurrentPage( currPage ); |
237 | } | 314 | } |
238 | 315 | ||
239 | void ComposeMail::addAttachment() | 316 | void ComposeMail::addAttachment() |
240 | { | 317 | { |
241 | QString lnk = KFileDialog::getOpenFileName( "", "Add Attachment", this ); | 318 | QString lnk = KFileDialog::getOpenFileName( "", "Add Attachment", this ); |
242 | if ( !lnk.isEmpty() ) { | 319 | if ( !lnk.isEmpty() ) { |
243 | Attachment *att = new Attachment( lnk ); | 320 | Attachment *att = new Attachment( lnk ); |
244 | (void) new AttachViewItem( attList, att ); | 321 | (void) new AttachViewItem( attList, att ); |
245 | } | 322 | } |
246 | } | 323 | } |
247 | 324 | ||
248 | void ComposeMail::removeAttachment() | 325 | void ComposeMail::removeAttachment() |
249 | { | 326 | { |
250 | if ( !attList->currentItem() ) { | 327 | if ( !attList->currentItem() ) { |
251 | QMessageBox::information( this, tr( "Error" ), | 328 | QMessageBox::information( this, tr( "Error" ), |
252 | tr( "<p>Please select a File.</p>" ), | 329 | tr( "<p>Please select a File.</p>" ), |
253 | tr( "Ok" ) ); | 330 | tr( "Ok" ) ); |
diff --git a/kmicromail/composemail.h b/kmicromail/composemail.h index 876b597..657f665 100644 --- a/kmicromail/composemail.h +++ b/kmicromail/composemail.h | |||
@@ -1,86 +1,90 @@ | |||
1 | #ifndef COMPOSEMAIL_H | 1 | #ifndef COMPOSEMAIL_H |
2 | #define COMPOSEMAIL_H | 2 | #define COMPOSEMAIL_H |
3 | 3 | ||
4 | #include <qlineedit.h> | 4 | #include <qlineedit.h> |
5 | #include <qlistview.h> | 5 | #include <qlistview.h> |
6 | 6 | ||
7 | #include "composemailui.h" | 7 | #include "composemailui.h" |
8 | //#include "addresspickerui.h" | 8 | //#include "addresspickerui.h" |
9 | #include <libmailwrapper/settings.h> | 9 | #include <libmailwrapper/settings.h> |
10 | #include <libmailwrapper/mailwrapper.h> | 10 | #include <libmailwrapper/mailwrapper.h> |
11 | 11 | ||
12 | class RecMail; | 12 | class RecMail; |
13 | 13 | ||
14 | #include <opie2/osmartpointer.h> | 14 | #include <opie2/osmartpointer.h> |
15 | #if 0 | 15 | #if 0 |
16 | class AddressPicker : public AddressPickerUI | 16 | class AddressPicker : public AddressPickerUI |
17 | { | 17 | { |
18 | //Q_OBJECT | 18 | //Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
21 | AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); | 21 | AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); |
22 | static QString getNames(); | 22 | static QString getNames(); |
23 | 23 | ||
24 | protected: | 24 | protected: |
25 | QString selectedNames; | 25 | QString selectedNames; |
26 | void accept(); | 26 | void accept(); |
27 | 27 | ||
28 | }; | 28 | }; |
29 | #endif | 29 | #endif |
30 | class RecMail; | 30 | class RecMail; |
31 | 31 | ||
32 | class ComposeMail : public ComposeMailUI | 32 | class ComposeMail : public ComposeMailUI |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | 35 | ||
36 | public: | 36 | public: |
37 | |||
37 | ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); | 38 | ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); |
38 | virtual ~ComposeMail(); | 39 | virtual ~ComposeMail(); |
39 | 40 | ||
40 | void reEditMail(const Opie::Core::OSmartPointer<RecMail>¤t); | 41 | void reEditMail(const Opie::Core::OSmartPointer<RecMail>¤t); |
41 | 42 | ||
42 | public slots: | 43 | public slots: |
43 | void slotAdjustColumns(); | 44 | void slotAdjustColumns(); |
44 | 45 | ||
45 | void setTo( const QString & to ); | 46 | void setTo( const QString & to ); |
46 | void setSubject( const QString & subject ); | 47 | void setSubject( const QString & subject ); |
47 | void setInReplyTo( const QString & messageId ); | 48 | void setInReplyTo( const QString & messageId ); |
48 | void setMessage( const QString & text ); | 49 | void setMessage( const QString & text ); |
50 | void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist); | ||
51 | |||
49 | 52 | ||
50 | protected slots: | 53 | protected slots: |
51 | void accept(); | 54 | void accept(); |
52 | void reject(); | 55 | void reject(); |
53 | 56 | ||
54 | private slots: | 57 | private slots: |
55 | void fillValues( int current ); | 58 | void fillValues( int current ); |
56 | void pickAddress( QLineEdit *line ); | 59 | void pickAddress(); |
57 | void pickAddressTo(); | 60 | void pickAddressTo(); |
58 | void pickAddressCC(); | 61 | void pickAddressCC(); |
59 | void pickAddressBCC(); | 62 | void pickAddressBCC(); |
60 | void pickAddressReply(); | 63 | void pickAddressReply(); |
61 | void saveAsDraft(); | 64 | void saveAsDraft(); |
62 | void addAttachment(); | 65 | void addAttachment(); |
63 | void removeAttachment(); | 66 | void removeAttachment(); |
64 | void clearStatus(); | 67 | void clearStatus(); |
65 | void setStatus( QString ); | 68 | void setStatus( QString ); |
66 | 69 | ||
67 | protected: | 70 | protected: |
71 | QLineEdit* mPickLineEdit; | ||
68 | Opie::Core::OSmartPointer<Mail> mMail; | 72 | Opie::Core::OSmartPointer<Mail> mMail; |
69 | Settings *settings; | 73 | Settings *settings; |
70 | QList<SMTPaccount> smtpAccounts; | 74 | QList<SMTPaccount> smtpAccounts; |
71 | QString m_replyid; | 75 | QString m_replyid; |
72 | bool warnAttach; | 76 | bool warnAttach; |
73 | }; | 77 | }; |
74 | 78 | ||
75 | class AttachViewItem : public QListViewItem | 79 | class AttachViewItem : public QListViewItem |
76 | { | 80 | { |
77 | public: | 81 | public: |
78 | AttachViewItem( QListView *parent, Attachment *att ); | 82 | AttachViewItem( QListView *parent, Attachment *att ); |
79 | Attachment *getAttachment() { return attachment; } | 83 | Attachment *getAttachment() { return attachment; } |
80 | 84 | ||
81 | private: | 85 | private: |
82 | Attachment *attachment; | 86 | Attachment *attachment; |
83 | 87 | ||
84 | }; | 88 | }; |
85 | 89 | ||
86 | #endif | 90 | #endif |
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index 22f1200..a3e1b86 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp | |||
@@ -1,58 +1,61 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | 2 | ||
3 | |||
3 | #ifndef DESKTOP_VERSION | 4 | #ifndef DESKTOP_VERSION |
4 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
6 | #include <libkdepim/externalapphandler.h> | ||
5 | #include <stdlib.h> | 7 | #include <stdlib.h> |
6 | #else | 8 | #else |
7 | #include <qapplication.h> | 9 | #include <qapplication.h> |
8 | #include <qstring.h> | 10 | #include <qstring.h> |
9 | #include <qwindowsstyle.h> | 11 | #include <qwindowsstyle.h> |
10 | #include <qplatinumstyle.h> | 12 | #include <qplatinumstyle.h> |
11 | #include <qsgistyle.h> | 13 | #include <qsgistyle.h> |
12 | #endif | 14 | #endif |
13 | #include "opiemail.h" | 15 | #include "opiemail.h" |
14 | #include <qdir.h> | 16 | #include <qdir.h> |
15 | #include <kstandarddirs.h> | 17 | #include <kstandarddirs.h> |
16 | #include <kglobal.h> | 18 | #include <kglobal.h> |
17 | #include <stdio.h> | 19 | #include <stdio.h> |
18 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
19 | 21 | ||
20 | using namespace Opie::Core; | 22 | using namespace Opie::Core; |
21 | int main( int argc, char **argv ) { | 23 | int main( int argc, char **argv ) { |
22 | 24 | ||
23 | #ifndef DESKTOP_VERSION | 25 | #ifndef DESKTOP_VERSION |
24 | QPEApplication a( argc, argv ); | 26 | QPEApplication a( argc, argv ); |
25 | a.setKeepRunning (); | 27 | a.setKeepRunning (); |
26 | #else | 28 | #else |
27 | QApplication a( argc, argv ); | 29 | QApplication a( argc, argv ); |
28 | QApplication::setStyle( new QPlatinumStyle ()); | 30 | QApplication::setStyle( new QPlatinumStyle ()); |
29 | #endif | 31 | #endif |
30 | 32 | ||
31 | KGlobal::setAppName( "kmicromail" ); | 33 | KGlobal::setAppName( "kmicromail" ); |
32 | QString fileName ; | 34 | QString fileName ; |
33 | #ifndef DESKTOP_VERSION | 35 | #ifndef DESKTOP_VERSION |
34 | fileName = getenv("QPEDIR"); | 36 | fileName = getenv("QPEDIR"); |
35 | if ( QApplication::desktop()->width() > 320 ) | 37 | if ( QApplication::desktop()->width() > 320 ) |
36 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); | 38 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); |
37 | else | 39 | else |
38 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); | 40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); |
39 | #else | 41 | #else |
40 | fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; | 42 | fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; |
41 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 43 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
42 | #endif | 44 | #endif |
43 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail"))); | 45 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail"))); |
44 | OpieMail mw; | 46 | OpieMail mw; |
45 | #ifndef DESKTOP_VERSION | 47 | #ifndef DESKTOP_VERSION |
46 | //qDebug("CONNECT "); | 48 | //qDebug("CONNECT "); |
47 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); | 49 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); |
50 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | ||
48 | a.showMainWidget(&mw ); | 51 | a.showMainWidget(&mw ); |
49 | #else | 52 | #else |
50 | a.setMainWidget(&mw ); | 53 | a.setMainWidget(&mw ); |
51 | mw.show(); | 54 | mw.show(); |
52 | //m.resize( 800, 600 ); | 55 | //m.resize( 800, 600 ); |
53 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | 56 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); |
54 | #endif | 57 | #endif |
55 | int rv = a.exec(); | 58 | int rv = a.exec(); |
56 | return rv; | 59 | return rv; |
57 | 60 | ||
58 | } | 61 | } |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 704a9ab..6df95c6 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -1,75 +1,75 @@ | |||
1 | 1 | ||
2 | // CHANGED 2004-08-06 Lutz Rogowski | 2 | // CHANGED 2004-08-06 Lutz Rogowski |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <qvbox.h> | 4 | #include <qvbox.h> |
5 | #include <qheader.h> | 5 | #include <qheader.h> |
6 | #include <qtimer.h> | 6 | #include <qtimer.h> |
7 | #include <qlayout.h> | 7 | #include <qlayout.h> |
8 | #include <kdialog.h> | 8 | #include <kdialog.h> |
9 | #include <kiconloader.h> | 9 | #include <kiconloader.h> |
10 | #include <kapplication.h> | 10 | #include <kapplication.h> |
11 | 11 | ||
12 | #ifndef DESKTOP_VERSION | 12 | #ifndef DESKTOP_VERSION |
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | #endif | 14 | #endif |
15 | #include "defines.h" | 15 | #include "defines.h" |
16 | #include "mainwindow.h" | 16 | #include "mainwindow.h" |
17 | #include <KDGanttMinimizeSplitter.h> | 17 | #include <KDGanttMinimizeSplitter.h> |
18 | 18 | ||
19 | 19 | ||
20 | #include <kabc/stdaddressbook.h> | 20 | #include <kabc/stdaddressbook.h> |
21 | 21 | ||
22 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 22 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
23 | : QMainWindow( parent, name ) //, flags ) | 23 | : QMainWindow( parent, name ) //, flags ) |
24 | { | 24 | { |
25 | setCaption( tr( "KOpieMail/Pi" ) ); | 25 | setCaption( tr( "KOpieMail/Pi" ) ); |
26 | setToolBarsMovable( false ); | 26 | setToolBarsMovable( false ); |
27 | KABC::StdAddressBook::self(); | 27 | //KABC::StdAddressBook::self(); |
28 | toolBar = new QToolBar( this ); | 28 | toolBar = new QToolBar( this ); |
29 | menuBar = new QMenuBar( toolBar ); | 29 | menuBar = new QMenuBar( toolBar ); |
30 | mailMenu = new QPopupMenu( menuBar ); | 30 | mailMenu = new QPopupMenu( menuBar ); |
31 | menuBar->insertItem( tr( "Mail" ), mailMenu ); | 31 | menuBar->insertItem( tr( "Mail" ), mailMenu ); |
32 | settingsMenu = new QPopupMenu( menuBar ); | 32 | settingsMenu = new QPopupMenu( menuBar ); |
33 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); | 33 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); |
34 | 34 | ||
35 | addToolBar( toolBar ); | 35 | addToolBar( toolBar ); |
36 | toolBar->setHorizontalStretchable( true ); | 36 | toolBar->setHorizontalStretchable( true ); |
37 | 37 | ||
38 | 38 | ||
39 | 39 | ||
40 | composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"), | 40 | composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"), |
41 | 0, 0, this ); | 41 | 0, 0, this ); |
42 | composeMail->addTo( toolBar ); | 42 | composeMail->addTo( toolBar ); |
43 | composeMail->addTo( mailMenu ); | 43 | composeMail->addTo( mailMenu ); |
44 | 44 | ||
45 | sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") , | 45 | sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") , |
46 | 0, 0, this ); | 46 | 0, 0, this ); |
47 | sendQueued->addTo( toolBar ); | 47 | sendQueued->addTo( toolBar ); |
48 | sendQueued->addTo( mailMenu ); | 48 | sendQueued->addTo( mailMenu ); |
49 | 49 | ||
50 | /* | 50 | /* |
51 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, | 51 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, |
52 | 0, 0, this ); | 52 | 0, 0, this ); |
53 | syncFolders->addTo( toolBar ); | 53 | syncFolders->addTo( toolBar ); |
54 | syncFolders->addTo( mailMenu ); | 54 | syncFolders->addTo( mailMenu ); |
55 | */ | 55 | */ |
56 | 56 | ||
57 | showFolders = new QAction( tr( "Show/Hide folders" ), SmallIcon("showfolders") , | 57 | showFolders = new QAction( tr( "Show/Hide folders" ), SmallIcon("showfolders") , |
58 | 0, 0, this, 0, true ); | 58 | 0, 0, this, 0, true ); |
59 | showFolders->addTo( toolBar ); | 59 | showFolders->addTo( toolBar ); |
60 | showFolders->addTo( mailMenu ); | 60 | showFolders->addTo( mailMenu ); |
61 | showFolders->setOn( true ); | 61 | showFolders->setOn( true ); |
62 | connect(showFolders, SIGNAL( toggled(bool) ), | 62 | connect(showFolders, SIGNAL( toggled(bool) ), |
63 | SLOT( slotShowFolders(bool) ) ); | 63 | SLOT( slotShowFolders(bool) ) ); |
64 | 64 | ||
65 | /* | 65 | /* |
66 | searchMails = new QAction( tr( "Search mails" ), SmallIcon("find") ), | 66 | searchMails = new QAction( tr( "Search mails" ), SmallIcon("find") ), |
67 | 0, 0, this ); | 67 | 0, 0, this ); |
68 | searchMails->addTo( toolBar ); | 68 | searchMails->addTo( toolBar ); |
69 | searchMails->addTo( mailMenu ); | 69 | searchMails->addTo( mailMenu ); |
70 | */ | 70 | */ |
71 | 71 | ||
72 | deleteMails = new QAction(tr("Delete Mail"), SmallIcon("trash"), 0, 0, this); | 72 | deleteMails = new QAction(tr("Delete Mail"), SmallIcon("trash"), 0, 0, this); |
73 | deleteMails->addTo( toolBar ); | 73 | deleteMails->addTo( toolBar ); |
74 | deleteMails->addTo( mailMenu ); | 74 | deleteMails->addTo( mailMenu ); |
75 | connect( deleteMails, SIGNAL( activated() ), | 75 | connect( deleteMails, SIGNAL( activated() ), |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 251f15a..3e560c5 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -59,96 +59,97 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
59 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 59 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
60 | if (msg == "writeMail(QString,QString)") | 60 | if (msg == "writeMail(QString,QString)") |
61 | { | 61 | { |
62 | QDataStream stream(data,IO_ReadOnly); | 62 | QDataStream stream(data,IO_ReadOnly); |
63 | QString name, email; | 63 | QString name, email; |
64 | stream >> name >> email; | 64 | stream >> name >> email; |
65 | // removing the whitespaces at beginning and end is needed! | 65 | // removing the whitespaces at beginning and end is needed! |
66 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); | 66 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); |
67 | } | 67 | } |
68 | else if (msg == "newMail()") | 68 | else if (msg == "newMail()") |
69 | { | 69 | { |
70 | slotComposeMail(); | 70 | slotComposeMail(); |
71 | } | 71 | } |
72 | else if (msg == "newMail(QString)") | 72 | else if (msg == "newMail(QString)") |
73 | { | 73 | { |
74 | QDataStream stream(data,IO_ReadOnly); | 74 | QDataStream stream(data,IO_ReadOnly); |
75 | QString nameemail; | 75 | QString nameemail; |
76 | stream >> nameemail; | 76 | stream >> nameemail; |
77 | // the format is | 77 | // the format is |
78 | // NAME <EMAIL>:SUBJECT | 78 | // NAME <EMAIL>:SUBJECT |
79 | //qDebug("message %s ", nameemail.latin1()); | 79 | //qDebug("message %s ", nameemail.latin1()); |
80 | 80 | ||
81 | slotwriteMail2( nameemail ); | 81 | slotwriteMail2( nameemail ); |
82 | } | 82 | } |
83 | } | 83 | } |
84 | void OpieMail::slotwriteMail2(const QString& namemail ) | 84 | void OpieMail::slotwriteMail2(const QString& namemail ) |
85 | { | 85 | { |
86 | // qDebug("OpieMail::slotwriteMail2 "); | 86 | // qDebug("OpieMail::slotwriteMail2 "); |
87 | qApp->processEvents(); | 87 | qApp->processEvents(); |
88 | ComposeMail compose( settings, this, 0, true ); | 88 | ComposeMail compose( settings, this, 0, true ); |
89 | if ( !namemail.isEmpty() ) { | 89 | if ( !namemail.isEmpty() ) { |
90 | QString to = namemail; | 90 | QString to = namemail; |
91 | if ( namemail.find( " <") > 1 ) { | 91 | if ( namemail.find( " <") > 1 ) { |
92 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; | 92 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; |
93 | } else | 93 | } else |
94 | if ( namemail.find( "<") > 1 ) { | 94 | if ( namemail.find( "<") > 1 ) { |
95 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; | 95 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; |
96 | } | 96 | } |
97 | int sub = to.find( ">:"); | 97 | int sub = to.find( ">:"); |
98 | if ( sub > 0 ) { | 98 | if ( sub > 0 ) { |
99 | compose.setTo( to.left(sub+1) ); | 99 | compose.setTo( to.left(sub+1) ); |
100 | compose.setSubject( to.mid(sub+2) ); | 100 | compose.setSubject( to.mid(sub+2) ); |
101 | } else | 101 | } else |
102 | compose.setTo( to ); | 102 | compose.setTo( to ); |
103 | } | 103 | } |
104 | compose.slotAdjustColumns(); | 104 | compose.slotAdjustColumns(); |
105 | compose.showMaximized(); | 105 | compose.showMaximized(); |
106 | compose.exec(); | 106 | compose.exec(); |
107 | raise(); | ||
107 | //qDebug("retttich "); | 108 | //qDebug("retttich "); |
108 | } | 109 | } |
109 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 110 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
110 | { | 111 | { |
111 | // qDebug("OpieMail::slotwriteMail "); | 112 | // qDebug("OpieMail::slotwriteMail "); |
112 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 113 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); |
113 | if (!email.isEmpty()) | 114 | if (!email.isEmpty()) |
114 | { | 115 | { |
115 | if (!name.isEmpty()) | 116 | if (!name.isEmpty()) |
116 | { | 117 | { |
117 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 118 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
118 | } | 119 | } |
119 | else | 120 | else |
120 | { | 121 | { |
121 | compose.setTo(email); | 122 | compose.setTo(email); |
122 | } | 123 | } |
123 | } | 124 | } |
124 | compose.slotAdjustColumns(); | 125 | compose.slotAdjustColumns(); |
125 | compose.showMaximized(); | 126 | compose.showMaximized(); |
126 | compose.exec(); | 127 | compose.exec(); |
127 | } | 128 | } |
128 | 129 | ||
129 | void OpieMail::slotComposeMail() | 130 | void OpieMail::slotComposeMail() |
130 | { | 131 | { |
131 | slotwriteMail2( QString () ); | 132 | slotwriteMail2( QString () ); |
132 | //slotwriteMail(0l,0l); | 133 | //slotwriteMail(0l,0l); |
133 | } | 134 | } |
134 | 135 | ||
135 | void OpieMail::slotSendQueued() | 136 | void OpieMail::slotSendQueued() |
136 | { | 137 | { |
137 | SMTPaccount *smtp = 0; | 138 | SMTPaccount *smtp = 0; |
138 | 139 | ||
139 | QList<Account> list = settings->getAccounts(); | 140 | QList<Account> list = settings->getAccounts(); |
140 | QList<SMTPaccount> smtpList; | 141 | QList<SMTPaccount> smtpList; |
141 | smtpList.setAutoDelete(false); | 142 | smtpList.setAutoDelete(false); |
142 | Account *it; | 143 | Account *it; |
143 | for ( it = list.first(); it; it = list.next() ) | 144 | for ( it = list.first(); it; it = list.next() ) |
144 | { | 145 | { |
145 | if ( it->getType() == MAILLIB::A_SMTP ) | 146 | if ( it->getType() == MAILLIB::A_SMTP ) |
146 | { | 147 | { |
147 | smtp = static_cast<SMTPaccount *>(it); | 148 | smtp = static_cast<SMTPaccount *>(it); |
148 | smtpList.append(smtp); | 149 | smtpList.append(smtp); |
149 | } | 150 | } |
150 | } | 151 | } |
151 | if (smtpList.count()==0) | 152 | if (smtpList.count()==0) |
152 | { | 153 | { |
153 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first!\n")); | 154 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first!\n")); |
154 | return; | 155 | return; |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 0866939..2f538c4 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -64,97 +64,97 @@ KOEventViewer::KOEventViewer(QWidget *parent,const char *name) | |||
64 | mSyncMode = false; | 64 | mSyncMode = false; |
65 | mColorMode = 0; | 65 | mColorMode = 0; |
66 | } | 66 | } |
67 | 67 | ||
68 | KOEventViewer::~KOEventViewer() | 68 | KOEventViewer::~KOEventViewer() |
69 | { | 69 | { |
70 | } | 70 | } |
71 | 71 | ||
72 | void KOEventViewer::setSource(const QString& n) | 72 | void KOEventViewer::setSource(const QString& n) |
73 | { | 73 | { |
74 | 74 | ||
75 | if ( n.left(3) == "uid" ) | 75 | if ( n.left(3) == "uid" ) |
76 | #ifdef DESKTOP_VERSION | 76 | #ifdef DESKTOP_VERSION |
77 | { | 77 | { |
78 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 78 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
79 | KABC::AddressBook::Iterator it; | 79 | KABC::AddressBook::Iterator it; |
80 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 80 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
81 | // LR I do not understand, why the uid string is different on zaurus and desktop | 81 | // LR I do not understand, why the uid string is different on zaurus and desktop |
82 | QString uid = "uid://"+(*it).uid(); | 82 | QString uid = "uid://"+(*it).uid(); |
83 | 83 | ||
84 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); | 84 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); |
85 | if (n == uid ) { | 85 | if (n == uid ) { |
86 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); | 86 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); |
87 | QDialog dia( this,"dia123", true ); | 87 | QDialog dia( this,"dia123", true ); |
88 | dia.setCaption( i18n("Details of attendee") ); | 88 | dia.setCaption( i18n("Details of attendee") ); |
89 | QVBoxLayout lay ( &dia ); | 89 | QVBoxLayout lay ( &dia ); |
90 | KPIM::AddresseeView av ( &dia ); | 90 | KPIM::AddresseeView av ( &dia ); |
91 | av.setAddressee( (*it) ); | 91 | av.setAddressee( (*it) ); |
92 | lay.addWidget( &av ); | 92 | lay.addWidget( &av ); |
93 | if ( QApplication::desktop()->width() < 480 ) | 93 | if ( QApplication::desktop()->width() < 480 ) |
94 | dia.resize( 220, 240); | 94 | dia.resize( 220, 240); |
95 | else { | 95 | else { |
96 | dia.resize( 400,400); | 96 | dia.resize( 400,400); |
97 | 97 | ||
98 | } | 98 | } |
99 | dia.exec(); | 99 | dia.exec(); |
100 | break; | 100 | break; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | return; | 103 | return; |
104 | } | 104 | } |
105 | #else | 105 | #else |
106 | { | 106 | { |
107 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); | 107 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); |
108 | if (attendees.count()) { | 108 | if (attendees.count()) { |
109 | Attendee *a; | 109 | Attendee *a; |
110 | for(a=attendees.first();a;a=attendees.next()) { | 110 | for(a=attendees.first();a;a=attendees.next()) { |
111 | if ( "uid:"+a->uid() == n ) { | 111 | if ( "uid:"+a->uid() == n ) { |
112 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), ""); | 112 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid()); |
113 | return; | 113 | return; |
114 | } | 114 | } |
115 | } | 115 | } |
116 | } | 116 | } |
117 | return; | 117 | return; |
118 | } | 118 | } |
119 | //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/); | 119 | //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/); |
120 | // the result should now arrive through method insertAttendees | 120 | // the result should now arrive through method insertAttendees |
121 | //QString uid = "uid:"+(*it).uid(); | 121 | //QString uid = "uid:"+(*it).uid(); |
122 | #endif | 122 | #endif |
123 | if ( n.left(6) == "mailto" ) { | 123 | if ( n.left(6) == "mailto" ) { |
124 | // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); | 124 | // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); |
125 | #ifndef DESKTOP_VERSION | 125 | #ifndef DESKTOP_VERSION |
126 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); | 126 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); |
127 | e << n.mid(7); | 127 | e << n.mid(7); |
128 | #endif | 128 | #endif |
129 | 129 | ||
130 | } | 130 | } |
131 | 131 | ||
132 | 132 | ||
133 | #ifndef KORG_NODCOP | 133 | #ifndef KORG_NODCOP |
134 | kdDebug() << "KOEventViewer::setSource(): " << n << endl; | 134 | kdDebug() << "KOEventViewer::setSource(): " << n << endl; |
135 | QString tmpStr; | 135 | QString tmpStr; |
136 | if (n.startsWith("mailto:")) { | 136 | if (n.startsWith("mailto:")) { |
137 | KApplication::kApplication()->invokeMailer(n.mid(7),QString::null); | 137 | KApplication::kApplication()->invokeMailer(n.mid(7),QString::null); |
138 | //emit showIncidence(n); | 138 | //emit showIncidence(n); |
139 | return; | 139 | return; |
140 | } else if (n.startsWith("uid:")) { | 140 | } else if (n.startsWith("uid:")) { |
141 | DCOPClient *client = KApplication::kApplication()->dcopClient(); | 141 | DCOPClient *client = KApplication::kApplication()->dcopClient(); |
142 | const QByteArray noParamData; | 142 | const QByteArray noParamData; |
143 | const QByteArray paramData; | 143 | const QByteArray paramData; |
144 | QByteArray replyData; | 144 | QByteArray replyData; |
145 | QCString replyTypeStr; | 145 | QCString replyTypeStr; |
146 | #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()", noParamData, replyTypeStr, replyData)) | 146 | #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()", noParamData, replyTypeStr, replyData)) |
147 | bool foundAbbrowser = PING_ABBROWSER; | 147 | bool foundAbbrowser = PING_ABBROWSER; |
148 | 148 | ||
149 | if (foundAbbrowser) { | 149 | if (foundAbbrowser) { |
150 | //KAddressbook is already running, so just DCOP to it to bring up the contact editor | 150 | //KAddressbook is already running, so just DCOP to it to bring up the contact editor |
151 | //client->send("kaddressbook","KAddressBookIface", | 151 | //client->send("kaddressbook","KAddressBookIface", |
152 | QDataStream arg(paramData, IO_WriteOnly); | 152 | QDataStream arg(paramData, IO_WriteOnly); |
153 | arg << n.mid(6); | 153 | arg << n.mid(6); |
154 | client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )", paramData); | 154 | client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )", paramData); |
155 | return; | 155 | return; |
156 | } else { | 156 | } else { |
157 | /* | 157 | /* |
158 | KaddressBook is not already running. Pass it the UID of the contact via the command line while starting it - its neater. | 158 | KaddressBook is not already running. Pass it the UID of the contact via the command line while starting it - its neater. |
159 | We start it without its main interface | 159 | We start it without its main interface |
160 | */ | 160 | */ |