ljp: added startup option,a dn fixed save when closing with no file edited

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
@@ -74,9 +74,9 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
 //      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
@@ -251,9 +251,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     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;
 
@@ -348,8 +348,14 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     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 );
 
@@ -413,9 +419,16 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     wa->setOn(wrap);
     updateCaption();
 
+    cfg.setGroup("View");
+    if(cfg.readEntry("startNew","TRUE") == "TRUE") {
+        nStart->setOn(TRUE);
     fileNew();    
+    } else {
+        fileOpen();
+    }
+
 }
 
 TextEdit::~TextEdit()
 {
@@ -696,11 +709,16 @@ 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;
@@ -715,10 +733,13 @@ bool TextEdit::save()
     }
     editor->setEdited( false );
 
     chmod( file.latin1(), mode);
+        }
     return true;
 }
+    return false;
+}
 
 /*!
   prompted save */
 bool TextEdit::saveAs()
@@ -762,27 +783,26 @@ 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();
     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;
@@ -855,11 +875,16 @@ void TextEdit::closeEvent( QCloseEvent *e )
 }
 
 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;
@@ -899,4 +924,17 @@ void TextEdit::editDelete()
             // 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
@@ -33,25 +33,28 @@
 #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 );
@@ -62,8 +65,9 @@ private slots:
     void fileNew();
     void fileRevert();
     void fileOpen();
     void newFileOpen();
+    void changeStartConfig(bool);
     bool save();
     bool saveAs();