| -rw-r--r-- | core/apps/textedit/textedit.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 834bd8c..18402d4 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -500,11 +500,8 @@ void TextEdit::fileNew() } void TextEdit::fileOpen() { - // OFileSelector *fileSelector; - // fileSelector = new OFileSelector( this, 1,1,"/","", "text/*"); - //fileSelector->showMaximized(); QString str = OFileDialog::getOpenFileName(1,"/","", QStringList() , this ); if(!str.isEmpty() ) openFile( str ); // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // @@ -644,21 +641,23 @@ void TextEdit::openFile( const QString &f ) { qDebug("filename is "+ f); QString filer; // bFromDocView = TRUE; - if(f.find(".desktop",0,TRUE)) { + if(f.find(".desktop",0,TRUE) != -1) { switch ( QMessageBox::warning(this,tr("Text Editor"), tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), - tr(".desktop File"),tr("Link"),0,0,1) ) { + tr(".desktop File"),tr("Linked Document"),0,1,1) ) { case 0: filer = f; break; case 1: DocLnk sf(f); filer = sf.file(); break; } - } + } else + filer = f; + DocLnk nf; nf.setType("text/plain"); nf.setFile(filer); currentFileName=filer; @@ -681,9 +680,9 @@ void TextEdit::openFile( const DocLnk &f ) // clear(); // bFromDocView = TRUE; FileManager fm; QString txt; - currentFileName=f.name(); + currentFileName=f.file(); qDebug("openFile doclnk " + currentFileName); if ( !fm.loadFile( f, txt ) ) { // ####### could be a new file qDebug( "Cannot open file" ); |