summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp40
-rw-r--r--core/apps/textedit/textedit.h2
2 files changed, 33 insertions, 9 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 84888c1..19449cb 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -349,8 +349,10 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
349 nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); 349 nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 );
350 connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); 350 connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) );
351 nStart->setToggleAction(TRUE); 351 nStart->setToggleAction(TRUE);
352 nStart->addTo( font ); 352 nStart->addTo( font );
353 font->insertSeparator();
354 font->insertItem(tr("About"), this, SLOT( doAbout()) );
353 355
354 mb->insertItem( tr( "File" ), file ); 356 mb->insertItem( tr( "File" ), file );
355 mb->insertItem( tr( "Edit" ), edit ); 357 mb->insertItem( tr( "Edit" ), edit );
356 mb->insertItem( tr( "View" ), font ); 358 mb->insertItem( tr( "View" ), font );
@@ -411,8 +413,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
411 fileNew(); 413 fileNew();
412 } else { 414 } else {
413 fileOpen(); 415 fileOpen();
414 } 416 }
417
415 viewSelection = cfg.readNumEntry( "FileView", 0 ); 418 viewSelection = cfg.readNumEntry( "FileView", 0 );
416} 419}
417 420
418void TextEdit::cleanUp() 421void TextEdit::cleanUp()
@@ -503,9 +506,9 @@ void TextEdit::fileOpen()
503{ 506{
504 Config cfg("TextEdit"); 507 Config cfg("TextEdit");
505 cfg.setGroup("View"); 508 cfg.setGroup("View");
506 bool b=FALSE; 509 bool b=FALSE;
507 if(cfg.readEntry("useOldFileDialog") == "TRUE") 510 if(cfg.readEntry("useOldFileDialog") == "TRUE")
508 b=TRUE; 511 b=TRUE;
509 if(!b) { 512 if(!b) {
510 QString str = OFileDialog::getOpenFileName( 1,"/","", "text/plain", this ); 513 QString str = OFileDialog::getOpenFileName( 1,"/","", "text/plain", this );
511 if(!str.isEmpty() ) 514 if(!str.isEmpty() )
@@ -529,13 +532,13 @@ void TextEdit::fileOpen()
529 QString fileName = fileTemp; 532 QString fileName = fileTemp;
530 if( fileName != "Unnamed" || fileName != "Empty Text" ) { 533 if( fileName != "Unnamed" || fileName != "Empty Text" ) {
531 currentFileName = fileName; 534 currentFileName = fileName;
532 qDebug("please open "+currentFileName); 535 qDebug("please open "+currentFileName);
533 openFile(str ); 536 openFile(currentFileName );
534 } 537 }
535 } 538 }
536 viewSelection = browseForFiles->SelectionCombo->currentItem(); 539 viewSelection = browseForFiles->SelectionCombo->currentItem();
537 } 540 }
538 delete browseForFiles; 541 delete browseForFiles;
539 editor->setEdited( FALSE); 542 editor->setEdited( FALSE);
540 edited1=FALSE; 543 edited1=FALSE;
541 edited=FALSE; 544 edited=FALSE;
@@ -662,10 +665,12 @@ void TextEdit::openFile( const QString &f )
662 DocLnk sf(f); 665 DocLnk sf(f);
663 filer = sf.file(); 666 filer = sf.file();
664 break; 667 break;
665 } 668 }
666 } else 669 } else {
667 filer = f; 670 filer = f;
671 fileIs = TRUE;
672 }
668 673
669 DocLnk nf; 674 DocLnk nf;
670 nf.setType("text/plain"); 675 nf.setType("text/plain");
671 nf.setFile(filer); 676 nf.setFile(filer);
@@ -741,13 +746,24 @@ bool TextEdit::save()
741 struct stat buf; 746 struct stat buf;
742 mode_t mode; 747 mode_t mode;
743 stat(file.latin1(), &buf); 748 stat(file.latin1(), &buf);
744 mode = buf.st_mode; 749 mode = buf.st_mode;
745 750 if(!fileIs) {
746 doc->setName( name); 751 doc->setName( name);
747 FileManager fm; 752 FileManager fm;
748 if ( !fm.saveFile( *doc, rt ) ) { 753 if ( !fm.saveFile( *doc, rt ) ) {
749 return false; 754 return false;
755 }
756 } else {
757 qDebug("regular save file");
758 QFile f(file);
759 if( f.open(IO_WriteOnly)) {
760 f.writeBlock(rt,rt.length());
761 } else {
762 QMessageBox::message("Text Edit","Write Failed");
763 return false;
764 }
765
750 } 766 }
751 editor->setEdited( FALSE); 767 editor->setEdited( FALSE);
752 edited1=FALSE; 768 edited1=FALSE;
753 edited=FALSE; 769 edited=FALSE;
@@ -968,4 +984,10 @@ void TextEdit::receive(const QCString&msg, const QByteArray&) {
968 qDebug("bugger all"); 984 qDebug("bugger all");
969 } 985 }
970 986
971} 987}
988void TextEdit::doAbout() {
989 QMessageBox::about(0,"Text Edit","Text Edit is copyright\n"
990 "2000 Trolltech AS, and\n"
991 "2002 by L.J.Potter \nljp@llornkcor.com\n"
992 "and is licensed under the GPL");
993}
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index edc6fe3..9d27ab0 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -64,11 +64,13 @@ public:
64public slots: 64public slots:
65 void editorChanged(); 65 void editorChanged();
66void receive(const QCString&, const QByteArray&); 66void receive(const QCString&, const QByteArray&);
67protected: 67protected:
68 bool fileIs;
68 void closeEvent( QCloseEvent *e ); 69 void closeEvent( QCloseEvent *e );
69 void doSearchBar(); 70 void doSearchBar();
70private slots: 71private slots:
72 void doAbout();
71 void setDocument(const QString&); 73 void setDocument(const QString&);
72 void changeFont(); 74 void changeFont();
73 void fileNew(); 75 void fileNew();
74 void fileRevert(); 76 void fileRevert();