summaryrefslogtreecommitdiff
authorbipolar <bipolar>2002-03-06 00:58:32 (UTC)
committer bipolar <bipolar>2002-03-06 00:58:32 (UTC)
commit406bed0f501ea131ba31dbdecdde8c1fe8b15806 (patch) (unidiff)
tree11f375b25df3534e7d8ecd4120ee2df53a9791d3
parentfcb139a744cfe6c9521962595f15cd8369251c56 (diff)
downloadopie-406bed0f501ea131ba31dbdecdde8c1fe8b15806.zip
opie-406bed0f501ea131ba31dbdecdde8c1fe8b15806.tar.gz
opie-406bed0f501ea131ba31dbdecdde8c1fe8b15806.tar.bz2
ljp: fixed setDocument opening the .desktop file and not the file it points too
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp9
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
@@ -823,28 +823,31 @@ void TextEdit::updateCaption( const QString &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
832void TextEdit::setDocument(const QString& fileref) 832void 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
841void TextEdit::closeEvent( QCloseEvent *e ) 844void 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();