fixed something erother.. probably something todo with deleting or somesuch. probably broke something else in the process

3 files changed, 104 insertions, 60 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index 8c942a1..8ea8067 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -112,25 +112,25 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,-1);
     ListView->addColumn( "Date",-1);
 
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
     ListView->setColumnAlignment(2,QListView::AlignRight);
     ListView->setAllColumnsShowFocus( TRUE );
 
     QPEApplication::setStylusOperation( ListView->viewport(),QPEApplication::RightOnHold);
     connect( ListView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-             this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
+             this, SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
     connect( ListView, SIGNAL( clicked( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
 
     FileStack->addWidget( ListView, get_unique_id() );
 
     fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
 //    connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
 //    connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
     connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) );
     layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 );
 
     SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" );
@@ -162,87 +162,88 @@ fileBrowser::~fileBrowser()
 {
 }
 
 void fileBrowser::setFileView( int selection )
 {
     SelectionCombo->setCurrentItem( selection );
     selectionChanged( SelectionCombo->currentText() );
 }
 
 void fileBrowser::populateList()
 {
     ListView->clear();
+    QListViewItem * item;
     bool isDir=FALSE;
 //qDebug(currentDir.canonicalPath());
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
 //    currentDir.setNameFilter("*.txt;*.etx");
     QString fileL, fileS, fileDate;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
-
-        if (fi->isSymLink() ){
-            QString symLink=fi->readLink();
+            if (fi->isSymLink() ){
+                QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
-         QFileInfo sym( symLink);
-            fileS.sprintf( "%10li", sym.size() );
-            fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
-            fileDate = sym.lastModified().toString();
-        } else {
+                QFileInfo sym( symLink);
+                fileS.sprintf( "%10li", sym.size() );
+                fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
+                fileDate = sym.lastModified().toString();
+            } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
-            fileS.sprintf( "%10li", fi->size() );
-            fileL.sprintf( "%s",fi->fileName().data() );
-            fileDate= fi->lastModified().toString();
-            if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
-                fileL+="/";
-                isDir=TRUE;
+                fileS.sprintf( "%10li", fi->size() );
+                fileL.sprintf( "%s",fi->fileName().data() );
+                fileDate= fi->lastModified().toString();
+                if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
+                    fileL+="/";
+                    isDir=TRUE;
 //     qDebug( fileL);
+                }
             }
-        }
-        if(fileL !="./") {
-            item= new QListViewItem( ListView,fileL,fileS , fileDate);
-            QPixmap pm;
+            if(fileL !="./" && fi->exists()) {
+                item= new QListViewItem( ListView,fileL,fileS , fileDate);
+                QPixmap pm;
          
-            if(isDir || fileL.find("/",0,TRUE) != -1) {
-                if( !QDir( fi->filePath() ).isReadable()) 
-                    pm = Resource::loadPixmap( "lockedfolder" );
-                else 
+                if(isDir || fileL.find("/",0,TRUE) != -1) {
+                    if( !QDir( fi->filePath() ).isReadable()) 
+                        pm = Resource::loadPixmap( "lockedfolder" );
+                    else 
+                        pm= Resource::loadPixmap( "folder" );
+                    item->setPixmap( 0,pm );
+                } else {
+                    if( !fi->isReadable() )
+                        pm = Resource::loadPixmap( "locked" );
+                    else {
+                        MimeType mt(fi->filePath());
+                        pm=mt.pixmap();
+                        if(pm.isNull())
+                            pm =  Resource::loadPixmap( "UnknownDocument-14" );
+                        item->setPixmap( 0,pm);
+                    }
+                }
+                if(  fileL.find("->",0,TRUE) != -1) {
+                      // overlay link image
                     pm= Resource::loadPixmap( "folder" );
-                item->setPixmap( 0,pm );
-            } else {
-                if( !fi->isReadable() )
-                    pm = Resource::loadPixmap( "locked" );
-                else {
-                    MimeType mt(fi->filePath());
-                    pm=mt.pixmap();
-                    if(pm.isNull())
-                        pm =  Resource::loadPixmap( "UnknownDocument-14" );
-                    item->setPixmap( 0,pm);
+                    QPixmap lnk = Resource::loadPixmap( "symlink" );
+                    QPainter painter( &pm );
+                    painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
+                    pm.setMask( pm.createHeuristicMask( FALSE ) );
+                    item->setPixmap( 0, pm);
                 }
             }
-            if(  fileL.find("->",0,TRUE) != -1) {
-                  // overlay link image
-                pm= Resource::loadPixmap( "folder" );
-                QPixmap lnk = Resource::loadPixmap( "symlink" );
-                QPainter painter( &pm );
-                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
-                pm.setMask( pm.createHeuristicMask( FALSE ) );
-                item->setPixmap( 0, pm);
-            }
-        }
-        isDir=FALSE;
-        ++it;
+            isDir=FALSE;
+            ++it;
+//         }
     }
     ListView->setSorting( 3, FALSE);
     QString currentPath = currentDir.canonicalPath();
 
     fillCombo( (const QString &)currentPath);
 //   dirPathCombo->lineEdit()->setText(currentPath);
 
 //      if( dirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
 //          dirPathCombo->clear();
 //          dirPathStringList.prepend(currentPath );
 //          dirPathCombo->insertStringList( dirPathStringList,-1);
 //      }
@@ -254,24 +255,25 @@ void fileBrowser::upDir()
     QDir dir(current);
     dir.cdUp();
     current = dir.canonicalPath();
     chdir( current.latin1() );
     currentDir.cd(  current, TRUE);
     populateList();
     update();
 }
 
 // you may want to switch these 2 functions. I like single clicks
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
+    if(selectedItem) {
     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
               // is 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);
@@ -293,24 +295,25 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
                     populateList();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                   if( QFile::exists(strItem ) ) {
 //currentDir.canonicalPath()
                       qDebug("We found our files!!"+strItem);
                     OnOK();
                   }
                 } //end not symlink
         chdir(strItem.latin1());
       }
