author | zautrix <zautrix> | 2004-09-07 20:33:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-07 20:33:23 (UTC) |
commit | 64a8ef1629f523df3006de5cb2b9882a50d96a05 (patch) (unidiff) | |
tree | b931dc5397b4eec926603080b20eddda131999ff /korganizer | |
parent | 9d5c8750ae671e73ec8ebc0a71f30fd30680f2c0 (diff) | |
download | kdepimpi-64a8ef1629f523df3006de5cb2b9882a50d96a05.zip kdepimpi-64a8ef1629f523df3006de5cb2b9882a50d96a05.tar.gz kdepimpi-64a8ef1629f523df3006de5cb2b9882a50d96a05.tar.bz2 |
Fixed Kopi-Kapi external app communication
-rw-r--r-- | korganizer/koeventviewer.cpp | 50 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
2 files changed, 44 insertions, 8 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 1f69700..0866939 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -1,541 +1,575 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
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 | 19 | ||
20 | #include <qcstring.h> | 20 | #include <qcstring.h> |
21 | #include <qwhatsthis.h> | 21 | #include <qwhatsthis.h> |
22 | #include <qdialog.h> | 22 | #include <qdialog.h> |
23 | #include <qapplication.h> | 23 | #include <qapplication.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | 26 | ||
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | #include <kapplication.h> | 28 | #include <kapplication.h> |
29 | #include <libkcal/event.h> | 29 | #include <libkcal/event.h> |
30 | #include <libkcal/todo.h> | 30 | #include <libkcal/todo.h> |
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <kiconloader.h> | 32 | #include <kiconloader.h> |
33 | #include <krun.h> | 33 | #include <krun.h> |
34 | #include <kglobal.h> | 34 | #include <kglobal.h> |
35 | #include <kprocess.h> | 35 | #include <kprocess.h> |
36 | #include "koprefs.h" | 36 | #include "koprefs.h" |
37 | 37 | ||
38 | #include <libkdepim/addresseeview.h> | 38 | #include <libkdepim/addresseeview.h> |
39 | #include <kabc/stdaddressbook.h> | 39 | #include <kabc/stdaddressbook.h> |
40 | 40 | ||
41 | #ifndef KORG_NODCOP | 41 | #ifndef KORG_NODCOP |
42 | #include <dcopclient.h> | 42 | #include <dcopclient.h> |
43 | #include "korganizer.h" | 43 | #include "korganizer.h" |
44 | #include "koprefs.h" | 44 | #include "koprefs.h" |
45 | #include "actionmanager.h" | 45 | #include "actionmanager.h" |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #include "koeventviewer.h" | 48 | #include "koeventviewer.h" |
49 | #ifndef KORG_NOKABC | 49 | #ifndef KORG_NOKABC |
50 | #include <kabc/stdaddressbook.h> | 50 | #include <kabc/stdaddressbook.h> |
51 | #define size count | 51 | #define size count |
52 | #endif | 52 | #endif |
53 | #ifndef DESKTOP_VERSION | 53 | |
54 | #ifdef DESKTOP_VERSION | ||
55 | #include <kabc/addresseedialog.h> | ||
56 | #else //DESKTOP_VERSION | ||
57 | #include <externalapphandler.h> | ||
54 | #include <qtopia/qcopenvelope_qws.h> | 58 | #include <qtopia/qcopenvelope_qws.h> |
55 | #endif | 59 | #endif //DESKTOP_VERSION |
56 | 60 | ||
57 | KOEventViewer::KOEventViewer(QWidget *parent,const char *name) | 61 | KOEventViewer::KOEventViewer(QWidget *parent,const char *name) |
58 | : QTextBrowser(parent,name) | 62 | : QTextBrowser(parent,name) |
59 | { | 63 | { |
60 | mSyncMode = false; | 64 | mSyncMode = false; |
61 | mColorMode = 0; | 65 | mColorMode = 0; |
62 | } | 66 | } |
63 | 67 | ||
64 | KOEventViewer::~KOEventViewer() | 68 | KOEventViewer::~KOEventViewer() |
65 | { | 69 | { |
66 | } | 70 | } |
67 | 71 | ||
68 | void KOEventViewer::setSource(const QString& n) | 72 | void KOEventViewer::setSource(const QString& n) |
69 | { | 73 | { |
70 | 74 | ||
71 | if ( n.left(3) == "uid" ) { | 75 | if ( n.left(3) == "uid" ) |
76 | #ifdef DESKTOP_VERSION | ||
77 | { | ||
72 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 78 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
73 | KABC::AddressBook::Iterator it; | 79 | KABC::AddressBook::Iterator it; |
74 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 80 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
75 | // 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 |
76 | #ifdef DESKTOP_VERSION | ||
77 | QString uid = "uid://"+(*it).uid(); | 82 | QString uid = "uid://"+(*it).uid(); |
78 | #else | 83 | |
79 | QString uid = "uid:"+(*it).uid(); | ||
80 | #endif | ||
81 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); | 84 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); |
82 | if (n == uid ) { | 85 | if (n == uid ) { |
83 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); | 86 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); |
84 | QDialog dia( this,"dia123", true ); | 87 | QDialog dia( this,"dia123", true ); |
85 | dia.setCaption( i18n("Details of attendee") ); | 88 | dia.setCaption( i18n("Details of attendee") ); |
86 | QVBoxLayout lay ( &dia ); | 89 | QVBoxLayout lay ( &dia ); |
87 | KPIM::AddresseeView av ( &dia ); | 90 | KPIM::AddresseeView av ( &dia ); |
88 | av.setAddressee( (*it) ); | 91 | av.setAddressee( (*it) ); |
89 | lay.addWidget( &av ); | 92 | lay.addWidget( &av ); |
90 | if ( QApplication::desktop()->width() < 480 ) | 93 | if ( QApplication::desktop()->width() < 480 ) |
91 | dia.resize( 220, 240); | 94 | dia.resize( 220, 240); |
92 | else { | 95 | else { |
93 | dia.resize( 400,400); | 96 | dia.resize( 400,400); |
94 | 97 | ||
95 | } | 98 | } |
96 | dia.exec(); | 99 | dia.exec(); |
97 | break; | 100 | break; |
98 | } | 101 | } |
99 | } | 102 | } |
100 | return; | 103 | return; |
101 | } | 104 | } |
105 | #else | ||
106 | { | ||
107 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); | ||
108 | if (attendees.count()) { | ||
109 | Attendee *a; | ||
110 | for(a=attendees.first();a;a=attendees.next()) { | ||
111 | if ( "uid:"+a->uid() == n ) { | ||
112 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), ""); | ||
113 | return; | ||
114 | } | ||
115 | } | ||
116 | } | ||
117 | return; | ||
118 | } | ||
119 | //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/); | ||
120 | // the result should now arrive through method insertAttendees | ||
121 | //QString uid = "uid:"+(*it).uid(); | ||
122 | #endif | ||
102 | if ( n.left(6) == "mailto" ) { | 123 | if ( n.left(6) == "mailto" ) { |
103 | // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); | 124 | // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); |
104 | #ifndef DESKTOP_VERSION | 125 | #ifndef DESKTOP_VERSION |
105 | QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)" ); | 126 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); |
106 | e << n.mid(7); | 127 | e << n.mid(7); |
107 | #endif | 128 | #endif |
108 | 129 | ||
109 | } | 130 | } |
110 | 131 | ||
111 | 132 | ||
112 | #ifndef KORG_NODCOP | 133 | #ifndef KORG_NODCOP |
113 | kdDebug() << "KOEventViewer::setSource(): " << n << endl; | 134 | kdDebug() << "KOEventViewer::setSource(): " << n << endl; |
114 | QString tmpStr; | 135 | QString tmpStr; |
115 | if (n.startsWith("mailto:")) { | 136 | if (n.startsWith("mailto:")) { |
116 | KApplication::kApplication()->invokeMailer(n.mid(7),QString::null); | 137 | KApplication::kApplication()->invokeMailer(n.mid(7),QString::null); |
117 | //emit showIncidence(n); | 138 | //emit showIncidence(n); |
118 | return; | 139 | return; |
119 | } else if (n.startsWith("uid:")) { | 140 | } else if (n.startsWith("uid:")) { |
120 | DCOPClient *client = KApplication::kApplication()->dcopClient(); | 141 | DCOPClient *client = KApplication::kApplication()->dcopClient(); |
121 | const QByteArray noParamData; | 142 | const QByteArray noParamData; |
122 | const QByteArray paramData; | 143 | const QByteArray paramData; |
123 | QByteArray replyData; | 144 | QByteArray replyData; |
124 | QCString replyTypeStr; | 145 | QCString replyTypeStr; |
125 | #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()", noParamData, replyTypeStr, replyData)) | 146 | #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()", noParamData, replyTypeStr, replyData)) |
126 | bool foundAbbrowser = PING_ABBROWSER; | 147 | bool foundAbbrowser = PING_ABBROWSER; |
127 | 148 | ||
128 | if (foundAbbrowser) { | 149 | if (foundAbbrowser) { |
129 | //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 |
130 | //client->send("kaddressbook","KAddressBookIface", | 151 | //client->send("kaddressbook","KAddressBookIface", |
131 | QDataStream arg(paramData, IO_WriteOnly); | 152 | QDataStream arg(paramData, IO_WriteOnly); |
132 | arg << n.mid(6); | 153 | arg << n.mid(6); |
133 | client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )", paramData); | 154 | client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )", paramData); |
134 | return; | 155 | return; |
135 | } else { | 156 | } else { |
136 | /* | 157 | /* |
137 | 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. |
138 | We start it without its main interface | 159 | We start it without its main interface |
139 | */ | 160 | */ |
140 | KIconLoader* iconLoader = new KIconLoader(); | 161 | KIconLoader* iconLoader = new KIconLoader(); |
141 | QString iconPath = iconLoader->iconPath("go",KIcon::Small); | 162 | QString iconPath = iconLoader->iconPath("go",KIcon::Small); |
142 | ActionManager::setStartedKAddressBook(true); | 163 | ActionManager::setStartedKAddressBook(true); |
143 | tmpStr = "kaddressbook --editor-only --uid "; | 164 | tmpStr = "kaddressbook --editor-only --uid "; |
144 | tmpStr += KProcess::quote(n.mid(6)); | 165 | tmpStr += KProcess::quote(n.mid(6)); |
145 | KRun::runCommand(tmpStr,"KAddressBook",iconPath); | 166 | KRun::runCommand(tmpStr,"KAddressBook",iconPath); |
146 | return; | 167 | return; |
147 | } | 168 | } |
148 | } else { | 169 | } else { |
149 | //QTextBrowser::setSource(n); | 170 | //QTextBrowser::setSource(n); |
150 | } | 171 | } |
151 | #endif | 172 | #endif |
152 | } | 173 | } |
153 | 174 | ||
154 | void KOEventViewer::addTag(const QString & tag,const QString & text) | 175 | void KOEventViewer::addTag(const QString & tag,const QString & text) |
155 | { | 176 | { |
156 | int number=text.contains("\n"); | 177 | int number=text.contains("\n"); |
157 | QString str = "<" + tag + ">"; | 178 | QString str = "<" + tag + ">"; |
158 | QString tmpText=text; | 179 | QString tmpText=text; |
159 | QString tmpStr=str; | 180 | QString tmpStr=str; |
160 | if(number !=-1) | 181 | if(number !=-1) |
161 | { | 182 | { |
162 | if (number > 0) { | 183 | if (number > 0) { |
163 | int pos=0; | 184 | int pos=0; |
164 | QString tmp; | 185 | QString tmp; |
165 | for(int i=0;i<=number;i++) { | 186 | for(int i=0;i<=number;i++) { |
166 | pos=tmpText.find("\n"); | 187 | pos=tmpText.find("\n"); |
167 | tmp=tmpText.left(pos); | 188 | tmp=tmpText.left(pos); |
168 | tmpText=tmpText.right(tmpText.length()-pos-1); | 189 | tmpText=tmpText.right(tmpText.length()-pos-1); |
169 | tmpStr+=tmp+"<br>"; | 190 | tmpStr+=tmp+"<br>"; |
170 | } | 191 | } |
171 | } | 192 | } |
172 | else tmpStr += tmpText; | 193 | else tmpStr += tmpText; |
173 | tmpStr+="</" + tag + ">"; | 194 | tmpStr+="</" + tag + ">"; |
174 | mText.append(tmpStr); | 195 | mText.append(tmpStr); |
175 | } | 196 | } |
176 | else | 197 | else |
177 | { | 198 | { |
178 | str += text + "</" + tag + ">"; | 199 | str += text + "</" + tag + ">"; |
179 | mText.append(str); | 200 | mText.append(str); |
180 | } | 201 | } |
181 | } | 202 | } |
182 | 203 | ||
183 | void KOEventViewer::setColorMode( int m ) | 204 | void KOEventViewer::setColorMode( int m ) |
184 | { | 205 | { |
185 | mColorMode = m; | 206 | mColorMode = m; |
186 | } | 207 | } |
187 | void KOEventViewer::appendEvent(Event *event, int mode ) | 208 | void KOEventViewer::appendEvent(Event *event, int mode ) |
188 | { | 209 | { |
189 | mMailSubject = ""; | 210 | mMailSubject = ""; |
190 | mCurrentIncidence = event; | 211 | mCurrentIncidence = event; |
191 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 212 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
192 | topLevelWidget()->setCaption(i18n("Event Viewer")); | 213 | topLevelWidget()->setCaption(i18n("Event Viewer")); |
193 | if ( mode == 0 ) { | 214 | if ( mode == 0 ) { |
194 | addTag("h2",event->summary()); | 215 | addTag("h2",event->summary()); |
195 | } | 216 | } |
196 | else { | 217 | else { |
197 | if ( mColorMode == 1 ) { | 218 | if ( mColorMode == 1 ) { |
198 | mText +="<font color=\"#00A000\">"; | 219 | mText +="<font color=\"#00A000\">"; |
199 | } | 220 | } |
200 | if ( mColorMode == 2 ) { | 221 | if ( mColorMode == 2 ) { |
201 | mText +="<font color=\"#C00000\">"; | 222 | mText +="<font color=\"#C00000\">"; |
202 | } | 223 | } |
203 | // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; | 224 | // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; |
204 | if ( mode == 1 ) { | 225 | if ( mode == 1 ) { |
205 | addTag("h2",i18n( "Local: " ) +event->summary()); | 226 | addTag("h2",i18n( "Local: " ) +event->summary()); |
206 | } else { | 227 | } else { |
207 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 228 | addTag("h2",i18n( "Remote: " ) +event->summary()); |
208 | } | 229 | } |
209 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 230 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
210 | if ( mColorMode ) | 231 | if ( mColorMode ) |
211 | mText += "</font>"; | 232 | mText += "</font>"; |
212 | } | 233 | } |
213 | mMailSubject += i18n( "Meeting " )+ event->summary(); | 234 | mMailSubject += i18n( "Meeting " )+ event->summary(); |
214 | if (event->cancelled ()) { | 235 | if (event->cancelled ()) { |
215 | mText +="<font color=\"#B00000\">"; | 236 | mText +="<font color=\"#B00000\">"; |
216 | addTag("i",i18n("This event has been cancelled!")); | 237 | addTag("i",i18n("This event has been cancelled!")); |
217 | mText.append("<br>"); | 238 | mText.append("<br>"); |
218 | mText += "</font>"; | 239 | mText += "</font>"; |
219 | mMailSubject += i18n("(cancelled)"); | 240 | mMailSubject += i18n("(cancelled)"); |
220 | } | 241 | } |
221 | if (!event->location().isEmpty()) { | 242 | if (!event->location().isEmpty()) { |
222 | addTag("b",i18n("Location: ")); | 243 | addTag("b",i18n("Location: ")); |
223 | mText.append(event->location()+"<br>"); | 244 | mText.append(event->location()+"<br>"); |
224 | mMailSubject += i18n(" at ") + event->location(); | 245 | mMailSubject += i18n(" at ") + event->location(); |
225 | } | 246 | } |
226 | if (event->doesFloat()) { | 247 | if (event->doesFloat()) { |
227 | if (event->isMultiDay()) { | 248 | if (event->isMultiDay()) { |
228 | mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>") | 249 | mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>") |
229 | .arg(event->dtStartDateStr(shortDate)) | 250 | .arg(event->dtStartDateStr(shortDate)) |
230 | .arg(event->dtEndDateStr(shortDate))); | 251 | .arg(event->dtEndDateStr(shortDate))); |
231 | } else { | 252 | } else { |
232 | mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate ))); | 253 | mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate ))); |
233 | } | 254 | } |
234 | } else { | 255 | } else { |
235 | if (event->isMultiDay()) { | 256 | if (event->isMultiDay()) { |
236 | mText.append(i18n("<p><b>From:</b> %1</p> ") | 257 | mText.append(i18n("<p><b>From:</b> %1</p> ") |
237 | .arg(event->dtStartStr( shortDate))); | 258 | .arg(event->dtStartStr( shortDate))); |
238 | mText.append(i18n("<p><b>To:</b> %1</p>") | 259 | mText.append(i18n("<p><b>To:</b> %1</p>") |
239 | .arg(event->dtEndStr(shortDate))); | 260 | .arg(event->dtEndStr(shortDate))); |
240 | } else { | 261 | } else { |
241 | mText.append(i18n("<p><b>On:</b> %1</p> ") | 262 | mText.append(i18n("<p><b>On:</b> %1</p> ") |
242 | .arg(event->dtStartDateStr( shortDate ))); | 263 | .arg(event->dtStartDateStr( shortDate ))); |
243 | mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>") | 264 | mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>") |
244 | .arg(event->dtStartTimeStr()) | 265 | .arg(event->dtStartTimeStr()) |
245 | .arg(event->dtEndTimeStr())); | 266 | .arg(event->dtEndTimeStr())); |
246 | } | 267 | } |
247 | } | 268 | } |
248 | 269 | ||
249 | if (event->recurrence()->doesRecur()) { | 270 | if (event->recurrence()->doesRecur()) { |
250 | 271 | ||
251 | QString recurText = event->recurrence()->recurrenceText(); | 272 | QString recurText = event->recurrence()->recurrenceText(); |
252 | addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>"); | 273 | addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>"); |
253 | bool last; | 274 | bool last; |
254 | QDate start = QDate::currentDate(); | 275 | QDate start = QDate::currentDate(); |
255 | QDate next; | 276 | QDate next; |
256 | next = event->recurrence()->getPreviousDate( start , &last ); | 277 | next = event->recurrence()->getPreviousDate( start , &last ); |
257 | if ( !last ) { | 278 | if ( !last ) { |
258 | next = event->recurrence()->getNextDate( start.addDays( - 1 ) ); | 279 | next = event->recurrence()->getNextDate( start.addDays( - 1 ) ); |
259 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); | 280 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); |
260 | addTag("p", KGlobal::locale()->formatDate( next, shortDate )); | 281 | addTag("p", KGlobal::locale()->formatDate( next, shortDate )); |
261 | QDateTime nextdt = QDateTime( next, event->dtStart().time()); | 282 | QDateTime nextdt = QDateTime( next, event->dtStart().time()); |
262 | mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( nextdt, true ); | 283 | mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( nextdt, true ); |
263 | 284 | ||
264 | } else { | 285 | } else { |
265 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); | 286 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); |
266 | addTag("p", KGlobal::locale()->formatDate( next, shortDate )); | 287 | addTag("p", KGlobal::locale()->formatDate( next, shortDate )); |
267 | } | 288 | } |
268 | } else { | 289 | } else { |
269 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); | 290 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); |
270 | 291 | ||
271 | } | 292 | } |
272 | 293 | ||
273 | 294 | ||
274 | if (event->isAlarmEnabled()) { | 295 | if (event->isAlarmEnabled()) { |
275 | Alarm *alarm =event->alarms().first() ; | 296 | Alarm *alarm =event->alarms().first() ; |
276 | QDateTime t = alarm->time(); | 297 | QDateTime t = alarm->time(); |
277 | int min = t.secsTo( event->dtStart() )/60; | 298 | int min = t.secsTo( event->dtStart() )/60; |
278 | QString s =i18n("( %1 min before )").arg( min ); | 299 | QString s =i18n("( %1 min before )").arg( min ); |
279 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 300 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
280 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 301 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
281 | //addTag("p",s); | 302 | //addTag("p",s); |
282 | } | 303 | } |
283 | 304 | ||
284 | addTag("b",i18n("Access: ")); | 305 | addTag("b",i18n("Access: ")); |
285 | mText.append(event->secrecyStr()+"<br>"); | 306 | mText.append(event->secrecyStr()+"<br>"); |
286 | if (!event->description().isEmpty()) { | 307 | if (!event->description().isEmpty()) { |
287 | addTag("p",i18n("<b>Details: </b>")); | 308 | addTag("p",i18n("<b>Details: </b>")); |
288 | addTag("p",event->description()); | 309 | addTag("p",event->description()); |
289 | } | 310 | } |
290 | 311 | ||
291 | formatCategories(event); | 312 | formatCategories(event); |
292 | 313 | ||
293 | formatReadOnly(event); | 314 | formatReadOnly(event); |
294 | formatAttendees(event); | 315 | formatAttendees(event); |
295 | 316 | ||
296 | setText(mText); | 317 | setText(mText); |
297 | //QWhatsThis::add(this,mText); | 318 | //QWhatsThis::add(this,mText); |
298 | 319 | ||
299 | } | 320 | } |
300 | 321 | ||
301 | void KOEventViewer::appendTodo(Todo *event, int mode ) | 322 | void KOEventViewer::appendTodo(Todo *event, int mode ) |
302 | { | 323 | { |
303 | mMailSubject = ""; | 324 | mMailSubject = ""; |
304 | mCurrentIncidence = event; | 325 | mCurrentIncidence = event; |
305 | topLevelWidget()->setCaption(i18n("Todo Viewer")); | 326 | topLevelWidget()->setCaption(i18n("Todo Viewer")); |
306 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 327 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
307 | if (mode == 0 ) | 328 | if (mode == 0 ) |
308 | addTag("h2",event->summary()); | 329 | addTag("h2",event->summary()); |
309 | else { | 330 | else { |
310 | if ( mColorMode == 1 ) { | 331 | if ( mColorMode == 1 ) { |
311 | mText +="<font color=\"#00A000\">"; | 332 | mText +="<font color=\"#00A000\">"; |
312 | } | 333 | } |
313 | if ( mColorMode == 2 ) { | 334 | if ( mColorMode == 2 ) { |
314 | mText +="<font color=\"#B00000\">"; | 335 | mText +="<font color=\"#B00000\">"; |
315 | } | 336 | } |
316 | if ( mode == 1 ) { | 337 | if ( mode == 1 ) { |
317 | addTag("h2",i18n( "Local: " ) +event->summary()); | 338 | addTag("h2",i18n( "Local: " ) +event->summary()); |
318 | } else { | 339 | } else { |
319 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 340 | addTag("h2",i18n( "Remote: " ) +event->summary()); |
320 | } | 341 | } |
321 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 342 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
322 | if ( mColorMode ) | 343 | if ( mColorMode ) |
323 | mText += "</font>"; | 344 | mText += "</font>"; |
324 | } | 345 | } |
325 | mMailSubject += i18n( "Todo " )+ event->summary(); | 346 | mMailSubject += i18n( "Todo " )+ event->summary(); |
326 | if (event->cancelled ()) { | 347 | if (event->cancelled ()) { |
327 | mText +="<font color=\"#B00000\">"; | 348 | mText +="<font color=\"#B00000\">"; |
328 | addTag("i",i18n("This todo has been cancelled!")); | 349 | addTag("i",i18n("This todo has been cancelled!")); |
329 | mText.append("<br>"); | 350 | mText.append("<br>"); |
330 | mText += "</font>"; | 351 | mText += "</font>"; |
331 | mMailSubject += i18n("(cancelled)"); | 352 | mMailSubject += i18n("(cancelled)"); |
332 | } | 353 | } |
333 | 354 | ||
334 | if (!event->location().isEmpty()) { | 355 | if (!event->location().isEmpty()) { |
335 | addTag("b",i18n("Location: ")); | 356 | addTag("b",i18n("Location: ")); |
336 | mText.append(event->location()+"<br>"); | 357 | mText.append(event->location()+"<br>"); |
337 | mMailSubject += i18n(" at ") + event->location(); | 358 | mMailSubject += i18n(" at ") + event->location(); |
338 | } | 359 | } |
339 | if (event->hasDueDate()) { | 360 | if (event->hasDueDate()) { |
340 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 361 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
341 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 362 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
342 | } | 363 | } |
343 | addTag("b",i18n("Access: ")); | 364 | addTag("b",i18n("Access: ")); |
344 | mText.append(event->secrecyStr()+"<br>"); | 365 | mText.append(event->secrecyStr()+"<br>"); |
345 | if (!event->description().isEmpty()) { | 366 | if (!event->description().isEmpty()) { |
346 | addTag("p",i18n("<b>Details: </b>")); | 367 | addTag("p",i18n("<b>Details: </b>")); |
347 | addTag("p",event->description()); | 368 | addTag("p",event->description()); |
348 | } | 369 | } |
349 | 370 | ||
350 | formatCategories(event); | 371 | formatCategories(event); |
351 | 372 | ||
352 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 373 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
353 | .arg(QString::number(event->priority()))); | 374 | .arg(QString::number(event->priority()))); |
354 | 375 | ||
355 | mText.append(i18n("<p><i>%1 % completed</i></p>") | 376 | mText.append(i18n("<p><i>%1 % completed</i></p>") |
356 | .arg(event->percentComplete())); | 377 | .arg(event->percentComplete())); |
357 | 378 | ||
358 | formatReadOnly(event); | 379 | formatReadOnly(event); |
359 | formatAttendees(event); | 380 | formatAttendees(event); |
360 | 381 | ||
361 | setText(mText); | 382 | setText(mText); |
362 | } | 383 | } |
363 | 384 | ||
364 | void KOEventViewer::formatCategories(Incidence *event) | 385 | void KOEventViewer::formatCategories(Incidence *event) |
365 | { | 386 | { |
366 | if (!event->categoriesStr().isEmpty()) { | 387 | if (!event->categoriesStr().isEmpty()) { |
367 | if (event->categories().count() == 1) { | 388 | if (event->categories().count() == 1) { |
368 | addTag("h3",i18n("Category")); | 389 | addTag("h3",i18n("Category")); |
369 | } else { | 390 | } else { |
370 | addTag("h3",i18n("Categories")); | 391 | addTag("h3",i18n("Categories")); |
371 | } | 392 | } |
372 | addTag("p",event->categoriesStr()); | 393 | addTag("p",event->categoriesStr()); |
373 | } | 394 | } |
374 | } | 395 | } |
375 | void KOEventViewer::formatAttendees(Incidence *event) | 396 | void KOEventViewer::formatAttendees(Incidence *event) |
376 | { | 397 | { |
377 | QPtrList<Attendee> attendees = event->attendees(); | 398 | QPtrList<Attendee> attendees = event->attendees(); |
378 | if (attendees.count()) { | 399 | if (attendees.count()) { |
379 | 400 | ||
380 | 401 | ||
381 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 402 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
382 | addTag("h3",i18n("Organizer")); | 403 | addTag("h3",i18n("Organizer")); |
383 | mText.append("<ul><li>"); | 404 | mText.append("<ul><li>"); |
384 | #ifndef KORG_NOKABC | 405 | #ifndef KORG_NOKABC |
385 | 406 | ||
407 | #ifdef DESKTOP_VERSION | ||
386 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 408 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
387 | KABC::Addressee::List addressList; | 409 | KABC::Addressee::List addressList; |
388 | addressList = add_book->findByEmail(event->organizer()); | 410 | addressList = add_book->findByEmail(event->organizer()); |
389 | KABC::Addressee o = addressList.first(); | 411 | KABC::Addressee o = addressList.first(); |
390 | if (!o.isEmpty() && addressList.size()<2) { | 412 | if (!o.isEmpty() && addressList.size()<2) { |
391 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 413 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
392 | mText += o.formattedName(); | 414 | mText += o.formattedName(); |
393 | mText += "</a>\n"; | 415 | mText += "</a>\n"; |
394 | } else { | 416 | } else { |
395 | mText.append(event->organizer()); | 417 | mText.append(event->organizer()); |
396 | } | 418 | } |
419 | #else //DESKTOP_VERSION | ||
420 | mText.append(event->organizer()); | ||
421 | #endif //DESKTOP_VERSION | ||
422 | |||
423 | |||
397 | #else | 424 | #else |
398 | mText.append(event->organizer()); | 425 | mText.append(event->organizer()); |
399 | #endif | 426 | #endif |
400 | 427 | ||
401 | if (iconPath) { | 428 | if (iconPath) { |
402 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; | 429 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; |
403 | mText += "<IMG src=\"" + iconPath + "\">"; | 430 | mText += "<IMG src=\"" + iconPath + "\">"; |
404 | mText += "</a>\n"; | 431 | mText += "</a>\n"; |
405 | } | 432 | } |
406 | mText.append("</li></ul>"); | 433 | mText.append("</li></ul>"); |
407 | 434 | ||
408 | addTag("h3",i18n("Attendees")); | 435 | addTag("h3",i18n("Attendees")); |
409 | Attendee *a; | 436 | Attendee *a; |
410 | mText.append("<ul>"); | 437 | mText.append("<ul>"); |
411 | for(a=attendees.first();a;a=attendees.next()) { | 438 | for(a=attendees.first();a;a=attendees.next()) { |
412 | #ifndef KORG_NOKABC | 439 | #ifndef KORG_NOKABC |
440 | #ifdef DESKTOP_VERSION | ||
413 | if (a->name().isEmpty()) { | 441 | if (a->name().isEmpty()) { |
414 | addressList = add_book->findByEmail(a->email()); | 442 | addressList = add_book->findByEmail(a->email()); |
415 | KABC::Addressee o = addressList.first(); | 443 | KABC::Addressee o = addressList.first(); |
416 | if (!o.isEmpty() && addressList.size()<2) { | 444 | if (!o.isEmpty() && addressList.size()<2) { |
417 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 445 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
418 | mText += o.formattedName(); | 446 | mText += o.formattedName(); |
419 | mText += "</a>\n"; | 447 | mText += "</a>\n"; |
420 | } else { | 448 | } else { |
421 | mText += "<li>"; | 449 | mText += "<li>"; |
422 | mText.append(a->email()); | 450 | mText.append(a->email()); |
423 | mText += "\n"; | 451 | mText += "\n"; |
424 | } | 452 | } |
425 | } else { | 453 | } else { |
426 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 454 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
427 | if (!a->name().isEmpty()) mText += a->name(); | 455 | if (!a->name().isEmpty()) mText += a->name(); |
428 | else mText += a->email(); | 456 | else mText += a->email(); |
429 | mText += "</a>\n"; | 457 | mText += "</a>\n"; |
430 | } | 458 | } |
459 | #else //DESKTOP_VERSION | ||
460 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | ||
461 | if (!a->name().isEmpty()) mText += a->name(); | ||
462 | else mText += a->email(); | ||
463 | mText += "</a>\n"; | ||
464 | #endif //DESKTOP_VERSION | ||
431 | #else | 465 | #else |
432 | //qDebug("nokabc "); | 466 | //qDebug("nokabc "); |
433 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 467 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
434 | if (!a->name().isEmpty()) mText += a->name(); | 468 | if (!a->name().isEmpty()) mText += a->name(); |
435 | else mText += a->email(); | 469 | else mText += a->email(); |
436 | mText += "</a>\n"; | 470 | mText += "</a>\n"; |
437 | #endif | 471 | #endif |
438 | 472 | ||
439 | 473 | ||
440 | if (!a->email().isEmpty()) { | 474 | if (!a->email().isEmpty()) { |
441 | if (iconPath) { | 475 | if (iconPath) { |
442 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; | 476 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; |
443 | mText += "<IMG src=\"" + iconPath + "\">"; | 477 | mText += "<IMG src=\"" + iconPath + "\">"; |
444 | mText += "</a>\n"; | 478 | mText += "</a>\n"; |
445 | } | 479 | } |
446 | } | 480 | } |
447 | if (a->status() != Attendee::NeedsAction ) | 481 | if (a->status() != Attendee::NeedsAction ) |
448 | mText +="[" + a->statusStr() + "] "; | 482 | mText +="[" + a->statusStr() + "] "; |
449 | if (a->role() == Attendee::Chair ) | 483 | if (a->role() == Attendee::Chair ) |
450 | mText +="(" + a->roleStr().left(1) + ".)"; | 484 | mText +="(" + a->roleStr().left(1) + ".)"; |
451 | } | 485 | } |
452 | mText.append("</li></ul>"); | 486 | mText.append("</li></ul>"); |
453 | } | 487 | } |
454 | 488 | ||
455 | } | 489 | } |
456 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 490 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
457 | { | 491 | { |
458 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 492 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
459 | if (mode == 0 ) | 493 | if (mode == 0 ) |
460 | addTag("h2",i18n("Journal from: ")); | 494 | addTag("h2",i18n("Journal from: ")); |
461 | else { | 495 | else { |
462 | if ( mode == 1 ) { | 496 | if ( mode == 1 ) { |
463 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); | 497 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); |
464 | } else { | 498 | } else { |
465 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); | 499 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); |
466 | } | 500 | } |
467 | addTag("h3",i18n( "Last modified " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | 501 | addTag("h3",i18n( "Last modified " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); |
468 | } | 502 | } |
469 | topLevelWidget()->setCaption("Journal Viewer"); | 503 | topLevelWidget()->setCaption("Journal Viewer"); |
470 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); | 504 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); |
471 | if (!jour->description().isEmpty()) { | 505 | if (!jour->description().isEmpty()) { |
472 | addTag("p",jour->description()); | 506 | addTag("p",jour->description()); |
473 | } | 507 | } |
474 | setText(mText); | 508 | setText(mText); |
475 | } | 509 | } |
476 | 510 | ||
477 | void KOEventViewer::formatReadOnly(Incidence *event) | 511 | void KOEventViewer::formatReadOnly(Incidence *event) |
478 | { | 512 | { |
479 | if (event->isReadOnly()) { | 513 | if (event->isReadOnly()) { |
480 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); | 514 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); |
481 | } | 515 | } |
482 | } | 516 | } |
483 | void KOEventViewer::setSyncMode( bool b ) | 517 | void KOEventViewer::setSyncMode( bool b ) |
484 | { | 518 | { |
485 | mSyncMode = b; | 519 | mSyncMode = b; |
486 | } | 520 | } |
487 | 521 | ||
488 | 522 | ||
489 | void KOEventViewer::setTodo(Todo *event, bool clearV ) | 523 | void KOEventViewer::setTodo(Todo *event, bool clearV ) |
490 | { | 524 | { |
491 | if ( clearV ) | 525 | if ( clearV ) |
492 | clearEvents(); | 526 | clearEvents(); |
493 | if ( mSyncMode ) { | 527 | if ( mSyncMode ) { |
494 | if ( clearV ) | 528 | if ( clearV ) |
495 | appendTodo(event,1 ); | 529 | appendTodo(event,1 ); |
496 | else | 530 | else |
497 | appendTodo(event,2); | 531 | appendTodo(event,2); |
498 | } else | 532 | } else |
499 | appendTodo(event); | 533 | appendTodo(event); |
500 | } | 534 | } |
501 | void KOEventViewer::setJournal(Journal *event, bool clearV ) | 535 | void KOEventViewer::setJournal(Journal *event, bool clearV ) |
502 | { | 536 | { |
503 | if ( clearV ) | 537 | if ( clearV ) |
504 | clearEvents(); | 538 | clearEvents(); |
505 | if ( mSyncMode ) { | 539 | if ( mSyncMode ) { |
506 | if ( clearV ) | 540 | if ( clearV ) |
507 | appendJournal(event, 1); | 541 | appendJournal(event, 1); |
508 | else | 542 | else |
509 | appendJournal(event, 2); | 543 | appendJournal(event, 2); |
510 | } else | 544 | } else |
511 | appendJournal(event); | 545 | appendJournal(event); |
512 | } | 546 | } |
513 | 547 | ||
514 | void KOEventViewer::setEvent(Event *event) | 548 | void KOEventViewer::setEvent(Event *event) |
515 | { | 549 | { |
516 | clearEvents(); | 550 | clearEvents(); |
517 | if ( mSyncMode ) | 551 | if ( mSyncMode ) |
518 | appendEvent(event, 1); | 552 | appendEvent(event, 1); |
519 | else | 553 | else |
520 | appendEvent(event); | 554 | appendEvent(event); |
521 | } | 555 | } |
522 | 556 | ||
523 | void KOEventViewer::addEvent(Event *event) | 557 | void KOEventViewer::addEvent(Event *event) |
524 | { | 558 | { |
525 | if ( mSyncMode ) | 559 | if ( mSyncMode ) |
526 | appendEvent(event, 2); | 560 | appendEvent(event, 2); |
527 | else | 561 | else |
528 | appendEvent(event); | 562 | appendEvent(event); |
529 | } | 563 | } |
530 | 564 | ||
531 | void KOEventViewer::clearEvents(bool now) | 565 | void KOEventViewer::clearEvents(bool now) |
532 | { | 566 | { |
533 | mText = ""; | 567 | mText = ""; |
534 | if (now) setText(mText); | 568 | if (now) setText(mText); |
535 | } | 569 | } |
536 | 570 | ||
537 | void KOEventViewer::addText(QString text) | 571 | void KOEventViewer::addText(QString text) |
538 | { | 572 | { |
539 | mText.append(text); | 573 | mText.append(text); |
540 | setText(mText); | 574 | setText(mText); |
541 | } | 575 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index d4fadcb..7978b46 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -13,385 +13,387 @@ | |||
13 | #include <qlabel.h> | 13 | #include <qlabel.h> |
14 | #include <qmap.h> | 14 | #include <qmap.h> |
15 | #include <qwmatrix.h> | 15 | #include <qwmatrix.h> |
16 | #include <qtextbrowser.h> | 16 | #include <qtextbrowser.h> |
17 | #include <qtextstream.h> | 17 | #include <qtextstream.h> |
18 | #ifndef DESKTOP_VERSION | 18 | #ifndef DESKTOP_VERSION |
19 | #include <qpe/global.h> | 19 | #include <qpe/global.h> |
20 | #include <qpe/qpemenubar.h> | 20 | #include <qpe/qpemenubar.h> |
21 | #include <qpe/qpetoolbar.h> | 21 | #include <qpe/qpetoolbar.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qtopia/alarmserver.h> | 24 | #include <qtopia/alarmserver.h> |
25 | #include <qtopia/qcopenvelope_qws.h> | 25 | #include <qtopia/qcopenvelope_qws.h> |
26 | #else | 26 | #else |
27 | #include <qmenubar.h> | 27 | #include <qmenubar.h> |
28 | #include <qtoolbar.h> | 28 | #include <qtoolbar.h> |
29 | #include <qapplication.h> | 29 | #include <qapplication.h> |
30 | //#include <resource.h> | 30 | //#include <resource.h> |
31 | 31 | ||
32 | #endif | 32 | #endif |
33 | #include <libkcal/calendarlocal.h> | 33 | #include <libkcal/calendarlocal.h> |
34 | #include <libkcal/todo.h> | 34 | #include <libkcal/todo.h> |
35 | #include <libkdepim/ksyncprofile.h> | 35 | #include <libkdepim/ksyncprofile.h> |
36 | #include <libkdepim/kincidenceformatter.h> | 36 | #include <libkdepim/kincidenceformatter.h> |
37 | 37 | ||
38 | #include "calendarview.h" | 38 | #include "calendarview.h" |
39 | #include "koviewmanager.h" | 39 | #include "koviewmanager.h" |
40 | #include "datenavigator.h" | 40 | #include "datenavigator.h" |
41 | #include "koagendaview.h" | 41 | #include "koagendaview.h" |
42 | #include "koagenda.h" | 42 | #include "koagenda.h" |
43 | #include "kodialogmanager.h" | 43 | #include "kodialogmanager.h" |
44 | #include "kdialogbase.h" | 44 | #include "kdialogbase.h" |
45 | #include "kapplication.h" | 45 | #include "kapplication.h" |
46 | #include "kofilterview.h" | 46 | #include "kofilterview.h" |
47 | #include "kstandarddirs.h" | 47 | #include "kstandarddirs.h" |
48 | #include "koprefs.h" | 48 | #include "koprefs.h" |
49 | #include "kfiledialog.h" | 49 | #include "kfiledialog.h" |
50 | #include "koglobals.h" | 50 | #include "koglobals.h" |
51 | #include "kglobal.h" | 51 | #include "kglobal.h" |
52 | #include "klocale.h" | 52 | #include "klocale.h" |
53 | #include "kconfig.h" | 53 | #include "kconfig.h" |
54 | #include "simplealarmclient.h" | 54 | #include "simplealarmclient.h" |
55 | #include "externalapphandler.h" | 55 | #include "externalapphandler.h" |
56 | 56 | ||
57 | using namespace KCal; | 57 | using namespace KCal; |
58 | #ifndef _WIN32_ | 58 | #ifndef _WIN32_ |
59 | #include <unistd.h> | 59 | #include <unistd.h> |
60 | #else | 60 | #else |
61 | #include "koimportoldialog.h" | 61 | #include "koimportoldialog.h" |
62 | #endif | 62 | #endif |
63 | #include "mainwindow.h" | 63 | #include "mainwindow.h" |
64 | 64 | ||
65 | int globalFlagBlockStartup; | 65 | int globalFlagBlockStartup; |
66 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 66 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
67 | QMainWindow( parent, name ) | 67 | QMainWindow( parent, name ) |
68 | { | 68 | { |
69 | 69 | ||
70 | #ifdef DESKTOP_VERSION | 70 | #ifdef DESKTOP_VERSION |
71 | setFont( QFont("Arial"), 14 ); | 71 | setFont( QFont("Arial"), 14 ); |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 74 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
75 | QString confFile = locateLocal("config","korganizerrc"); | 75 | QString confFile = locateLocal("config","korganizerrc"); |
76 | QFileInfo finf ( confFile ); | 76 | QFileInfo finf ( confFile ); |
77 | bool showWarning = !finf.exists(); | 77 | bool showWarning = !finf.exists(); |
78 | setIcon(SmallIcon( "ko24" ) ); | 78 | setIcon(SmallIcon( "ko24" ) ); |
79 | mBlockAtStartup = true; | 79 | mBlockAtStartup = true; |
80 | mFlagKeyPressed = false; | 80 | mFlagKeyPressed = false; |
81 | setCaption("KOrganizer/Pi"); | 81 | setCaption("KOrganizer/Pi"); |
82 | KOPrefs *p = KOPrefs::instance(); | 82 | KOPrefs *p = KOPrefs::instance(); |
83 | // if ( QApplication::desktop()->height() > 480 ) { | 83 | // if ( QApplication::desktop()->height() > 480 ) { |
84 | // if ( p->mHourSize == 4 ) | 84 | // if ( p->mHourSize == 4 ) |
85 | // p->mHourSize = 6; | 85 | // p->mHourSize = 6; |
86 | // } | 86 | // } |
87 | if ( p->mHourSize > 18 ) | 87 | if ( p->mHourSize > 18 ) |
88 | p->mHourSize = 18; | 88 | p->mHourSize = 18; |
89 | QMainWindow::ToolBarDock tbd; | 89 | QMainWindow::ToolBarDock tbd; |
90 | if ( p->mToolBarHor ) { | 90 | if ( p->mToolBarHor ) { |
91 | if ( p->mToolBarUp ) | 91 | if ( p->mToolBarUp ) |
92 | tbd = Bottom; | 92 | tbd = Bottom; |
93 | else | 93 | else |
94 | tbd = Top; | 94 | tbd = Top; |
95 | } | 95 | } |
96 | else { | 96 | else { |
97 | if ( p->mToolBarUp ) | 97 | if ( p->mToolBarUp ) |
98 | tbd = Right; | 98 | tbd = Right; |
99 | else | 99 | else |
100 | tbd = Left; | 100 | tbd = Left; |
101 | } | 101 | } |
102 | if ( KOPrefs::instance()->mUseAppColors ) | 102 | if ( KOPrefs::instance()->mUseAppColors ) |
103 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 103 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
104 | globalFlagBlockStartup = 1; | 104 | globalFlagBlockStartup = 1; |
105 | iconToolBar = new QPEToolBar( this ); | 105 | iconToolBar = new QPEToolBar( this ); |
106 | addToolBar (iconToolBar , tbd ); | 106 | addToolBar (iconToolBar , tbd ); |
107 | mBlockSaveFlag = false; | 107 | mBlockSaveFlag = false; |
108 | mCalendarModifiedFlag = false; | 108 | mCalendarModifiedFlag = false; |
109 | 109 | ||
110 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 110 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
111 | splash->setAlignment ( AlignCenter ); | 111 | splash->setAlignment ( AlignCenter ); |
112 | setCentralWidget( splash ); | 112 | setCentralWidget( splash ); |
113 | #ifndef DESKTOP_VERSION | 113 | #ifndef DESKTOP_VERSION |
114 | showMaximized(); | 114 | showMaximized(); |
115 | #endif | 115 | #endif |
116 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); | 116 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); |
117 | setDefaultPreferences(); | 117 | setDefaultPreferences(); |
118 | mCalendar = new CalendarLocal(); | 118 | mCalendar = new CalendarLocal(); |
119 | mView = new CalendarView( mCalendar, this,"mCalendar " ); | 119 | mView = new CalendarView( mCalendar, this,"mCalendar " ); |
120 | mView->hide(); | 120 | mView->hide(); |
121 | //mView->resize(splash->size() ); | 121 | //mView->resize(splash->size() ); |
122 | initActions(); | 122 | initActions(); |
123 | #ifndef DESKTOP_VERSION | 123 | #ifndef DESKTOP_VERSION |
124 | iconToolBar->show(); | 124 | iconToolBar->show(); |
125 | qApp->processEvents(); | 125 | qApp->processEvents(); |
126 | #endif | 126 | #endif |
127 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); | 127 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); |
128 | int vh = height() ; | 128 | int vh = height() ; |
129 | int vw = width(); | 129 | int vw = width(); |
130 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); | 130 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); |
131 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 131 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
132 | vh -= iconToolBar->height(); | 132 | vh -= iconToolBar->height(); |
133 | } else { | 133 | } else { |
134 | vw -= iconToolBar->height(); | 134 | vw -= iconToolBar->height(); |
135 | } | 135 | } |
136 | //mView->setMaximumSize( splash->size() ); | 136 | //mView->setMaximumSize( splash->size() ); |
137 | //mView->resize( splash->size() ); | 137 | //mView->resize( splash->size() ); |
138 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 138 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
139 | mView->readSettings(); | 139 | mView->readSettings(); |
140 | bool oldOpened = false; | 140 | bool oldOpened = false; |
141 | bool newFile = false; | 141 | bool newFile = false; |
142 | if( !QFile::exists( defaultFileName() ) ) { | 142 | if( !QFile::exists( defaultFileName() ) ) { |
143 | QFileInfo finfo ( defaultFileName() ); | 143 | QFileInfo finfo ( defaultFileName() ); |
144 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 144 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
145 | qDebug("oldfile %s ", oldFile.latin1()); | 145 | qDebug("oldfile %s ", oldFile.latin1()); |
146 | 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"; | 146 | 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"; |
147 | finfo.setFile( oldFile ); | 147 | finfo.setFile( oldFile ); |
148 | if (finfo.exists() ) { | 148 | if (finfo.exists() ) { |
149 | KMessageBox::information( this, message); | 149 | KMessageBox::information( this, message); |
150 | mView->openCalendar( oldFile ); | 150 | mView->openCalendar( oldFile ); |
151 | qApp->processEvents(); | 151 | qApp->processEvents(); |
152 | } else { | 152 | } else { |
153 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); | 153 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); |
154 | finfo.setFile( oldFile ); | 154 | finfo.setFile( oldFile ); |
155 | if (finfo.exists() ) { | 155 | if (finfo.exists() ) { |
156 | KMessageBox::information( this, message); | 156 | KMessageBox::information( this, message); |
157 | mView->openCalendar( oldFile ); | 157 | mView->openCalendar( oldFile ); |
158 | qApp->processEvents(); | 158 | qApp->processEvents(); |
159 | } | 159 | } |
160 | } | 160 | } |
161 | mView->saveCalendar( defaultFileName() ); | 161 | mView->saveCalendar( defaultFileName() ); |
162 | newFile = true; | 162 | newFile = true; |
163 | } | 163 | } |
164 | 164 | ||
165 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 165 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
166 | if ( ! oldOpened ) | 166 | if ( ! oldOpened ) |
167 | mView->openCalendar( defaultFileName() ); | 167 | mView->openCalendar( defaultFileName() ); |
168 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 168 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
169 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 169 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
170 | 170 | ||
171 | if ( KOPrefs::instance()->mLanguageChanged ) { | 171 | if ( KOPrefs::instance()->mLanguageChanged ) { |
172 | KOPrefs::instance()->setCategoryDefaults(); | 172 | KOPrefs::instance()->setCategoryDefaults(); |
173 | int count = mView->addCategories(); | 173 | int count = mView->addCategories(); |
174 | KOPrefs::instance()->mLanguageChanged = false; | 174 | KOPrefs::instance()->mLanguageChanged = false; |
175 | } | 175 | } |
176 | processIncidenceSelection( 0 ); | 176 | processIncidenceSelection( 0 ); |
177 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 177 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
178 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 178 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
179 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 179 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
180 | SLOT( slotModifiedChanged( bool ) ) ); | 180 | SLOT( slotModifiedChanged( bool ) ) ); |
181 | 181 | ||
182 | 182 | ||
183 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 183 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
184 | mView->setModified( false ); | 184 | mView->setModified( false ); |
185 | mBlockAtStartup = false; | 185 | mBlockAtStartup = false; |
186 | mView->setModified( false ); | 186 | mView->setModified( false ); |
187 | setCentralWidget( mView ); | 187 | setCentralWidget( mView ); |
188 | globalFlagBlockStartup = 0; | 188 | globalFlagBlockStartup = 0; |
189 | mView->show(); | 189 | mView->show(); |
190 | delete splash; | 190 | delete splash; |
191 | if ( newFile ) | 191 | if ( newFile ) |
192 | mView->updateConfig(); | 192 | mView->updateConfig(); |
193 | // qApp->processEvents(); | 193 | // qApp->processEvents(); |
194 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 194 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
195 | fillSyncMenu(); | 195 | fillSyncMenu(); |
196 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 196 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
197 | if ( showWarning ) { | 197 | if ( showWarning ) { |
198 | KMessageBox::information( this, | 198 | KMessageBox::information( this, |
199 | "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"); | 199 | "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"); |
200 | qApp->processEvents(); | 200 | qApp->processEvents(); |
201 | mView->dialogManager()->showSyncOptions(); | 201 | mView->dialogManager()->showSyncOptions(); |
202 | } | 202 | } |
203 | 203 | ||
204 | //US listen for result adressed from Ka/Pi | 204 | //US listen for result adressed from Ka/Pi |
205 | #ifndef DESKTOP_VERSION | ||
205 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 206 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
207 | #endif | ||
206 | } | 208 | } |
207 | MainWindow::~MainWindow() | 209 | MainWindow::~MainWindow() |
208 | { | 210 | { |
209 | //qDebug("MainWindow::~MainWindow() "); | 211 | //qDebug("MainWindow::~MainWindow() "); |
210 | //save toolbar location | 212 | //save toolbar location |
211 | 213 | ||
212 | delete mCalendar; | 214 | delete mCalendar; |
213 | delete KOPrefs::instance(); | 215 | delete KOPrefs::instance(); |
214 | delete KIncidenceFormatter::instance(); | 216 | delete KIncidenceFormatter::instance(); |
215 | 217 | ||
216 | 218 | ||
217 | } | 219 | } |
218 | void MainWindow::showMaximized () | 220 | void MainWindow::showMaximized () |
219 | { | 221 | { |
220 | #ifndef DESKTOP_VERSION | 222 | #ifndef DESKTOP_VERSION |
221 | if ( ! globalFlagBlockStartup ) | 223 | if ( ! globalFlagBlockStartup ) |
222 | mView->goToday(); | 224 | mView->goToday(); |
223 | #endif | 225 | #endif |
224 | QWidget::showMaximized () ; | 226 | QWidget::showMaximized () ; |
225 | } | 227 | } |
226 | void MainWindow::closeEvent( QCloseEvent* ce ) | 228 | void MainWindow::closeEvent( QCloseEvent* ce ) |
227 | { | 229 | { |
228 | 230 | ||
229 | 231 | ||
230 | 232 | ||
231 | if ( ! KOPrefs::instance()->mAskForQuit ) { | 233 | if ( ! KOPrefs::instance()->mAskForQuit ) { |
232 | saveOnClose(); | 234 | saveOnClose(); |
233 | ce->accept(); | 235 | ce->accept(); |
234 | return; | 236 | return; |
235 | 237 | ||
236 | } | 238 | } |
237 | 239 | ||
238 | switch( QMessageBox::information( this, "KO/Pi", | 240 | switch( QMessageBox::information( this, "KO/Pi", |
239 | i18n("Do you really want\nto close KO/Pi?"), | 241 | i18n("Do you really want\nto close KO/Pi?"), |
240 | i18n("Close"), i18n("No"), | 242 | i18n("Close"), i18n("No"), |
241 | 0, 0 ) ) { | 243 | 0, 0 ) ) { |
242 | case 0: | 244 | case 0: |
243 | saveOnClose(); | 245 | saveOnClose(); |
244 | ce->accept(); | 246 | ce->accept(); |
245 | break; | 247 | break; |
246 | case 1: | 248 | case 1: |
247 | ce->ignore(); | 249 | ce->ignore(); |
248 | break; | 250 | break; |
249 | case 2: | 251 | case 2: |
250 | 252 | ||
251 | default: | 253 | default: |
252 | break; | 254 | break; |
253 | } | 255 | } |
254 | 256 | ||
255 | 257 | ||
256 | } | 258 | } |
257 | 259 | ||
258 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | 260 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) |
259 | { | 261 | { |
260 | QDataStream stream( data, IO_ReadOnly ); | 262 | QDataStream stream( data, IO_ReadOnly ); |
261 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); | 263 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); |
262 | //QString datamess; | 264 | //QString datamess; |
263 | //qDebug("message "); | 265 | //qDebug("message "); |
264 | qDebug("KO: QCOP message received: %s ", cmsg.data() ); | 266 | qDebug("KO: QCOP message received: %s ", cmsg.data() ); |
265 | 267 | ||
266 | if ( cmsg == "-writeFile" ) { | 268 | if ( cmsg == "-writeFile" ) { |
267 | // I made from the "-writeFile" an "-writeAlarm" | 269 | // I made from the "-writeFile" an "-writeAlarm" |
268 | mView->viewManager()->showWhatsNextView(); | 270 | mView->viewManager()->showWhatsNextView(); |
269 | mCalendar->checkAlarmForIncidence( 0, true); | 271 | mCalendar->checkAlarmForIncidence( 0, true); |
270 | showMaximized(); | 272 | showMaximized(); |
271 | raise(); | 273 | raise(); |
272 | return; | 274 | return; |
273 | } | 275 | } |
274 | 276 | ||
275 | if ( cmsg == "-writeFile" ) { | 277 | if ( cmsg == "-writeFile" ) { |
276 | // I made from the "-writeFile" an "-writeAlarm" | 278 | // I made from the "-writeFile" an "-writeAlarm" |
277 | mView->viewManager()->showWhatsNextView(); | 279 | mView->viewManager()->showWhatsNextView(); |
278 | mCalendar->checkAlarmForIncidence( 0, true); | 280 | mCalendar->checkAlarmForIncidence( 0, true); |
279 | showMaximized(); | 281 | showMaximized(); |
280 | raise(); | 282 | raise(); |
281 | return; | 283 | return; |
282 | 284 | ||
283 | } | 285 | } |
284 | if ( cmsg == "-writeFileSilent" ) { | 286 | if ( cmsg == "-writeFileSilent" ) { |
285 | // I made from the "-writeFile" an "-writeAlarm" | 287 | // I made from the "-writeFile" an "-writeAlarm" |
286 | // mView->viewManager()->showWhatsNextView(); | 288 | // mView->viewManager()->showWhatsNextView(); |
287 | mCalendar->checkAlarmForIncidence( 0, true); | 289 | mCalendar->checkAlarmForIncidence( 0, true); |
288 | //showMaximized(); | 290 | //showMaximized(); |
289 | //raise(); | 291 | //raise(); |
290 | hide(); | 292 | hide(); |
291 | return; | 293 | return; |
292 | } | 294 | } |
293 | if ( cmsg == "-newCountdown" ) { | 295 | if ( cmsg == "-newCountdown" ) { |
294 | qDebug("newCountdown "); | 296 | qDebug("newCountdown "); |
295 | 297 | ||
296 | } | 298 | } |
297 | QString msg ; | 299 | QString msg ; |
298 | QString allmsg = cmsg; | 300 | QString allmsg = cmsg; |
299 | while ( allmsg.length() > 0 ) { | 301 | while ( allmsg.length() > 0 ) { |
300 | int nextC = allmsg.find( "-", 1 ); | 302 | int nextC = allmsg.find( "-", 1 ); |
301 | if ( nextC == -1 ) { | 303 | if ( nextC == -1 ) { |
302 | msg = allmsg; | 304 | msg = allmsg; |
303 | allmsg = ""; | 305 | allmsg = ""; |
304 | } else{ | 306 | } else{ |
305 | msg = allmsg.left( nextC ); | 307 | msg = allmsg.left( nextC ); |
306 | allmsg = allmsg.mid( nextC, allmsg.length()-nextC ); | 308 | allmsg = allmsg.mid( nextC, allmsg.length()-nextC ); |
307 | } | 309 | } |
308 | //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); | 310 | //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); |
309 | if ( msg == "-newEvent" ) { | 311 | if ( msg == "-newEvent" ) { |
310 | mView->newEvent(); | 312 | mView->newEvent(); |
311 | } | 313 | } |
312 | if ( msg == "-newTodo" ) { | 314 | if ( msg == "-newTodo" ) { |
313 | mView->newTodo(); | 315 | mView->newTodo(); |
314 | 316 | ||
315 | } | 317 | } |
316 | if ( msg == "-showWN" ) { | 318 | if ( msg == "-showWN" ) { |
317 | mView->viewManager()->showWhatsNextView(); | 319 | mView->viewManager()->showWhatsNextView(); |
318 | } | 320 | } |
319 | if ( msg == "-showTodo" ) { | 321 | if ( msg == "-showTodo" ) { |
320 | mView->viewManager()->showTodoView(); | 322 | mView->viewManager()->showTodoView(); |
321 | } | 323 | } |
322 | if ( msg == "-showList" ) { | 324 | if ( msg == "-showList" ) { |
323 | mView->viewManager()->showListView(); | 325 | mView->viewManager()->showListView(); |
324 | } | 326 | } |
325 | else if ( msg == "-showDay" ) { | 327 | else if ( msg == "-showDay" ) { |
326 | mView->viewManager()->showDayView(); | 328 | mView->viewManager()->showDayView(); |
327 | } | 329 | } |
328 | else if ( msg == "-showWWeek" ) { | 330 | else if ( msg == "-showWWeek" ) { |
329 | mView->viewManager()->showWorkWeekView(); | 331 | mView->viewManager()->showWorkWeekView(); |
330 | } | 332 | } |
331 | else if ( msg == "-ringSync" ) { | 333 | else if ( msg == "-ringSync" ) { |
332 | multiSync( false ); | 334 | multiSync( false ); |
333 | } | 335 | } |
334 | else if ( msg == "-showWeek" ) { | 336 | else if ( msg == "-showWeek" ) { |
335 | mView->viewManager()->showWeekView(); | 337 | mView->viewManager()->showWeekView(); |
336 | } | 338 | } |
337 | else if ( msg == "-showTodo" ) { | 339 | else if ( msg == "-showTodo" ) { |
338 | mView->viewManager()->showTodoView(); | 340 | mView->viewManager()->showTodoView(); |
339 | } | 341 | } |
340 | else if ( msg == "-showJournal" ) { | 342 | else if ( msg == "-showJournal" ) { |
341 | mView->dateNavigator()->selectDates( 1 ); | 343 | mView->dateNavigator()->selectDates( 1 ); |
342 | mView->dateNavigator()->selectToday(); | 344 | mView->dateNavigator()->selectToday(); |
343 | mView->viewManager()->showJournalView(); | 345 | mView->viewManager()->showJournalView(); |
344 | } | 346 | } |
345 | else if ( msg == "-showKO" ) { | 347 | else if ( msg == "-showKO" ) { |
346 | mView->viewManager()->showNextXView(); | 348 | mView->viewManager()->showNextXView(); |
347 | } | 349 | } |
348 | else if ( msg == "-showWNext" || msg == "nextView()" ) { | 350 | else if ( msg == "-showWNext" || msg == "nextView()" ) { |
349 | mView->viewManager()->showWhatsNextView(); | 351 | mView->viewManager()->showWhatsNextView(); |
350 | } | 352 | } |
351 | else if ( msg == "-showNextXView" ) { | 353 | else if ( msg == "-showNextXView" ) { |
352 | mView->viewManager()->showNextXView(); | 354 | mView->viewManager()->showNextXView(); |
353 | } | 355 | } |
354 | 356 | ||
355 | 357 | ||
356 | } | 358 | } |
357 | 359 | ||
358 | showMaximized(); | 360 | showMaximized(); |
359 | raise(); | 361 | raise(); |
360 | } | 362 | } |
361 | 363 | ||
362 | QPixmap MainWindow::loadPixmap( QString name ) | 364 | QPixmap MainWindow::loadPixmap( QString name ) |
363 | { | 365 | { |
364 | return SmallIcon( name ); | 366 | return SmallIcon( name ); |
365 | 367 | ||
366 | } | 368 | } |
367 | void MainWindow::initActions() | 369 | void MainWindow::initActions() |
368 | { | 370 | { |
369 | //KOPrefs::instance()->mShowFullMenu | 371 | //KOPrefs::instance()->mShowFullMenu |
370 | iconToolBar->clear(); | 372 | iconToolBar->clear(); |
371 | KOPrefs *p = KOPrefs::instance(); | 373 | KOPrefs *p = KOPrefs::instance(); |
372 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); | 374 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); |
373 | 375 | ||
374 | QPopupMenu *viewMenu = new QPopupMenu( this ); | 376 | QPopupMenu *viewMenu = new QPopupMenu( this ); |
375 | QPopupMenu *actionMenu = new QPopupMenu( this ); | 377 | QPopupMenu *actionMenu = new QPopupMenu( this ); |
376 | QPopupMenu *importMenu = new QPopupMenu( this ); | 378 | QPopupMenu *importMenu = new QPopupMenu( this ); |
377 | selectFilterMenu = new QPopupMenu( this ); | 379 | selectFilterMenu = new QPopupMenu( this ); |
378 | selectFilterMenu->setCheckable( true ); | 380 | selectFilterMenu->setCheckable( true ); |
379 | syncMenu = new QPopupMenu( this ); | 381 | syncMenu = new QPopupMenu( this ); |
380 | configureAgendaMenu = new QPopupMenu( this ); | 382 | configureAgendaMenu = new QPopupMenu( this ); |
381 | configureToolBarMenu = new QPopupMenu( this ); | 383 | configureToolBarMenu = new QPopupMenu( this ); |
382 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 384 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
383 | if ( KOPrefs::instance()->mShowFullMenu ) { | 385 | if ( KOPrefs::instance()->mShowFullMenu ) { |
384 | QMenuBar *menuBar1; | 386 | QMenuBar *menuBar1; |
385 | menuBar1 = menuBar(); | 387 | menuBar1 = menuBar(); |
386 | menuBar1->insertItem( i18n("File"), importMenu ); | 388 | menuBar1->insertItem( i18n("File"), importMenu ); |
387 | menuBar1->insertItem( i18n("View"), viewMenu ); | 389 | menuBar1->insertItem( i18n("View"), viewMenu ); |
388 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 390 | menuBar1->insertItem( i18n("Actions"), actionMenu ); |
389 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 391 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
390 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 392 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
391 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 393 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
392 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); | 394 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); |
393 | menuBar1->insertItem( i18n("Help"), helpMenu ); | 395 | menuBar1->insertItem( i18n("Help"), helpMenu ); |
394 | } else { | 396 | } else { |
395 | QPEMenuBar *menuBar1; | 397 | QPEMenuBar *menuBar1; |
396 | menuBar1 = new QPEMenuBar( iconToolBar ); | 398 | menuBar1 = new QPEMenuBar( iconToolBar ); |
397 | QPopupMenu *menuBar = new QPopupMenu( this ); | 399 | QPopupMenu *menuBar = new QPopupMenu( this ); |