summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-02-06 04:03:25 (UTC)
committer llornkcor <llornkcor>2005-02-06 04:03:25 (UTC)
commite23dd592fc71aa22c449363231eac2f8ebd2a45b (patch) (side-by-side diff)
tree6944284c2632754357578581b564413f0fa09109
parentb09f9ce74d40f47bc336b4647c6c091a4f3bd5b6 (diff)
downloadopie-e23dd592fc71aa22c449363231eac2f8ebd2a45b.zip
opie-e23dd592fc71aa22c449363231eac2f8ebd2a45b.tar.gz
opie-e23dd592fc71aa22c449363231eac2f8ebd2a45b.tar.bz2
fix #1499 - rename working
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
@@ -344,80 +344,48 @@ void AdvancedFm::CFButtonPushed() {
void AdvancedFm::QPEButtonPushed() {
changeTo(QPEApplication::qpeDir());
}
void AdvancedFm::doAbout() {
QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
}
void AdvancedFm::keyPressEvent( QKeyEvent *e) {
Q_UNUSED(e);
}
void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
// if( CurrentView()->hasFocus() )
// e->ignore();
+
if( currentPathCombo->lineEdit()->hasFocus()) {
// qDebug("shout!");
}
else if( e->key() == Key_Left )
upDir();
else if( e->key() == Key_Return || e->key() == Key_Enter)
navigateToSelected();
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) {
fileSystemTypeList.clear();
fsList.clear();
struct mntent *me;
FILE *mntfp = setmntent( fileName.latin1(), "r" );
if ( mntfp ) {
while ( (me = getmntent( mntfp )) != 0 ) {
QString deviceName = me->mnt_fsname;
QString filesystemType = me->mnt_type;
QString mountDir = me->mnt_dir;
if(deviceName != "none") {
if( fsList.contains(filesystemType) == 0
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
@@ -852,22 +852,23 @@ void AdvancedFm::okRename() {
qDebug("okrename");
if( !renameBox) return;
QString newName = renameBox->text();
cancelRename();
QListView * view = CurrentView();
QString path = CurrentDir()->canonicalPath() + "/";
oldName = path + oldName;
newName = path + newName;
if( rename( oldName.latin1(), newName.latin1())== -1)
QMessageBox::message(tr("Note"),tr("Could not rename"));
else
oldName = "";
QListViewItem *item = view->currentItem();
view->takeItem( item );
delete item;
- rePopulate();
+ populateView();
+
}
void AdvancedFm::openSearch() {
QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
}