+    }
 }
 
 void fileBrowser::OnOK()
 {
   QListViewItemIterator it1( ListView);
     for ( ; it1.current(); ++it1 ) {
       if ( it1.current()->isSelected() ) {
          selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0));
          qDebug("selected filename is "+selectedFileName);
        fileList.append( selectedFileName );
       }
     }
@@ -369,46 +372,51 @@ void fileBrowser::ListPressed( int mouse, QListViewItem *item, const QPoint &poi
     switch (mouse) {
       case 1:
           break;
       case 2:
           showListMenu(item);
     break;
     };
 }
 
 void fileBrowser::showListMenu(QListViewItem *item) {
 
     QPopupMenu  m;// = new QPopupMenu( Local_View );
-    if( item->text(0).find("/",0,TRUE))
-    m.insertItem( tr( "Change Directory" ), this, SLOT( doCd() ));
-    else
-    m.insertItem( tr( "Make Directory" ), this, SLOT( makDir() ));
-    m.insertItem( tr( "Rescan" ), this, SLOT( populateList() ));
-    m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
-    m.insertSeparator();
-    m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
+    if(item) {
+        if( item->text(0).find("/",0,TRUE))
+            m.insertItem( tr( "Change Directory" ), this, SLOT( doCd() ));
+        m.insertItem( tr( "Make Directory" ), this, SLOT( makDir() ));
+        m.insertItem( tr( "Rescan" ), this, SLOT( populateList() ));
+        m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+        m.insertSeparator();
+        m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
+    } else {
+        m.insertItem( tr( "Make Directory" ), this, SLOT( makDir() ));
+        m.insertItem( tr( "Rescan" ), this, SLOT( populateList() ));
+ 
+    }
     m.exec( QCursor::pos() );
-
 }
 
 void fileBrowser::doCd() {
     listClicked( ListView->currentItem());
 }
 
 void fileBrowser::makDir() {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,"Make Directory",TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
+       qDebug("Make dir");
        currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
     }
     populateList();
 }
 
 void fileBrowser::localRename() {
     QString curFile = ListView->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,"Rename",TRUE, 0);
     fileDlg->inputText = curFile;
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
@@ -427,25 +435,24 @@ void fileBrowser::localDelete() {
                                       " ?\nIt must be empty","Yes","No",0,0,1) ) {
           case 0: {
               f=currentDir.canonicalPath()+"/"+f;
               QString cmd="rmdir "+f;
               system( cmd.latin1());
               populateList();
           }
               break;
           case 1:
                 // exit
               break;
         };
