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 | 52 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 6 |
3 files changed, 51 insertions, 9 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 @@ -72,13 +72,13 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl // tmpFileName=fi.FilePath(); // qDebug( tmpFileName); currentDir.setPath( QDir::currentDirPath() ); populateList(); move(0,15); - + fileEdit->setFocus(); } fileSaver::~fileSaver() { } 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 @@ -249,13 +249,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) bar->setHorizontalStretchable( TRUE ); menu = bar; QPEMenuBar *mb = new QPEMenuBar( bar ); QPopupMenu *file = new QPopupMenu( this ); QPopupMenu *edit = new QPopupMenu( this ); - QPopupMenu *font = new QPopupMenu( this ); + font = new QPopupMenu( this ); bar = new QPEToolBar( this ); editBar = bar; QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); @@ -346,12 +346,18 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) wa->setToggleAction(TRUE); wa->addTo( font ); font->insertSeparator(); 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 ); mb->insertItem( tr( "View" ), font ); searchBar = new QPEToolBar(this); addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); @@ -411,13 +417,20 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) defaultFont = fdb.font(family,style,i_size,charSet); editor->setFont( defaultFont); wa->setOn(wrap); updateCaption(); + cfg.setGroup("View"); + if(cfg.readEntry("startNew","TRUE") == "TRUE") { + nStart->setOn(TRUE); fileNew(); + } else { + fileOpen(); + } + } TextEdit::~TextEdit() { // save(); @@ -694,15 +707,20 @@ void TextEdit::showEditTools() /*! unprompted save */ bool TextEdit::save() { QString file = doc->file(); + qDebug(file); QString name= doc->name(); - + qDebug(name); QString rt = editor->text(); + if( !rt.isEmpty() ) { + if(name.isEmpty()) { + saveAs(); + } else { currentFileName= name ; qDebug("saveFile "+currentFileName); struct stat buf; mode_t mode; stat(file.latin1(), &buf); @@ -713,14 +731,17 @@ bool TextEdit::save() if ( !fm.saveFile( *doc, rt ) ) { return false; } editor->setEdited( false ); chmod( file.latin1(), mode); + } return true; } + return false; +} /*! prompted save */ bool TextEdit::saveAs() { // qDebug("saveAsFile "+currentFileName); @@ -760,31 +781,30 @@ bool TextEdit::saveAs() doc->setName(docname); currentFileName=docname; } } - 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(); if( fileSaveDlg->result() == 1 ) { QString fileNm=fileSaveDlg->selectedFileName; qDebug("saving filename "+fileNm); QFileInfo fi(fileNm); currentFileName=fi.fileName(); if(doc) { - qDebug("doclnk exists"); // QString file = doc->file(); // doc->removeFiles(); delete doc; DocLnk nf; nf.setType("text/plain"); nf.setFile( fileNm); doc = new DocLnk(nf); // editor->setText(rt); - qDebug("openFile doclnk "+currentFileName); +// qDebug("openFile doclnk "+currentFileName); doc->setName( currentFileName); updateCaption( currentFileName); FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { return false; @@ -853,15 +873,20 @@ void TextEdit::closeEvent( QCloseEvent *e ) e->accept(); } } void TextEdit::accept() { + QString file = doc->file(); + if (file.find("_.txt",0,TRUE) ==-1) save(); - close(); -// fileOpen(); //godamn thats obnoxious! lemme out!!! + else { + QFile(file).remove(); + } + exit(0); + } void TextEdit::changeFont() { FontDatabase fdb; QFont defaultFont=editor->font(); QFontInfo fontInfo(defaultFont); @@ -897,6 +922,19 @@ void TextEdit::editDelete() break; case 1: // exit break; }; } + +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 @@ -31,41 +31,45 @@ #include <qmainwindow.h> #include <qmultilineedit.h> #include <qlist.h> #include <qmap.h> +class QAction; class QWidgetStack; class QToolButton; class QPopupMenu; class QToolBar; class QLineEdit; class QAction; class FileSelector; class QpeEditor; +class QPopupMenu; class TextEdit : public QMainWindow { Q_OBJECT public: TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~TextEdit(); - + QPopupMenu *font; + QAction *nStart; void openFile( const QString & ); protected: void closeEvent( QCloseEvent *e ); private slots: void setDocument(const QString&); void changeFont(); void fileNew(); void fileRevert(); void fileOpen(); void newFileOpen(); + void changeStartConfig(bool); bool save(); bool saveAs(); void editCut(); void editCopy(); |