author | llornkcor <llornkcor> | 2002-09-01 13:16:27 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-09-01 13:16:27 (UTC) |
commit | 41d125f02fb485f963818efea9f32f3f29148710 (patch) (side-by-side diff) | |
tree | 1a56bad99a18d7003543e5456458f23dcb8cee1d /core/apps | |
parent | 21394ee7a48bbe0768a1b820b2493defa534257e (diff) | |
download | opie-41d125f02fb485f963818efea9f32f3f29148710.zip opie-41d125f02fb485f963818efea9f32f3f29148710.tar.gz opie-41d125f02fb485f963818efea9f32f3f29148710.tar.bz2 |
added a few remaining tr, fixed a few bugs
-rw-r--r-- | core/apps/textedit/textedit.cpp | 26 |
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 @@ -432,41 +432,43 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) cfg.setGroup("View"); if(cfg.readEntry("startNew","TRUE") == "TRUE") { nStart->setOn(TRUE); fileNew(); } else { fileOpen(); } viewSelection = cfg.readNumEntry( "FileView", 0 ); } TextEdit::~TextEdit() { + if( edited1 & !useAdvancedFeatures ) + saveAs(); } void TextEdit::cleanUp() { -// save(); +qDebug("cleanUp");// save(); Config cfg("TextEdit"); cfg.setGroup("View"); QFont f = editor->font(); cfg.writeEntry("FontSize",f.pointSize()); cfg.writeEntry("Bold",f.bold()); cfg.writeEntry("Italic",f.italic()); cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth); cfg.writeEntry( "FileView", viewSelection ); } void TextEdit::accept() { - if(edited1) + if( edited1) saveAs(); exit(0); } void TextEdit::zoomIn() { setFontSize(editor->font().pointSize()+1,FALSE); } void TextEdit::zoomOut() { setFontSize(editor->font().pointSize()-1,TRUE); } @@ -626,37 +628,39 @@ void TextEdit::newFile( const DocLnk &f ) { currentFileName = "Unnamed"; qDebug("newFile "+currentFileName); updateCaption( currentFileName); // editor->setEdited( FALSE); } void TextEdit::openFile( const QString &f ) { qDebug("filename is "+ f); QString filer; // bFromDocView = TRUE; if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { switch ( QMessageBox::warning(this,tr("Text Editor"), - tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), + tr("Text Editor has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), tr(".desktop File"),tr("Linked Document"),0,1,1) ) { case 0: filer = f; break; case 1: DocLnk sf(f); filer = sf.file(); break; } } else { - filer = f; - fileIs = TRUE; + DocLnk sf(f); + filer = sf.file(); +// filer = f; +// fileIs = TRUE; } DocLnk nf; nf.setType("text/plain"); nf.setFile(filer); currentFileName=filer; QFileInfo fi( currentFileName); nf.setName(fi.baseName()); qDebug("openFile string "+currentFileName); openFile(nf); showEditTools(); @@ -728,25 +732,25 @@ bool TextEdit::save() { doc->setName( name); FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { return false; } } else { qDebug("regular save file"); QFile f(file); if( f.open(IO_WriteOnly)) { QCString crt = rt.utf8(); f.writeBlock(crt,crt.length()); } else { - QMessageBox::message("Text Edit","Write Failed"); + QMessageBox::message(tr("Text Edit"),tr("Write Failed")); return false; } } editor->setEdited( FALSE); edited1=FALSE; edited=FALSE; if(caption().left(1)=="*") setCaption(caption().right(caption().length()-1)); chmod( file.latin1(), mode); @@ -905,25 +909,25 @@ void TextEdit::changeFont() { FontDialog *fontDlg; fontDlg=new FontDialog(this,tr("FontDialog"),TRUE); fontDlg->exec(); QFont myFont=fontDlg->selectedFont; editor->setFont( myFont); delete fontDlg; } void TextEdit::editDelete() { - 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) ) { + 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) ) { case 0: if(doc) { doc->removeFiles(); clear(); setCaption( tr("Text Editor") ); } break; case 1: // exit break; }; } @@ -948,28 +952,28 @@ void TextEdit::editorChanged() { } edited=TRUE; } void TextEdit::receive(const QCString&msg, const QByteArray&) { qDebug("QCop "+msg); if ( msg == "setDocument(QString)" ) { qDebug("bugger all"); } } void TextEdit::doAbout() { - QMessageBox::about(0,"Text Edit","Text Edit is copyright\n" - "2000 Trolltech AS, and\n" - "2002 by L.J.Potter \nljp@llornkcor.com\n" - "and is licensed under the GPL"); + QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>" + "2000 Trolltech AS, and<BR>" + "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>" + "and is licensed under the GPL")); } void TextEdit::doAdvanced(bool b) { useAdvancedFeatures=b; Config cfg("TextEdit"); cfg.setGroup("View"); cfg.writeEntry("AdvancedFeatures",b); } void TextEdit::editPasteTimeDate() { #ifndef QT_NO_CLIPBOARD QClipboard *cb = QApplication::clipboard(); |