-rw-r--r-- | core/apps/textedit/textedit.cpp | 9 |
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 | |||
@@ -811,52 +811,55 @@ void TextEdit::clear() | |||
811 | doc = 0; | 811 | doc = 0; |
812 | editor->clear(); | 812 | editor->clear(); |
813 | } | 813 | } |
814 | 814 | ||
815 | void TextEdit::updateCaption( const QString &name ) | 815 | void TextEdit::updateCaption( const QString &name ) |
816 | { | 816 | { |
817 | if ( !doc ) | 817 | if ( !doc ) |
818 | setCaption( tr("Text Editor") ); | 818 | setCaption( tr("Text Editor") ); |
819 | else { | 819 | else { |
820 | QString s = name; | 820 | QString s = name; |
821 | if ( s.isNull() ) | 821 | if ( s.isNull() ) |
822 | s = doc->name(); | 822 | s = doc->name(); |
823 | if ( s.isEmpty() ) { | 823 | if ( s.isEmpty() ) { |
824 | s = tr( "Unnamed" ); | 824 | s = tr( "Unnamed" ); |
825 | currentFileName=s; | 825 | currentFileName=s; |
826 | } | 826 | } |
827 | 827 | ||
828 | setCaption( s + " - " + tr("Text Editor") ); | 828 | setCaption( s + " - " + tr("Text Editor") ); |
829 | } | 829 | } |
830 | } | 830 | } |
831 | 831 | ||
832 | void TextEdit::setDocument(const QString& fileref) | 832 | void TextEdit::setDocument(const QString& fileref) |
833 | { | 833 | { |
834 | bFromDocView = TRUE; | 834 | bFromDocView = TRUE; |
835 | qDebug("setDocument "+fileref); | ||
836 | bFromDocView = TRUE; | ||
837 | if(fileref.find(".desktop",0,TRUE) == -1) { | ||
835 | openFile(fileref); | 838 | openFile(fileref); |
836 | // bFromDocView = TRUE; | 839 | } else { |
837 | // openFile(DocLnk(fileref)); | 840 | openFile(DocLnk(fileref)); |
838 | // showEditTools(); | 841 | } |
839 | } | 842 | } |
840 | 843 | ||
841 | void TextEdit::closeEvent( QCloseEvent *e ) | 844 | void TextEdit::closeEvent( QCloseEvent *e ) |
842 | { | 845 | { |
843 | if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) { | 846 | if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) { |
844 | e->ignore(); | 847 | e->ignore(); |
845 | repaint(); | 848 | repaint(); |
846 | // fileRevert(); | 849 | // fileRevert(); |
847 | 850 | ||
848 | } else { | 851 | } else { |
849 | bFromDocView = FALSE; | 852 | bFromDocView = FALSE; |
850 | e->accept(); | 853 | e->accept(); |
851 | } | 854 | } |
852 | } | 855 | } |
853 | 856 | ||
854 | void TextEdit::accept() | 857 | void TextEdit::accept() |
855 | { | 858 | { |
856 | save(); | 859 | save(); |
857 | close(); | 860 | close(); |
858 | // fileOpen(); //godamn thats obnoxious! lemme out!!! | 861 | // fileOpen(); //godamn thats obnoxious! lemme out!!! |
859 | } | 862 | } |
860 | 863 | ||
861 | void TextEdit::changeFont() { | 864 | void TextEdit::changeFont() { |
862 | FontDatabase fdb; | 865 | FontDatabase fdb; |