fixed filesave and fileopen cancel

3 files changed, 24 insertions, 10 deletions

diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index d01daee..88608cc 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -30,5 +30,7 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     resize( 236, 280 );
     setCaption(tr( "Save file" ) );
-//    filterStr=currentFileName;
+    QFileInfo fi(currentFileName);
+    QString tmpFileName=fi.fileName();
+//    qDebug( tmpFileName);
 
     dirLabel = new QLabel(this, "DirLabel");
@@ -50,8 +52,13 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     fileEdit= new QLineEdit(this);
     fileEdit->setGeometry( QRect( 10, 230, 200, 25));
-    fileEdit->setText(currentFileName);
+
+    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();
+//      qDebug( tmpFileName);
     currentDir.setPath(QDir::currentDirPath() );
     populateList();
@@ -161,4 +168,5 @@ void fileSaver::accept() {
     selectedFileName =  fileEdit->text();
     selectedFileName = currentDir.canonicalPath()+ selectedFileName;
+    qDebug("goint to save "+selectedFileName);
     reject();
 }
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 14bc496..429c195 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -486,5 +486,7 @@ void TextEdit::setWordWrap(bool y)
 void TextEdit::fileNew()
 {
+    if( !bFromDocView  ) {
     save();
+    }
     newFile(DocLnk());
 }
@@ -513,5 +515,5 @@ void TextEdit::fileOpen()
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
-    updateCaption();
+    updateCaption(currentFileName);
 }
 
@@ -520,5 +522,5 @@ void TextEdit::newFileOpen()
     fileBrowser *browseForFiles;
     browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*");
-    browseForFiles->exec();
+    if( browseForFiles->exec()!= 0 ) {
     QString selFile= browseForFiles->selectedFileName;
     QStringList fileList=browseForFiles->fileList;
@@ -532,8 +534,9 @@ void TextEdit::newFileOpen()
         if( fileName != "Unnamed" || fileName != "Empty Text"  ) {
             currentFileName = fileName;
-            qDebug("please open "+currentFileName);
+//                qDebug("please open "+currentFileName);
             openFile(fileName );
         }
     }
+    }
     delete browseForFiles;
 
@@ -620,5 +623,5 @@ void TextEdit::newFile( const DocLnk &f )
     editor->setFocus();
     doc = new DocLnk(nf);
-    updateCaption();
+//    updateCaption();
 }
 
@@ -642,4 +645,5 @@ void TextEdit::openFile( const DocLnk &f )
 {
 //    clear();
+    bFromDocView = TRUE;
     FileManager fm;
     QString txt;
@@ -657,5 +661,5 @@ void TextEdit::openFile( const DocLnk &f )
     editor->setText(txt);
     editor->setEdited(FALSE);
-    updateCaption();
+    updateCaption(currentFileName);
 }
 
@@ -670,5 +674,5 @@ void TextEdit::showEditTools()
     if ( searchVisible )
   searchBar->show();
-    updateCaption();
+//    updateCaption();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
@@ -687,4 +691,5 @@ bool TextEdit::save()
 
     QString rt = editor->text();
+    qDebug(currentFileName);
 
     if(currentFileName.isEmpty() || currentFileName == "Unnamed") {
@@ -712,9 +717,10 @@ bool TextEdit::save()
     fileSaver *fileSaveDlg;
     fileSaveDlg=new fileSaver(this,"SaveFile",TRUE,0, currentFileName);
-    fileSaveDlg->exec();
+    if( fileSaveDlg->exec() != 0 ) {
     QString fileNm=fileSaveDlg->selectedFileName;
     qDebug("save filename "+fileNm);
     doc->setName(fileNm);
-    updateCaption();
+    updateCaption(fileNm);
+    }
     delete fileSaveDlg;
 
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index 4e469cc..4bfb260 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h