| -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 @@ -71,36 +71,34 @@ OBJMOC = moc_textedit.o \ .C.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: textedit.pro - tmake textedit.pro -o Makefile.in +tmake: + tmake textedit.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo 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 @@ -819,33 +819,35 @@ void TextEdit::updateCaption( const QString &name ) else { QString s = name; if ( s.isNull() ) s = doc->name(); if ( s.isEmpty() ) { s = tr( "Unnamed" ); currentFileName=s; } setCaption( s + " - " + tr("Text Editor") ); } } void TextEdit::setDocument(const QString& fileref) { bFromDocView = TRUE; - openFile(DocLnk(fileref)); + openFile(fileref); +// bFromDocView = TRUE; +// openFile(DocLnk(fileref)); // showEditTools(); } void TextEdit::closeEvent( QCloseEvent *e ) { if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) { e->ignore(); repaint(); // fileRevert(); } else { bFromDocView = FALSE; e->accept(); } } |