on your way out, save dialog

1 files changed, 29 insertions, 20 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index ea27e1b..40ea501 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -461,105 +461,105 @@ void TextEdit::setFontSize(int sz, bool round_down_not_up)
       }
   }
     }
 
     QFont f = editor->font();
     f.setPointSize(s);
     editor->setFont(f);
 
     zin->setEnabled(s != fontsize[nfontsizes-1]);
     zout->setEnabled(s != fontsize[0]);
 }
 
 void TextEdit::setBold(bool y)
 {
     QFont f = editor->font();
     f.setBold(y);
     editor->setFont(f);
 }
 
 void TextEdit::setItalic(bool y)
 {
     QFont f = editor->font();
     f.setItalic(y);
     editor->setFont(f);
 }
 
 void TextEdit::setWordWrap(bool y)
 {
     bool state = editor->edited();
     editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
     editor->setEdited( state );
 }
 
 void TextEdit::fileNew()
 {
 //     if( !bFromDocView  ) {
 //         saveAs();
 //     }
     newFile(DocLnk());
 }
 
 void TextEdit::fileOpen()
 {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     bool b=FALSE;
 
     QMap<QString, QStringList> map;
-  map.insert(tr("All"), QStringList() );
-  QStringList text;
-  text << "text/*";
-  map.insert(tr("Text"), text );
-  text << "*";
-  map.insert(tr("All"), text );
-        QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);
-        if(!str.isEmpty() )
-            openFile( str );
+    map.insert(tr("All"), QStringList() );
+    QStringList text;
+    text << "text/*";
+    map.insert(tr("Text"), text );
+    text << "*";
+    map.insert(tr("All"), text );
+    QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);
+    if(!str.isEmpty() )
+        openFile( str );
     
 }
 
 void TextEdit::doSearchBar()
 {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     if(cfg.readEntry("SearchBar","Closed") != "Opened")
         searchBar->hide();
 }
 
 #if 0
 void TextEdit::slotFind()
 {
     FindDialog frmFind( tr("Text Editor"), this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));
 
     //case sensitive, backwards, [category]
 
     connect( editor, SIGNAL(notFound()),
        &frmFind, SLOT(slotNotFound()) );
     connect( editor, SIGNAL(searchWrapped()),
        &frmFind, SLOT(slotWrapAround()) );
 
     frmFind.exec();
 
 
 }
 #endif
 
 void TextEdit::fileRevert()
 {
     clear();
     fileOpen();
 }
 
 void TextEdit::editCut()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->cut();
 #endif
 }
 
 void TextEdit::editCopy()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->copy();
@@ -747,142 +747,151 @@ bool TextEdit::save()
         }
         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;
       }
     if ( !editor->edited() ) {
         delete doc;
         doc = 0;
         return true;
     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
     
     if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) {
         qDebug("do silly TT filename thing");
         if ( doc->name().isEmpty() ) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ' );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left( i );
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 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 = tr("Unnamed");
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
-    
-//         QString str = OFileDialog::getSaveFileName( 2,"/");//,"", "*", this );
-//         if(!str.isEmpty() ) {
-//            openFile( str );
-
-     fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName);
-     qDebug("wanna save filename "+currentFileName);
-     fileSaveDlg->exec();
-     if( fileSaveDlg->result() == 1 ) {
+/*    
+    QMap<QString, QStringList> map;
+    map.insert(tr("All"), QStringList() );
+    QStringList text;
+    text << "text/*";
+    map.insert(tr("Text"), text );
+    text << "*";
+    map.insert(tr("All"), text );
+    QString str = OFileDialog::getSaveFileName( 2,"/", QString::null, map);
+    if(!str.isEmpty() ) {
+        QString fileNm=str;
+*/
+
+      fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName);
+      qDebug("wanna save filename "+currentFileName);
+      fileSaveDlg->exec();
+      if( fileSaveDlg->result() == 1 ) {
         QString fileNm=fileSaveDlg->selectedFileName;
-//             QString fileNm=srt;
+
+
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc) {
 //        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);
             doc->setName( currentFileName);
             updateCaption( currentFileName);
 
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
             if( fileSaveDlg->filePermCheck->isChecked() ) {
                 filePermissions *filePerm;
                 filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm);
                 filePerm->exec();
 
                 if( filePerm)
                     delete  filePerm;
             }
         }
     }
     editor->setEdited(TRUE);
     edited1=FALSE;
     edited=TRUE;
     if(caption().left(1)=="*")
-    setCaption(caption().right(caption().length()-1));
+        setCaption(caption().right(caption().length()-1));
 
     if(fileSaveDlg)
         delete fileSaveDlg;
     return true;
 } //end saveAs
 
 void TextEdit::clear()
 {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name )
 {
     if ( !doc )
   setCaption( tr("Text Editor") );
     else {
   QString s = name;
   if ( s.isNull() )
       s = doc->name();
   if ( s.isEmpty()  ) {
       s = tr( "Unnamed" );
        currentFileName=s;
   }
   if(s.left(1) == "/")
       s = s.right(s.length()-1);
   setCaption( s + " - " + tr("Text Editor") );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
     openFile(fileref);
     editor->setEdited(TRUE);
     edited1=FALSE;
     edited=TRUE;
     doSearchBar();
 }
 
 void TextEdit::closeEvent( QCloseEvent *e )
 {
     bFromDocView = FALSE;
     e->accept();
 }
 
 void TextEdit::accept()