5 files changed, 112 insertions, 37 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index 82ccf2c..bb420e6 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -105,17 +105,17 @@ void fileBrowser::listDoubleClicked(QListViewItem *selectedItem)
 {
 }
 
 // you may want to switch these 2 functions. I like single clicks
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
     QString strItem=selectedItem->text(0);
     QString strSize=selectedItem->text(1);
-//  qDebug("strItem is "+strItem);
+//    qDebug("strItem is "+strItem);
     strSize.stripWhiteSpace();
 //  qDebug(strSize);
 
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
               // is symlink
             QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4);
 //            qDebug("strItem symlink is "+strItem2);
             if(QDir(strItem2).exists() ) {
@@ -132,29 +132,32 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
                 } else {
                     currentDir.cdUp();
                     populateList();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateList();
                 }
-            } else
+            } else {
+                strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                   if( QFile::exists(strItem ) ) {
-//                      qDebug("We found our files!!");
+//currentDir.canonicalPath()
+                      qDebug("We found our files!!"+strItem);
                     OnOK();
+                  }
                 } //end not symlink
         chdir(strItem.latin1());
       }
 }
 
 void fileBrowser::OnOK()
 {
   QListViewItemIterator it1( ListView);
     for ( ; it1.current(); ++it1 ) {
       if ( it1.current()->isSelected() ) {
          selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0));
-//         qDebug("selected filename is "+selectedFileName);
+         qDebug("selected filename is "+selectedFileName);
        fileList.append( selectedFileName );
       }
     }
   accept();
 }
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index 88608cc..af51fc3 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -45,17 +45,17 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     ListView->setColumnWidth(1,59);
 //      ListView->setMultiSelection(true);
 //      ListView->setSelectionMode(QListView::Extended);
 
     ListView->setAllColumnsShowFocus( TRUE );
     ListView->setGeometry( QRect( 10, 35, 220, 160 ) );
 
     fileEdit= new QLineEdit(this);
-    fileEdit->setGeometry( QRect( 10, 230, 200, 25));
+    fileEdit->setGeometry( QRect( 10, 200, 200, 22));
 
     fileEdit->setText( tmpFileName);
 
       // signals and slots connections
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     
 //      tmpFileName=fi.FilePath();
@@ -142,31 +142,41 @@ void fileSaver::listClicked(QListViewItem *selectedItem)
                 } else {
                     currentDir.cdUp();
                     populateList();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateList();
                 }
-            } //  else
+            } // else
 //                    if( QFile::exists(strItem ) ) {
 //                        qDebug("We found our files!!");
 
 //                      OnOK();
                 } //end not symlink
         chdir(strItem.latin1());
 
 
 }
 
 
-void fileSaver::OnOK()
+void fileSaver::closeEvent( QCloseEvent *e )
 {
-//    reject();
+    if(e->isAccepted()) {
+    e->accept();        
+    } else {
+    qDebug("not accepted");
+    done(-1);
+    }
 }
 
 void fileSaver::accept() {
     selectedFileName =  fileEdit->text();
-    selectedFileName = currentDir.canonicalPath()+ selectedFileName;
-    qDebug("goint to save "+selectedFileName);
-    reject();
+    QString path =  currentDir.canonicalPath()+"/" + selectedFileName;
+    if( path.find("//",0,TRUE) ==-1 ) {
+        selectedFileName = path;
+    } else {
+        selectedFileName = currentDir.canonicalPath()+selectedFileName;
+    }
+    qDebug("going to save "+selectedFileName);
+    done(1);
 }
diff --git a/core/apps/textedit/fileSaver.h b/core/apps/textedit/fileSaver.h
index f496270..4a38a65 100644
--- a/core/apps/textedit/fileSaver.h
+++ b/core/apps/textedit/fileSaver.h
@@ -52,20 +52,21 @@ public:
     QStringList fileList;
  
 QListViewItem * item;
 public slots:
 
 private:
 
 private slots:
-    void accept();
+        void accept(); 
         void upDir();
         void listDoubleClicked(QListViewItem *);
         void listClicked(QListViewItem *);
-        void OnOK();
+        void closeEvent( QCloseEvent * );
+
 protected slots: 
 
 protected:
 
 };
 
 #endif // FILESAVER_H
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 8004771..e41c69d 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -294,16 +294,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     a->addTo( edit );
 
      a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
      connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) );
      edit->insertSeparator();
      a->addTo( bar );
      a->addTo( edit );
 
+     
     int defsize;
     bool defb, defi, wrap;
 
     Config cfg("TextEdit");
     cfg.setGroup("View");
     defsize = cfg.readNumEntry("FontSize",10);
     defb = cfg.readBoolEntry("Bold",FALSE);
     defi = cfg.readBoolEntry("Italic",FALSE);