-
     } else {
         switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f
                                       +" ?","Yes","No",0,0,1) ) {
           case 0: {
               f=currentDir.canonicalPath()+"/"+f;
               QString cmd="rm "+f;
               system( cmd.latin1());
               populateList();
           }
               break;
           case 1:
                 // exit
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index 339483f..e76c7df 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -58,25 +58,25 @@ public:
     QComboBox *SelectionCombo;
 public slots:
     void setFileView( int );
 
 private:
 //    QDict<void> mimes;
     QPushButton *buttonOk, *buttonCancel, *homeButton, *docButton, *hideButton, *cdUpButton;
     QListView* ListView;
     QLabel *dirLabel;
     QString filterStr, mimeType;
     QDir currentDir;
     QStringList dirPathStringList, mimetypes;
-    QListViewItem * item;
+/*     QListViewItem * item; */
     QComboBox *dirPathCombo;
     MenuButton *typemb;
     QWidgetStack *FileStack;
     FileSelector *fileSelector;
     QRegExp tf;
     QStringList getMimeTypes();
     void fillCombo( const QString&);
 
 private slots:
     void populateList();
     void homeButtonPushed();
     void docButtonPushed();
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index 07fb5ba..f2a5355 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -5,24 +5,25 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileSaver.h"
 #include <qpe/config.h>
 #include <qpe/resource.h>
+#include <qpe/mimetype.h>
 
 #include <qpe/qpeapplication.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 
 #include <unistd.h>
 
 fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString currentFileName )
@@ -38,38 +39,41 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
     dirLabel->setGeometry(10,20,230,15);
 
     homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
     homeButton->setGeometry(200,4,25,25);
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
     homeButton->setFlat(TRUE);
     
     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
     docButton->setGeometry(170,4,25,25);
     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
+    
     docButton->setFlat(TRUE);
 
     hideButton = new QPushButton( Resource::loadIconSet("textedit/s_hidden"),"",this,"hideButton");
     hideButton->setGeometry(140,4,25,25);
     connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) );
     hideButton->setToggleButton(TRUE);
     hideButton->setFlat(TRUE);
 
     ListView = new QListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
-    ListView->setColumnWidth(0,140);
+    ListView->setColumnWidth(0,120);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
-    ListView->setColumnWidth(1,59);
+    ListView->setColumnWidth(1,-1);
+    ListView->addColumn( "Date",-1);
+
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
 //      ListView->setMultiSelection(true);
 //      ListView->setSelectionMode(QListView::Extended);
 
     ListView->setAllColumnsShowFocus( TRUE );
     ListView->setGeometry( QRect( 10,35,220,125));
 
     fileEdit= new QLineEdit(this);
     fileEdit->setGeometry( QRect( 10, 162, 205, 17));
 
     fileEdit->setText( tmpFileName);
@@ -88,51 +92,84 @@ fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl
     populateList();
     move(0,15);
     fileEdit->setFocus();
 }
 
 fileSaver::~fileSaver()
 {
 }
 
 void fileSaver::populateList()
 {
     ListView->clear();
+    bool isDir=FALSE;
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter("*");
-    QString fileL, fileS;
+    QString fileL, fileS, fileDate;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
 
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
          QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
 
         } else {
 //  //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
+                isDir=TRUE;
 //     qDebug(currentDir.canonicalPath()+fileL);
             }
         }
-        item= new QListViewItem( ListView,fileL,fileS );
+        if(fileL !="./") {
+            item= new QListViewItem( ListView,fileL,fileS , fileDate);
+            QPixmap pm;
+         
+            if(isDir || fileL.find("/",0,TRUE) != -1) {
+                if( !QDir( fi->filePath() ).isReadable()) 
+                    pm = Resource::loadPixmap( "lockedfolder" );
+                else 
+                    pm= Resource::loadPixmap( "folder" );
+                item->setPixmap( 0,pm );
+            } else {
+                if( !fi->isReadable() )
+                    pm = Resource::loadPixmap( "locked" );
+                else {
+                    MimeType mt(fi->filePath());
+                    pm=mt.pixmap();
+                    if(pm.isNull())
+                        pm =  Resource::loadPixmap( "UnknownDocument-14" );
+                    item->setPixmap( 0,pm);
+                }
+            }
+            if(  fileL.find("->",0,TRUE) != -1) {
+                  // overlay link image
+                pm= Resource::loadPixmap( "folder" );
+                QPixmap lnk = Resource::loadPixmap( "symlink" );
+                QPainter painter( &pm );
+                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
+                pm.setMask( pm.createHeuristicMask( FALSE ) );
+                item->setPixmap( 0, pm);
+            }
+        }
+        isDir=FALSE;
         ++it;
     }
     ListView->setSorting( 2, FALSE);
     dirLabel->setText(currentDir.canonicalPath());
 
 
 }
 
 void fileSaver::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }