fixed several silly bugs having to do with Doclnk stuff..

5 files changed, 107 insertions, 32 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
@@ -139,6 +139,9 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
                 }
-            } 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
@@ -154,3 +157,3 @@ void fileBrowser::OnOK()
          selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0));
-//         qDebug("selected filename is "+selectedFileName);
+         qDebug("selected filename is "+selectedFileName);
        fileList.append( selectedFileName );
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
@@ -52,3 +52,3 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     fileEdit= new QLineEdit(this);
-    fileEdit->setGeometry( QRect( 10, 230, 200, 25));
+    fileEdit->setGeometry( QRect( 10, 200, 200, 22));
 
@@ -161,5 +161,10 @@ void fileSaver::listClicked(QListViewItem *selectedItem)
 
-void fileSaver::OnOK()
+void fileSaver::closeEvent( QCloseEvent *e )
 {
-//    reject();
+    if(e->isAccepted()) {
+    e->accept();        
+    } else {
+    qDebug("not accepted");
+    done(-1);
+    }
 }
@@ -168,5 +173,10 @@ void fileSaver::accept() {
     selectedFileName =  fileEdit->text();
+    QString path =  currentDir.canonicalPath()+"/" + selectedFileName;
+    if( path.find("//",0,TRUE) ==-1 ) {
+        selectedFileName = path;
+    } else {
     selectedFileName = currentDir.canonicalPath()+ selectedFileName;
-    qDebug("goint to save "+selectedFileName);
-    reject();
+    }
+    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
@@ -63,3 +63,4 @@ private slots:
         void listClicked(QListViewItem *);
-        void OnOK();
+        void closeEvent( QCloseEvent * );
+
 protected slots: 
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
@@ -301,2 +301,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
+     
     int defsize;
@@ -370,2 +371,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
+     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();
@@ -411,3 +417,3 @@ TextEdit::~TextEdit()
 {
-    saveAs();
+//    saveAs();
 
@@ -511,3 +517,3 @@ void TextEdit::fileOpen()
     fileSelector->reread();
-    updateCaption(currentFileName);
+    updateCaption();
 }
@@ -516,5 +522,4 @@ void TextEdit::newFileOpen()
 {
-    fileBrowser *browseForFiles;
     browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*");
-    if( browseForFiles->exec()!= 0 ) {
+    if( browseForFiles->exec() != -1 ) {
         QString selFile= browseForFiles->selectedFileName;
@@ -536,3 +541,3 @@ void TextEdit::newFileOpen()
     delete browseForFiles;
-
+    editor->setEdited( true );
 }
@@ -619,2 +624,3 @@ void TextEdit::newFile( const DocLnk &f )
     doc = new DocLnk(nf);
+    qDebug("newFile "+currentFileName);
     updateCaption(currentFileName);
@@ -628,2 +634,5 @@ void TextEdit::openFile( const QString &f )
     nf.setFile(f);
+    currentFileName=f;
+    qDebug("openFile string"+currentFileName);
+
     openFile(nf);
@@ -644,2 +653,4 @@ void TextEdit::openFile( const DocLnk &f )
     QString txt;
+    currentFileName=f.name();
+    qDebug("openFile doclnk " + currentFileName);
     if ( !fm.loadFile( f, txt ) ) {
@@ -656,4 +667,6 @@ void TextEdit::openFile( const DocLnk &f )
     editor->setText(txt);
-    editor->setEdited(FALSE);
-    updateCaption(currentFileName);
+    editor->setEdited( false);
+    qDebug("openFile doclnk "+currentFileName);
+    doc->setName(currentFileName);
+    updateCaption();
 }
@@ -675,4 +688,8 @@ void TextEdit::showEditTools()
 
+/*!
+  unprompted save */
 bool TextEdit::save()
 {
+     qDebug("saveFile "+currentFileName);
+
     QString rt = editor->text();
@@ -683,14 +700,21 @@ bool TextEdit::save()
     }
-    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() ) {
@@ -705,3 +729,3 @@ bool TextEdit::saveAs()
     if( currentFileName.isEmpty() || currentFileName == "Unnamed") {
-
+        qDebug("do silly TT filename thing");
         if ( doc->name().isEmpty() ) {
@@ -720,3 +744,3 @@ bool TextEdit::saveAs()
             if ( docname.isEmpty() )
-                docname = "Empty Text";
+                docname = "Unnamed";
             doc->setName(docname);
@@ -726,11 +750,24 @@ bool TextEdit::saveAs()
 
-    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);
 
@@ -740,5 +777,8 @@ bool TextEdit::saveAs()
     }
-    delete doc;
-    doc = 0;
+//      delete doc;
+//      doc = 0;
     editor->setEdited( false );
+    }
+    if(fileSaveDlg)
+    delete fileSaveDlg;
     return true;
@@ -820 +860,15 @@ void TextEdit::changeFont() {
 
+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
@@ -26,2 +26,5 @@
 
+#include "fileBrowser.h"
+#include "fileSaver.h"
+
 #include <qpe/filemanager.h>
@@ -70,2 +73,3 @@ private slots:
     void editFind();
+    void editDelete();
 
@@ -96,2 +100,5 @@ private:
     FileSelector *fileSelector;
+    fileSaver *fileSaveDlg;
+    fileBrowser *browseForFiles;
+
     QpeEditor* editor;