-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 22 | ||||
-rw-r--r-- | core/apps/textedit/fileBrowser.h | 5 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 2 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 3 |
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 @@ -12,4 +12,5 @@ ** ****************************************************************************/ +#define QTOPIA_INTERNAL_MIMEEXT #include "fileBrowser.h" //#include "inputDialog.h" @@ -44,5 +45,5 @@ 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 ) { @@ -50,5 +51,14 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags setName( "fileBrowser" ); 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 ); // connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), @@ -80,5 +90,4 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags layout->addMultiCellWidget( cdUpButton, 0, 0, 5, 5 ); - docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton"); docButton->setMinimumSize( QSize( 20, 20 ) ); @@ -97,5 +106,4 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags FileStack = new QWidgetStack( this ); - ListView = new QListView( this, "ListView" ); // ListView->setMinimumSize( QSize( 100, 25 ) ); @@ -119,5 +127,5 @@ 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 // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); @@ -154,4 +162,8 @@ 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 @@ -53,5 +53,5 @@ public: ~fileBrowser(); - QString selectedFileName, mimeType; + QString selectedFileName; QFile file; QStringList fileList; @@ -59,4 +59,5 @@ public: public slots: void setFileView( int ); + void setMimeType(const QString &); private: @@ -65,5 +66,5 @@ private: QListView* ListView; QLabel *dirLabel; - QString filterStr; + QString filterStr, mimeType; QDir currentDir; QStringList dirPathStringList; 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 @@ -494,5 +494,5 @@ void TextEdit::fileNew() void TextEdit::fileOpen() { - browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*"); + browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "text/*"); // browseForFiles->setFileView( viewSelection ); browseForFiles->showMaximized(); 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 @@ -53,5 +53,6 @@ public: TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~TextEdit(); - QPopupMenu *font; + + QPopupMenu *font; QAction *nStart; bool edited, edited1; |