author | llornkcor <llornkcor> | 2002-04-17 23:27:59 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-17 23:27:59 (UTC) |
commit | 025156262b9bcab1e484347fe89657671f8f951f (patch) (unidiff) | |
tree | 1d80440bb9c954de4efb92afe30c7441aa85f92c | |
parent | 7b19e1d98d5acf01102ac057ec077fc036c034c6 (diff) | |
download | opie-025156262b9bcab1e484347fe89657671f8f951f.zip opie-025156262b9bcab1e484347fe89657671f8f951f.tar.gz opie-025156262b9bcab1e484347fe89657671f8f951f.tar.bz2 |
bug fix
-rw-r--r-- | core/apps/textedit/textedit.cpp | 15 |
1 files changed, 7 insertions, 8 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 | |||
@@ -500,11 +500,8 @@ void TextEdit::fileNew() | |||
500 | } | 500 | } |
501 | 501 | ||
502 | void TextEdit::fileOpen() | 502 | void TextEdit::fileOpen() |
503 | { | 503 | { |
504 | // OFileSelector *fileSelector; | ||
505 | // fileSelector = new OFileSelector( this, 1,1,"/","", "text/*"); | ||
506 | //fileSelector->showMaximized(); | ||
507 | QString str = OFileDialog::getOpenFileName(1,"/","", QStringList() , this ); | 504 | QString str = OFileDialog::getOpenFileName(1,"/","", QStringList() , this ); |
508 | if(!str.isEmpty() ) | 505 | if(!str.isEmpty() ) |
509 | openFile( str ); | 506 | openFile( str ); |
510 | // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // | 507 | // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // |
@@ -644,21 +641,23 @@ void TextEdit::openFile( const QString &f ) | |||
644 | { | 641 | { |
645 | qDebug("filename is "+ f); | 642 | qDebug("filename is "+ f); |
646 | QString filer; | 643 | QString filer; |
647 | // bFromDocView = TRUE; | 644 | // bFromDocView = TRUE; |
648 | if(f.find(".desktop",0,TRUE)) { | 645 | if(f.find(".desktop",0,TRUE) != -1) { |
649 | switch ( QMessageBox::warning(this,tr("Text Editor"), | 646 | switch ( QMessageBox::warning(this,tr("Text Editor"), |
650 | tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), | 647 | tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), |
651 | tr(".desktop File"),tr("Link"),0,0,1) ) { | 648 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { |
652 | case 0: | 649 | case 0: |
653 | filer = f; | 650 | filer = f; |
654 | break; | 651 | break; |
655 | case 1: | 652 | case 1: |
656 | DocLnk sf(f); | 653 | DocLnk sf(f); |
657 | filer = sf.file(); | 654 | filer = sf.file(); |
658 | break; | 655 | break; |
659 | } | 656 | } |
660 | } | 657 | } else |
658 | filer = f; | ||
659 | |||
661 | DocLnk nf; | 660 | DocLnk nf; |
662 | nf.setType("text/plain"); | 661 | nf.setType("text/plain"); |
663 | nf.setFile(filer); | 662 | nf.setFile(filer); |
664 | currentFileName=filer; | 663 | currentFileName=filer; |
@@ -681,9 +680,9 @@ void TextEdit::openFile( const DocLnk &f ) | |||
681 | // clear(); | 680 | // clear(); |
682 | // bFromDocView = TRUE; | 681 | // bFromDocView = TRUE; |
683 | FileManager fm; | 682 | FileManager fm; |
684 | QString txt; | 683 | QString txt; |
685 | currentFileName=f.name(); | 684 | currentFileName=f.file(); |
686 | qDebug("openFile doclnk " + currentFileName); | 685 | qDebug("openFile doclnk " + currentFileName); |
687 | if ( !fm.loadFile( f, txt ) ) { | 686 | if ( !fm.loadFile( f, txt ) ) { |
688 | // ####### could be a new file | 687 | // ####### could be a new file |
689 | qDebug( "Cannot open file" ); | 688 | qDebug( "Cannot open file" ); |