buf gix

2 files changed, 13 insertions, 6 deletions

diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index b1ddc0b..209a258 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -167,32 +167,33 @@ void fileSaver::populateList()
     dirLabel->setText(currentDir.canonicalPath());
 
 
 }
 
 void fileSaver::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }
 
 void fileSaver::listDoubleClicked(QListViewItem *selectedItem)
 {
 }
 
 void fileSaver::listClicked(QListViewItem *selectedItem)
 {
+    if(selectedItem != NULL) {
     QString strItem=selectedItem->text(0);
     QString strSize=selectedItem->text(1);
 //  qDebug("strItem is "+strItem);
     strSize.stripWhiteSpace();
 //  qDebug(strSize);
 
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
             QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4);
 //            qDebug("strItem symlink is "+strItem2);
             if(QDir(strItem2).exists() ) {
                 currentDir.cd(strItem2, TRUE);
                 populateList();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
                 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
@@ -203,33 +204,33 @@ void fileSaver::listClicked(QListViewItem *selectedItem)
                 } else {
                     currentDir.cdUp();
                     populateList();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateList();
                 }
             } // else
 //                    if( QFile::exists(strItem ) ) {
 //                        qDebug("We found our files!!");
 
 //                      OnOK();
                 } //end not symlink
         chdir(strItem.latin1());
 
-
+    }
 }
 
 
 void fileSaver::closeEvent( QCloseEvent *e )
 {
     if(e->isAccepted()) {
     e->accept();
     } else {
     qDebug("not accepted");
     done(-1);
     }
 }
 
 void fileSaver::accept() {
     selectedFileName =  fileEdit->text();
     QString path =  currentDir.canonicalPath()+"/" + selectedFileName;
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f89ed6d..f99f259 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -497,33 +497,33 @@ void TextEdit::setWordWrap(bool y)
 void TextEdit::fileNew()
 {
 //     if( !bFromDocView  ) {
 //         saveAs();
 //     }
     newFile(DocLnk());
 }
 
 void TextEdit::fileOpen()
 {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     bool b=FALSE;
 //         if(cfg.readEntry("useOldFileDialog") == "TRUE")
 //      b=TRUE;
 //      if(!b) {
-        QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
+        QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
         if(!str.isEmpty() )
             openFile( str );
 //      } else {
 //          QString str;
 //          browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); //
 //          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++ ) {
@@ -735,32 +735,33 @@ 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;
                  }
                      
@@ -809,37 +810,42 @@ bool TextEdit::saveAs()
                 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;
         }
     }
 
     
-    fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName);
-    qDebug("wanna save filename "+currentFileName);
-    fileSaveDlg->exec();
-    if( fileSaveDlg->result() == 1 ) {
+//         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 ) {
         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);