summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/ofiledialog.cc6
-rw-r--r--libopie/ofiledialog.h6
-rw-r--r--libopie/ofileselector.cc118
-rw-r--r--libopie/ofileselector.h53
4 files changed, 147 insertions, 36 deletions
diff --git a/libopie/ofiledialog.cc b/libopie/ofiledialog.cc
index 164fadd..4783004 100644
--- a/libopie/ofiledialog.cc
+++ b/libopie/ofiledialog.cc
@@ -39,3 +39,3 @@ OFileDialog::OFileDialog(const QString &caption,
const QString &fileName,
- const QStringList &mimetypes )
+ const QMap<QString,QStringList>& mimetypes )
: QDialog( wid, "OFileDialog", true )
@@ -77,3 +77,3 @@ QString OFileDialog::getOpenFileName(int selector,
const QString &file,
- const QStringList &mimes,
+ const MimeTypes &mimes,
QWidget *wid,
@@ -93,3 +93,3 @@ QString OFileDialog::getSaveFileName(int selector,
const QString &file,
- const QStringList &mimes,
+ const MimeTypes &mimes,
QWidget *wid,
diff --git a/libopie/ofiledialog.h b/libopie/ofiledialog.h
index 40d147e..e14253c 100644
--- a/libopie/ofiledialog.h
+++ b/libopie/ofiledialog.h
@@ -43,3 +43,3 @@ class OFileDialog : public QDialog {
const QString &fileName = QString::null,
- const QStringList &mimetypes = QStringList() );
+ const MimeTypes &mimetypes = MimeTypes() );
QString mimetype() const;
@@ -52,3 +52,3 @@ class OFileDialog : public QDialog {
const QString &fileName = QString::null,
- const QStringList& mimefilter = QStringList(),
+ const MimeTypes& mime = MimeTypes(),
QWidget *wid = 0,
@@ -59,3 +59,3 @@ class OFileDialog : public QDialog {
const QString& fileName = QString::null,
- const QStringList& mimefilter = QStringList(),
+ const MimeTypes& mimefilter = MimeTypes(),
QWidget *wid = 0,
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 7a67ab2..6c59f89 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -102,3 +102,3 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector,
const QString &fileName,
- const QStringList &mimeTypes )
+ 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,3 +121,6 @@ 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();
@@ -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",
@@ -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",
@@ -450,2 +458,23 @@ void OFileSelector::slotViewCheck(const QString &sel)
}
+// 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,5 +482,15 @@ 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_select = new FileSelector( newMimeType,
m_stack, "fileselector",
@@ -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() );
}
@@ -683,2 +729,3 @@ void OFileSelector::initializeName()
m_edit = new QLineEdit( m_boxName );
+ m_edit->setText( m_name );
//m_boxName->addWidget( m_fnLabel );
@@ -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 & ) ),
@@ -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();
}
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 47697b9..f2d5f84 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -1,3 +1,3 @@
/*
- This is based on code and idea of
+ This is based on code and ideas of
L. J. Potter ljp@llornkcor.com
@@ -45,2 +45,3 @@
#include <qlistview.h>
+
/** This is OPIEs FileDialog Widget. You can use it
@@ -68,2 +69,3 @@ class QHBox;
+typedef QMap< QString, QStringList> MimeTypes;
@@ -72,6 +74,35 @@ class OFileSelector : public QWidget {
public:
+ /**
+ * The mode of the file selector
+ * Either open, save, fileselector or dir browsing mode
+ *
+ */
enum Mode {OPEN=1, SAVE=2, FILESELECTOR=4, DIR=8 };
+
+ /**
+ * Selector. Either NORMAL for the one shipped with
+ * libqpe or EXTENDED. for the EXTENDED
+ * EXTENDED_ALL also shows 'hidden' files
+ */
enum Selector{NORMAL=0, EXTENDED = 1, EXTENDED_ALL =2 };
+
+ /**
+ * This is reserved for futrue views
+ */
enum View { DIRS = 1, FILES = 2, TREE = 4, ICON = 8 };
+ /**
+ * A c'tor which should be used for advanced mode
+ * @param wid the parent
+ * @param mode the Mode of the Selector
+ * @param selector the current View of the Selector
+ * @param dirName in which dir to start
+ * @param fileName a proposed filename
+ * @param mimetypes A list of mimetypes \
+ * QString is for a identifier name like "Text files"
+ * the coresponding QStringList is used for the mimetypes
+ * if empty it'll fill the list of mimetypes depending
+ * on the content of the current directory
+ */
+
OFileSelector(QWidget *wid, int mode, int selector,
@@ -79,5 +110,8 @@ class OFileSelector : public QWidget {
const QString &fileName = QString::null,
- const QStringList &mimetypes = QStringList() );
+ const MimeTypes &mimetypes = MimeTypes() );
+ /**
+ * This is a QPE compatible c'tor
+ */
OFileSelector(const QString &mimeFilter, QWidget *parent,
@@ -192,3 +226,4 @@ class OFileSelector : public QWidget {
QString m_name;
- QStringList m_mimetypes;
+// QStringList m_mimetypes;
+ QMap<QString, QStringList> m_mimetypes;
@@ -234,4 +269,14 @@ class OFileSelector : public QWidget {
void initPics();
- bool compliesMime(const QString &path, const QString &mime);
+ bool compliesMime(const QString &path,
+ const QString &mime);
+ bool compliesMime(const QString& mime );
+ /**
+ * Updates the QComboBox with the current mimetypes
+ */
+ void updateMimeCheck();
+ /**
+ * Returns the current mimetype
+ */
+ QString currentMimeType()const;
class OFileSelectorPrivate;