1 files changed, 20 insertions, 11 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index cc3ccbc..834bd8c 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -621,62 +621,76 @@ void TextEdit::findClose()
     cfg.write();
 }
 
 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)) {
+        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) ) {
+          case 0:
+              filer = f;
+              break;
+          case 1:
+              DocLnk sf(f);
+              filer = sf.file();
+              break;
+        }
+    }       
     DocLnk nf;
     nf.setType("text/plain");
-    nf.setFile(f);
-    currentFileName=f;
+    nf.setFile(filer);
+    currentFileName=filer;
     QFileInfo fi( currentFileName);
     nf.setName(fi.baseName());
-    qDebug("openFile string"+currentFileName);
+    qDebug("openFile string "+currentFileName);
 
     openFile(nf);
     showEditTools();
       // Show filename in caption
-    QString name = f;
+    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();
     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);
@@ -836,54 +850,49 @@ void TextEdit::clear()
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name )
 {
     if ( !doc )
   setCaption( tr("Text Editor") );
     else {
   QString s = name;
   if ( s.isNull() )
       s = doc->name();
   if ( s.isEmpty()  ) {
       s = tr( "Unnamed" );
        currentFileName=s;
   }
   if(s.left(1) == "/")
       s = s.right(s.length()-1);
   setCaption( s + " - " + tr("Text Editor") );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
-    if(fileref.find(".desktop",0,TRUE) == -1) {
-        openFile(fileref);
-    } else {
-        qDebug("is desktop file");
-        openFile(DocLnk(fileref));
-    }
+    openFile(fileref);
     editor->setEdited(TRUE);
     edited1=FALSE;
     edited=TRUE;
     doSearchBar();
 }
 
 void TextEdit::closeEvent( QCloseEvent *e )
 {
     bFromDocView = FALSE;
     e->accept();
 }
 
 void TextEdit::accept()
  {
        //if(caption() !="Unnamed")
  if(edited1)
      saveAs();
     exit(0);
 
 }
 
 void TextEdit::changeFont() {
     FontDatabase fdb;
     QFont defaultFont=editor->font();