summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp87
-rw-r--r--noncore/apps/advancedfm/advancedfm.h2
2 files changed, 24 insertions, 65 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
@@ -44,7 +44,7 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
initConnections();
- populateView();
+ rePopulate();
channel = new QCopChannel( "QPE/Application/advancedfm", this );
connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
switchToLocalTab();
@@ -374,92 +374,51 @@ void AdvancedFm::doAbout() {
}
void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-// owarn << "key " << e->key() << "" << oendl;
-// if( CurrentView()->hasFocus() )
- {
- switch ( e->key() ) {
- case Key_Left:
+ if( e->key() == Key_Left )
upDir();
- break;
- case Key_Next:
- break;
- case Key_Return:
- case Key_Enter:
+ else if( e->key() == Key_Return || e->key() == Key_Enter)
navigateToSelected();
- break;
- case Key_Tab: {
+ else if( e->key() == Key_Tab)
setOtherTabCurrent();
- }
- break;
- case Key_Delete:
+ else if( e->key() == Key_Delete )
del();
- break;
- case Key_A:
+ else if( e->key() == Key_A)
copyAs();
- break;
- case Key_C:
+ else if( e->key() == Key_C)
copy();
- break;
- case Key_E:
+ else if( e->key() == Key_E)
runThis();
- break;
- case Key_G:
- {
+ else if( e->key() == Key_G)
currentPathCombo->lineEdit()->setFocus();
- }
- break;
-
- case Key_H:
+ else if( e->key() == Key_H )
showHidden();
- break;
- case Key_I:
+ else if( e->key() == Key_I)
fileStatus();
- break;
- case Key_M:
+ else if( e->key() == Key_M)
move();
- break;
- case Key_N:
+ else if( e->key() == Key_N )
mkDir();
- break;
- case Key_P:
+ else if( e->key() == Key_P)
filePerms();
- break;
- case Key_R:
+ else if( e->key() == Key_R )
rn();
- break;
- case Key_U:
+ else if( e->key() == Key_U )
upDir();
- break;
- case Key_1:
+ else if( e->key() == Key_1)
switchToLocalTab();
- break;
- case Key_2:
+ else if( e->key() == Key_2)
switchToRemoteTab();
- break;
- case Key_3:
+ else if( e->key() == Key_3)
CFButtonPushed();
- break;
- case Key_4:
+ else if( e->key() == Key_4)
SDButtonPushed();
- break;
- case Key_5:
+ else if( e->key() == Key_5 )
homeButtonPushed();
- break;
- case Key_6:
+ else if( e->key() == Key_6 )
docButtonPushed();
- break;
- case Key_7:
- break;
- case Key_8:
- break;
- case Key_9:
- break;
- case Key_0:
- break;
- };
+ else
e->accept();
}
-}
void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
if( CurrentView()->hasFocus() )
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
@@ -97,7 +97,7 @@ protected:
QListView *CurrentView();
QListView *OtherView();
void setOtherTabCurrent();
- void changeTo(QString & dir);
+ void changeTo(QString dir);
//protected signals:
// void newPath(QString);