changed way of saving files, so a file opened through the file dialog, which is not a DocLnk, gets saved without a DocLnk. I got tired of hearing, 'I edited /etc/so-and-so and it saved it to Documents.' Will make this an option later. :)

2 files changed, 27 insertions, 3 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
@@ -329,48 +329,50 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     QAction *ia = new QAction( tr("Italic"), QString::null, 0, this, 0 );
     connect( ia, SIGNAL( toggled(bool) ), this, SLOT( setItalic(bool) ) );
     ia->setToggleAction(TRUE);
     ia->addTo( font );
 
     ba->setOn(defb);
     ia->setOn(defi);
 
     font->insertSeparator();
 #endif
 
     QAction *wa = new QAction( tr("Wrap lines"), QString::null, 0, this, 0 );
     connect( wa, SIGNAL( toggled(bool) ), this, SLOT( setWordWrap(bool) ) );
     wa->setToggleAction(TRUE);
     wa->addTo( font );
 
     font->insertSeparator();
     font->insertItem(tr("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 );
+    font->insertSeparator();
+   font->insertItem(tr("About"), this, SLOT( doAbout()) );
 
     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 );
 
     searchBar->setHorizontalStretchable( TRUE );
 
     searchEdit = new QLineEdit( searchBar, "searchEdit" );
     searchBar->setStretchableWidget( searchEdit );
     connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( search() ) );
 
     a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
     a->addTo( searchBar );
     a->addTo( edit );
 
     a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
     a->addTo( searchBar );
 
@@ -391,48 +393,49 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 //    setFontSize(defsize,TRUE);
     FontDatabase fdb;
     QFont defaultFont=editor->font();
     QFontInfo fontInfo(defaultFont);
 
     cfg.setGroup("Font");
     QString family = cfg.readEntry("Family", fontInfo.family());
     QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
     int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
     QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
 
     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();
      }
+     
     viewSelection = cfg.readNumEntry( "FileView", 0 );
 }
 
 void TextEdit::cleanUp()
 {
 //    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);
     cfg.writeEntry( "FileView", viewSelection );
 
 }
 
 TextEdit::~TextEdit()
 {
 }
 
 void TextEdit::zoomIn()
 {
     setFontSize(editor->font().pointSize()+1,FALSE);
@@ -509,49 +512,49 @@ void TextEdit::fileOpen()
     if(!b) {
         QString str = OFileDialog::getOpenFileName( 1,"/","", "text/plain", this );
         if(!str.isEmpty() )
             openFile( str );
     } else {
         QString str;
         browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
         browseForFiles->setFileView( viewSelection );
         browseForFiles->showMaximized();
 //    if( result != -1 )
 
         if( browseForFiles->exec() != -1 ) {
             QString selFile = browseForFiles->selectedFileName;
             QStringList fileList = browseForFiles->fileList;
             qDebug(selFile);
             QStringList::ConstIterator f;
             QString fileTemp;
             for (  f = fileList.begin(); f != fileList.end(); f++ ) {
                 fileTemp = *f;
                 fileTemp.right( fileTemp.length()-5);
                 QString  fileName = fileTemp;
                 if( fileName != "Unnamed" || fileName != "Empty Text"  ) {
                     currentFileName = fileName;
                     qDebug("please open "+currentFileName);
-                    openFile(str );
+                    openFile(currentFileName );
                 }
             }
             viewSelection = browseForFiles->SelectionCombo->currentItem();
         }
         delete browseForFiles;
         editor->setEdited( FALSE);
         edited1=FALSE;
         edited=FALSE;
         if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
         doSearchBar();
     }
 }
 
 void TextEdit::doSearchBar()
 {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     if(cfg.readEntry("SearchBar","Closed") != "Opened")
         searchBar->hide();
 }
 
 #if 0
 void TextEdit::slotFind()
