author | llornkcor <llornkcor> | 2004-09-25 04:38:48 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-25 04:38:48 (UTC) |
commit | 4eab17fb1381c938188e13ec5025b8302b159c9e (patch) (unidiff) | |
tree | bb8d1c5e52e59d8e1683da3dab08d20177e684f7 /noncore/apps | |
parent | 037acb8741eabb71693104f7807ffd848ac4d1f9 (diff) | |
download | opie-4eab17fb1381c938188e13ec5025b8302b159c9e.zip opie-4eab17fb1381c938188e13ec5025b8302b159c9e.tar.gz opie-4eab17fb1381c938188e13ec5025b8302b159c9e.tar.bz2 |
opti function and fix
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 133 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 2 |
2 files changed, 47 insertions, 88 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index fec320d..73d0d57 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -46,6 +46,6 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | |||
46 | initConnections(); | 46 | initConnections(); |
47 | populateView(); | 47 | rePopulate(); |
48 | channel = new QCopChannel( "QPE/Application/advancedfm", this ); | 48 | channel = new QCopChannel( "QPE/Application/advancedfm", this ); |
49 | connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&))); | 49 | connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&))); |
50 | switchToLocalTab(); | 50 | switchToLocalTab(); |
51 | } | 51 | } |
@@ -376,87 +376,46 @@ void AdvancedFm::doAbout() { | |||
376 | void AdvancedFm::keyPressEvent( QKeyEvent *e) { | 376 | void AdvancedFm::keyPressEvent( QKeyEvent *e) { |
377 | // owarn << "key " << e->key() << "" << oendl; | 377 | if( e->key() == Key_Left ) |
378 | // if( CurrentView()->hasFocus() ) | 378 | upDir(); |
379 | { | 379 | else if( e->key() == Key_Return || e->key() == Key_Enter) |
380 | switch ( e->key() ) { | 380 | navigateToSelected(); |
381 | case Key_Left: | 381 | else if( e->key() == Key_Tab) |
382 | upDir(); | 382 | setOtherTabCurrent(); |
383 | break; | 383 | else if( e->key() == Key_Delete ) |
384 | case Key_Next: | 384 | del(); |
385 | break; | 385 | else if( e->key() == Key_A) |
386 | case Key_Return: | 386 | copyAs(); |
387 | case Key_Enter: | 387 | else if( e->key() == Key_C) |
388 | navigateToSelected(); | 388 | copy(); |
389 | break; | 389 | else if( e->key() == Key_E) |
390 | case Key_Tab: { | 390 | runThis(); |
391 | setOtherTabCurrent(); | 391 | else if( e->key() == Key_G) |
392 | } | 392 | currentPathCombo->lineEdit()->setFocus(); |
393 | break; | 393 | else if( e->key() == Key_H ) |
394 | case Key_Delete: | 394 | showHidden(); |
395 | del(); | 395 | else if( e->key() == Key_I) |
396 | break; | 396 | fileStatus(); |
397 | case Key_A: | 397 | else if( e->key() == Key_M) |
398 | copyAs(); | 398 | move(); |
399 | break; | 399 | else if( e->key() == Key_N ) |
400 | case Key_C: | 400 | mkDir(); |
401 | copy(); | 401 | else if( e->key() == Key_P) |
402 | break; | 402 | filePerms(); |
403 | case Key_E: | 403 | else if( e->key() == Key_R ) |
404 | runThis(); | 404 | rn(); |
405 | break; | 405 | else if( e->key() == Key_U ) |
406 | case Key_G: | 406 | upDir(); |
407 | { | 407 | else if( e->key() == Key_1) |
408 | currentPathCombo->lineEdit()->setFocus(); | 408 | switchToLocalTab(); |
409 | } | 409 | else if( e->key() == Key_2) |
410 | break; | 410 | switchToRemoteTab(); |
411 | 411 | else if( e->key() == Key_3) | |
412 | case Key_H: | 412 | CFButtonPushed(); |
413 | showHidden(); | 413 | else if( e->key() == Key_4) |
414 | break; | 414 | SDButtonPushed(); |
415 | case Key_I: | 415 | else if( e->key() == Key_5 ) |
416 | fileStatus(); | 416 | homeButtonPushed(); |
417 | break; | 417 | else if( e->key() == Key_6 ) |
418 | case Key_M: | 418 | docButtonPushed(); |
419 | move(); | 419 | else |
420 | break; | 420 | e->accept(); |
421 | case Key_N: | ||
422 | mkDir(); | ||
423 | break; | ||
424 | case Key_P: | ||
425 | filePerms(); | ||
426 | break; | ||
427 | case Key_R: | ||
428 | rn(); | ||
429 | break; | ||
430 | case Key_U: | ||
431 | upDir(); | ||
432 | break; | ||
433 | case Key_1: | ||
434 | switchToLocalTab(); | ||
435 | break; | ||
436 | case Key_2: | ||
437 | switchToRemoteTab(); | ||
438 | break; | ||
439 | case Key_3: | ||
440 | CFButtonPushed(); | ||
441 | break; | ||
442 | case Key_4: | ||
443 | SDButtonPushed(); | ||
444 | break; | ||
445 | case Key_5: | ||
446 | homeButtonPushed(); | ||
447 | break; | ||
448 | case Key_6: | ||
449 | docButtonPushed(); | ||
450 | break; | ||
451 | case Key_7: | ||
452 | break; | ||
453 | case Key_8: | ||
454 | break; | ||
455 | case Key_9: | ||
456 | break; | ||
457 | case Key_0: | ||
458 | break; | ||
459 | }; | ||
460 | e->accept(); | ||
461 | } | ||
462 | } | 421 | } |
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index c52b853..b109364 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -99,3 +99,3 @@ protected: | |||
99 | void setOtherTabCurrent(); | 99 | void setOtherTabCurrent(); |
100 | void changeTo(QString & dir); | 100 | void changeTo(QString dir); |
101 | 101 | ||