ljp: fixed setDocument opening the .desktop file and not the file it points too

1 files changed, 6 insertions, 3 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f138572..0f19da9 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -451,449 +451,452 @@ void TextEdit::setFontSize(int sz, bool round_down_not_up)
   } else if ( round_down_not_up ) {
       if ( fontsize[i] < sz )
     s = fontsize[i];
   } else {
       if ( fontsize[i] > sz ) {
     s = fontsize[i];
     break;
       }
   }
     }
 
     QFont f = editor->font();
     f.setPointSize(s);
     editor->setFont(f);
 
     zin->setEnabled(s != fontsize[nfontsizes-1]);
     zout->setEnabled(s != fontsize[0]);
 }
 
 void TextEdit::setBold(bool y)
 {
     QFont f = editor->font();
     f.setBold(y);
     editor->setFont(f);
 }
 
 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()
 {
 //      if ( !save() ) {
 //    if ( QMessageBox::critical( this, tr( "Out of space" ),
 //              tr( "Text Editor was unable to\n"
 //            "save your changes.\n"
 //            "Free some space and try again.\n"
 //            "\nContinue anyway?" ),
 //              QMessageBox::Yes|QMessageBox::Escape,
 //              QMessageBox::No|QMessageBox::Default )
 //         != QMessageBox::Yes )
 //        return;
 //    else {
 //        delete doc;
 //        doc = 0;
 //    }
 //      }
     menu->hide();
     editBar->hide();
     searchBar->hide();
     clearWState (WState_Reserved1 );
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
     updateCaption();
 }
 
 void TextEdit::newFileOpen()
 {
     browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
     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(fileName );
             }
         }
     }
     delete browseForFiles;
     editor->setEdited( true );
 }
 
 #if 0
 void TextEdit::slotFind()
 {
     FindDialog frmFind( "Text Editor", this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));
 
     //case sensitive, backwards, [category]
 
     connect( editor, SIGNAL(notFound()),
        &frmFind, SLOT(slotNotFound()) );
     connect( editor, SIGNAL(searchWrapped()),
        &frmFind, SLOT(slotWrapAround()) );
 
     frmFind.exec();
 
 
 }
 #endif
 
 void TextEdit::fileRevert()
 {
     clear();
     fileOpen();
 }
 
 void TextEdit::editCut()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->cut();
 #endif
 }
 
 void TextEdit::editCopy()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->copy();
 #endif
 }
 
 void TextEdit::editPaste()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->paste();
 #endif
 }
 
 void TextEdit::editFind()
 {
     searchBar->show();
     searchVisible = TRUE;
     searchEdit->setFocus();
 }
 
 void TextEdit::findNext()
 {
     editor->find( searchEdit->text(), FALSE, FALSE );
 
 }
 
 void TextEdit::findClose()
 {
     searchVisible = FALSE;
     searchBar->hide();
 }
 
 void TextEdit::search()
 {
     editor->find( searchEdit->text(), FALSE, FALSE );
 }
 
 void TextEdit::newFile( const DocLnk &f )
 {
     DocLnk nf = f;
     nf.setType("text/plain");
     clear();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
     editor->setFocus();
     doc = new DocLnk(nf);
     qDebug("newFile "+currentFileName);
     updateCaption(currentFileName);
 }
 
 void TextEdit::openFile( const QString &f )
 {
     bFromDocView = TRUE;
     DocLnk nf;
     nf.setType("text/plain");
     nf.setFile(f);
     currentFileName=f;
     QFileInfo fi( currentFileName);
     nf.setName(fi.baseName());
     qDebug("openFile string"+currentFileName);
 
     openFile(nf);
     showEditTools();
     // Show filename in caption
     QString name = f;
     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" );
  
   //return;
     }
     
     fileNew();
     if ( doc )
   delete doc;
     doc = new DocLnk(f);
     editor->setText(txt);
     editor->setEdited( false);
     qDebug("openFile doclnk "+currentFileName);
     doc->setName(currentFileName);
     updateCaption();
 }
 
 void TextEdit::showEditTools()
 {
 //        if ( !doc )
 //      close();
 //    clear();
     fileSelector->hide();
     menu->show();
     editBar->show();
     if ( searchVisible )
   searchBar->show();
 //    updateCaption();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
 }
 
 /*!
   unprompted save */
 bool TextEdit::save()
 {
     QString file = doc->file();
     QString name= doc->name();
 
     QString rt = editor->text();
     currentFileName= name ;
     qDebug("saveFile "+currentFileName);
 
     struct stat buf;
     mode_t mode;
     stat(file.latin1(), &buf);
     mode = buf.st_mode;
 
     doc->setName( name);
     FileManager fm;
     if ( !fm.saveFile( *doc, rt ) ) {
         return false;
     }
     editor->setEdited( false );
 
     chmod( file.latin1(), mode);
     return true;
 }
 
 /*!
   prompted save */
 bool TextEdit::saveAs()
 {
 //        qDebug("saveAsFile "+currentFileName);
 
       // case of nothing to save... /// there's always something to save
 //          if ( !doc )//|| !bFromDocView)
 //            {
 //                qDebug("no doc");
 //                return true;
 //      }
     if ( !editor->edited() ) {
         delete doc;
         doc = 0;
         return true;
     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
     
     if( currentFileName.isEmpty() || currentFileName == "Unnamed") {
         qDebug("do silly TT filename thing");
         if ( doc->name().isEmpty() ) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ' );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left( i );
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
             if ( docname.length() > 40 )
                 docname = docname.left(40);
             if ( docname.isEmpty() )
                 docname = "Unnamed";
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
     
     fileSaveDlg=new fileSaver(this,"Save File",TRUE, 0, currentFileName);
     qDebug("wanna save filename "+currentFileName);
     fileSaveDlg->exec();
     if( fileSaveDlg->result() == 1 ) {
         QString fileNm=fileSaveDlg->selectedFileName;
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc) {
             qDebug("doclnk exists");
 //        QString file = doc->file();
 //        doc->removeFiles();
             delete doc;
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile( fileNm);
             doc = new DocLnk(nf);
 //        editor->setText(rt);
             qDebug("openFile doclnk "+currentFileName);
             doc->setName( currentFileName);
             updateCaption( currentFileName);
 
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
             if( fileSaveDlg->filePermCheck->isChecked() ) {
                 filePermissions *filePerm;
                 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)fileNm);
                 filePerm->exec();
                 editor->setEdited( false );
                 if( filePerm)
                     delete  filePerm;
             }
         }
     }
 
     if(fileSaveDlg)
         delete fileSaveDlg;
     return true;
 }
 
 void TextEdit::clear()
 {
     delete doc;
     doc = 0;
     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;
   }
 
   setCaption( s + " - " + tr("Text Editor") );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
+    qDebug("setDocument "+fileref);
+    bFromDocView = TRUE;
+    if(fileref.find(".desktop",0,TRUE) == -1) {
     openFile(fileref);
-//  bFromDocView = TRUE;
-//         openFile(DocLnk(fileref));
-//    showEditTools();
+    } else {
+      openFile(DocLnk(fileref));
+    }
 }
 
 void TextEdit::closeEvent( QCloseEvent *e )
 {
     if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) {
         e->ignore();
         repaint();
 //        fileRevert();
   
     } else {
         bFromDocView = FALSE;
         e->accept();
     }
 }
 
 void TextEdit::accept()
 {
     save();
     close();
 //    fileOpen(); //godamn thats obnoxious! lemme out!!!
 }
 
 void TextEdit::changeFont() {
     FontDatabase fdb;
     QFont defaultFont=editor->font();
     QFontInfo fontInfo(defaultFont);
     Config cfg("TextEdit");
     cfg.setGroup("Font");
     QString family = cfg.readEntry("Family", fontInfo.family());
     QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
     int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
     QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
 
     defaultFont = fdb.font(family,style,i_size,charSet);
 
     FontDialog *fontDlg;
     fontDlg=new FontDialog(this,"FontDialog",TRUE);
 
     fontDlg->exec();
 
     QFont myFont=fontDlg->selectedFont;
     editor->setFont( myFont);
     delete fontDlg;
 
 }
 
 void TextEdit::editDelete()
 {
     switch ( QMessageBox::warning(this,"Text Editor","Do you really want\nto delete the current file\nfrom the disk?\nThis is irreversable!!","Yes","No",0,0,1) ) {
       case 0:
           if(doc) {
               doc->removeFiles();
               clear();
               setCaption( tr("Text Editor") );
           }
           break;
       case 1: 
             // exit
           break;
     };
 }