1 files changed, 1 insertions, 4 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 21bf4b3..6f96574 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -573,260 +573,257 @@ void TextEdit::fileOpen() {
    QMap<QString, QStringList> map;
    map.insert(tr("All"), QStringList() );
    QStringList text;
    text << "text/*";
    map.insert(tr("Text"), text );
    text << "*";
    map.insert(tr("All"), text );
    QString str = OFileDialog::getOpenFileName( 2,
                                                dir ,
                                                QString::null, map);
    if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )
    {
       cfg.writeEntry("LastOpenDirectory",  QFileInfo(str).dirPath(false));
       openFile( str );
    }
    else
        updateCaption();
 }
 void TextEdit::doSearchBar() {
    if(!useSearchBar)
        searchBar->hide();
    else
        searchBar->show();
 }
 #if 0
 void TextEdit::slotFind() {
    FindDialog frmFind( tr("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();
    searchEdit->setFocus();
 }
 void TextEdit::findNext() {
    editor->find( searchEdit->text(), false, false );
 }
 void TextEdit::findClose() {
    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();
    setWState (WState_Reserved1 );
    editor->setFocus();
    doc = new DocLnk(nf);
    currentFileName = "Unnamed";
    qDebug("newFile "+currentFileName);
    updateCaption( currentFileName);
 //    editor->setEdited( false);
 }
 void TextEdit::openDotFile( const QString &f ) {
    if(!currentFileName.isEmpty()) {
    currentFileName=f;
    qDebug("openFile dotfile " + currentFileName);
    QString txt;
    QFile file(f);
    file.open(IO_ReadWrite);
    QTextStream t(&file);
    while ( !t.atEnd()) {
        txt+=t.readLine()+"\n";
    }
    editor->setText(txt);
    editor->setEdited( false);
    edited1=false;
    edited=false;
    }
    updateCaption( currentFileName);
 }
 void TextEdit::openFile( const QString &f ) {
  qDebug("filename is "+ f);
  QString filer;
  QFileInfo fi( f);
 //    bFromDocView = true;
  if(f.find(".desktop",0,true) != -1 && !openDesktop )
    {
-      switch ( QMessageBox::warning(this,tr("Text Editor"),
+      switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Text Editor has detected<BR>you selected a <B>.desktop</B>file.<BR>Open<B>.desktop</B> file or <B>linked</B> file?"),tr(".desktop File"),tr("Linked Document"),0,1,1) )
-                                    tr("Text Editor has detected<BR>you selected a <B>.desktop</B>
-file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
-                                    tr(".desktop File"),tr("Linked Document"),0,1,1) )
        {
        case 0: //desktop
          filer = f;
          break;
        case 1: //linked
          DocLnk sf(f);
          filer = sf.file();
          break;
        };
    }
  else if(fi.baseName().left(1) == "")
    {
      qDebug("opening dotfile");
      currentFileName=f;
      openDotFile(currentFileName);
      return;
    }
  else
    {
      DocLnk sf(f);
      filer = sf.file();
      if(filer.right(1) == "/")
        filer = f;
    }
      DocLnk nf;
      nf.setType("text/plain");
      nf.setFile(filer);
      currentFileName=filer;
      nf.setName(fi.baseName());
      openFile(nf);
      qDebug("openFile string "+currentFileName);
  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.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();
    setTimer();
 }
 void TextEdit::showEditTools() {
    menu->show();
    editBar->show();
    if(!useSearchBar)
        searchBar->hide();
    else
        searchBar->show();
    setWState (WState_Reserved1 );
 }
 /*!
  unprompted save */
 bool TextEdit::save() {
    qDebug("saveAsFile " + currentFileName);
    if(currentFileName.isEmpty()) {
        saveAs();
        return false;
    }
    QString file = doc->file();
    qDebug("saver file "+file);
    QString name= doc->name();
    qDebug("File named "+name);
    QString rt = editor->text();
    if( !rt.isEmpty() ) {
        if(name.isEmpty()) {
            saveAs();
        } else {
            currentFileName= name ;
            qDebug("saveFile "+currentFileName);
            struct stat buf;
            mode_t mode;
            stat(file.latin1(), &buf);
            mode = buf.st_mode;
            if(!fileIs) {
                doc->setName( name);
                FileManager fm;
                if ( !fm.saveFile( *doc, rt ) ) {
                    return false;
                }
            } else {
                qDebug("regular save file");
                QFile f(file);
                 if( f.open(IO_WriteOnly)) {
                     QCString crt = rt.utf8();
                     f.writeBlock(crt,crt.length());
                 } else {
                     QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
                 return false;
                 }
            }
            editor->setEdited( false);
            edited1=false;
            edited=false;
            if(caption().left(1)=="*")
            setCaption(caption().right(caption().length()-1));