5 files changed, 35 insertions, 20 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index 8ea8067..652f830 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -6,17 +6,17 @@
 ** 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.
 **
 ****************************************************************************/
-#define QTOPIA_INTERNAL_MIMEEXT
+//#define QTOPIA_INTERNAL_MIMEEXT
 #include "fileBrowser.h"
 //#include "inputDialog.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/menubutton.h>
@@ -45,35 +45,42 @@ static int get_unique_id()
 }
 
 fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString mimeFilter )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
         setName( "fileBrowser" );
     setCaption(tr( name ) );
-    mimeType =  mimeFilter;
-    MimeType mt( mimeType);
-    if( mt.extension().isEmpty())
-        filterStr =  "*";
-    else
-        filterStr = "*."+ mt.extension();
+//     mimeType =  mimeFilter;
+//     MimeType mt( mimeType);
+//     if( mt.extension().isEmpty())
+    QStringList filterList;
+    filterList=QStringList::split(";",mimeFilter,FALSE);
+     for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) {
+            printf( "%s \n", (*it).latin1() );
+        }
+
+    filterStr = mimeFilter.right(mimeFilter.length()- mimeFilter.find("/",0,TRUE) - 1);// "*";
+    qDebug(filterStr);
+//     else
+//         filterStr = "*."+ mt.extension();
 //      qDebug("description "+mt.description());
 //      qDebug( "id "+mt.id());
 //      qDebug("extension "+mt.extension());
 
 //      channel = new QCopChannel( "QPE/fileDialog", this );
 //      connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 //         this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
-    dirPathCombo = new QComboBox( FALSE, this, "dorPathCombo" );
+    dirPathCombo = new QComboBox( FALSE, this, "dirPathCombo" );
     dirPathCombo->setEditable(TRUE);
 
     connect( dirPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT( dirPathComboActivated( const QString & ) ) );
 
     connect( dirPathCombo->lineEdit(), SIGNAL( returnPressed(  ) ),
               this, SLOT( dirPathEditPressed( ) ) );
 
@@ -125,17 +132,18 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
 
     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 & ) ) );
+    connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ),
+             this, SLOT( docOpen( const DocLnk & ) ) );
     layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 );
 
     SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" );
     SelectionCombo->insertItem( tr( "Documents" ) );
     SelectionCombo->insertItem( tr( "All files" ) );
     SelectionCombo->insertItem( tr( "Hidden files" ) );
 //      SelectionCombo->setMaximumWidth(120);
     layout->addMultiCellWidget( SelectionCombo, 2, 2, 0, 3 );
@@ -211,17 +219,17 @@ void fileBrowser::populateList()
                     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();
+                        pm=mt.pixmap();// sets the pixmap for the mimetype
                         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" );
@@ -412,17 +420,17 @@ void fileBrowser::makDir() {
     }
     populateList();
 }
 
 void fileBrowser::localRename() {
     QString curFile = ListView->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,"Rename",TRUE, 0);
-    fileDlg->inputText = curFile;
+    fileDlg->setTextEdit((const QString &) curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname =  currentDir.canonicalPath() + "/" + curFile;
         QString newName =  currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message("Note","Could not rename");
     }
     populateList();
@@ -487,24 +495,24 @@ void fileBrowser::showType(const QString &t) {
     if(t.find("All",0,TRUE) != -1) {
         filterStr =  "*";
     } else {
         QStringList list =  mimetypes.grep( t,TRUE);
         QString ext;     
         for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
             mimeType =(*it);
             MimeType mt( mimeType);
-            qDebug("mime "+mimeType);
+//            qDebug("mime "+mimeType);
 //         qDebug("description "+mt.description());
 //         qDebug( "id "+mt.id());
-            qDebug("extension "+mt.extension());
-            if( mt.extension().isEmpty())
+//            qDebug("extension "+mt.extension());
+//             if( mt.extension().isEmpty())
                 filterStr =  "*";
-            else
-                filterStr = "*."+ mt.extension()+" ";
+//             else
+//                 filterStr = "*."+ mt.extension()+" ";
 //         printf( "%s \n", (*it).latin1() );
         }
     }
     currentDir.setNameFilter(filterStr);
 
     populateList();
     update();
 //      if(fileSelector) {
@@ -606,8 +614,11 @@ InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags
 }
 
 InputDialog::~InputDialog()
 {
     inputText= LineEdit1->text();
   
 }
 
+void InputDialog::setTextEdit(const QString &string) {
+    LineEdit1->setText(string);
+}
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index e76c7df..3db6a27 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -108,12 +108,12 @@ class InputDialog : public QDialog
 { 
     Q_OBJECT
 
 public:
     InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~InputDialog();
     QString inputText;
     QLineEdit* LineEdit1;
-
+    void setTextEdit(const QString &);
 };
 
 #endif // FILEBROWSER_H
diff --git a/noncore/net/opieftp/inputDialog.cpp b/noncore/net/opieftp/inputDialog.cpp
index 89b345e..373db3b 100644
--- a/noncore/net/opieftp/inputDialog.cpp
+++ b/noncore/net/opieftp/inputDialog.cpp
@@ -33,8 +33,12 @@ InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags
 }
 
 InputDialog::~InputDialog()
 {
     inputText= LineEdit1->text();
   
 }
 
+void InputDialog::setTextEdit(const QString &string)
+{
+    LineEdit1->setText(string);
+}
diff --git a/noncore/net/opieftp/inputDialog.h b/noncore/net/opieftp/inputDialog.h
index 2cd8285..dfe0e8a 100644
--- a/noncore/net/opieftp/inputDialog.h
+++ b/noncore/net/opieftp/inputDialog.h
@@ -23,12 +23,12 @@ class InputDialog : public QDialog
 { 
     Q_OBJECT
 
 public:
     InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~InputDialog();
     QString inputText;
     QLineEdit* LineEdit1;
-
+    void setTextEdit(const QString &);
 };
 
 #endif // INPUTDIALOG_H
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index e64fd73..b451925 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -938,17 +938,17 @@ void OpieFtp::remoteDelete()
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::remoteRename()
 {
     QString curFile = Remote_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-    fileDlg->inputText = curFile;
+    fileDlg->setTextEdit((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldName = currentRemoteDir +"/"+ curFile;
         QString newName = currentRemoteDir  +"/"+ fileDlg->LineEdit1->text();//+".playlist";
         QCopEnvelope ( "QPE/System", "busy()" );
         if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) {
             QString msg;
             msg.sprintf(tr("Unable to rename file\n")+"%s",FtpLastResponse(conn));
@@ -960,17 +960,17 @@ void OpieFtp::remoteRename()
     }
 }
 
 void OpieFtp::localRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-    fileDlg->inputText = curFile;
+    fileDlg->setTextEdit((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname =  currentDir.canonicalPath() + "/" + curFile;
         QString newName =  currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateLocalView();