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
@@ -480,51 +480,48 @@ void TextEdit::setBold(bool y)
 void TextEdit::setItalic(bool y)
 {
     QFont f = editor->font();
     f.setItalic(y);
     editor->setFont(f);
 }
 
 void TextEdit::setWordWrap(bool y)
 {
     bool state = editor->edited();
     editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
     editor->setEdited( state );
 }
 
 void TextEdit::fileNew()
 {
 //     if( !bFromDocView  ) {
 //         saveAs();
 //     }
     newFile(DocLnk());
 }
 
 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/*"); //
 //     browseForFiles->setFileView( viewSelection );
 //     browseForFiles->showMaximized();
 // //    if( result != -1 )
 
 //     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);
 //             QString  fileName = fileTemp;
 //             if( fileName != "Unnamed" || fileName != "Empty Text"  ) {
 //                 currentFileName = fileName;
 //                 qDebug("please open "+currentFileName);
 //                 openFile(str );
 //             }
 //         }
@@ -624,86 +621,88 @@ void TextEdit::findClose()
 void TextEdit::search()
 {
     editor->find( searchEdit->text(), FALSE, FALSE );
 }
 
 void TextEdit::newFile( const DocLnk &f )
 {
     DocLnk nf = f;
     nf.setType("text/plain");
     clear();
     setWState (WState_Reserved1 );
     editor->setFocus();
     doc = new DocLnk(nf);
     currentFileName = "Unnamed";
     qDebug("newFile "+currentFileName);
     updateCaption( currentFileName);
 //    editor->setEdited( FALSE);
 }
 
 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;
     QFileInfo fi( currentFileName);
     nf.setName(fi.baseName());
     qDebug("openFile string "+currentFileName);
 
     openFile(nf);
     showEditTools();
       // Show filename in caption
     QString name = filer;
     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();
+    currentFileName=f.file();
     qDebug("openFile doclnk " + currentFileName);
     if ( !fm.loadFile( f, txt ) ) {
           // ####### could be a new file
         qDebug( "Cannot open file" );
     }
 //    fileNew();
     if ( doc )
         delete doc;
     doc = new DocLnk(f);
     editor->setText(txt);
     editor->setEdited( FALSE);
     edited1=FALSE;
     edited=FALSE;
 
     doc->setName(currentFileName);
     updateCaption();
 }
 
 void TextEdit::showEditTools()
 {
 //        if ( !doc )
 //      close();
 //    clear();
     menu->show();