2 files changed, 22 insertions, 0 deletions

diff --git a/library/fileselector.cpp b/library/fileselector.cpp
index 382012f..7ff09b4 100644
--- a/library/fileselector.cpp
+++ b/library/fileselector.cpp
@@ -291,64 +291,65 @@ FileSelector::FileSelector( const QString &f, QWidget *parent, const char *name,
     d = new FileSelectorPrivate();
     d->newDocItem = 0;
     d->showNew = newVisible;
     d->catId = -2; // All files
 
     d->toolbar = new QHBox( this );
     d->toolbar->setBackgroundMode( PaletteButton );   // same colour as toolbars
     d->toolbar->setSpacing( 0 );
     d->toolbar->hide();
 
     QWidget *spacer = new QWidget( d->toolbar );
     spacer->setBackgroundMode( PaletteButton );
 
     QToolButton *tb = new QToolButton( d->toolbar );
     tb->setPixmap( Resource::loadPixmap( "close" ) );
     connect( tb, SIGNAL( clicked() ), this, SIGNAL( closeMe() ) );
     buttonClose = tb;
     tb->setFixedSize( 18, 20 ); // tb->sizeHint() );
     tb->setAutoRaise( TRUE );
     QToolTip::add( tb, tr( "Close the File Selector" ) );
     QPEMenuToolFocusManager::manager()->addWidget( tb );
 
     view = new FileSelectorView( this, "fileview" );
     QPEApplication::setStylusOperation( view->viewport(), QPEApplication::RightOnHold );
     connect( view, SIGNAL( mouseButtonClicked( int, QListViewItem *, const QPoint &, int ) ),
              this, SLOT( fileClicked( int, QListViewItem *, const QPoint &, int ) ) );
     connect( view, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint &, int ) ),
              this, SLOT( filePressed( int, QListViewItem *, const QPoint &, int ) ) );
     connect( view, SIGNAL( returnPressed( QListViewItem * ) ),
              this, SLOT( fileClicked( QListViewItem * ) ) );
 
     QHBox *hb = new QHBox( this );
+
     d->typeCombo = new TypeCombo( hb );
     connect( d->typeCombo, SIGNAL(selected(const QString&)),
             this, SLOT(typeSelected(const QString&)) );
     QWhatsThis::add( d->typeCombo, tr("Show documents of this type") );
 
     Categories c;
     c.load(categoryFileName());
     QArray<int> vl( 0 );
     d->catSelect = new CategorySelect( hb );
     d->catSelect->setRemoveCategoryEdit( TRUE );
     d->catSelect->setCategories( vl, "Document View", tr("Document View") );
     d->catSelect->setAllCategories( TRUE );
     connect( d->catSelect, SIGNAL(signalSelected(int)), this, SLOT(catSelected(int)) );
     QWhatsThis::add( d->catSelect, tr("Show documents in this category") );
 
     setCloseVisible( closeVisible );
 
     QCopChannel *channel = new QCopChannel( "QPE/Card", this );
     connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
             this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
 
     reread();
     updateWhatsThis();
 }
 
 /*!
   Destroys the widget.
 */
 FileSelector::~FileSelector()
 {
     delete d;
 }
@@ -467,64 +468,83 @@ const DocLnk *FileSelector::selected()
 
 
 /*!
   If \a b is TRUE a "new document" entry is visible; if \a b is FALSE
   this entry is not visible and the user is unable to create new
   documents from the dialog.
 */
 void FileSelector::setNewVisible( bool b )
 {
     if ( d->showNew != b ) {
         d->showNew = b;
         updateView();
         updateWhatsThis();
     }
 }
 
 /*!
   If \a b is TRUE a "close" or "no document" button is visible; if \a
   b is FALSE this button is not visible and the user is unable to
   leave the dialog without creating or selecting a document.
 
   This function is deprecated.
 */
 void FileSelector::setCloseVisible( bool b )
 {
     if (  b )
         d->toolbar->show();
     else
         d->toolbar->hide();
 }
 
 /*!
+
+*/
+void FileSelector::setTypeComboVisible( bool b ) {
+    if ( b )
+        d->typeCombo->show();
+    else
+        d->typeCombo->hide();
+}
+/*!
+
+*/
+void FileSelector::setCategorySelectVisible( bool b ) {
+    if ( b )
+        d->catSelect->show();
+    else
+        d->catSelect->hide();
+}
+
+/*!
   Rereads the list of documents.
 */
 void FileSelector::reread()
 {
     d->files.clear();
     Global::findDocuments(&d->files, filter);
     d->typeCombo->reread( d->files, filter );
     updateView();
 }
 
 void FileSelector::updateView()
 {
     FileSelectorItem *item = (FileSelectorItem *)view->selectedItem();
     if ( item == d->newDocItem )
         item = 0;
     QString oldFile;
     if ( item )
         oldFile = item->file().file();
     view->clear();
     QListIterator<DocLnk> dit( d->files.children() );
     for ( ; dit.current(); ++dit ) {
         bool mimeMatch = FALSE;
         if ( d->mimeFilters.count() ) {
             QValueList<QRegExp>::Iterator it;
             for ( it = d->mimeFilters.begin(); it != d->mimeFilters.end(); ++it ) {
                 if ( (*it).match((*dit)->type()) >= 0 ) {
                     mimeMatch = TRUE;
                     break;
                 }
             }
         } else {
             mimeMatch = TRUE;
diff --git a/library/fileselector.h b/library/fileselector.h
index f1c9eb1..e3ae891 100644
--- a/library/fileselector.h
+++ b/library/fileselector.h
@@ -25,64 +25,66 @@
 #include <qtoolbutton.h>
 #include <qlistview.h>
 
 #include "filemanager.h"
 #include "applnk.h"
 
 class QPopupMenu;
 class QPushButton;
 class FileSelectorView;
 
 class FileSelectorItem : public QListViewItem
 {
 public:
     FileSelectorItem( QListView *parent, const DocLnk& f );
     ~FileSelectorItem();
 
     DocLnk file() const { return fl; }
 
 private:
     DocLnk fl;
 };
 
 class FileSelectorPrivate;
 class FileSelector : public QVBox
 {
     Q_OBJECT
 
 public:
     FileSelector( const QString &mimefilter, QWidget *parent, const char *name=0, bool newVisible = TRUE, bool closeVisible = TRUE );
     ~FileSelector();
     void setNewVisible( bool b );
     void setCloseVisible( bool b );
+    void setTypeComboVisible( bool b = TRUE );
+    void setCategorySelectVisible( bool b = TRUE );
     void reread();
     int fileCount();
     DocLnk selectedDocument() const
     {
         const DocLnk* rp = ((FileSelector*)this)->selected();
         if (!rp) {
             DocLnk r;
             return r;
         }
         DocLnk r(*rp);
         delete rp;
         return r;
     }
 
     QValueList<DocLnk> fileList() const
     {
         ((FileSelector*)this)->fileCount(); // ensure all loaded when this is extended
 
         QValueList<DocLnk> list;
         FileSelectorItem *item = (FileSelectorItem *)((QListView*)view)->firstChild();
         while (item) {
             list.append(item->file());
             item = (FileSelectorItem *)item->nextSibling();
         }
 
         return list;
     }
 
 signals:
     void fileSelected( const DocLnk & );
     void newSelected( const DocLnk & );
     void closeMe();