summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index d61da2a..8eaafce 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -441,10 +441,12 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
441} 441}
442 442
443TextEdit::~TextEdit() { 443TextEdit::~TextEdit() {
444 if( edited1 & !useAdvancedFeatures )
445 saveAs();
444} 446}
445 447
446void TextEdit::cleanUp() { 448void TextEdit::cleanUp() {
447// save(); 449qDebug("cleanUp");// save();
448 Config cfg("TextEdit"); 450 Config cfg("TextEdit");
449 cfg.setGroup("View"); 451 cfg.setGroup("View");
450 QFont f = editor->font(); 452 QFont f = editor->font();
@@ -457,7 +459,7 @@ void TextEdit::cleanUp() {
457 459
458 460
459void TextEdit::accept() { 461void TextEdit::accept() {
460 if(edited1) 462 if( edited1)
461 saveAs(); 463 saveAs();
462 exit(0); 464 exit(0);
463} 465}
@@ -635,7 +637,7 @@ void TextEdit::openFile( const QString &f ) {
635// bFromDocView = TRUE; 637// bFromDocView = TRUE;
636 if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { 638 if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) {
637 switch ( QMessageBox::warning(this,tr("Text Editor"), 639 switch ( QMessageBox::warning(this,tr("Text Editor"),
638 tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), 640 tr("Text Editor has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
639 tr(".desktop File"),tr("Linked Document"),0,1,1) ) { 641 tr(".desktop File"),tr("Linked Document"),0,1,1) ) {
640 case 0: 642 case 0:
641 filer = f; 643 filer = f;
@@ -646,8 +648,10 @@ void TextEdit::openFile( const QString &f ) {
646 break; 648 break;
647 } 649 }
648 } else { 650 } else {
649 filer = f; 651 DocLnk sf(f);
650 fileIs = TRUE; 652 filer = sf.file();
653// filer = f;
654// fileIs = TRUE;
651 } 655 }
652 656
653 DocLnk nf; 657 DocLnk nf;
@@ -737,7 +741,7 @@ bool TextEdit::save() {
737 QCString crt = rt.utf8(); 741 QCString crt = rt.utf8();
738 f.writeBlock(crt,crt.length()); 742 f.writeBlock(crt,crt.length());
739 } else { 743 } else {
740 QMessageBox::message("Text Edit","Write Failed"); 744 QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
741 return false; 745 return false;
742 } 746 }
743 747
@@ -914,7 +918,7 @@ void TextEdit::changeFont() {
914} 918}
915 919
916void TextEdit::editDelete() { 920void TextEdit::editDelete() {
917 switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Do you really want\nto delete the current file\nfrom the disk?\nThis is irreversable!!"),tr("Yes"),tr("No"),0,0,1) ) { 921 switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Do you really want<BR>to <B>delete</B> the current file\nfrom the disk?<BR>This is <B>irreversable!!</B>"),tr("Yes"),tr("No"),0,0,1) ) {
918 case 0: 922 case 0:
919 if(doc) { 923 if(doc) {
920 doc->removeFiles(); 924 doc->removeFiles();
@@ -957,10 +961,10 @@ void TextEdit::receive(const QCString&msg, const QByteArray&) {
957 961
958} 962}
959void TextEdit::doAbout() { 963void TextEdit::doAbout() {
960 QMessageBox::about(0,"Text Edit","Text Edit is copyright\n" 964 QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>"
961 "2000 Trolltech AS, and\n" 965 "2000 Trolltech AS, and<BR>"
962 "2002 by L.J.Potter \nljp@llornkcor.com\n" 966 "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>"
963 "and is licensed under the GPL"); 967 "and is licensed under the GPL"));
964} 968}
965 969
966void TextEdit::doAdvanced(bool b) { 970void TextEdit::doAdvanced(bool b) {