2 files changed, 124 insertions, 41 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 7ced056..42775ee 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -35,24 +35,25 @@ class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
 class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
+
 //class QPushButton;
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
     Q_OBJECT
 public:
     AdvancedFm();
     ~AdvancedFm();
 
     OTabWidget *TabWidget;
@@ -107,25 +108,26 @@ protected slots:
     void doProperties();
     void runCommand();
     void runCommandStd();
     QStringList getPath();
     void mkSym();
   void switchToLocalTab();
   void switchToRemoteTab();
 
 protected:
   bool zaurusDevice;
   QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
   QStringList remoteDirPathStringList, localDirPathStringList;
-
+  QLineEdit *renameBox;
+ 
   void init();
   void initConnections();
   void keyReleaseEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
   QString getDiskSpace(const QString &);
   void parsetab(const QString &fileName);
   QString checkDiskSpace(const QString &);
   QString dealWithSymName(const QString &);
   
 protected slots:
   void showFileMenu();
   void cancelMenuTimer();
@@ -140,19 +142,24 @@ protected slots:
   void copyAs();
   void copySameDir();
   void currentPathComboActivated(const QString &);
   void fillCombo(const QString &);
   bool copyFile( const QString & , const QString & );
   void move();
   void fileStatus();
   void doAbout();
   void doBeam();
   void fileBeamFinished( Ir *);
 
 private:
-      QTimer menuTimer;
-      void startProcess(const QString &);
+    QString oldName;
+    QTimer menuTimer;
+    void startProcess(const QString &);
+    bool eventFilter( QObject * , QEvent * );
+    void cancelRename();
+    void doRename(QListView *);
+    void okRename();
 private slots:
     void processEnded();
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 98d024d..f067013 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -330,62 +330,24 @@ void AdvancedFm::remoteDelete() {
                     };
                 }
                 QString cmd="rm "+f;
                 QFile file(f);
                 if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1)
                     file.remove();
             }
         }
     }
     populateRemoteView();
 }
 
-void AdvancedFm::localRename() {
-  QString curFile = Local_View->currentItem()->text(0);
-  qDebug("currentItem "+curFile);
-  if( curFile !="../") {
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-    fileDlg->setInputText((const QString &)curFile);
-    fileDlg->exec();
-    if( fileDlg->result() == 1 ) {
-      QString oldname = currentDir.canonicalPath() + "/" + curFile;
-      QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();
-//+".playlist";
-      if( rename(oldname.latin1(), newName.latin1())== -1)
-        QMessageBox::message(tr("Note"),tr("Could not rename"));
-    }
-    populateLocalView();
-  }
-}
-
-void AdvancedFm::remoteRename()
-{
-  QString curFile = Remote_View->currentItem()->text(0);
-  if( curFile !="../") {
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-    fileDlg->setInputText((const QString &)curFile);
-    fileDlg->exec();
-    if( fileDlg->result() == 1 ) {
-      QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
-      QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();
-//+".playlist";
-      if( rename(oldname.latin1(), newName.latin1())== -1)
-        QMessageBox::message(tr("Note"),tr("Could not rename"));
-    }
-    populateRemoteView();
-  }
-}
-
 
 void AdvancedFm::filePerms() {
 
   QStringList curFileList = getPath();
   QString filePath;
 
   if (TabWidget->getCurrentTab() == 0) {
     filePath = currentDir.canonicalPath()+"/";
   } else {
     filePath= currentRemoteDir.canonicalPath()+"/";
   }
 
@@ -1038,12 +1000,126 @@ void AdvancedFm::startProcess(const QString & cmd) {
       command << "/bin/sh";
       command << "-c";
       command << cmd.latin1();
       *process << command;
       if(!process->start(OProcess::NotifyOnExit) )
           qDebug("could not start process");
 }
 
 void AdvancedFm::processEnded() {
   populateLocalView();
   populateRemoteView();
 }
+
+bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
+    if ( o->inherits( "QLineEdit" ) ) {
+        if ( e->type() == QEvent::KeyPress ) {
+            QKeyEvent *ke = (QKeyEvent*)e;
+            if ( ke->key() == Key_Return ||
+                 ke->key() == Key_Enter ) {
+                okRename();
+                return true;
+            } else if ( ke->key() == Key_Escape ) {
+                cancelRename();
+                return true;
+            }
+        } else if ( e->type() == QEvent::FocusOut ) {
+            cancelRename();
+            return true;
+        }
+    }
+    return QWidget::eventFilter( o, e );
+}
+
+
+void AdvancedFm::cancelRename() {
+    qDebug("cancel rename");
+    QListView * view;
+    if (TabWidget->getCurrentTab() == 0) {
+        view = Local_View;
+    }
+    else
+      {
+          view = Remote_View;
+      }
+
+    bool resetFocus = view->viewport()->focusProxy() == renameBox;
+    delete renameBox;
+    renameBox = 0;
+    if ( resetFocus ) {
+        view->viewport()->setFocusProxy( view);
+        view->setFocus();
+    }
+}
+
+void AdvancedFm::doRename(QListView * view) {
+
+    QRect r = view->itemRect( view->currentItem( ));
+    r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
+    r.setX( view->contentsX() );
+    if ( r.width() > view->visibleWidth() )
+        r.setWidth( view->visibleWidth() );
+
+    renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
+    renameBox->setFrame(true);
+
+    renameBox->setText(  view->currentItem()->text(0) );
+
+    renameBox->selectAll();
+    renameBox->installEventFilter( this );
+    view->addChild( renameBox, r.x(), r.y() );
+    renameBox->resize( r.size() );
+    view->viewport()->setFocusProxy( renameBox );
+    renameBox->setFocus();
+    renameBox->show();
+
+}
+
+
+void AdvancedFm::localRename() {
+    oldName = Local_View->currentItem()->text(0);
+    doRename(Local_View );
+    populateLocalView();
+}
+
+void AdvancedFm::remoteRename()
+{
+    oldName = Remote_View->currentItem()->text(0);
+    doRename(Local_View );
+    populateRemoteView();
+}
+
+void AdvancedFm::okRename() {
+    QString newName = renameBox->text();
+    cancelRename();
+    int tabs=0;
+     QListView * view;
+     tabs = TabWidget->getCurrentTab();
+     if ( tabs == 0)
+       {
+           view = Local_View;
+           QString path =  currentDir.canonicalPath() + "/";
+           oldName = path + oldName;
+           newName = path + newName;
+        }
+     else
+       {
+           view = Remote_View;
+           QString path =  currentRemoteDir.canonicalPath() + "/";
+           oldName = path + oldName;
+           newName = path + newName;
+       }
+
+     if(  view->currentItem() == NULL)
+         return;
+       if( rename(oldName.latin1(), newName.latin1())== -1)
+         QMessageBox::message(tr("Note"),tr("Could not rename"));
+       else
+           oldName = "";
+
+    view->takeItem( view->currentItem() );
+    delete view->currentItem();
+    if ( tabs == 0)
+        populateLocalView();
+    else
+        populateRemoteView();
+}