| -rw-r--r-- | libopie/ofileselector.cc | 160 |
1 files changed, 113 insertions, 47 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 7a67ab2..6c59f89 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc @@ -101,4 +101,4 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, const QString &dirName, - const QString &fileName, - const QStringList &mimeTypes ) + const QString &fileName, + const QMap<QString,QStringList>& mimeTypes) : QWidget( wid, "OFileSelector") @@ -106,2 +106,4 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, m_mimetypes = mimeTypes; + if (mode == SAVE ) + m_name = fileName; initVars(); @@ -111,3 +113,3 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, init(); -QTimer::singleShot(6*1000, this, SLOT( slotTest() ) ); + //QTimer::singleShot(6*1000, this, SLOT( slotTest() ) ); } @@ -119,5 +121,8 @@ OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, { - m_mimetypes = QStringList::split(";", mimeFilter ); + if (!mimeFilter.isEmpty() ) { + QStringList list = QStringList::split(";", mimeFilter ); + m_mimetypes.insert(mimeFilter, list ); + } initVars(); - m_currentDir = QPEApplication::documentDir(); + m_currentDir = QPEApplication::documentDir(); m_mode = OPEN; @@ -131,3 +136,3 @@ OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, - + } @@ -137,2 +142,3 @@ OFileSelector::~OFileSelector() + } @@ -145,4 +151,4 @@ void OFileSelector::setNewVisible( bool visible ) // we need to initialize but keep the selected mimetype - QString mime = m_mimeCheck == 0 ? QString::null : m_mimeCheck->currentText() ; - m_select = new FileSelector( m_autoMime ? mime : m_mimetypes.join(";") , + QString mime = currentMimeType(); + m_select = new FileSelector( mime , m_stack, "fileselector", @@ -343,3 +349,3 @@ QStringList OFileSelector::selectedNames()const /** If mode is set to the Dir selection this will return the selected path. - * + * * @@ -366,3 +372,3 @@ QString OFileSelector::directory()const return QPEApplication::documentDir(); - + return QDir(m_currentDir).absPath(); @@ -427,3 +433,5 @@ void OFileSelector::slotViewCheck(const QString &sel) // autMime? fix cause now we use All and not the current - m_select = new FileSelector(m_autoMime ? QString::null : m_mimetypes.join(";"), + // yes currentMime fixes that for us + QString mime = currentMimeType(); + m_select = new FileSelector(mime, m_stack, "fileselector", @@ -433,3 +441,3 @@ void OFileSelector::slotViewCheck(const QString &sel) //connect to close me and other signals as well - + m_stack->addWidget( m_select, NORMAL ); @@ -447,5 +455,26 @@ void OFileSelector::slotViewCheck(const QString &sel) reparse(); - m_stack->raiseWidget( EXTENDED ); // same widget other QFileFilter + m_stack->raiseWidget( EXTENDED ); // same widget other QFileFilter } } +// not yet finished..... +QString OFileSelector::currentMimeType() const{ + QString mime; + QString currentText; + if (m_shChooser ) + currentText = m_mimeCheck->currentText(); + + if (tr("All") == currentText ) return QString::null; + else if (currentText.isEmpty() ) { + ; + }else { + QMap<QString, QStringList>::ConstIterator it; + it = m_mimetypes.find( currentText ); + if ( it == m_mimetypes.end() ) { + mime = it.data().join(";"); + }else{ + mime = currentText; + } + } + return mime; +} void OFileSelector::slotMimeCheck(const QString &mime) @@ -453,7 +482,17 @@ void OFileSelector::slotMimeCheck(const QString &mime) if( m_selector == NORMAL ){ - if( m_autoMime ){ + //if( m_autoMime ){ + QString newMimeType; + if (mime != tr("All") ) { + QMap<QString, QStringList>::Iterator it; + it = m_mimetypes.find(mime); + if ( it != m_mimetypes.end() ) { + newMimeType = it.data().join(";"); + }else{ + newMimeType = mime; + } + } delete m_select; - m_select = new FileSelector( mime == tr("All") ? QString::null : mime, - m_stack, "fileselector", - FALSE, FALSE); + m_select = new FileSelector( newMimeType, + m_stack, "fileselector", + FALSE, FALSE); @@ -465,6 +504,5 @@ void OFileSelector::slotMimeCheck(const QString &mime) updateMimes(); - m_mimeCheck->clear(); - m_mimeCheck->insertStringList(m_mimetypes ); + updateMimeCheck(); m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) ); - } + //} }else{ // others @@ -514,3 +552,11 @@ void OFileSelector::init() if( m_selector == NORMAL ){ - m_select = new FileSelector(m_autoMime ? QString::null : m_mimetypes.join(";"), + QString mime; + if (!m_autoMime) { + if (!m_mimetypes.isEmpty() ) { + QMap<QString, QStringList>::Iterator it; + it = m_mimetypes.begin(); // cause we're in the init + mime = it.data().join(";"); + } + } + m_select = new FileSelector(mime, m_stack, "fileselector", @@ -547,3 +593,3 @@ void OFileSelector::updateMimes() m_mimetypes.clear(); - m_mimetypes.append( tr("All") ); + m_mimetypes.insert( tr("All"), QString::null ); if( m_selector == NORMAL ){ @@ -554,3 +600,3 @@ void OFileSelector::updateMimes() if( !m_mimetypes.contains( (*dit)->type() ) ) - m_mimetypes.append( (*dit)->type() ); + m_mimetypes.insert( (*dit)->type(), (*dit)->type() ); } @@ -630,3 +676,3 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink) ( m_mode == SAVE && !info->isWritable() ) ){ - + locked = true; pix = Resource::loadPixmap("locked"); @@ -659,3 +705,3 @@ void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink ) info->lastModified().toString(), - QString::number( info->size() ), + QString::number( info->size() ), info->dirPath( true ), locked, @@ -672,4 +718,4 @@ void OFileSelector::initializeName() /** Name Layout Line - * This is the Layout line arranged in - * horizontal way each components + * This is the Layout line arranged in + * horizontal way each components * are next to each other @@ -683,2 +729,3 @@ void OFileSelector::initializeName() m_edit = new QLineEdit( m_boxName ); + m_edit->setText( m_name ); //m_boxName->addWidget( m_fnLabel ); @@ -690,3 +737,3 @@ void OFileSelector::initializeName() }// else we already initialized - // maybe show the components? + // maybe show the components? // @@ -715,2 +762,20 @@ void OFileSelector::initializeYes() } +/* + * OK m_mimeCheck is a QComboBox we now want to fill + * out that combobox + * if automime we need to update the mimetypes + */ +void OFileSelector::updateMimeCheck() { + m_mimeCheck->clear(); + if (m_autoMime ) { + //m_mimeCheck->insertItem( tr("All") ); + updateMimes(); + } + + QMap<QString, QStringList>::Iterator it; + for (it = m_mimetypes.begin(); it != m_mimetypes.end(); ++it ) { + m_mimeCheck->insertItem( it.key() ); + } +} + void OFileSelector::initializeChooser() @@ -727,8 +792,4 @@ void OFileSelector::initializeChooser() m_viewCheck->insertItem( tr("All Files") ); - if(!m_autoMime ) - m_mimeCheck->insertItem(m_mimetypes.join(",") ); - else{ - updateMimes(); - m_mimeCheck->insertStringList( m_mimetypes ); - } + updateMimeCheck(); + connect( m_viewCheck, SIGNAL( activated(const QString & ) ), @@ -748,3 +809,3 @@ void OFileSelector::initializeListView() - // toolbar members + // toolbar members { @@ -752,3 +813,3 @@ void OFileSelector::initializeListView() m_location = new QComboBox( m_boxToolbar ); - m_location->setEditable( TRUE ); + m_location->setEditable( TRUE ); m_location->setDuplicatesEnabled( FALSE ); @@ -833,9 +894,9 @@ void OFileSelector::initializeListView() - connect(m_View, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ), + connect(m_View, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ), this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) ); - connect(m_View, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )), + connect(m_View, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )), this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int ) ) ); - m_pseudoLayout->addWidget( m_View, 288 ); + m_pseudoLayout->addWidget( m_View, 288 ); m_stack->addWidget( m_pseudo, EXTENDED ); @@ -878,3 +939,8 @@ bool OFileSelector::compliesMime( const QString &path, const QString &mime ) } +/* check if the mimetype in mime + * complies with the one which is current + */ +bool OFileSelector::compliesMime( const QString& mime ) { +} void OFileSelector::slotFileSelected( const QString &string ) @@ -1052,3 +1118,3 @@ void OFileSelector::reparse() //qWarning("Type %s", type.id().latin1() ); - m_mimetypes.append( type.id() ); + m_mimetypes.insert( type.id(), type.id() ); } @@ -1058,4 +1124,3 @@ void OFileSelector::reparse() // add them to the chooser - m_mimeCheck->insertItem( tr("All") ); - m_mimeCheck->insertStringList( m_mimetypes ); + updateMimeCheck(); m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) ); @@ -1064,6 +1129,7 @@ void OFileSelector::reparse() }else { // no autoMime - currentMimeType = m_mimetypes.join(";"); + // let the mimetype be set from out side the m_mimeCheck FEATURE + if( m_shChooser ){ - m_mimeCheck->clear(); - m_mimeCheck->insertItem(m_mimetypes.join(",") ); + currentMimeType = m_mimeCheck->currentText(); + updateMimeCheck(); } @@ -1077,3 +1143,3 @@ void OFileSelector::reparse() sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed); - else + else sort = (QDir::Name | QDir::DirsFirst | QDir::Reversed); @@ -1127,3 +1193,3 @@ void OFileSelector::reparse() } // of while loop - m_View->sort(); + m_View->sort(); if( m_shTool ){ |