author | llornkcor <llornkcor> | 2002-02-25 05:24:43 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-02-25 05:24:43 (UTC) |
commit | 160308bc29cf01582775f73e1aca13e82c65bffd (patch) (unidiff) | |
tree | 67ebc478e5eef47e881f3f4ea330633a67df0827 | |
parent | 1bebd27631a6c9d1ab967cbb32dd4e796b3b0402 (diff) | |
download | opie-160308bc29cf01582775f73e1aca13e82c65bffd.zip opie-160308bc29cf01582775f73e1aca13e82c65bffd.tar.gz opie-160308bc29cf01582775f73e1aca13e82c65bffd.tar.bz2 |
fixed open setDoc bug
-rw-r--r-- | core/apps/textedit/Makefile.in | 6 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in index fa394d6..234965b 100644 --- a/core/apps/textedit/Makefile.in +++ b/core/apps/textedit/Makefile.in | |||
@@ -63,52 +63,50 @@ OBJMOC = moc_textedit.o \ | |||
63 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 63 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
64 | 64 | ||
65 | .cxx.o: | 65 | .cxx.o: |
66 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 66 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
67 | 67 | ||
68 | .cc.o: | 68 | .cc.o: |
69 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 69 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
70 | 70 | ||
71 | .C.o: | 71 | .C.o: |
72 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 72 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
73 | 73 | ||
74 | .c.o: | 74 | .c.o: |
75 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 75 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
76 | 76 | ||
77 | ####### Build rules | 77 | ####### Build rules |
78 | 78 | ||
79 | 79 | ||
80 | all: $(DESTDIR)$(TARGET) | 80 | all: $(DESTDIR)$(TARGET) |
81 | 81 | ||
82 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 82 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
83 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 83 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
84 | 84 | ||
85 | moc: $(SRCMOC) | 85 | moc: $(SRCMOC) |
86 | 86 | ||
87 | tmake: Makefile.in | 87 | tmake: |
88 | 88 | tmake textedit.pro | |
89 | Makefile.in: textedit.pro | ||
90 | tmake textedit.pro -o Makefile.in | ||
91 | 89 | ||
92 | clean: | 90 | clean: |
93 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 91 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
94 | -rm -f *~ core | 92 | -rm -f *~ core |
95 | -rm -f allmoc.cpp | 93 | -rm -f allmoc.cpp |
96 | 94 | ||
97 | ####### Extension Modules | 95 | ####### Extension Modules |
98 | 96 | ||
99 | listpromodules: | 97 | listpromodules: |
100 | @echo | 98 | @echo |
101 | 99 | ||
102 | listallmodules: | 100 | listallmodules: |
103 | @echo | 101 | @echo |
104 | 102 | ||
105 | listaddonpromodules: | 103 | listaddonpromodules: |
106 | @echo | 104 | @echo |
107 | 105 | ||
108 | listaddonentmodules: | 106 | listaddonentmodules: |
109 | @echo | 107 | @echo |
110 | 108 | ||
111 | 109 | ||
112 | REQUIRES= | 110 | REQUIRES= |
113 | 111 | ||
114 | ####### Sub-libraries | 112 | ####### Sub-libraries |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 603f032..bc975f3 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -811,49 +811,51 @@ 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 | openFile(DocLnk(fileref)); | 835 | openFile(fileref); |
836 | // bFromDocView = TRUE; | ||
837 | // openFile(DocLnk(fileref)); | ||
836 | // showEditTools(); | 838 | // showEditTools(); |
837 | } | 839 | } |
838 | 840 | ||
839 | void TextEdit::closeEvent( QCloseEvent *e ) | 841 | void TextEdit::closeEvent( QCloseEvent *e ) |
840 | { | 842 | { |
841 | if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) { | 843 | if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) { |
842 | e->ignore(); | 844 | e->ignore(); |
843 | repaint(); | 845 | repaint(); |
844 | // fileRevert(); | 846 | // fileRevert(); |
845 | 847 | ||
846 | } else { | 848 | } else { |
847 | bFromDocView = FALSE; | 849 | bFromDocView = FALSE; |
848 | e->accept(); | 850 | e->accept(); |
849 | } | 851 | } |
850 | } | 852 | } |
851 | 853 | ||
852 | void TextEdit::accept() | 854 | void TextEdit::accept() |
853 | { | 855 | { |
854 | save(); | 856 | save(); |
855 | close(); | 857 | close(); |
856 | // fileOpen(); //godamn thats obnoxious! lemme out!!! | 858 | // fileOpen(); //godamn thats obnoxious! lemme out!!! |
857 | } | 859 | } |
858 | 860 | ||
859 | void TextEdit::changeFont() { | 861 | void TextEdit::changeFont() { |