1 files changed, 46 insertions, 29 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index c869dc9..515fcdc 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -13,24 +13,25 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // changes added by L. J. Potter Sun 02-17-2002 21:31:31
 
 #include "textedit.h"
 #include "fileBrowser.h"
 #include "fileSaver.h"
+#include "filePermissions.h"
 
 #include "fontDialog.h"
 
 #include <qpe/fontdatabase.h>
 #include <qpe/global.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -38,24 +39,27 @@
 
 #include <qstringlist.h>
 #include <qaction.h>
 #include <qcolordialog.h>
 #include <qfileinfo.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qpopupmenu.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
+#include <qcheckbox.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 #include <stdlib.h> //getenv
 /* XPM */
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
 ".  c #343434",
 "+  c #A0A0A0",
 "@  c #565656",
 "#  c #9E9E9E",
 "$  c #525252",
 "%  c #929292",
@@ -406,25 +410,25 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     defaultFont = fdb.font(family,style,i_size,charSet);
     editor->setFont( defaultFont);
 
     wa->setOn(wrap);
     updateCaption();
 
     fileNew();    
 }
 
 TextEdit::~TextEdit()
 {
-//    saveAs();
+//    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);
 }
 
 void TextEdit::zoomIn()
 {
@@ -685,45 +689,50 @@ void TextEdit::showEditTools()
   searchBar->show();
 //    updateCaption();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
 }
 
 /*!
   unprompted save */
 bool TextEdit::save()
 {
     QString file = doc->file();
     QString name= doc->name();
+
     QString rt = editor->text();
     currentFileName= name ;
     qDebug("saveFile "+currentFileName);
 
+    struct stat buf;
+    mode_t mode;
+    lstat(file.latin1(), &buf);
+    mode = buf.st_mode;
+
     doc->setName( name);
     FileManager fm;
     if ( !fm.saveFile( *doc, rt ) ) {
         return false;
     }
-//  if(doc)
-//      delete doc;
-//      doc = 0;
     editor->setEdited( false );
+
+    chmod( file.latin1(), mode);
     return true;
 }
 
 /*!
   prompted save */
 bool TextEdit::saveAs()
 {
-        qDebug("saveAsFile "+currentFileName);
+//        qDebug("saveAsFile "+currentFileName);
 
       // case of nothing to save... /// there's always something to save
 //          if ( !doc )//|| !bFromDocView)
 //            {
 //                qDebug("no doc");
 //                return true;
 //      }
     if ( !editor->edited() ) {
         delete doc;
         doc = 0;
         return true;
     }
@@ -744,57 +753,64 @@ bool TextEdit::saveAs()
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
             if ( docname.length() > 40 )
                 docname = docname.left(40);
             if ( docname.isEmpty() )
                 docname = "Unnamed";
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
+    
     fileSaveDlg=new fileSaver(this,"SaveFile",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 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);
+            delete doc;
+            DocLnk nf;
+            nf.setType("text/plain");
+            nf.setFile( fileNm);
+            doc = new DocLnk(nf);
 //        editor->setText(rt);
-        qDebug("openFile doclnk "+currentFileName);
-    }
-    doc->setName( currentFileName);
-    updateCaption( currentFileName);
-    
-    FileManager fm;
-    if ( !fm.saveFile( *doc, rt ) ) {
-        return false;
-    }
-//      delete doc;
-//      doc = 0;
-    editor->setEdited( false );
+            qDebug("openFile doclnk "+currentFileName);
+            doc->setName( currentFileName);
+            updateCaption( currentFileName);
+
+            FileManager fm;
+            if ( !fm.saveFile( *doc, rt ) ) {
+                return false;
+            }
+            if( fileSaveDlg->filePermCheck->isChecked() ) {
+                filePermissions *filePerm;
+                filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)fileNm);
+                filePerm->exec();
+                editor->setEdited( false );
+                if( filePerm)
+                    delete  filePerm;
+            }
+        }
     }
+
     if(fileSaveDlg)
-    delete fileSaveDlg;
+        delete fileSaveDlg;
     return true;
 }
 
 void TextEdit::clear()
 {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name )
 {
@@ -826,24 +842,25 @@ void TextEdit::closeEvent( QCloseEvent *e )
         e->ignore();
         repaint();
 //        fileRevert();
   
     } else {
         bFromDocView = FALSE;
         e->accept();
     }
 }
 
 void TextEdit::accept()
 {
+    save();
     close();
 //    fileOpen(); //godamn thats obnoxious! lemme out!!!
 }
 
 void TextEdit::changeFont() {
     FontDatabase fdb;
     QFont defaultFont=editor->font();
     QFontInfo fontInfo(defaultFont);
     Config cfg("TextEdit");
     cfg.setGroup("Font");
     QString family = cfg.readEntry("Family", fontInfo.family());
     QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));