-rw-r--r-- | core/apps/textedit/textedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 2f59ede..019ffee 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -648,97 +648,97 @@ void TextEdit::openFile( const QString &f ) | |||
648 | void TextEdit::openFile( const DocLnk &f ) | 648 | void TextEdit::openFile( const DocLnk &f ) |
649 | { | 649 | { |
650 | // clear(); | 650 | // clear(); |
651 | bFromDocView = TRUE; | 651 | bFromDocView = TRUE; |
652 | FileManager fm; | 652 | FileManager fm; |
653 | QString txt; | 653 | QString txt; |
654 | currentFileName=f.name(); | 654 | currentFileName=f.name(); |
655 | qDebug("openFile doclnk " + currentFileName); | 655 | qDebug("openFile doclnk " + currentFileName); |
656 | if ( !fm.loadFile( f, txt ) ) { | 656 | if ( !fm.loadFile( f, txt ) ) { |
657 | // ####### could be a new file | 657 | // ####### could be a new file |
658 | qDebug( "Cannot open file" ); | 658 | qDebug( "Cannot open file" ); |
659 | 659 | ||
660 | //return; | 660 | //return; |
661 | } | 661 | } |
662 | 662 | ||
663 | fileNew(); | 663 | fileNew(); |
664 | if ( doc ) | 664 | if ( doc ) |
665 | delete doc; | 665 | delete doc; |
666 | doc = new DocLnk(f); | 666 | doc = new DocLnk(f); |
667 | editor->setText(txt); | 667 | editor->setText(txt); |
668 | editor->setEdited( false); | 668 | editor->setEdited( false); |
669 | qDebug("openFile doclnk "+currentFileName); | 669 | qDebug("openFile doclnk "+currentFileName); |
670 | doc->setName(currentFileName); | 670 | doc->setName(currentFileName); |
671 | updateCaption(); | 671 | updateCaption(); |
672 | } | 672 | } |
673 | 673 | ||
674 | void TextEdit::showEditTools() | 674 | void TextEdit::showEditTools() |
675 | { | 675 | { |
676 | // if ( !doc ) | 676 | // if ( !doc ) |
677 | // close(); | 677 | // close(); |
678 | // clear(); | 678 | // clear(); |
679 | fileSelector->hide(); | 679 | fileSelector->hide(); |
680 | menu->show(); | 680 | menu->show(); |
681 | editBar->show(); | 681 | editBar->show(); |
682 | if ( searchVisible ) | 682 | if ( searchVisible ) |
683 | searchBar->show(); | 683 | searchBar->show(); |
684 | // updateCaption(); | 684 | // updateCaption(); |
685 | editorStack->raiseWidget( editor ); | 685 | editorStack->raiseWidget( editor ); |
686 | setWState (WState_Reserved1 ); | 686 | setWState (WState_Reserved1 ); |
687 | } | 687 | } |
688 | 688 | ||
689 | /*! | 689 | /*! |
690 | unprompted save */ | 690 | unprompted save */ |
691 | bool TextEdit::save() | 691 | bool TextEdit::save() |
692 | { | 692 | { |
693 | QString file = doc->file(); | 693 | QString file = doc->file(); |
694 | QString name= doc->name(); | 694 | QString name= doc->name(); |
695 | QString rt = editor->text(); | 695 | QString rt = editor->text(); |
696 | currentFileName= file ; | 696 | currentFileName= name ; |
697 | qDebug("saveFile "+currentFileName); | 697 | qDebug("saveFile "+currentFileName); |
698 | 698 | ||
699 | doc->setName( name); | 699 | doc->setName( name); |
700 | FileManager fm; | 700 | FileManager fm; |
701 | if ( !fm.saveFile( *doc, rt ) ) { | 701 | if ( !fm.saveFile( *doc, rt ) ) { |
702 | return false; | 702 | return false; |
703 | } | 703 | } |
704 | // if(doc) | 704 | // if(doc) |
705 | // delete doc; | 705 | // delete doc; |
706 | // doc = 0; | 706 | // doc = 0; |
707 | editor->setEdited( false ); | 707 | editor->setEdited( false ); |
708 | return true; | 708 | return true; |
709 | } | 709 | } |
710 | 710 | ||
711 | /*! | 711 | /*! |
712 | prompted save */ | 712 | prompted save */ |
713 | bool TextEdit::saveAs() | 713 | bool TextEdit::saveAs() |
714 | { | 714 | { |
715 | qDebug("saveAsFile "+currentFileName); | 715 | qDebug("saveAsFile "+currentFileName); |
716 | 716 | ||
717 | // case of nothing to save... /// there's always something to save | 717 | // case of nothing to save... /// there's always something to save |
718 | // if ( !doc )//|| !bFromDocView) | 718 | // if ( !doc )//|| !bFromDocView) |
719 | // { | 719 | // { |
720 | // qDebug("no doc"); | 720 | // qDebug("no doc"); |
721 | // return true; | 721 | // return true; |
722 | // } | 722 | // } |
723 | if ( !editor->edited() ) { | 723 | if ( !editor->edited() ) { |
724 | delete doc; | 724 | delete doc; |
725 | doc = 0; | 725 | doc = 0; |
726 | return true; | 726 | return true; |
727 | } | 727 | } |
728 | 728 | ||
729 | QString rt = editor->text(); | 729 | QString rt = editor->text(); |
730 | qDebug(currentFileName); | 730 | qDebug(currentFileName); |
731 | 731 | ||
732 | if( currentFileName.isEmpty() || currentFileName == "Unnamed") { | 732 | if( currentFileName.isEmpty() || currentFileName == "Unnamed") { |
733 | qDebug("do silly TT filename thing"); | 733 | qDebug("do silly TT filename thing"); |
734 | if ( doc->name().isEmpty() ) { | 734 | if ( doc->name().isEmpty() ) { |
735 | QString pt = rt.simplifyWhiteSpace(); | 735 | QString pt = rt.simplifyWhiteSpace(); |
736 | int i = pt.find( ' ' ); | 736 | int i = pt.find( ' ' ); |
737 | QString docname = pt; | 737 | QString docname = pt; |
738 | if ( i > 0 ) | 738 | if ( i > 0 ) |
739 | docname = pt.left( i ); | 739 | docname = pt.left( i ); |
740 | // remove "." at the beginning | 740 | // remove "." at the beginning |
741 | while( docname.startsWith( "." ) ) | 741 | while( docname.startsWith( "." ) ) |
742 | docname = docname.mid( 1 ); | 742 | docname = docname.mid( 1 ); |
743 | docname.replace( QRegExp("/"), "_" ); | 743 | docname.replace( QRegExp("/"), "_" ); |
744 | // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long. | 744 | // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long. |