Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
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 @@ -487,3 +487,5 @@ void TextEdit::fileNew() { + if( !bFromDocView ) { save(); + } newFile(DocLnk()); @@ -514,3 +516,3 @@ void TextEdit::fileOpen() fileSelector->reread(); - updateCaption(); + updateCaption(currentFileName); } @@ -521,3 +523,3 @@ void TextEdit::newFileOpen() browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*"); - browseForFiles->exec(); + if( browseForFiles->exec()!= 0 ) { QString selFile= browseForFiles->selectedFileName; @@ -533,3 +535,3 @@ void TextEdit::newFileOpen() currentFileName = fileName; - qDebug("please open "+currentFileName); +// qDebug("please open "+currentFileName); openFile(fileName ); @@ -537,2 +539,3 @@ void TextEdit::newFileOpen() } + } delete browseForFiles; @@ -621,3 +624,3 @@ void TextEdit::newFile( const DocLnk &f ) doc = new DocLnk(nf); - updateCaption(); +// updateCaption(); } @@ -643,2 +646,3 @@ void TextEdit::openFile( const DocLnk &f ) // clear(); + bFromDocView = TRUE; FileManager fm; @@ -658,3 +662,3 @@ void TextEdit::openFile( const DocLnk &f ) editor->setEdited(FALSE); - updateCaption(); + updateCaption(currentFileName); } @@ -671,3 +675,3 @@ void TextEdit::showEditTools() searchBar->show(); - updateCaption(); +// updateCaption(); editorStack->raiseWidget( editor ); @@ -688,2 +692,3 @@ bool TextEdit::save() QString rt = editor->text(); + qDebug(currentFileName); @@ -713,3 +718,3 @@ bool TextEdit::save() fileSaveDlg=new fileSaver(this,"SaveFile",TRUE,0, currentFileName); - fileSaveDlg->exec(); + if( fileSaveDlg->exec() != 0 ) { QString fileNm=fileSaveDlg->selectedFileName; @@ -717,3 +722,4 @@ bool TextEdit::save() doc->setName(fileNm); - updateCaption(); + updateCaption(fileNm); + } delete fileSaveDlg; |