author | bipolar <bipolar> | 2002-03-08 00:12:12 (UTC) |
---|---|---|
committer | bipolar <bipolar> | 2002-03-08 00:12:12 (UTC) |
commit | 11b56113b6641e0b85c6015eafab802dd7663198 (patch) (side-by-side diff) | |
tree | 1899707c9144a342519acf9693ec69d2d4edffc7 | |
parent | 50f8f55346f369787063f42c571d2dc832eb58aa (diff) | |
download | opie-11b56113b6641e0b85c6015eafab802dd7663198.zip opie-11b56113b6641e0b85c6015eafab802dd7663198.tar.gz opie-11b56113b6641e0b85c6015eafab802dd7663198.tar.bz2 |
ljp: added startup option,a dn fixed save when closing with no file edited
-rw-r--r-- | core/apps/textedit/fileSaver.cpp | 2 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 88 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 6 |
3 files changed, 69 insertions, 27 deletions
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp index d78f2e8..4e80735 100644 --- a/core/apps/textedit/fileSaver.cpp +++ b/core/apps/textedit/fileSaver.cpp @@ -76,5 +76,5 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl populateList(); move(0,15); - + fileEdit->setFocus(); } diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 0f19da9..03f3a1e 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -253,5 +253,5 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) QPopupMenu *file = new QPopupMenu( this ); QPopupMenu *edit = new QPopupMenu( this ); - QPopupMenu *font = new QPopupMenu( this ); + font = new QPopupMenu( this ); bar = new QPEToolBar( this ); @@ -350,4 +350,10 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) font->insertItem("Font", this, SLOT(changeFont()) ); + font->insertSeparator(); + nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); + connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); + nStart->setToggleAction(TRUE); + nStart->addTo( font ); + mb->insertItem( tr( "File" ), file ); mb->insertItem( tr( "Edit" ), edit ); @@ -415,5 +421,12 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) updateCaption(); - fileNew(); + cfg.setGroup("View"); + if(cfg.readEntry("startNew","TRUE") == "TRUE") { + nStart->setOn(TRUE); + fileNew(); + } else { + fileOpen(); + } + } @@ -698,24 +711,32 @@ bool TextEdit::save() { QString file = doc->file(); + qDebug(file); QString name= doc->name(); - + qDebug(name); QString rt = editor->text(); - currentFileName= name ; - qDebug("saveFile "+currentFileName); - - struct stat buf; - mode_t mode; - stat(file.latin1(), &buf); - mode = buf.st_mode; + if( !rt.isEmpty() ) { + if(name.isEmpty()) { + saveAs(); + } else { + currentFileName= name ; + qDebug("saveFile "+currentFileName); + + struct stat buf; + mode_t mode; + stat(file.latin1(), &buf); + mode = buf.st_mode; + + doc->setName( name); + FileManager fm; + if ( !fm.saveFile( *doc, rt ) ) { + return false; + } + editor->setEdited( false ); - doc->setName( name); - FileManager fm; - if ( !fm.saveFile( *doc, rt ) ) { - return false; + chmod( file.latin1(), mode); + } + return true; } - editor->setEdited( false ); - - chmod( file.latin1(), mode); - return true; + return false; } @@ -764,5 +785,5 @@ bool TextEdit::saveAs() - fileSaveDlg=new fileSaver(this,"Save File",TRUE, 0, currentFileName); + fileSaveDlg=new fileSaver(this,"Save File As?",TRUE, 0, currentFileName); qDebug("wanna save filename "+currentFileName); fileSaveDlg->exec(); @@ -773,5 +794,4 @@ bool TextEdit::saveAs() currentFileName=fi.fileName(); if(doc) { - qDebug("doclnk exists"); // QString file = doc->file(); // doc->removeFiles(); @@ -782,5 +802,5 @@ bool TextEdit::saveAs() doc = new DocLnk(nf); // editor->setText(rt); - qDebug("openFile doclnk "+currentFileName); +// qDebug("openFile doclnk "+currentFileName); doc->setName( currentFileName); updateCaption( currentFileName); @@ -856,8 +876,13 @@ void TextEdit::closeEvent( QCloseEvent *e ) void TextEdit::accept() -{ - save(); - close(); -// fileOpen(); //godamn thats obnoxious! lemme out!!! + { + QString file = doc->file(); + if (file.find("_.txt",0,TRUE) ==-1) + save(); + else { + QFile(file).remove(); + } + exit(0); + } @@ -901,2 +926,15 @@ void TextEdit::editDelete() }; } + +void TextEdit::changeStartConfig( bool b ) { + + Config cfg("TextEdit"); + cfg.setGroup("View"); + if(b) { + qDebug("bool"); + cfg.writeEntry("startNew","TRUE"); + } else { + cfg.writeEntry("startNew","FALSE"); + } + update(); +} diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index 781061a..fb58738 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h @@ -35,4 +35,5 @@ #include <qmap.h> +class QAction; class QWidgetStack; class QToolButton; @@ -43,4 +44,5 @@ class QAction; class FileSelector; class QpeEditor; +class QPopupMenu; class TextEdit : public QMainWindow @@ -51,5 +53,6 @@ public: TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~TextEdit(); - + QPopupMenu *font; + QAction *nStart; void openFile( const QString & ); @@ -64,4 +67,5 @@ private slots: void fileOpen(); void newFileOpen(); + void changeStartConfig(bool); bool save(); bool saveAs(); |