author | llornkcor <llornkcor> | 2002-10-03 13:04:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-03 13:04:26 (UTC) |
commit | 8a7f57c5c172958d67d8397eed1860c914df485d (patch) (unidiff) | |
tree | f665602210cf23240c626dabb15b2b4e13ad5e60 | |
parent | ee864e9e055fd23778a8e5dd3c35e3a29cded368 (diff) | |
download | opie-8a7f57c5c172958d67d8397eed1860c914df485d.zip opie-8a7f57c5c172958d67d8397eed1860c914df485d.tar.gz opie-8a7f57c5c172958d67d8397eed1860c914df485d.tar.bz2 |
fix not opening
-rw-r--r-- | core/apps/textedit/textedit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 7b50a6c..6844023 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -615,39 +615,40 @@ void TextEdit::newFile( const DocLnk &f ) { | |||
615 | currentFileName = "Unnamed"; | 615 | currentFileName = "Unnamed"; |
616 | qDebug("newFile "+currentFileName); | 616 | qDebug("newFile "+currentFileName); |
617 | updateCaption( currentFileName); | 617 | updateCaption( currentFileName); |
618 | // editor->setEdited( FALSE); | 618 | // editor->setEdited( FALSE); |
619 | } | 619 | } |
620 | 620 | ||
621 | void TextEdit::openFile( const QString &f ) { | 621 | void TextEdit::openFile( const QString &f ) { |
622 | qDebug("filename is "+ f); | 622 | qDebug("filename is "+ f); |
623 | QString filer; | 623 | QString filer; |
624 | // bFromDocView = TRUE; | 624 | // bFromDocView = TRUE; |
625 | if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { | 625 | if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { |
626 | switch ( QMessageBox::warning(this,tr("Text Editor"), | 626 | switch ( QMessageBox::warning(this,tr("Text Editor"), |
627 | tr("Text Editor has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), | 627 | tr("Text Editor has detected<BR>you selected a <B>.desktop</B> |
628 | file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), | ||
628 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { | 629 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { |
629 | case 0: | 630 | case 0: |
630 | filer = f; | 631 | filer = f; |
631 | break; | 632 | break; |
632 | case 1: | 633 | case 1: |
633 | DocLnk sf(f); | 634 | DocLnk sf(f); |
634 | filer = sf.file(); | 635 | filer = sf.file(); |
635 | break; | 636 | break; |
636 | } | 637 | } |
637 | } else { | 638 | } else { |
638 | DocLnk sf(f); | 639 | DocLnk sf(f); |
639 | filer = sf.file(); | 640 | filer = sf.file(); |
640 | // filer = f; | 641 | if(filer.right(1) == "/") |
641 | // fileIs = TRUE; | 642 | filer = f; |
642 | } | 643 | } |
643 | 644 | ||
644 | DocLnk nf; | 645 | DocLnk nf; |
645 | nf.setType("text/plain"); | 646 | nf.setType("text/plain"); |
646 | nf.setFile(filer); | 647 | nf.setFile(filer); |
647 | currentFileName=filer; | 648 | currentFileName=filer; |
648 | QFileInfo fi( currentFileName); | 649 | QFileInfo fi( currentFileName); |
649 | nf.setName(fi.baseName()); | 650 | nf.setName(fi.baseName()); |
650 | qDebug("openFile string "+currentFileName); | 651 | qDebug("openFile string "+currentFileName); |
651 | 652 | ||
652 | openFile(nf); | 653 | openFile(nf); |
653 | showEditTools(); | 654 | showEditTools(); |