set mimetype handling

4 files changed, 23 insertions, 9 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index e103bcb..7a3a703 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -13,2 +13,3 @@
 ****************************************************************************/
+#define QTOPIA_INTERNAL_MIMEEXT
 #include "fileBrowser.h"
@@ -45,3 +46,3 @@ static int get_unique_id()
 
-fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter )
+fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString mimeFilter )
     : QDialog( parent, name, modal, fl )
@@ -51,3 +52,12 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     setCaption(tr( name ) );
-    filterStr = filter;
+    mimeType =  mimeFilter;
+    MimeType mt( mimeType);
+    if( mt.extension().isEmpty())
+        filterStr =  "*";
+    else
+        filterStr = "*."+ mt.extension();
+//      qDebug("description "+mt.description());
+//      qDebug( "id "+mt.id());
+//      qDebug("extension "+mt.extension());
+
 //      channel = new QCopChannel( "QPE/fileDialog", this );
@@ -81,3 +91,2 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
 
-
     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
@@ -98,3 +107,2 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
 
-
     ListView = new QListView( this, "ListView" );
@@ -120,3 +128,3 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     FileStack->addWidget( ListView, get_unique_id() );
-mimeType="text/*";
+
     fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
@@ -155,2 +163,6 @@ fileBrowser::~fileBrowser()
 
+void fileBrowser::setMimeType(const QString &type) {
+    mimeType = type;
+}
+
 void fileBrowser::setFileView( int selection )
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index 77ac166..1138d80 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -54,3 +54,3 @@ public:
 
-    QString selectedFileName, mimeType;
+    QString selectedFileName;
     QFile file;
@@ -60,2 +60,3 @@ public slots:
     void setFileView( int );
+    void setMimeType(const QString &);
 
@@ -66,3 +67,3 @@ private:
     QLabel *dirLabel;
-    QString filterStr;
+    QString filterStr, mimeType;
     QDir currentDir;
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index ecebe12..d28ece8 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -495,3 +495,3 @@ void TextEdit::fileOpen()
 {
-    browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
+    browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "text/*"); //
     browseForFiles->setFileView( viewSelection );
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index 70cf068..af69518 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -54,3 +54,4 @@ public:
     ~TextEdit();
- QPopupMenu *font;
+
+    QPopupMenu *font;
     QAction *nStart;