-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 6 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 9 | ||||
-rw-r--r-- | korganizer/searchdialog.h | 4 |
4 files changed, 18 insertions, 3 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index e2c8e6e..f606124 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -169,124 +169,130 @@ void KOEventViewerDialog::addEvent(Event *event) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | void KOEventViewerDialog::setTodo(Todo *event) | 171 | void KOEventViewerDialog::setTodo(Todo *event) |
172 | { | 172 | { |
173 | mEventViewer->setTodo(event); | 173 | mEventViewer->setTodo(event); |
174 | mIncidence = (Incidence*)event; | 174 | mIncidence = (Incidence*)event; |
175 | mEventViewer->setFocus(); | 175 | mEventViewer->setFocus(); |
176 | //findButton( Close )->setFocus(); | 176 | //findButton( Close )->setFocus(); |
177 | if ( !mSyncMode ) { | 177 | if ( !mSyncMode ) { |
178 | findButton( User1 )->setText( i18n("Set complete")); | 178 | findButton( User1 )->setText( i18n("Set complete")); |
179 | } | 179 | } |
180 | } | 180 | } |
181 | void KOEventViewerDialog::setJournal(Journal *j) | 181 | void KOEventViewerDialog::setJournal(Journal *j) |
182 | { | 182 | { |
183 | mEventViewer->setJournal(j); | 183 | mEventViewer->setJournal(j); |
184 | mIncidence = (Incidence*)j; | 184 | mIncidence = (Incidence*)j; |
185 | mEventViewer->setFocus(); | 185 | mEventViewer->setFocus(); |
186 | //findButton( Close )->setFocus(); | 186 | //findButton( Close )->setFocus(); |
187 | if ( !mSyncMode ) { | 187 | if ( !mSyncMode ) { |
188 | findButton( User1 )->setText( i18n("Agenda")); | 188 | findButton( User1 )->setText( i18n("Agenda")); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | 191 | ||
192 | void KOEventViewerDialog::addText(QString text) | 192 | void KOEventViewerDialog::addText(QString text) |
193 | { | 193 | { |
194 | mEventViewer->addText(text); | 194 | mEventViewer->addText(text); |
195 | mEventViewer->setFocus(); | 195 | mEventViewer->setFocus(); |
196 | //findButton( Close )->setFocus(); | 196 | //findButton( Close )->setFocus(); |
197 | } | 197 | } |
198 | void KOEventViewerDialog::editIncidence() | 198 | void KOEventViewerDialog::editIncidence() |
199 | { | 199 | { |
200 | sendSignalViewerClosed = false; | 200 | sendSignalViewerClosed = false; |
201 | if ( mSyncMode ) { | 201 | if ( mSyncMode ) { |
202 | mSyncResult = 2; | 202 | mSyncResult = 2; |
203 | accept(); | 203 | accept(); |
204 | return; | 204 | return; |
205 | } | 205 | } |
206 | if ( mIncidence ){ | 206 | if ( mIncidence ){ |
207 | #ifndef DESKTOP_VERSION | 207 | #ifndef DESKTOP_VERSION |
208 | hide(); | 208 | hide(); |
209 | #endif | 209 | #endif |
210 | emit editIncidence( mIncidence ); | 210 | emit editIncidence( mIncidence ); |
211 | } | 211 | } |
212 | } | 212 | } |
213 | void KOEventViewerDialog::showIncidence() | 213 | void KOEventViewerDialog::showIncidence() |
214 | { | 214 | { |
215 | sendSignalViewerClosed = false; | 215 | sendSignalViewerClosed = false; |
216 | if ( mSyncMode ) { | 216 | if ( mSyncMode ) { |
217 | mSyncResult = 1; | 217 | mSyncResult = 1; |
218 | accept(); | 218 | accept(); |
219 | return; | 219 | return; |
220 | } | 220 | } |
221 | 221 | ||
222 | if ( mIncidence ){ | 222 | if ( mIncidence ){ |
223 | #ifndef DESKTOP_VERSION | 223 | #ifndef DESKTOP_VERSION |
224 | hide(); | 224 | hide(); |
225 | #endif | 225 | #endif |
226 | QDate date; | 226 | QDate date; |
227 | if ( mIncidence->type() == "Todo" ) { | 227 | if ( mIncidence->type() == "Todo" ) { |
228 | /* | 228 | /* |
229 | if ( ((Todo*)mIncidence)->hasDueDate() ) | 229 | if ( ((Todo*)mIncidence)->hasDueDate() ) |
230 | date = ((Todo*)mIncidence)->dtDue().date(); | 230 | date = ((Todo*)mIncidence)->dtDue().date(); |
231 | else { | 231 | else { |
232 | globalFlagBlockAgenda = 2; | 232 | globalFlagBlockAgenda = 2; |
233 | emit showAgendaView( false ); | 233 | emit showAgendaView( false ); |
234 | return; | 234 | return; |
235 | } | 235 | } |
236 | */ | 236 | */ |
237 | ((Todo*)mIncidence)->setCompleted( true ); | 237 | ((Todo*)mIncidence)->setCompleted( true ); |
238 | ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); | 238 | ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); |
239 | hide(); | 239 | hide(); |
240 | emit todoCompleted(((Todo*)mIncidence)); | 240 | emit todoCompleted(((Todo*)mIncidence)); |
241 | return; | 241 | return; |
242 | 242 | ||
243 | } else | 243 | } else |
244 | date = mIncidence->dtStart().date(); | 244 | date = mIncidence->dtStart().date(); |
245 | globalFlagBlockAgenda = 1; | 245 | globalFlagBlockAgenda = 1; |
246 | emit showAgendaView( false ); | 246 | emit showAgendaView( false ); |
247 | globalFlagBlockAgenda = 2; | 247 | globalFlagBlockAgenda = 2; |
248 | emit jumpToTime( date ); | 248 | emit jumpToTime( date ); |
249 | } | 249 | } |
250 | } | 250 | } |
251 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | 251 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) |
252 | { | 252 | { |
253 | switch ( e->key() ) { | 253 | switch ( e->key() ) { |
254 | 254 | ||
255 | case Qt::Key_A : | 255 | case Qt::Key_A : |
256 | case Qt::Key_L : | 256 | case Qt::Key_L : |
257 | showIncidence(); | 257 | showIncidence(); |
258 | break; | 258 | break; |
259 | case Qt::Key_E : | 259 | case Qt::Key_E : |
260 | case Qt::Key_R : | 260 | case Qt::Key_R : |
261 | editIncidence(); | 261 | editIncidence(); |
262 | break; | 262 | break; |
263 | case Qt::Key_C: | 263 | case Qt::Key_C: |
264 | case Qt::Key_Escape: | 264 | case Qt::Key_Escape: |
265 | sendSignalViewerClosed = true; | ||
265 | close(); | 266 | close(); |
266 | break; | 267 | break; |
267 | case Qt::Key_I: | 268 | case Qt::Key_I: |
269 | #ifndef DESKTOP_VERSION | ||
270 | sendSignalViewerClosed = true; | ||
271 | close(); | ||
272 | #else | ||
268 | sendSignalViewerClosed = true; | 273 | sendSignalViewerClosed = true; |
269 | slotViewerClosed(); | 274 | slotViewerClosed(); |
270 | //accept(); | 275 | //accept(); |
276 | #endif | ||
271 | break; | 277 | break; |
272 | default: | 278 | default: |
273 | KDialogBase::keyPressEvent ( e ); | 279 | KDialogBase::keyPressEvent ( e ); |
274 | break; | 280 | break; |
275 | } | 281 | } |
276 | 282 | ||
277 | } | 283 | } |
278 | void KOEventViewerDialog::hideEvent ( QHideEvent * e ) | 284 | void KOEventViewerDialog::hideEvent ( QHideEvent * e ) |
279 | { | 285 | { |
280 | KDialogBase::hideEvent ( e ); | 286 | KDialogBase::hideEvent ( e ); |
281 | QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) ); | 287 | QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) ); |
282 | } | 288 | } |
283 | 289 | ||
284 | void KOEventViewerDialog::slotViewerClosed() | 290 | void KOEventViewerDialog::slotViewerClosed() |
285 | { | 291 | { |
286 | if ( sendSignalViewerClosed ) { | 292 | if ( sendSignalViewerClosed ) { |
287 | //qDebug("KOEventViewerDialog::hideEvent "); | 293 | //qDebug("KOEventViewerDialog::hideEvent "); |
288 | emit signalViewerClosed(); | 294 | emit signalViewerClosed(); |
289 | } | 295 | } |
290 | sendSignalViewerClosed = true; | 296 | sendSignalViewerClosed = true; |
291 | } | 297 | } |
292 | 298 | ||
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 6acee75..710a9f9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -990,194 +990,194 @@ void KOListView::clear() | |||
990 | Incidence* KOListView::currentItem() | 990 | Incidence* KOListView::currentItem() |
991 | { | 991 | { |
992 | if ( mListView->currentItem() ) | 992 | if ( mListView->currentItem() ) |
993 | return ((KOListViewItem*) mListView->currentItem())->data(); | 993 | return ((KOListViewItem*) mListView->currentItem())->data(); |
994 | return 0; | 994 | return 0; |
995 | } | 995 | } |
996 | void KOListView::keyPressEvent ( QKeyEvent *e) | 996 | void KOListView::keyPressEvent ( QKeyEvent *e) |
997 | { | 997 | { |
998 | 998 | ||
999 | if ( e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace ) { | 999 | if ( e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace ) { |
1000 | deleteAll(); | 1000 | deleteAll(); |
1001 | return; | 1001 | return; |
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | e->ignore(); | 1004 | e->ignore(); |
1005 | } | 1005 | } |
1006 | void KOListViewListView::keyPressEvent ( QKeyEvent *e) | 1006 | void KOListViewListView::keyPressEvent ( QKeyEvent *e) |
1007 | { | 1007 | { |
1008 | 1008 | ||
1009 | switch ( e->key() ) { | 1009 | switch ( e->key() ) { |
1010 | case Qt::Key_Down: | 1010 | case Qt::Key_Down: |
1011 | if ( e->state() == ShiftButton ) { | 1011 | if ( e->state() == ShiftButton ) { |
1012 | QListViewItem* cn = currentItem(); | 1012 | QListViewItem* cn = currentItem(); |
1013 | if ( !cn ) | 1013 | if ( !cn ) |
1014 | cn = firstChild(); | 1014 | cn = firstChild(); |
1015 | if ( !cn ) | 1015 | if ( !cn ) |
1016 | return; | 1016 | return; |
1017 | while ( cn->nextSibling() ) | 1017 | while ( cn->nextSibling() ) |
1018 | cn = cn->nextSibling(); | 1018 | cn = cn->nextSibling(); |
1019 | setCurrentItem ( cn ); | 1019 | setCurrentItem ( cn ); |
1020 | ensureItemVisible ( cn ); | 1020 | ensureItemVisible ( cn ); |
1021 | 1021 | ||
1022 | e->accept(); | 1022 | e->accept(); |
1023 | return; | 1023 | return; |
1024 | } | 1024 | } |
1025 | if ( e->state() == ControlButton ) { | 1025 | if ( e->state() == ControlButton ) { |
1026 | int count = childCount (); | 1026 | int count = childCount (); |
1027 | int jump = count / 5; | 1027 | int jump = count / 5; |
1028 | QListViewItem* cn; | 1028 | QListViewItem* cn; |
1029 | cn = currentItem(); | 1029 | cn = currentItem(); |
1030 | if ( ! cn ) | 1030 | if ( ! cn ) |
1031 | return; | 1031 | return; |
1032 | if ( jump == 0 ) | 1032 | if ( jump == 0 ) |
1033 | jump = 1; | 1033 | jump = 1; |
1034 | while ( jump && cn->nextSibling() ) { | 1034 | while ( jump && cn->nextSibling() ) { |
1035 | cn = cn->nextSibling(); | 1035 | cn = cn->nextSibling(); |
1036 | --jump; | 1036 | --jump; |
1037 | } | 1037 | } |
1038 | setCurrentItem ( cn ); | 1038 | setCurrentItem ( cn ); |
1039 | ensureItemVisible ( cn ); | 1039 | ensureItemVisible ( cn ); |
1040 | 1040 | ||
1041 | } else | 1041 | } else |
1042 | QListView::keyPressEvent ( e ) ; | 1042 | QListView::keyPressEvent ( e ) ; |
1043 | e->accept(); | 1043 | e->accept(); |
1044 | break; | 1044 | break; |
1045 | 1045 | ||
1046 | case Qt::Key_Up: | 1046 | case Qt::Key_Up: |
1047 | if ( e->state() == ShiftButton ) { | 1047 | if ( e->state() == ShiftButton ) { |
1048 | QListViewItem* cn = firstChild(); | 1048 | QListViewItem* cn = firstChild(); |
1049 | if ( cn ) { | 1049 | if ( cn ) { |
1050 | setCurrentItem ( cn ); | 1050 | setCurrentItem ( cn ); |
1051 | ensureItemVisible ( cn ); | 1051 | ensureItemVisible ( cn ); |
1052 | } | 1052 | } |
1053 | e->accept(); | 1053 | e->accept(); |
1054 | return; | 1054 | return; |
1055 | } | 1055 | } |
1056 | if ( e->state() == ControlButton ) { | 1056 | if ( e->state() == ControlButton ) { |
1057 | int count = childCount (); | 1057 | int count = childCount (); |
1058 | int jump = count / 5; | 1058 | int jump = count / 5; |
1059 | QListViewItem* cn; | 1059 | QListViewItem* cn; |
1060 | cn = currentItem(); | 1060 | cn = currentItem(); |
1061 | if ( ! cn ) | 1061 | if ( ! cn ) |
1062 | return; | 1062 | return; |
1063 | if ( jump == 0 ) | 1063 | if ( jump == 0 ) |
1064 | jump = 1; | 1064 | jump = 1; |
1065 | while ( jump && cn->itemAbove ()) { | 1065 | while ( jump && cn->itemAbove ()) { |
1066 | cn = cn->itemAbove (); | 1066 | cn = cn->itemAbove (); |
1067 | --jump; | 1067 | --jump; |
1068 | } | 1068 | } |
1069 | setCurrentItem ( cn ); | 1069 | setCurrentItem ( cn ); |
1070 | ensureItemVisible ( cn ); | 1070 | ensureItemVisible ( cn ); |
1071 | } else | 1071 | } else |
1072 | QListView::keyPressEvent ( e ) ; | 1072 | QListView::keyPressEvent ( e ) ; |
1073 | e->accept(); | 1073 | e->accept(); |
1074 | break; | 1074 | break; |
1075 | case Qt::Key_I: { | 1075 | case Qt::Key_I: { |
1076 | QListViewItem* cn; | 1076 | QListViewItem* cn; |
1077 | cn = currentItem(); | 1077 | cn = currentItem(); |
1078 | if ( cn ) { | 1078 | if ( cn ) { |
1079 | KOListViewItem* ci = (KOListViewItem*)( cn ); | 1079 | KOListViewItem* ci = (KOListViewItem*)( cn ); |
1080 | if ( ci ){ | 1080 | if ( ci ){ |
1081 | //emit showIncidence( ci->data()); | 1081 | //emit showIncidence( ci->data()); |
1082 | cn = cn->nextSibling(); | 1082 | cn = cn->nextSibling(); |
1083 | if ( cn ) { | 1083 | if ( cn ) { |
1084 | setCurrentItem ( cn ); | 1084 | setCurrentItem ( cn ); |
1085 | ensureItemVisible ( cn ); | 1085 | ensureItemVisible ( cn ); |
1086 | emit showIncidence( ci->data()); | ||
1087 | } | 1086 | } |
1087 | emit showIncidence( ci->data()); | ||
1088 | } | 1088 | } |
1089 | } | 1089 | } |
1090 | e->accept(); | 1090 | e->accept(); |
1091 | } | 1091 | } |
1092 | break; | 1092 | break; |
1093 | case Qt::Key_Return: | 1093 | case Qt::Key_Return: |
1094 | case Qt::Key_Enter: | 1094 | case Qt::Key_Enter: |
1095 | { | 1095 | { |
1096 | QListViewItem* cn; | 1096 | QListViewItem* cn; |
1097 | cn = currentItem(); | 1097 | cn = currentItem(); |
1098 | if ( cn ) { | 1098 | if ( cn ) { |
1099 | KOListViewItem* ci = (KOListViewItem*)( cn ); | 1099 | KOListViewItem* ci = (KOListViewItem*)( cn ); |
1100 | if ( ci ){ | 1100 | if ( ci ){ |
1101 | if ( e->state() == ShiftButton ) | 1101 | if ( e->state() == ShiftButton ) |
1102 | ci->setSelected( false ); | 1102 | ci->setSelected( false ); |
1103 | else | 1103 | else |
1104 | ci->setSelected( true ); | 1104 | ci->setSelected( true ); |
1105 | cn = cn->nextSibling(); | 1105 | cn = cn->nextSibling(); |
1106 | if ( cn ) { | 1106 | if ( cn ) { |
1107 | setCurrentItem ( cn ); | 1107 | setCurrentItem ( cn ); |
1108 | ensureItemVisible ( cn ); | 1108 | ensureItemVisible ( cn ); |
1109 | } | 1109 | } |
1110 | } | 1110 | } |
1111 | } | 1111 | } |
1112 | e->accept(); | 1112 | e->accept(); |
1113 | } | 1113 | } |
1114 | break; | 1114 | break; |
1115 | default: | 1115 | default: |
1116 | e->ignore(); | 1116 | e->ignore(); |
1117 | } | 1117 | } |
1118 | } | 1118 | } |
1119 | KOListViewListView::KOListViewListView(KOListView * lv ) | 1119 | KOListViewListView::KOListViewListView(KOListView * lv ) |
1120 | : KListView( lv ) | 1120 | : KListView( lv ) |
1121 | { | 1121 | { |
1122 | #ifndef DESKTOP_VERSION | 1122 | #ifndef DESKTOP_VERSION |
1123 | QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); | 1123 | QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); |
1124 | #endif | 1124 | #endif |
1125 | mYMousePos = -1000; | 1125 | mYMousePos = -1000; |
1126 | setSelectionMode( QListView::Multi ); | 1126 | setSelectionMode( QListView::Multi ); |
1127 | setMultiSelection( true); | 1127 | setMultiSelection( true); |
1128 | mAllowPopupMenu = true; | 1128 | mAllowPopupMenu = true; |
1129 | mMouseDown = false; | 1129 | mMouseDown = false; |
1130 | 1130 | ||
1131 | } | 1131 | } |
1132 | void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e) | 1132 | void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e) |
1133 | { | 1133 | { |
1134 | if (!e) return; | 1134 | if (!e) return; |
1135 | QPoint vp = contentsToViewport(e->pos()); | 1135 | QPoint vp = contentsToViewport(e->pos()); |
1136 | QListViewItem *item = itemAt(vp); | 1136 | QListViewItem *item = itemAt(vp); |
1137 | if (!item) { | 1137 | if (!item) { |
1138 | emit newEvent(); | 1138 | emit newEvent(); |
1139 | return; | 1139 | return; |
1140 | } | 1140 | } |
1141 | KListView::contentsMouseDoubleClickEvent(e); | 1141 | KListView::contentsMouseDoubleClickEvent(e); |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | 1144 | ||
1145 | void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) | 1145 | void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) |
1146 | { | 1146 | { |
1147 | //qDebug("contentsMousePressEvent++++ "); | 1147 | //qDebug("contentsMousePressEvent++++ "); |
1148 | if (! mMouseDown ) { | 1148 | if (! mMouseDown ) { |
1149 | mAllowPopupMenu = true; | 1149 | mAllowPopupMenu = true; |
1150 | mYMousePos = mapToGlobal( (e->pos())).y(); | 1150 | mYMousePos = mapToGlobal( (e->pos())).y(); |
1151 | } | 1151 | } |
1152 | if ( e->button() == RightButton && mMouseDown ) | 1152 | if ( e->button() == RightButton && mMouseDown ) |
1153 | return; | 1153 | return; |
1154 | if ( e->button() == LeftButton ) | 1154 | if ( e->button() == LeftButton ) |
1155 | mMouseDown = true; | 1155 | mMouseDown = true; |
1156 | KListView::contentsMousePressEvent( e ); | 1156 | KListView::contentsMousePressEvent( e ); |
1157 | } | 1157 | } |
1158 | void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) | 1158 | void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) |
1159 | { | 1159 | { |
1160 | //qDebug("contentsMouseReleaseEv---- "); | 1160 | //qDebug("contentsMouseReleaseEv---- "); |
1161 | if ( ! mMouseDown ) { | 1161 | if ( ! mMouseDown ) { |
1162 | if ( e->button() == RightButton && ! mAllowPopupMenu ) | 1162 | if ( e->button() == RightButton && ! mAllowPopupMenu ) |
1163 | return; | 1163 | return; |
1164 | QListViewItem* ci = currentItem(); | 1164 | QListViewItem* ci = currentItem(); |
1165 | if ( ci ) | 1165 | if ( ci ) |
1166 | ci->setSelected( true ); | 1166 | ci->setSelected( true ); |
1167 | KListView::contentsMouseReleaseEvent(e); | 1167 | KListView::contentsMouseReleaseEvent(e); |
1168 | return; | 1168 | return; |
1169 | } | 1169 | } |
1170 | if ( e->button() == LeftButton ) | 1170 | if ( e->button() == LeftButton ) |
1171 | mMouseDown = false; | 1171 | mMouseDown = false; |
1172 | if ( e->button() == RightButton && ! mAllowPopupMenu ) | 1172 | if ( e->button() == RightButton && ! mAllowPopupMenu ) |
1173 | return; | 1173 | return; |
1174 | if ( e->button() == RightButton ) { | 1174 | if ( e->button() == RightButton ) { |
1175 | QListViewItem* ci = currentItem(); | 1175 | QListViewItem* ci = currentItem(); |
1176 | if ( ci ) | 1176 | if ( ci ) |
1177 | ci->setSelected( true ); | 1177 | ci->setSelected( true ); |
1178 | } | 1178 | } |
1179 | KListView::contentsMouseReleaseEvent(e); | 1179 | KListView::contentsMouseReleaseEvent(e); |
1180 | } | 1180 | } |
1181 | void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) | 1181 | void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) |
1182 | { | 1182 | { |
1183 | // qDebug("contentsMouseMoveEv....... "); | 1183 | // qDebug("contentsMouseMoveEv....... "); |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index cef59a2..678e1bd 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -1,224 +1,231 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 1998 Preston Brown | 3 | Copyright (c) 1998 Preston Brown |
4 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
8 | the Free Software Foundation; either version 2 of the License, or | 8 | the Free Software Foundation; either version 2 of the License, or |
9 | (at your option) any later version. | 9 | (at your option) any later version. |
10 | 10 | ||
11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qgroupbox.h> | 27 | #include <qgroupbox.h> |
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | #include <qlistview.h> | ||
29 | #include <qwhatsthis.h> | 30 | #include <qwhatsthis.h> |
30 | #include <qlineedit.h> | 31 | #include <qlineedit.h> |
31 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
32 | 33 | ||
33 | #include <klocale.h> | 34 | #include <klocale.h> |
34 | #include <kmessagebox.h> | 35 | #include <kmessagebox.h> |
35 | 36 | ||
36 | #include <libkdepim/kdateedit.h> | 37 | #include <libkdepim/kdateedit.h> |
37 | 38 | ||
38 | #include "koglobals.h" | 39 | #include "koglobals.h" |
39 | #include "koprefs.h" | 40 | #include "koprefs.h" |
41 | #include "klineedit.h" | ||
40 | 42 | ||
41 | #include "calendarview.h" | 43 | #include "calendarview.h" |
42 | #include "koviewmanager.h" | 44 | #include "koviewmanager.h" |
43 | #include "searchdialog.h" | 45 | #include "searchdialog.h" |
44 | 46 | ||
45 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | 47 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) |
46 | : QVBox( 0 ) | 48 | : QVBox( 0 ) |
47 | 49 | ||
48 | { | 50 | { |
49 | mCalendar = calendar; | 51 | mCalendar = calendar; |
50 | QFrame *topFrame = new QFrame( this ) ;//plainPage(); | 52 | QFrame *topFrame = new QFrame( this ) ;//plainPage(); |
51 | QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); | 53 | QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); |
52 | 54 | ||
53 | // Search expression | 55 | // Search expression |
54 | QHBoxLayout *subLayout = new QHBoxLayout(); | 56 | QHBoxLayout *subLayout = new QHBoxLayout(); |
55 | layout->addLayout(subLayout); | 57 | layout->addLayout(subLayout); |
56 | searchLabel = new QLabel(topFrame); | 58 | searchLabel = new QLabel(topFrame); |
57 | searchLabel->setText(i18n("Search for:")); | 59 | searchLabel->setText(i18n("Search for:")); |
58 | subLayout->addWidget(searchLabel); | 60 | subLayout->addWidget(searchLabel); |
59 | 61 | ||
60 | searchEdit = new QLineEdit(topFrame); | 62 | searchEdit = new KLineEdit(topFrame); |
61 | subLayout->addWidget(searchEdit); | 63 | subLayout->addWidget(searchEdit); |
62 | QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); | 64 | QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); |
63 | //OkButton->setDefault( true ); | 65 | //OkButton->setDefault( true ); |
64 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); | 66 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); |
65 | subLayout->addWidget(OkButton); | 67 | subLayout->addWidget(OkButton); |
66 | searchEdit->setText("*"); // Find all events by default | 68 | searchEdit->setText("*"); // Find all events by default |
67 | searchEdit->setFocus(); | 69 | searchEdit->setFocus(); |
68 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); | 70 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); |
69 | connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); | 71 | connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); |
70 | // Subjects to search | 72 | // Subjects to search |
71 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), | 73 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), |
72 | // topFrame); | 74 | // topFrame); |
73 | 75 | ||
74 | QHBox *incidenceGroup = new QHBox( topFrame ); | 76 | QHBox *incidenceGroup = new QHBox( topFrame ); |
75 | layout->addWidget(incidenceGroup); | 77 | layout->addWidget(incidenceGroup); |
76 | 78 | ||
77 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); | 79 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); |
78 | mSearchEvent->setChecked(true); | 80 | mSearchEvent->setChecked(true); |
79 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); | 81 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); |
80 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); | 82 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); |
81 | 83 | ||
82 | QHBox *subjectGroup = new QHBox( topFrame ); | 84 | QHBox *subjectGroup = new QHBox( topFrame ); |
83 | layout->addWidget(subjectGroup); | 85 | layout->addWidget(subjectGroup); |
84 | 86 | ||
85 | mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); | 87 | mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); |
86 | mSummaryCheck->setChecked(true); | 88 | mSummaryCheck->setChecked(true); |
87 | mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); | 89 | mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); |
88 | mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); | 90 | mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); |
89 | 91 | ||
90 | QHBox *attendeeGroup = new QHBox( topFrame ); | 92 | QHBox *attendeeGroup = new QHBox( topFrame ); |
91 | layout->addWidget(attendeeGroup ); | 93 | layout->addWidget(attendeeGroup ); |
92 | new QLabel( i18n("Attendee:"),attendeeGroup ); | 94 | new QLabel( i18n("Attendee:"),attendeeGroup ); |
93 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); | 95 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); |
94 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); | 96 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); |
95 | // Date range | 97 | // Date range |
96 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), | 98 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), |
97 | // topFrame); | 99 | // topFrame); |
98 | // layout->addWidget(rangeGroup); | 100 | // layout->addWidget(rangeGroup); |
99 | 101 | ||
100 | QWidget *rangeWidget = new QWidget(topFrame); | 102 | QWidget *rangeWidget = new QWidget(topFrame); |
101 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); | 103 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); |
102 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 104 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
103 | mStartDate = new KDateEdit(rangeWidget); | 105 | mStartDate = new KDateEdit(rangeWidget); |
104 | rangeLayout->addWidget(mStartDate); | 106 | rangeLayout->addWidget(mStartDate); |
105 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); | 107 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); |
106 | mEndDate = new KDateEdit(rangeWidget); | 108 | mEndDate = new KDateEdit(rangeWidget); |
107 | mEndDate->setDate(QDate::currentDate().addDays(365)); | 109 | mEndDate->setDate(QDate::currentDate().addDays(365)); |
108 | rangeLayout->addWidget(mEndDate); | 110 | rangeLayout->addWidget(mEndDate); |
109 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); | 111 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); |
110 | rangeLayout->addWidget( (QWidget*)wt ); | 112 | rangeLayout->addWidget( (QWidget*)wt ); |
111 | layout->addWidget(rangeWidget); | 113 | layout->addWidget(rangeWidget); |
112 | // Results list view | 114 | // Results list view |
113 | listView = new KOListView(mCalendar,topFrame); | 115 | listView = new KOListView(mCalendar,topFrame); |
114 | layout->addWidget(listView); | 116 | layout->addWidget(listView); |
115 | 117 | ||
116 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); | 118 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |
119 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); | ||
117 | 120 | ||
118 | setCaption( i18n("KO/Pi Find: ")); | 121 | setCaption( i18n("KO/Pi Find: ")); |
119 | #ifdef DESKTOP_VERSION | 122 | #ifdef DESKTOP_VERSION |
120 | OkButton = new QPushButton( i18n("Close"), this ); | 123 | OkButton = new QPushButton( i18n("Close"), this ); |
121 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); | 124 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); |
122 | #endif | 125 | #endif |
123 | } | 126 | } |
124 | 127 | ||
125 | SearchDialog::~SearchDialog() | 128 | SearchDialog::~SearchDialog() |
126 | { | 129 | { |
127 | 130 | ||
128 | } | 131 | } |
132 | void SearchDialog::setFocusToList() | ||
133 | { | ||
134 | listView->resetFocus(); | ||
135 | } | ||
129 | void SearchDialog::accept() | 136 | void SearchDialog::accept() |
130 | { | 137 | { |
131 | doSearch(); | 138 | doSearch(); |
132 | } | 139 | } |
133 | void SearchDialog::updateList() | 140 | void SearchDialog::updateList() |
134 | { | 141 | { |
135 | //listView->updateList(); | 142 | //listView->updateList(); |
136 | if ( isVisible() ) { | 143 | if ( isVisible() ) { |
137 | updateView(); | 144 | updateView(); |
138 | //qDebug("SearchDialog::updated "); | 145 | //qDebug("SearchDialog::updated "); |
139 | } | 146 | } |
140 | else { | 147 | else { |
141 | listView->clear(); | 148 | listView->clear(); |
142 | //qDebug("SearchDialog::cleared "); | 149 | //qDebug("SearchDialog::cleared "); |
143 | 150 | ||
144 | } | 151 | } |
145 | } | 152 | } |
146 | void SearchDialog::searchTextChanged( const QString &_text ) | 153 | void SearchDialog::searchTextChanged( const QString &_text ) |
147 | { | 154 | { |
148 | #if 0 | 155 | #if 0 |
149 | enableButton( KDialogBase::User1, !_text.isEmpty() ); | 156 | enableButton( KDialogBase::User1, !_text.isEmpty() ); |
150 | #endif | 157 | #endif |
151 | } | 158 | } |
152 | 159 | ||
153 | void SearchDialog::doSearch() | 160 | void SearchDialog::doSearch() |
154 | { | 161 | { |
155 | QRegExp re; | 162 | QRegExp re; |
156 | 163 | ||
157 | re.setWildcard(true); // most people understand these better. | 164 | re.setWildcard(true); // most people understand these better. |
158 | re.setCaseSensitive(false); | 165 | re.setCaseSensitive(false); |
159 | re.setPattern(searchEdit->text()); | 166 | re.setPattern(searchEdit->text()); |
160 | if (!re.isValid() ) { | 167 | if (!re.isValid() ) { |
161 | KMessageBox::sorry(this, | 168 | KMessageBox::sorry(this, |
162 | i18n("Invalid search expression,\ncannot perform " | 169 | i18n("Invalid search expression,\ncannot perform " |
163 | "the search.\nPlease enter a search expression\n" | 170 | "the search.\nPlease enter a search expression\n" |
164 | "using the wildcard characters\n '*' and '?'" | 171 | "using the wildcard characters\n '*' and '?'" |
165 | "where needed.")); | 172 | "where needed.")); |
166 | return; | 173 | return; |
167 | } | 174 | } |
168 | 175 | ||
169 | search(re); | 176 | search(re); |
170 | 177 | ||
171 | listView->setStartDate( mStartDate->date() ); | 178 | listView->setStartDate( mStartDate->date() ); |
172 | listView->showEvents(mMatchedEvents); | 179 | listView->showEvents(mMatchedEvents); |
173 | listView->addTodos(mMatchedTodos); | 180 | listView->addTodos(mMatchedTodos); |
174 | listView->addJournals(mMatchedJournals); | 181 | listView->addJournals(mMatchedJournals); |
175 | 182 | ||
176 | if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) { | 183 | if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) { |
177 | setCaption(i18n("No items found. Use '*' and '?' where needed.")); | 184 | setCaption(i18n("No items found. Use '*' and '?' where needed.")); |
178 | } else { | 185 | } else { |
179 | QString mess; | 186 | QString mess; |
180 | mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() ); | 187 | mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() ); |
181 | setCaption( i18n("KO/Pi Find: ") + mess); | 188 | setCaption( i18n("KO/Pi Find: ") + mess); |
182 | 189 | ||
183 | } | 190 | } |
184 | searchEdit->setFocus(); | 191 | searchEdit->setFocus(); |
185 | } | 192 | } |
186 | void SearchDialog::updateConfig() | 193 | void SearchDialog::updateConfig() |
187 | { | 194 | { |
188 | listView->updateConfig(); | 195 | listView->updateConfig(); |
189 | } | 196 | } |
190 | void SearchDialog::updateView() | 197 | void SearchDialog::updateView() |
191 | { | 198 | { |
192 | 199 | ||
193 | QRegExp re; | 200 | QRegExp re; |
194 | re.setWildcard(true); // most people understand these better. | 201 | re.setWildcard(true); // most people understand these better. |
195 | re.setCaseSensitive(false); | 202 | re.setCaseSensitive(false); |
196 | re.setPattern(searchEdit->text()); | 203 | re.setPattern(searchEdit->text()); |
197 | if (re.isValid()) { | 204 | if (re.isValid()) { |
198 | search(re); | 205 | search(re); |
199 | } else { | 206 | } else { |
200 | mMatchedEvents.clear(); | 207 | mMatchedEvents.clear(); |
201 | mMatchedTodos.clear(); | 208 | mMatchedTodos.clear(); |
202 | mMatchedJournals.clear(); | 209 | mMatchedJournals.clear(); |
203 | } | 210 | } |
204 | listView->setStartDate( mStartDate->date() ); | 211 | listView->setStartDate( mStartDate->date() ); |
205 | listView->showEvents(mMatchedEvents); | 212 | listView->showEvents(mMatchedEvents); |
206 | listView->addTodos(mMatchedTodos); | 213 | listView->addTodos(mMatchedTodos); |
207 | listView->addJournals(mMatchedJournals); | 214 | listView->addJournals(mMatchedJournals); |
208 | } | 215 | } |
209 | 216 | ||
210 | void SearchDialog::search(const QRegExp &re) | 217 | void SearchDialog::search(const QRegExp &re) |
211 | { | 218 | { |
212 | QPtrList<Event> events = mCalendar->events( mStartDate->date(), | 219 | QPtrList<Event> events = mCalendar->events( mStartDate->date(), |
213 | mEndDate->date(), | 220 | mEndDate->date(), |
214 | false /*mInclusiveCheck->isChecked()*/ ); | 221 | false /*mInclusiveCheck->isChecked()*/ ); |
215 | 222 | ||
216 | mMatchedEvents.clear(); | 223 | mMatchedEvents.clear(); |
217 | if ( mSearchEvent->isChecked() ) { | 224 | if ( mSearchEvent->isChecked() ) { |
218 | Event *ev; | 225 | Event *ev; |
219 | for(ev=events.first();ev;ev=events.next()) { | 226 | for(ev=events.first();ev;ev=events.next()) { |
220 | if (mSummaryCheck->isChecked()) { | 227 | if (mSummaryCheck->isChecked()) { |
221 | #if QT_VERSION >= 0x030000 | 228 | #if QT_VERSION >= 0x030000 |
222 | if (re.search(ev->summary()) != -1) | 229 | if (re.search(ev->summary()) != -1) |
223 | #else | 230 | #else |
224 | if (re.match(ev->summary()) != -1) | 231 | if (re.match(ev->summary()) != -1) |
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index f4aad9e..b730ed5 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h | |||
@@ -1,92 +1,94 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 1998 Preston Brown | 3 | Copyright (c) 1998 Preston Brown |
4 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
8 | the Free Software Foundation; either version 2 of the License, or | 8 | the Free Software Foundation; either version 2 of the License, or |
9 | (at your option) any later version. | 9 | (at your option) any later version. |
10 | 10 | ||
11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | #ifndef SEARCHDIALOG_H | 24 | #ifndef SEARCHDIALOG_H |
25 | #define SEARCHDIALOG_H | 25 | #define SEARCHDIALOG_H |
26 | 26 | ||
27 | #include <qregexp.h> | 27 | #include <qregexp.h> |
28 | 28 | ||
29 | #include <kdialogbase.h> | 29 | #include <kdialogbase.h> |
30 | #include <qvbox.h> | 30 | #include <qvbox.h> |
31 | 31 | ||
32 | #include <libkcal/calendar.h> | 32 | #include <libkcal/calendar.h> |
33 | 33 | ||
34 | #include "kolistview.h" | 34 | #include "kolistview.h" |
35 | 35 | ||
36 | class KDateEdit; | 36 | class KDateEdit; |
37 | class QCheckBox; | 37 | class QCheckBox; |
38 | class QLineEdit; | 38 | class QLineEdit; |
39 | class KLineEdit; | ||
39 | class QLabel; | 40 | class QLabel; |
40 | class CalendarView; | 41 | class CalendarView; |
41 | 42 | ||
42 | using namespace KCal; | 43 | using namespace KCal; |
43 | class SearchDialog : public QVBox | 44 | class SearchDialog : public QVBox |
44 | { | 45 | { |
45 | Q_OBJECT | 46 | Q_OBJECT |
46 | public: | 47 | public: |
47 | SearchDialog(Calendar *calendar,CalendarView *parent=0); | 48 | SearchDialog(Calendar *calendar,CalendarView *parent=0); |
48 | virtual ~SearchDialog(); | 49 | virtual ~SearchDialog(); |
49 | KOListView *listview(){ return listView;} | 50 | KOListView *listview(){ return listView;} |
50 | void updateView(); | 51 | void updateView(); |
51 | 52 | ||
52 | public slots: | 53 | public slots: |
53 | void changeEventDisplay(Event *, int) { updateView(); } | 54 | void changeEventDisplay(Event *, int) { updateView(); } |
54 | void updateConfig(); | 55 | void updateConfig(); |
55 | void updateList(); | 56 | void updateList(); |
56 | protected slots: | 57 | protected slots: |
58 | void setFocusToList(); | ||
57 | void accept(); | 59 | void accept(); |
58 | void doSearch(); | 60 | void doSearch(); |
59 | void searchTextChanged( const QString &_text ); | 61 | void searchTextChanged( const QString &_text ); |
60 | 62 | ||
61 | signals: | 63 | signals: |
62 | void showEventSignal(Event *); | 64 | void showEventSignal(Event *); |
63 | void editEventSignal(Event *); | 65 | void editEventSignal(Event *); |
64 | void deleteEventSignal(Event *); | 66 | void deleteEventSignal(Event *); |
65 | 67 | ||
66 | private: | 68 | private: |
67 | void search(const QRegExp &); | 69 | void search(const QRegExp &); |
68 | 70 | ||
69 | Calendar *mCalendar; | 71 | Calendar *mCalendar; |
70 | 72 | ||
71 | QPtrList<Event> mMatchedEvents; | 73 | QPtrList<Event> mMatchedEvents; |
72 | QPtrList<Todo> mMatchedTodos; | 74 | QPtrList<Todo> mMatchedTodos; |
73 | QPtrList<Journal> mMatchedJournals; | 75 | QPtrList<Journal> mMatchedJournals; |
74 | 76 | ||
75 | QLabel *searchLabel; | 77 | QLabel *searchLabel; |
76 | QLineEdit *searchEdit; | 78 | KLineEdit *searchEdit; |
77 | KOListView *listView; | 79 | KOListView *listView; |
78 | 80 | ||
79 | KDateEdit *mStartDate; | 81 | KDateEdit *mStartDate; |
80 | KDateEdit *mEndDate; | 82 | KDateEdit *mEndDate; |
81 | QCheckBox *mSummaryCheck; | 83 | QCheckBox *mSummaryCheck; |
82 | QCheckBox *mDescriptionCheck; | 84 | QCheckBox *mDescriptionCheck; |
83 | QCheckBox *mCategoryCheck; | 85 | QCheckBox *mCategoryCheck; |
84 | QCheckBox *mSearchEvent; | 86 | QCheckBox *mSearchEvent; |
85 | QCheckBox *mSearchTodo; | 87 | QCheckBox *mSearchTodo; |
86 | QCheckBox *mSearchJournal; | 88 | QCheckBox *mSearchJournal; |
87 | QCheckBox *mSearchAName; | 89 | QCheckBox *mSearchAName; |
88 | QCheckBox *mSearchAEmail; | 90 | QCheckBox *mSearchAEmail; |
89 | void keyPressEvent ( QKeyEvent *e) ; | 91 | void keyPressEvent ( QKeyEvent *e) ; |
90 | }; | 92 | }; |
91 | 93 | ||
92 | #endif | 94 | #endif |