author | zecke <zecke> | 2002-03-29 00:53:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-03-29 00:53:55 (UTC) |
commit | 4d2839434de70bc67dca076ccf6a09d2d578d627 (patch) (side-by-side diff) | |
tree | 7cb5823e727eb4b3bf19d224e9fbb041180b7c5c | |
parent | e5c50fab1c8a84f6e2337ebe85be57f354bef676 (diff) | |
download | opie-4d2839434de70bc67dca076ccf6a09d2d578d627.zip opie-4d2839434de70bc67dca076ccf6a09d2d578d627.tar.gz opie-4d2839434de70bc67dca076ccf6a09d2d578d627.tar.bz2 |
interface updates. and some more implementation
-rw-r--r-- | libopie/ofileselector.cc | 118 | ||||
-rw-r--r-- | libopie/ofileselector.h | 12 |
2 files changed, 125 insertions, 5 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index c9abde1..b911d37 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc @@ -1,15 +1,15 @@ /* =. This file is part of the OPIE Project - .=l. Copyright (c) 2002 <> + .=l. Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> .>+-= _;:, .> :=|. This library is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A @@ -27,28 +27,32 @@ */ #include <qnamespace.h> #include <qpushbutton.h> #include <qcombobox.h> #include <qhbox.h> #include <qvbox.h> #include <qlayout.h> #include <qwidgetstack.h> #include <qlineedit.h> #include <qcheckbox.h> #include <qlabel.h> +#include <qheader.h> +#include <qdir.h> +#include <qpe/qpeapplication.h> #include <qpe/fileselector.h> #include <qpe/applnk.h> #include <qpe/global.h> +#include <qpe/mimetype.h> #include "ofileselector.h" OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName, const QString &fileName, const QStringList mimetypes ) : QWidget( wid ) { m_selector = selector; m_currentDir = dirName; m_name = fileName; m_mimetypes = mimetypes; if( mimetypes.isEmpty() ) @@ -259,27 +263,99 @@ void OFileSelector::updateLay() delete m_cancel; delete m_mimeCheck; delete m_viewCheck; delete m_select; // test delete m_stack; //delete m_list; init(); if( m_shLne ) m_edit->setText(text ); if( m_shPerm ) m_checkPerm->setChecked(check ); } +// let's update the mimetypes. Use the current mimefilter for the 2nd QDir retrieve +// insert QListViewItems with the right options +bool OFileSelector::compliesMime(const QString &path, const QString &mime ) +{ + if( mime == "All" ) + return true; + MimeType type( path ); + if( type.id() == mime ) + return true; + return false; +} + void OFileSelector::reparse() { + if(m_View== 0) + return; + + m_View->clear(); + + QDir dir( m_currentDir ); + QString currMime =m_mimeCheck->currentText(); + // update the mimetype now + if( m_autoMime ) { + m_mimetypes.clear(); + m_mimeCheck->clear(); + dir.setFilter( QDir::Files | QDir::Readable ); + dir.setSorting(QDir::Size ); + const QFileInfoList *list = dir.entryInfoList(); + QFileInfoListIterator it( *list ); + QFileInfo *fi; + while( (fi=it.current()) ){ + if(fi->extension() == QString::fromLatin1("desktop") ){ + ++it; + continue; + } + MimeType type(fi->filePath() ); + if( !m_mimetypes.contains( type.id() ) ) + m_mimetypes.append( type.id() ); + + ++it; + } + m_mimeCheck->insertStringList(m_mimetypes ); + // set it to the current mimetype + }; + dir.setFilter(QDir::All ); + dir.setSorting(QDir::Name | QDir::DirsFirst ); + const QFileInfoList *list = dir.entryInfoList(); + QFileInfoListIterator it( *list ); + QFileInfo *fi; + while( (fi=it.current()) ){ + if(fi->isSymLink() ){ + QString file = fi->readLink(); + for(int i=0; i<=4; i++ ){ // prepend from dos + QFileInfo info( file ); + if( !info.exists() ){ + addSymlink(m_currentDir, info.fileName(), TRUE ); + break; + }else if( info.isDir() ){ + //addDir( ); + }else if( info.isFile() ){ + }else if( info.isSymLink() ){ + file = info.readLink(); + }else if( i == 4 ){ // just insert it and have the symlink symbol + addSymlink(m_currentDir, info.fileName() ); + } + } + }else if( fi->isDir() ){ + + }else if( fi->isFile() ) { // file ? + + + } + ++it; + } } QString OFileSelector::directory() { QString string; return string; } int OFileSelector::fileCount() { return 0; } void OFileSelector::slotOk( ) { @@ -356,58 +432,90 @@ void OFileSelector::slotMimeCheck(const QString &view ){ } } void OFileSelector::slotViewCheck(const QString &view ){ qWarning("changed: show %s", view.latin1() ); // if the current view is the one QString currMime = m_mimeCheck->currentText(); if( view == QString::fromLatin1("Documents") ){ // get the mimetype now // check if we're the current widget and return + if( m_View != 0) // delete 0 shouldn't crash but it did :( + delete m_View; + m_View = 0; delete m_select; m_select = new FileSelector( currMime == "All" ? QString::null : currMime, m_stack,"fileselector", FALSE, FALSE ); m_stack->addWidget( m_select, NORMAL ); m_stack->raiseWidget( NORMAL ); m_selector = NORMAL; }else if(view == QString::fromLatin1("Files") ){ - if( m_select != 0 ){ // remove from the stack delete m_select; m_select = 0; + delete m_View; + m_View = 0; m_selector = EXTENDED; // create the ListView or IconView + initializeListView(); reparse(); - } }else if(view == QString::fromLatin1("All Files") ) { // remove from the stack delete m_select; m_select = 0; + delete m_View; + m_View = 0; m_selector = EXTENDED_ALL; - + initializeListView(); reparse(); }; }; void OFileSelector::updateMimes() // lets check which mode is active // check the current dir for items then { m_mimetypes.clear(); m_mimetypes.append("All" ); if( m_selector == NORMAL ){ DocLnkSet set; Global::findDocuments(&set, QString::null ); QListIterator<DocLnk> dit( set.children() ); for ( ; dit.current(); ++dit ) { if( !m_mimetypes.contains((*dit)->type() ) ) m_mimetypes.append( (*dit)->type() ); } }else{ - + // should be allreday updatet } }; +void OFileSelector::initializeListView() +{ + m_View = new QListView(m_stack, "Extended view" ); + m_stack->addWidget( m_View, EXTENDED ); + m_stack->raiseWidget( EXTENDED ); + QPEApplication::setStylusOperation( m_View->viewport(),QPEApplication::RightOnHold); + // set up the stuff + // Pixmap Name Date Size mime + //(m_View->header() )->hide(); + //m_View->setRootIsDecorated(false); + m_View->addColumn(" "); + m_View->addColumn(tr("Name") ); + m_View->addColumn(tr("Size") ); + m_View->addColumn(tr("Date"), 60 ); + m_View->addColumn(tr("Mime Type") ); + QHeader *header = m_View->header(); + header->hide(); +}; + + + + + + + + diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h index 757a960..a90219f 100644 --- a/libopie/ofileselector.h +++ b/libopie/ofileselector.h @@ -49,24 +49,26 @@ */ class DocLnk; class QCheckBox; class QComboBox; class QPushButton; class FileSelector; class QGridLayout; class QLineEdit; class QLabel; class QWidgetStack; class QHBoxLayout; class QVBoxLayout; +class QPopupMenu; + class OFileSelectorItem : public QListViewItem { public: OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path, const QString &date, const QString &size, bool isDir=false ): QListViewItem(view) { setPixmap(0, pixmap ); setText(1, path ); setText(2, size ); setText(3, date ); dir = isDir; } @@ -93,28 +95,32 @@ class OFileSelector : public QWidget { bool showLineEdit()const { return m_shLne; }; bool showChooser( )const { return m_shChooser; }; bool showYesCancel()const { return m_shYesNo; }; void setShowYesCancel( bool show ); void setShowToolbar( bool show ); void setShowPermissionBar( bool show ); void setShowLineEdit(bool show) ; void setShowChooser( bool chooser ); QCheckBox* permissionCheckbox(); bool setPermission() const; void setPermissionChecked( bool check ); void setMode( int ); + void setShowDirs(bool dir ) { }; + bool showDirs() {bool turn; return turn; } int mode()const { return m_mode; }; int selector()const { return m_selector; }; void setSelector( int ); QString selectedName( ); + void setPopupMenu( const QPopupMenu * ); + const DocLnk* selectedDocument()const; void updateLay(); void reparse(); // re reads the dir QString directory(); int fileCount(); signals: void fileSelected( const DocLnk & ); void fileSelected( const QString & ); void closeMe(); void ok(); @@ -153,24 +159,30 @@ class OFileSelector : public QWidget { QLabel *m_fnLabel; bool m_shTool:1; bool m_shPerm:1; bool m_shLne:1; bool m_shChooser:1; bool m_shYesNo:1; bool m_boCheckPerm:1; bool m_autoMime:1; protected: private: + // implementation todo + virtual void addFile(const QString &path, const QString &name, bool symlink = FALSE ) {}; + virtual void addDir( const QString &path, const QString &dir , bool symlink = FALSE ){}; + virtual void addSymlink(const QString &path, const QString &name, bool broken = FALSE ){}; void delItems(); void initializeName(); void initializeYes(); void initializeChooser(); + void initializeListView(); + bool compliesMime(const QString &path, const QString &mime); class OFileSelectorPrivate; OFileSelectorPrivate *d; }; #endif |