-rw-r--r-- | korganizer/kolistview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index e560ce4..b236c2d 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -1192,192 +1192,194 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e) | |||
1192 | if ( !cn ) | 1192 | if ( !cn ) |
1193 | cn = firstChild(); | 1193 | cn = firstChild(); |
1194 | if ( !cn ) | 1194 | if ( !cn ) |
1195 | return; | 1195 | return; |
1196 | while ( cn->nextSibling() ) | 1196 | while ( cn->nextSibling() ) |
1197 | cn = cn->nextSibling(); | 1197 | cn = cn->nextSibling(); |
1198 | setCurrentItem ( cn ); | 1198 | setCurrentItem ( cn ); |
1199 | ensureItemVisible ( cn ); | 1199 | ensureItemVisible ( cn ); |
1200 | 1200 | ||
1201 | e->accept(); | 1201 | e->accept(); |
1202 | return; | 1202 | return; |
1203 | } | 1203 | } |
1204 | if ( e->state() == ControlButton ) { | 1204 | if ( e->state() == ControlButton ) { |
1205 | int count = childCount (); | 1205 | int count = childCount (); |
1206 | int jump = count / 5; | 1206 | int jump = count / 5; |
1207 | QListViewItem* cn; | 1207 | QListViewItem* cn; |
1208 | cn = currentItem(); | 1208 | cn = currentItem(); |
1209 | if ( ! cn ) | 1209 | if ( ! cn ) |
1210 | return; | 1210 | return; |
1211 | if ( jump == 0 ) | 1211 | if ( jump == 0 ) |
1212 | jump = 1; | 1212 | jump = 1; |
1213 | while ( jump && cn->nextSibling() ) { | 1213 | while ( jump && cn->nextSibling() ) { |
1214 | cn = cn->nextSibling(); | 1214 | cn = cn->nextSibling(); |
1215 | --jump; | 1215 | --jump; |
1216 | } | 1216 | } |
1217 | setCurrentItem ( cn ); | 1217 | setCurrentItem ( cn ); |
1218 | ensureItemVisible ( cn ); | 1218 | ensureItemVisible ( cn ); |
1219 | 1219 | ||
1220 | } else | 1220 | } else |
1221 | QListView::keyPressEvent ( e ) ; | 1221 | QListView::keyPressEvent ( e ) ; |
1222 | e->accept(); | 1222 | e->accept(); |
1223 | break; | 1223 | break; |
1224 | 1224 | ||
1225 | case Qt::Key_Up: | 1225 | case Qt::Key_Up: |
1226 | if ( e->state() == ShiftButton ) { | 1226 | if ( e->state() == ShiftButton ) { |
1227 | QListViewItem* cn = firstChild(); | 1227 | QListViewItem* cn = firstChild(); |
1228 | if ( cn ) { | 1228 | if ( cn ) { |
1229 | setCurrentItem ( cn ); | 1229 | setCurrentItem ( cn ); |
1230 | ensureItemVisible ( cn ); | 1230 | ensureItemVisible ( cn ); |
1231 | } | 1231 | } |
1232 | e->accept(); | 1232 | e->accept(); |
1233 | return; | 1233 | return; |
1234 | } | 1234 | } |
1235 | if ( e->state() == ControlButton ) { | 1235 | if ( e->state() == ControlButton ) { |
1236 | int count = childCount (); | 1236 | int count = childCount (); |
1237 | int jump = count / 5; | 1237 | int jump = count / 5; |
1238 | QListViewItem* cn; | 1238 | QListViewItem* cn; |
1239 | cn = currentItem(); | 1239 | cn = currentItem(); |
1240 | if ( ! cn ) | 1240 | if ( ! cn ) |
1241 | return; | 1241 | return; |
1242 | if ( jump == 0 ) | 1242 | if ( jump == 0 ) |
1243 | jump = 1; | 1243 | jump = 1; |
1244 | while ( jump && cn->itemAbove ()) { | 1244 | while ( jump && cn->itemAbove ()) { |
1245 | cn = cn->itemAbove (); | 1245 | cn = cn->itemAbove (); |
1246 | --jump; | 1246 | --jump; |
1247 | } | 1247 | } |
1248 | setCurrentItem ( cn ); | 1248 | setCurrentItem ( cn ); |
1249 | ensureItemVisible ( cn ); | 1249 | ensureItemVisible ( cn ); |
1250 | } else | 1250 | } else |
1251 | QListView::keyPressEvent ( e ) ; | 1251 | QListView::keyPressEvent ( e ) ; |
1252 | e->accept(); | 1252 | e->accept(); |
1253 | break; | 1253 | break; |
1254 | case Qt::Key_I: { | 1254 | case Qt::Key_I: { |
1255 | QListViewItem* cn; | 1255 | QListViewItem* cn; |
1256 | cn = currentItem(); | 1256 | cn = currentItem(); |
1257 | if ( cn ) { | 1257 | if ( cn ) { |
1258 | KOListViewItem* ci = (KOListViewItem*)( cn ); | 1258 | KOListViewItem* ci = (KOListViewItem*)( cn ); |
1259 | if ( ci ){ | 1259 | if ( ci ){ |
1260 | //emit showIncidence( ci->data()); | 1260 | //emit showIncidence( ci->data()); |
1261 | cn = cn->nextSibling(); | 1261 | cn = cn->nextSibling(); |
1262 | if ( cn ) { | 1262 | if ( cn ) { |
1263 | setCurrentItem ( cn ); | 1263 | setCurrentItem ( cn ); |
1264 | ensureItemVisible ( cn ); | 1264 | ensureItemVisible ( cn ); |
1265 | } | 1265 | } |
1266 | emit showIncidence( ci->data()); | 1266 | emit showIncidence( ci->data()); |
1267 | } | 1267 | } |
1268 | } | 1268 | } |
1269 | e->accept(); | 1269 | e->accept(); |
1270 | } | 1270 | } |
1271 | break; | 1271 | break; |
1272 | case Qt::Key_Return: | 1272 | case Qt::Key_Return: |
1273 | case Qt::Key_Enter: | 1273 | case Qt::Key_Enter: |
1274 | { | 1274 | { |
1275 | QListViewItem* cn; | 1275 | QListViewItem* cn; |
1276 | cn = currentItem(); | 1276 | cn = currentItem(); |
1277 | if ( cn ) { | 1277 | if ( cn ) { |
1278 | KOListViewItem* ci = (KOListViewItem*)( cn ); | 1278 | KOListViewItem* ci = (KOListViewItem*)( cn ); |
1279 | if ( ci ){ | 1279 | if ( ci ){ |
1280 | if ( e->state() == ShiftButton ) | 1280 | if ( e->state() == ShiftButton ) |
1281 | ci->setSelected( false ); | 1281 | ci->setSelected( false ); |
1282 | else | 1282 | else |
1283 | ci->setSelected( true ); | 1283 | ci->setSelected( true ); |
1284 | cn = cn->nextSibling(); | 1284 | cn = cn->nextSibling(); |
1285 | if ( cn ) { | 1285 | if ( cn ) { |
1286 | setCurrentItem ( cn ); | 1286 | setCurrentItem ( cn ); |
1287 | ensureItemVisible ( cn ); | 1287 | ensureItemVisible ( cn ); |
1288 | } else { | ||
1289 | emit currentChanged( ci ); | ||
1288 | } | 1290 | } |
1289 | } | 1291 | } |
1290 | } | 1292 | } |
1291 | e->accept(); | 1293 | e->accept(); |
1292 | } | 1294 | } |
1293 | break; | 1295 | break; |
1294 | default: | 1296 | default: |
1295 | e->ignore(); | 1297 | e->ignore(); |
1296 | } | 1298 | } |
1297 | } | 1299 | } |
1298 | KOListViewListView::KOListViewListView(KOListView * lv ) | 1300 | KOListViewListView::KOListViewListView(KOListView * lv ) |
1299 | : KListView( lv, "kolistlistview", false ) | 1301 | : KListView( lv, "kolistlistview", false ) |
1300 | { | 1302 | { |
1301 | mYMousePos = 0; | 1303 | mYMousePos = 0; |
1302 | mPopupTimer = new QTimer(this); | 1304 | mPopupTimer = new QTimer(this); |
1303 | connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); | 1305 | connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); |
1304 | #ifndef DESKTOP_VERSION | 1306 | #ifndef DESKTOP_VERSION |
1305 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); | 1307 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); |
1306 | #endif | 1308 | #endif |
1307 | setSelectionMode( QListView::Multi ); | 1309 | setSelectionMode( QListView::Multi ); |
1308 | setMultiSelection( true); | 1310 | setMultiSelection( true); |
1309 | } | 1311 | } |
1310 | bool KOListViewListView::hasMultiSelection(QListViewItem* item) | 1312 | bool KOListViewListView::hasMultiSelection(QListViewItem* item) |
1311 | { | 1313 | { |
1312 | QListViewItem *qitem = firstChild (); | 1314 | QListViewItem *qitem = firstChild (); |
1313 | while ( qitem ) { | 1315 | while ( qitem ) { |
1314 | if ( qitem->isSelected() && item != qitem ) | 1316 | if ( qitem->isSelected() && item != qitem ) |
1315 | return true; | 1317 | return true; |
1316 | qitem = qitem->nextSibling(); | 1318 | qitem = qitem->nextSibling(); |
1317 | } | 1319 | } |
1318 | return false; | 1320 | return false; |
1319 | } | 1321 | } |
1320 | void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e) | 1322 | void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e) |
1321 | { | 1323 | { |
1322 | if (!e) return; | 1324 | if (!e) return; |
1323 | QPoint vp = contentsToViewport(e->pos()); | 1325 | QPoint vp = contentsToViewport(e->pos()); |
1324 | QListViewItem *item = itemAt(vp); | 1326 | QListViewItem *item = itemAt(vp); |
1325 | if (!item) { | 1327 | if (!item) { |
1326 | emit newEvent(); | 1328 | emit newEvent(); |
1327 | return; | 1329 | return; |
1328 | } | 1330 | } |
1329 | KListView::contentsMouseDoubleClickEvent(e); | 1331 | KListView::contentsMouseDoubleClickEvent(e); |
1330 | } | 1332 | } |
1331 | #if 0 | 1333 | #if 0 |
1332 | void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) | 1334 | void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) |
1333 | { | 1335 | { |
1334 | //qDebug("contentsMousePressEvent++++ "); | 1336 | //qDebug("contentsMousePressEvent++++ "); |
1335 | KListView::contentsMousePressEvent( e ); | 1337 | KListView::contentsMousePressEvent( e ); |
1336 | if ( e->button() == RightButton ) { | 1338 | if ( e->button() == RightButton ) { |
1337 | QListViewItem* ci = currentItem(); | 1339 | QListViewItem* ci = currentItem(); |
1338 | clearSelection () ; | 1340 | clearSelection () ; |
1339 | if ( ci ) | 1341 | if ( ci ) |
1340 | ci->setSelected( true ); | 1342 | ci->setSelected( true ); |
1341 | } | 1343 | } |
1342 | } | 1344 | } |
1343 | void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) | 1345 | void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) |
1344 | { | 1346 | { |
1345 | KListView::contentsMouseReleaseEvent(e); | 1347 | KListView::contentsMouseReleaseEvent(e); |
1346 | } | 1348 | } |
1347 | void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) | 1349 | void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) |
1348 | { | 1350 | { |
1349 | KListView::contentsMouseMoveEvent(e); | 1351 | KListView::contentsMouseMoveEvent(e); |
1350 | } | 1352 | } |
1351 | #endif | 1353 | #endif |
1352 | void KOListViewListView::popupMenu() | 1354 | void KOListViewListView::popupMenu() |
1353 | { | 1355 | { |
1354 | mPopupTimer->stop(); | 1356 | mPopupTimer->stop(); |
1355 | QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton ); | 1357 | QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton ); |
1356 | QApplication::postEvent( this->viewport(), e ); | 1358 | QApplication::postEvent( this->viewport(), e ); |
1357 | 1359 | ||
1358 | } | 1360 | } |
1359 | void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) | 1361 | void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) |
1360 | { | 1362 | { |
1361 | //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y()); | 1363 | //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y()); |
1362 | mYMousePos = mapToGlobal( (e->pos())).y(); | 1364 | mYMousePos = mapToGlobal( (e->pos())).y(); |
1363 | if ( e->button() == LeftButton ) { | 1365 | if ( e->button() == LeftButton ) { |
1364 | mPopupTimer->start( 600 ); | 1366 | mPopupTimer->start( 600 ); |
1365 | mEventPos = contentsToViewport(e->pos()); | 1367 | mEventPos = contentsToViewport(e->pos()); |
1366 | mEventGlobalPos = e->globalPos(); | 1368 | mEventGlobalPos = e->globalPos(); |
1367 | } | 1369 | } |
1368 | KListView::contentsMousePressEvent( e ); | 1370 | KListView::contentsMousePressEvent( e ); |
1369 | if ( e->button() == RightButton ) { | 1371 | if ( e->button() == RightButton ) { |
1370 | QListViewItem* ci = currentItem(); | 1372 | QListViewItem* ci = currentItem(); |
1371 | //clearSelection(); | 1373 | //clearSelection(); |
1372 | if ( ci ) | 1374 | if ( ci ) |
1373 | ci->setSelected( true ); | 1375 | ci->setSelected( true ); |
1374 | } | 1376 | } |
1375 | } | 1377 | } |
1376 | void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) | 1378 | void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) |
1377 | { | 1379 | { |
1378 | mPopupTimer->stop(); | 1380 | mPopupTimer->stop(); |
1379 | KListView::contentsMouseReleaseEvent(e); | 1381 | KListView::contentsMouseReleaseEvent(e); |
1380 | } | 1382 | } |
1381 | void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) | 1383 | void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) |
1382 | { | 1384 | { |
1383 | // qDebug("contentsMouseMoveEv....... "); | 1385 | // qDebug("contentsMouseMoveEv....... "); |