@@ -642,50 +645,52 @@ void TextEdit::newFile( const DocLnk &f )
     doc = new DocLnk(nf);
     currentFileName = "Unnamed";
     qDebug("newFile "+currentFileName);
     updateCaption( currentFileName);
 //    editor->setEdited( FALSE);
 }
 
 void TextEdit::openFile( const QString &f )
 {
     qDebug("filename is "+ f);
     QString filer;
 //    bFromDocView = TRUE;
     if(f.find(".desktop",0,TRUE) != -1) {
         switch ( QMessageBox::warning(this,tr("Text Editor"),
         tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"),
         tr(".desktop File"),tr("Linked Document"),0,1,1) ) {
           case 0:
               filer = f;
               break;
           case 1:
               DocLnk sf(f);
               filer = sf.file();
               break;
         }
-    } else
+    } else {
         filer = f;
+        fileIs = TRUE;
+    }
         
     DocLnk nf;
     nf.setType("text/plain");
     nf.setFile(filer);
     currentFileName=filer;
     QFileInfo fi( currentFileName);
     nf.setName(fi.baseName());
     qDebug("openFile string "+currentFileName);
 
     openFile(nf);
     showEditTools();
       // Show filename in caption
     QString name = filer;
     int sep = name.findRev( '/' );
     if ( sep > 0 )
         name = name.mid( sep+1 );
     updateCaption( name );
 }
 
 void TextEdit::openFile( const DocLnk &f )
 {
 //    clear();
 //    bFromDocView = TRUE;
     FileManager fm;
@@ -721,54 +726,65 @@ void TextEdit::showEditTools()
 //    updateCaption();
     setWState (WState_Reserved1 );
 }
 
 /*!
   unprompted save */
 bool TextEdit::save()
 {
     QString file = doc->file();
     qDebug("saver file "+file);
     QString name= doc->name();
     qDebug("File named "+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);
             mode = buf.st_mode;
-
+            if(!fileIs) {
             doc->setName( name);
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
+            } else {
+                qDebug("regular save file");
+                QFile f(file);
+                 if( f.open(IO_WriteOnly)) {
+                     f.writeBlock(rt,rt.length());
+                 } else {
+                     QMessageBox::message("Text Edit","Write Failed");
+                 return false;
+                 }
+                     
+            }
             editor->setEdited( FALSE);
             edited1=FALSE;
             edited=FALSE;
             if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
 
 
             chmod( file.latin1(), mode);
         }
         return true;
     }
     return false;
 }
 
 /*!
   prompted save */
 bool TextEdit::saveAs()
 {
 //        qDebug("saveAsFile "+currentFileName);
  // case of nothing to save... 
     if ( !doc )//|| !bFromDocView)
       {
           qDebug("no doc");
           return true;
@@ -948,24 +964,30 @@ void TextEdit::changeStartConfig( bool b ) {
     if(b) {
         qDebug("bool");
         cfg.writeEntry("startNew","TRUE");
     } else {
         cfg.writeEntry("startNew","FALSE");
     }
     update();
 }
 
 void TextEdit::editorChanged() { 
     if(editor->edited() && edited && !edited1) {
         setCaption( "*"+caption());
         edited1=TRUE;
     }
     edited=TRUE;
 }
 
 void TextEdit::receive(const QCString&msg, const QByteArray&) {
     qDebug("QCop "+msg);
   if ( msg == "setDocument(QString)" ) {
       qDebug("bugger all");
   }
 
 }
+void TextEdit::doAbout() {
+    QMessageBox::about(0,"Text Edit","Text Edit is copyright\n"
+                         "2000 Trolltech AS, and\n"
+                         "2002 by L.J.Potter \nljp@llornkcor.com\n"
+                         "and is licensed under the GPL");
+}
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
@@ -44,51 +44,53 @@ 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, *nFileDlgOpt;
     bool edited, edited1;
     void openFile( const QString & );
         QCopChannel * channel;
 public slots:
     void editorChanged();
 void  receive(const QCString&, const QByteArray&);
 protected:
+    bool fileIs; 
     void closeEvent( QCloseEvent *e );
     void doSearchBar();
 private slots:
+    void doAbout();
     void setDocument(const QString&);
     void changeFont();
     void fileNew();
     void fileRevert();
     void fileOpen();
     void changeStartConfig(bool);
     bool save();
     bool saveAs();
     void cleanUp();
 
 
     void editCut();
     void editCopy();
     void editPaste();
     void editFind();
     void editDelete();
 
     void findNext();
     void findClose();
 
     void search();
     void accept();
 
     void newFile( const DocLnk & );