@@ -363,16 +364,21 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
      connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
      a->addTo( searchBar );
      a->addTo( edit );
 
     a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
     a->addTo( searchBar );
 
+     edit->insertSeparator();
+     a = new QAction( tr( "Delete" ), Resource::loadPixmap( "delete" ), QString::null, 0, this, 0 );
+     connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
+     a->addTo( edit );
+     
     searchBar->hide();
 
     editorStack = new QWidgetStack( this );
     setCentralWidget( editorStack );
 
     searchVisible = FALSE;
 
     fileSelector = new FileSelector( "text/*", editorStack, "fileselector" , TRUE, TRUE); //buggy
@@ -404,17 +410,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     wa->setOn(wrap);
     updateCaption();
 
     fileNew();    
 }
 
 TextEdit::~TextEdit()
 {
-    saveAs();
+//    saveAs();
 
     Config cfg("TextEdit");
     cfg.setGroup("View");
     QFont f = editor->font();
     cfg.writeEntry("FontSize",f.pointSize());
     cfg.writeEntry("Bold",f.bold());
     cfg.writeEntry("Italic",f.italic());
     cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth);
@@ -504,24 +510,23 @@ void TextEdit::fileOpen()
 //    }
 //      }
     menu->hide();
     editBar->hide();
     searchBar->hide();
     clearWState (WState_Reserved1 );
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
-    updateCaption(currentFileName);
+    updateCaption();
 }
 
 void TextEdit::newFileOpen()
 {
-    fileBrowser *browseForFiles;
     browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*");
-    if( browseForFiles->exec()!= 0 ) {
+    if( browseForFiles->exec() != -1 ) {
         QString selFile= browseForFiles->selectedFileName;
         QStringList fileList=browseForFiles->fileList;
         qDebug(selFile);
         QStringList::ConstIterator f;
         QString fileTemp;
         for (  f = fileList.begin(); f != fileList.end(); f++ ) {
             fileTemp = *f;
             fileTemp.right( fileTemp.length()-5);
@@ -529,17 +534,17 @@ void TextEdit::newFileOpen()
             if( fileName != "Unnamed" || fileName != "Empty Text"  ) {
                 currentFileName = fileName;
 //                qDebug("please open "+currentFileName);
                 openFile(fileName );
             }
         }
     }
     delete browseForFiles;
-
+    editor->setEdited( true );
 }
 
 #if 0
 void TextEdit::slotFind()
 {
     FindDialog frmFind( "Text Editor", this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));
@@ -612,55 +617,63 @@ void TextEdit::newFile( const DocLnk &f )
 {
     DocLnk nf = f;
     nf.setType("text/plain");
     clear();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
     editor->setFocus();
     doc = new DocLnk(nf);
+    qDebug("newFile "+currentFileName);
     updateCaption(currentFileName);
 }
 
 void TextEdit::openFile( const QString &f )
 {
     bFromDocView = TRUE;
     DocLnk nf;
     nf.setType("text/plain");
     nf.setFile(f);
+    currentFileName=f;
+    qDebug("openFile string"+currentFileName);
+
     openFile(nf);
     showEditTools();
     // Show filename in caption
     QString name = f;
     int sep = name.findRev( '/' );
     if ( sep > 0 )
   name = name.mid( sep+1 );
     updateCaption( name );
 }
 
 void TextEdit::openFile( const DocLnk &f )
 {
 //    clear();
     bFromDocView = TRUE;
     FileManager fm;
     QString txt;
+    currentFileName=f.name();
+    qDebug("openFile doclnk " + currentFileName);
     if ( !fm.loadFile( f, txt ) ) {
   // ####### could be a new file
         qDebug( "Cannot open file" );
  
   //return;
     }
     
     fileNew();
     if ( doc )
   delete doc;
     doc = new DocLnk(f);
     editor->setText(txt);
-    editor->setEdited(FALSE);
-    updateCaption(currentFileName);
+    editor->setEdited( false);
+    qDebug("openFile doclnk "+currentFileName);
+    doc->setName(currentFileName);
+    updateCaption();
 }
 
 void TextEdit::showEditTools()
 {
 //        if ( !doc )
 //      close();
 //    clear();
     fileSelector->hide();
@@ -668,84 +681,111 @@ void TextEdit::showEditTools()
     editBar->show();
     if ( searchVisible )
   searchBar->show();
 //    updateCaption();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
 }
 
+/*!
+  unprompted save */
 bool TextEdit::save()
 {
+     qDebug("saveFile "+currentFileName);
+
     QString rt = editor->text();
     doc->setName( currentFileName);
     FileManager fm;
     if ( !fm.saveFile( *doc, rt ) ) {
         return false;
     }
-    delete doc;
-    doc = 0;
+//  if(doc)
+//      delete doc;
+//      doc = 0;
     editor->setEdited( false );
     return true;
-    
 }
 
+/*!
+  prompted save */
 bool TextEdit::saveAs()
 {
-      // case of nothing to save...
-    if ( !doc || !bFromDocView)
-        return true;
+        qDebug("saveAsFile "+currentFileName);
+
+      // case of nothing to save... /// there's always something to save
+//          if ( !doc )//|| !bFromDocView)
+//            {
+//                qDebug("no doc");
+//                return true;
+//      }
     if ( !editor->edited() ) {
         delete doc;
         doc = 0;
         return true;
     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
     
     if( currentFileName.isEmpty() || currentFileName == "Unnamed") {
-
+        qDebug("do silly TT filename thing");
         if ( doc->name().isEmpty() ) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ' );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left( i );
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
             if ( docname.length() > 40 )
                 docname = docname.left(40);
             if ( docname.isEmpty() )
-                docname = "Empty Text";
+                docname = "Unnamed";
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
-    fileSaver *fileSaveDlg;
     fileSaveDlg=new fileSaver(this,"SaveFile",TRUE,0, currentFileName);
-    if( fileSaveDlg->exec() != 0 ) {
+    qDebug("wanna save filename "+currentFileName);
+    fileSaveDlg->exec();
+    if( fileSaveDlg->result() == 1 ) {
     QString fileNm=fileSaveDlg->selectedFileName;
-    qDebug("save filename "+fileNm);
-    doc->setName(fileNm);
-    updateCaption(fileNm);
+    qDebug("saving filename "+fileNm);
+    QFileInfo fi(fileNm);
+    currentFileName=fi.fileName();
+    if(doc) {
+        qDebug("doclnk exists");
+//        QString file = doc->file();
+//        doc->removeFiles();
+        delete doc;
+        DocLnk nf;
+        nf.setType("text/plain");
+        nf.setFile( fileNm);
+        doc = new DocLnk(nf);
+//        editor->setText(rt);
+        qDebug("openFile doclnk "+currentFileName);
     }
-    delete fileSaveDlg;
-
+    doc->setName( currentFileName);
+    updateCaption( currentFileName);
+    
     FileManager fm;
     if ( !fm.saveFile( *doc, rt ) ) {
         return false;
     }
-    delete doc;
-    doc = 0;
+//      delete doc;
+//      doc = 0;
     editor->setEdited( false );
+    }
+    if(fileSaveDlg)
+    delete fileSaveDlg;
     return true;
 }
 
 void TextEdit::clear()
 {
     delete doc;
     doc = 0;
     editor->clear();
@@ -813,8 +853,22 @@ void TextEdit::changeFont() {
     fontDlg->exec();
 
     QFont myFont=fontDlg->selectedFont;
     editor->setFont( myFont);
     delete fontDlg;
 
 }
 
+void TextEdit::editDelete()
+{
+    switch ( QMessageBox::warning(this,"Text Editor","Do you really want\nto delete the current file\nfrom the disk?\nThis is irreversable!!","Yes","No",0,0,1) ) {
+      case 0:
+          if(doc) {
+              doc->removeFiles();
+              clear();
+          }
+          break;
+      case 1: 
+            // exit
+          break;
+    };
+}
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index f9eb241..781061a 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -19,16 +19,19 @@
 **********************************************************************/
 // additions made by L.J. Potter Sun 02-17-2002 22:27:46
 
 #ifndef TEXTEDIT_H
 #define TEXTEDIT_H
 
 #define QTEXTEDIT_OPEN_API
 
+#include "fileBrowser.h"
+#include "fileSaver.h"
+
 #include <qpe/filemanager.h>
 
 #include <qmainwindow.h>
 #include <qmultilineedit.h>
 #include <qlist.h>
 #include <qmap.h>
 
 class QWidgetStack;
@@ -63,16 +66,17 @@ private slots:
     bool save();
     bool saveAs();
 
 
     void editCut();
     void editCopy();
     void editPaste();
     void editFind();
+    void editDelete();
 
     void findNext();
     void findClose();
 
     void search();
     void accept();
 
     void newFile( const DocLnk & );
@@ -89,16 +93,19 @@ private:
     void colorChanged( const QColor &c );
     void clear();
     void updateCaption( const QString &name=QString::null );
     void setFontSize(int sz, bool round_down_not_up);
 
 private:
     QWidgetStack *editorStack;
     FileSelector *fileSelector;
+    fileSaver *fileSaveDlg;
+    fileBrowser *browseForFiles;
+
     QpeEditor* editor;
     QToolBar *menu, *editBar, *searchBar;
     QLineEdit *searchEdit;
     DocLnk *doc;
     bool searchVisible;
     bool bFromDocView;
     QAction *zin, *zout;
     QString currentFileName;