summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp36
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp3
2 files changed, 4 insertions, 35 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 8cc5d7b..56e3282 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -356,8 +356,9 @@ void AdvancedFm::keyPressEvent( QKeyEvent *e) {
void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
// if( CurrentView()->hasFocus() )
// e->ignore();
+
if( currentPathCombo->lineEdit()->hasFocus()) {
// qDebug("shout!");
}
@@ -368,44 +369,11 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
else if( e->key() == Key_Tab)
setOtherTabCurrent();
else if( e->key() == Key_Delete )
del();
- else if( e->key() == Key_A)
- copyAs();
- else if( e->key() == Key_C)
- copy();
- else if( e->key() == Key_E)
- runThis();
- else if( e->key() == Key_G)
- currentPathCombo->lineEdit()->setFocus();
- else if( e->key() == Key_H )
- showHidden();
- else if( e->key() == Key_I)
- fileStatus();
- else if( e->key() == Key_M)
- move();
- else if( e->key() == Key_N )
- mkDir();
- else if( e->key() == Key_P)
- filePerms();
- else if( e->key() == Key_R )
- rn();
- else if( e->key() == Key_U )
- upDir();
- else if( e->key() == Key_1)
- switchToLocalTab();
- else if( e->key() == Key_2)
- switchToRemoteTab();
- else if( e->key() == Key_3)
- CFButtonPushed();
- else if( e->key() == Key_4)
- SDButtonPushed();
- else if( e->key() == Key_5 )
- homeButtonPushed();
- else if( e->key() == Key_6 )
- docButtonPushed();
else
e->accept();
+
}
void AdvancedFm::parsetab(const QString &fileName) {
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 6abdc85..80324eb 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -864,9 +864,10 @@ void AdvancedFm::okRename() {
oldName = "";
QListViewItem *item = view->currentItem();
view->takeItem( item );
delete item;
- rePopulate();
+ populateView();
+
}
void AdvancedFm::openSearch() {
QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));