| -rw-r--r-- | libopie/ofileselector.cc | 217 |
1 files changed, 112 insertions, 105 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 7481360..6748bec 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc @@ -2,2 +2,3 @@ +#include <qwmatrix.h> #include <qcheckbox.h> @@ -42,4 +43,4 @@ namespace { if( str == box->text(i ) ){ - index= i; - break; + index= i; + break; } @@ -51,4 +52,4 @@ namespace { OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path, - const QString &date, const QString &size, const QString &mDir, - bool isLocked=false, bool isDir=false ): QListViewItem(view) { + const QString &date, const QString &size, const QString &mDir, + bool isLocked=false, bool isDir=false ): QListViewItem(view) { setPixmap(0, pixmap ); @@ -77,13 +78,13 @@ namespace { if( id == 0 || id == 1 ){ // name - if( dir ){ - ke.append("0" ); - ke.append( text(1) ); - }else{ - ke.append("1" ); - ke.append( text(1) ); - } + if( dir ){ + ke.append("0" ); + ke.append( text(1) ); + }else{ + ke.append("1" ); + ke.append( text(1) ); + } }else if( id == 2 ){ // size - return text(2); + return text(2); }else if( id == 3 ){ // date - return text(3); + return text(3); } @@ -100,4 +101,4 @@ namespace { OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, - const QString &dirName, - const QString &fileName, + const QString &dirName, + const QString &fileName, const QMap<QString,QStringList>& mimeTypes) @@ -117,4 +118,4 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, - const char *name, bool newVisible, - bool closeVisible ) + const char *name, bool newVisible, + bool closeVisible ) : QWidget( parent, name ) @@ -136,3 +137,2 @@ OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, - } @@ -153,8 +153,8 @@ void OFileSelector::setNewVisible( bool visible ) m_select = new FileSelector( mime , - m_stack, "fileselector", - m_shNew, m_shClose); + m_stack, "fileselector", + m_shNew, m_shClose); connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); + this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL(closeMe() ) ); + this, SIGNAL(closeMe() ) ); //connect to close me and other signals as well @@ -435,6 +435,6 @@ void OFileSelector::slotViewCheck(const QString &sel) m_select = new FileSelector(mime, - m_stack, "fileselector", - m_shNew, m_shClose); + m_stack, "fileselector", + m_shNew, m_shClose); connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); + this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); connect(m_select, SIGNAL(closeMe() ), @@ -500,5 +500,5 @@ void OFileSelector::slotMimeCheck(const QString &mime) connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); + this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL(closeMe() ) ); + this, SIGNAL(closeMe() ) ); //connect to close me and other signals as well @@ -585,9 +585,9 @@ void OFileSelector::init() m_select = new FileSelector(mime, - m_stack, "fileselector", - m_shNew, m_shClose); + m_stack, "fileselector", + m_shNew, m_shClose); connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); + this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL( closeMe() ) ); + this, SIGNAL( closeMe() ) ); //connect to close me and other signals as well @@ -599,3 +599,3 @@ void OFileSelector::init() // toolbar get's generade in initializeListView - initializeListView( ); // will raise the widget as well + initializeListView( ); // will raise the widget as well m_stack->raiseWidget( EXTENDED ); @@ -629,4 +629,4 @@ void OFileSelector::updateMimes() for( ; dit.current(); ++dit ){ - if( !m_mimetypes.contains( (*dit)->type() ) ) - m_mimetypes.insert( (*dit)->type(), (*dit)->type() ); + if( !m_mimetypes.contains( (*dit)->type() ) ) + m_mimetypes.insert( (*dit)->type(), (*dit)->type() ); } @@ -698,4 +698,10 @@ void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symli bool locked; - if( pix.isNull() ) - pix = Resource::loadPixmap( "UnknownDocument-14"); + if( pix.isNull() ) { + //TODO make this scaled pixmap global, so we dont have to keep doing this + QWMatrix matrix; + QPixmap pixer(Resource::loadPixmap( "UnknownDocument" )); + matrix.scale( .4, .4); + pix = pixer.xForm(matrix); +// pix = Resource::loadPixmap( "UnknownDocument-14"); + } dir = info->dirPath( true ); @@ -706,3 +712,3 @@ void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symli if( ( m_mode == OPEN && !info->isReadable() )|| - ( m_mode == SAVE && !info->isWritable() ) ){ + ( m_mode == SAVE && !info->isWritable() ) ){ @@ -712,5 +718,5 @@ void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symli new OFileSelectorItem( m_View, pix, name, - info->lastModified().toString(), - QString::number( info->size() ), - dir, locked ); + info->lastModified().toString(), + QString::number( info->size() ), + dir, locked ); } @@ -727,5 +733,5 @@ void OFileSelector::addDir(const QString &/*mime*/, QFileInfo *info, bool symlin if( symlink ) - pix = (*m_pixmaps)["symlinkedlocked"]; + pix = (*m_pixmaps)["symlinkedlocked"]; else - pix = Resource::loadPixmap("lockedfolder"); + pix = Resource::loadPixmap("lockedfolder"); }else { // readable @@ -735,6 +741,6 @@ void OFileSelector::addDir(const QString &/*mime*/, QFileInfo *info, bool symlin new OFileSelectorItem( m_View, pix, name, - info->lastModified().toString(), - QString::number( info->size() ), - info->dirPath( true ), locked, - true ); + info->lastModified().toString(), + QString::number( info->size() ), + info->dirPath( true ), locked, + true ); @@ -788,5 +794,5 @@ void OFileSelector::initializeYes() connect( m_ok, SIGNAL( clicked() ), - this, SLOT(slotOk() ) ); + this, SLOT(slotOk() ) ); connect( m_cancel, SIGNAL( clicked() ), - this, SLOT( slotCancel() ) ); + this, SLOT( slotCancel() ) ); } @@ -826,5 +832,5 @@ void OFileSelector::initializeChooser() connect( m_viewCheck, SIGNAL( activated(const QString & ) ), - this, SLOT( slotViewCheck(const QString & ) ) ); + this, SLOT( slotViewCheck(const QString & ) ) ); connect( m_mimeCheck, SIGNAL( activated(const QString & ) ), - this, SLOT( slotMimeCheck( const QString & ) ) ); + this, SLOT( slotMimeCheck( const QString & ) ) ); } @@ -849,8 +855,8 @@ void OFileSelector::initializeListView() connect( m_location, SIGNAL(activated(const QString &) ), - this, SLOT( slotLocationActivated(const QString &) ) ); + this, SLOT( slotLocationActivated(const QString &) ) ); connect( m_location->lineEdit(), SIGNAL(returnPressed() ), - this, SLOT(locationComboChanged() ) ); + this, SLOT(locationComboChanged() ) ); // UP Button m_up = new QPushButton(Resource::loadIconSet("up"),"", - m_boxToolbar,"cdUpButton"); + m_boxToolbar,"cdUpButton"); m_up->setFixedSize( QSize( 20, 20 ) ); @@ -861,3 +867,3 @@ void OFileSelector::initializeListView() m_homeButton = new QPushButton(Resource::loadIconSet("home") , - "", m_boxToolbar); + "", m_boxToolbar); m_homeButton->setFixedSize( QSize( 20, 20 ) ); @@ -867,3 +873,3 @@ void OFileSelector::initializeListView() m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", - m_boxToolbar,"docsButton"); + m_boxToolbar,"docsButton"); m_docButton->setFixedSize( QSize( 20, 20 ) ); @@ -874,3 +880,3 @@ void OFileSelector::initializeListView() m_close = new QPushButton( Resource::loadIconSet( "close"), "", - m_boxToolbar ); + m_boxToolbar ); connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) ); @@ -886,5 +892,5 @@ void OFileSelector::initializeListView() for( ; it.current(); ++it ){ - const QString disk = (*it)->name(); - const QString path = (*it)->path(); - m_location->insertItem(path+ "<-"+disk ); + const QString disk = (*it)->name(); + const QString path = (*it)->path(); + m_location->insertItem(path+ "<-"+disk ); } @@ -895,9 +901,9 @@ void OFileSelector::initializeListView() if( !m_shTool ){ - m_location->hide( ); - m_up->hide( ); - m_homeButton->hide( ); - m_docButton->hide( ); + m_location->hide( ); + m_up->hide( ); + m_homeButton->hide( ); + m_docButton->hide( ); } if(!m_shClose ) - m_close->hide(); + m_close->hide(); //if(!m_shNew) @@ -910,3 +916,3 @@ void OFileSelector::initializeListView() QPEApplication::setStylusOperation( m_View->viewport(), - QPEApplication::RightOnHold); + QPEApplication::RightOnHold); m_View->addColumn(" " ); @@ -922,12 +928,13 @@ void OFileSelector::initializeListView() connect(m_View, SIGNAL(selectionChanged() ), - this, SLOT(slotSelectionChanged() ) ); + this, SLOT(slotSelectionChanged() ) ); - connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), - this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); + connect(m_View, SIGNAL(clicked(QListViewItem *) ), +// connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), + this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); connect(m_View, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ), - this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) ); + this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) ); connect(m_View, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )), - this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int ) ) ); + this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int ) ) ); @@ -1052,3 +1059,3 @@ void OFileSelector::slotCurrentChanged(QListViewItem* item ) if( m_shLne ) - m_edit->setText( sel->text(1) ); + m_edit->setText( sel->text(1) ); @@ -1081,12 +1088,12 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint & if( sel->isDir() ){ - cd( sel->directory() + "/" + str[0].stripWhiteSpace() ); - // if MODE Dir m_shLne set the Text + cd( sel->directory() + "/" + str[0].stripWhiteSpace() ); + // if MODE Dir m_shLne set the Text }else{ - if( m_shLne ) - m_edit->setText( str[0].stripWhiteSpace() ); + if( m_shLne ) + m_edit->setText( str[0].stripWhiteSpace() ); qWarning("selected here in slot clicked"); - emit fileSelected( sel->directory() + "/" + str[0].stripWhiteSpace() ); - DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() ); + emit fileSelected( sel->directory() + "/" + str[0].stripWhiteSpace() ); + DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() ); qWarning("file selected"); - emit fileSelected( lnk ); + emit fileSelected( lnk ); } @@ -1211,13 +1218,13 @@ void OFileSelector::reparse() while( (fi=it.current() ) ) { - if( fi->extension() == QString::fromLatin1("desktop") ){ - ++it; - continue; - } - MimeType type( fi->absFilePath() ); - if( !m_mimetypes.contains( type.id() ) ){ - //qWarning("Type %s", type.id().latin1() ); - m_mimetypes.insert( type.id(), type.id() ); - } - - ++it; + if( fi->extension() == QString::fromLatin1("desktop") ){ + ++it; + continue; + } + MimeType type( fi->absFilePath() ); + if( !m_mimetypes.contains( type.id() ) ){ + //qWarning("Type %s", type.id().latin1() ); + m_mimetypes.insert( type.id(), type.id() ); + } + + ++it; } @@ -1270,18 +1277,18 @@ void OFileSelector::reparse() for( int i = 0; i<=4; i++) { // 5 tries to prevent dos - QFileInfo info( file ); - if( !info.exists() ){ - addSymlink( currentMimeType, fi, TRUE ); - break; - }else if( info.isDir() ){ - addDir( currentMimeType, fi, TRUE ); - break; - }else if( info.isFile() ){ - addFile( currentMimeType, fi, TRUE ); - break; - }else if( info.isSymLink() ){ - file = info.dirPath(true ) + "/" + info.readLink() ; - break; - }else if( i == 4){ - addSymlink( currentMimeType, fi ); - } + QFileInfo info( file ); + if( !info.exists() ){ + addSymlink( currentMimeType, fi, TRUE ); + break; + }else if( info.isDir() ){ + addDir( currentMimeType, fi, TRUE ); + break; + }else if( info.isFile() ){ + addFile( currentMimeType, fi, TRUE ); + break; + }else if( info.isSymLink() ){ + file = info.dirPath(true ) + "/" + info.readLink() ; + break; + }else if( i == 4){ + addSymlink( currentMimeType, fi ); + } } // off for loop |