author | zautrix <zautrix> | 2004-09-09 21:22:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-09 21:22:38 (UTC) |
commit | 10eb314475b75a162582e8138d465890dbd21806 (patch) (unidiff) | |
tree | 9045f8a02113eedf2f2c59d239e4e43b41c2cdc5 | |
parent | 5b0e3c87bbe32aacd51f6faff5446ed3838a68e0 (diff) | |
download | kdepimpi-10eb314475b75a162582e8138d465890dbd21806.zip kdepimpi-10eb314475b75a162582e8138d465890dbd21806.tar.gz kdepimpi-10eb314475b75a162582e8138d465890dbd21806.tar.bz2 |
Fixed closing of event viewer
-rw-r--r-- | korganizer/koeventviewer.cpp | 1 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index d34e6a9..948047a 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -73,49 +73,48 @@ 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 | |||
98 | } | 97 | } |
99 | dia.exec(); | 98 | dia.exec(); |
100 | break; | 99 | break; |
101 | } | 100 | } |
102 | } | 101 | } |
103 | return; | 102 | return; |
104 | } | 103 | } |
105 | #else | 104 | #else |
106 | { | 105 | { |
107 | if ( "uid:organizer" == n ) { | 106 | if ( "uid:organizer" == n ) { |
108 | ExternalAppHandler::instance()->requestDetailsFromKAPI("", mCurrentIncidence->organizer(),""); | 107 | ExternalAppHandler::instance()->requestDetailsFromKAPI("", mCurrentIncidence->organizer(),""); |
109 | return; | 108 | return; |
110 | } | 109 | } |
111 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); | 110 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); |
112 | if (attendees.count()) { | 111 | if (attendees.count()) { |
113 | Attendee *a; | 112 | Attendee *a; |
114 | for(a=attendees.first();a;a=attendees.next()) { | 113 | for(a=attendees.first();a;a=attendees.next()) { |
115 | if ( "uid:"+a->uid() == n ) { | 114 | if ( "uid:"+a->uid() == n ) { |
116 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid()); | 115 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid()); |
117 | return; | 116 | return; |
118 | } | 117 | } |
119 | } | 118 | } |
120 | } | 119 | } |
121 | return; | 120 | return; |
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index be183eb..68c0e1a 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -206,34 +206,35 @@ void KOEventViewerDialog::showIncidence() | |||
206 | emit showAgendaView( false ); | 206 | emit showAgendaView( false ); |
207 | return; | 207 | return; |
208 | } | 208 | } |
209 | } else | 209 | } else |
210 | date = mIncidence->dtStart().date(); | 210 | date = mIncidence->dtStart().date(); |
211 | globalFlagBlockAgenda = 1; | 211 | globalFlagBlockAgenda = 1; |
212 | emit showAgendaView( false ); | 212 | emit showAgendaView( false ); |
213 | globalFlagBlockAgenda = 2; | 213 | globalFlagBlockAgenda = 2; |
214 | emit jumpToTime( date ); | 214 | emit jumpToTime( date ); |
215 | } | 215 | } |
216 | } | 216 | } |
217 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | 217 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) |
218 | { | 218 | { |
219 | switch ( e->key() ) { | 219 | switch ( e->key() ) { |
220 | 220 | ||
221 | case Qt::Key_A : | 221 | case Qt::Key_A : |
222 | case Qt::Key_L : | 222 | case Qt::Key_L : |
223 | showIncidence(); | 223 | showIncidence(); |
224 | break; | 224 | break; |
225 | case Qt::Key_E : | 225 | case Qt::Key_E : |
226 | case Qt::Key_R : | 226 | case Qt::Key_R : |
227 | editIncidence(); | 227 | editIncidence(); |
228 | break; | 228 | break; |
229 | case Qt::Key_C: | 229 | case Qt::Key_C: |
230 | case Qt::Key_Escape: | ||
230 | close(); | 231 | close(); |
231 | break; | 232 | break; |
232 | case Qt::Key_I: | 233 | case Qt::Key_I: |
233 | accept(); | 234 | accept(); |
234 | break; | 235 | break; |
235 | default: | 236 | default: |
236 | break; | 237 | break; |
237 | } | 238 | } |
238 | 239 | ||
239 | } | 240 | } |