author | alwin <alwin> | 2004-11-08 14:20:12 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-08 14:20:12 (UTC) |
commit | 40bbaace5492ce6420a2d4a353b24df64c142287 (patch) (side-by-side diff) | |
tree | 4295cad588216667fab3983267c220742721bb7d | |
parent | ff5395987d739cbac81ccfdbca7006cec3950a30 (diff) | |
download | opie-40bbaace5492ce6420a2d4a353b24df64c142287.zip opie-40bbaace5492ce6420a2d4a353b24df64c142287.tar.gz opie-40bbaace5492ce6420a2d4a353b24df64c142287.tar.bz2 |
- reworked the icon generation for images in doctab
- some reorg of code was strongly required
- code more readable
-rw-r--r-- | core/launcher/launcherview.cpp | 546 | ||||
-rw-r--r-- | core/launcher/launcherview.h | 114 | ||||
-rw-r--r-- | core/launcher/server.pro | 0 |
3 files changed, 361 insertions, 299 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 1317bda..673e53c 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp @@ -101,267 +101,2 @@ private: bool m_EyeImage; - LauncherThumbReceiver*m_EyeCallback; -}; - - -class LauncherIconView : public QIconView { -public: - LauncherIconView( QWidget* parent, const char* name=0 ) : - QIconView(parent,name), - tf(""), - cf(0), - bsy(0), - busyTimer(0), - bigIcns(TRUE), - bgColor(white) - { - sortmeth = Name; - hidden.setAutoDelete(TRUE); - ike = FALSE; - calculateGrid( Bottom ); - } - - ~LauncherIconView() - { -#if 0 // debuggery - QListIterator<AppLnk> it(hidden); - AppLnk* l; - while ((l=it.current())) { - ++it; - //odebug << "" << l << ": hidden (should remove)" << oendl; - } -#endif - } - - QIconViewItem* busyItem() const { return bsy; } -#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY - QPixmap busyPixmap() const { return busyPix; } -#endif - void setBigIcons( bool bi ) { - bigIcns = bi; -#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY - busyPix.resize(0,0); -#endif - } - - void updateCategoriesAndMimeTypes(); - void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } - void doAutoScroll() - { - // We don't want rubberbanding (yet) - } - - void setBusy(bool on) - { -#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY - if ( busyPix.isNull() ) { - int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); - busyPix.convertFromImage( Resource::loadImage( "busy" ).smoothScale( size * 16, size ) ); - } -#endif - - if ( on ) { - busyTimer = startTimer( 100 ); - } else { - if ( busyTimer ) { - killTimer( busyTimer ); - busyTimer = 0; - } - } - - LauncherItem *c = on ? (LauncherItem*)currentItem() : 0; - - if ( bsy != c ) { - LauncherItem *oldBusy = bsy; - bsy = c; - if ( oldBusy ) { - oldBusy->resetIcon(); - } - if ( bsy ) { - bsy->setBusyIndicatorType( busyType ) ; - bsy->animateIcon(); - } - } - } - - bool inKeyEvent() const { return ike; } - void keyPressEvent(QKeyEvent* e) - { - ike = TRUE; - if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) { - if ( (e->state() & ShiftButton) ) - emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() ); - else - returnPressed(currentItem()); - } - - QIconView::keyPressEvent(e); - ike = FALSE; - } - - void addItem(AppLnk* app, bool resort=TRUE); - bool removeLink(const QString& linkfile); - - QStringList mimeTypes() const; - QStringList categories() const; - - void clear() - { - mimes.clear(); - cats.clear(); - QIconView::clear(); - hidden.clear(); - } - - void addCatsAndMimes(AppLnk* app) - { - // QStringList c = app->categories(); - // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { - // cats.replace(*cit,(void*)1); - // } - QString maj=app->type(); - int sl=maj.find('/'); - if (sl>=0) { - QString k; - k = maj.left(12) == "application/" ? maj : maj.left(sl); - mimes.replace(k,(void*)1); - } - } - - void setBackgroundOrigin( QWidget::BackgroundOrigin ) { - } - - void setBackgroundPixmap( const QPixmap &pm ) { - bgPixmap = pm; - } - - void setBackgroundColor( const QColor &c ) { - bgColor = c; - } - - void drawBackground( QPainter *p, const QRect &r ) - { - if ( !bgPixmap.isNull() ) { - p->drawTiledPixmap( r, bgPixmap, - QPoint( (r.x() + contentsX()) % bgPixmap.width(), - (r.y() + contentsY()) % bgPixmap.height() ) ); - } else { - p->fillRect( r, bgColor ); - } - } - - void setItemTextPos( ItemTextPos pos ) - { - calculateGrid( pos ); - QIconView::setItemTextPos( pos ); - } - - void hideOrShowItems(bool resort); - - void setTypeFilter(const QString& typefilter, bool resort) - { - tf = QRegExp(typefilter,FALSE,TRUE); - hideOrShowItems(resort); - } - - void setCategoryFilter( int catfilter, bool resort ) - { - Categories cat; - cat.load( categoryFileName() ); - QString str; - if ( catfilter == -2 ) - cf = 0; - else - cf = catfilter; - hideOrShowItems(resort); - } - - enum SortMethod { Name, Date, Type }; - - void setSortMethod( SortMethod m ) - { - if ( sortmeth != m ) { - sortmeth = m; - sort(); - } - } - - int compare(const AppLnk* a, const AppLnk* b) - { - switch (sortmeth) { - case Name: - return a->name().lower().compare(b->name().lower()); - case Date: { - QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); - QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); - return fa.lastModified().secsTo(fb.lastModified()); - } - case Type: - return a->type().compare(b->type()); - } - return 0; - } - -protected: - - void timerEvent( QTimerEvent *te ) - { - if ( te->timerId() == busyTimer ) { - if ( bsy ) - bsy->animateIcon(); - } else { - QIconView::timerEvent( te ); - } - } - - void styleChange( QStyle &old ) - { - QIconView::styleChange( old ); - calculateGrid( itemTextPos() ); - } - - void calculateGrid( ItemTextPos pos ) - { - int dw = QApplication::desktop()->width(); - int viewerWidth = dw-style().scrollBarExtent().width(); - if ( pos == Bottom ) { - int cols = 3; - if ( viewerWidth <= 200 ) - cols = 2; - else if ( viewerWidth >= 400 ) - cols = viewerWidth/96; - setSpacing( 4 ); - setGridX( (viewerWidth-(cols+1)*spacing())/cols ); - setGridY( fontMetrics().height()*2+24 ); - } else { - int cols = 2; - if ( viewerWidth < 150 ) - cols = 1; - else if ( viewerWidth >= 400 ) - cols = viewerWidth/150; - setSpacing( 2 ); - setGridX( (viewerWidth-(cols+1)*spacing())/cols ); - setGridY( fontMetrics().height()+2 ); - } - } - - void focusInEvent( QFocusEvent * ) {} - void focusOutEvent( QFocusEvent * ) {} - -private: - QList<AppLnk> hidden; - QDict<void> mimes; - QDict<void> cats; - SortMethod sortmeth; - QRegExp tf; - int cf; - LauncherItem* bsy; - int busyTimer; - bool ike; - bool bigIcns; - QPixmap bgPixmap; - QColor bgColor; -#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY - QPixmap busyPix; -#endif - BusyIndicatorType busyType; }; @@ -393,3 +128,2 @@ LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) { - m_EyeCallback = new LauncherThumbReceiver(this); if (applnk->type().lower().startsWith("image/") && applnk->exec().contains("opie-eye",false)) { @@ -397,3 +131,2 @@ LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) m_iPixmap = (bigIcon ? applnk->bigPixmap():applnk->pixmap()); - m_EyeCallback->requestThumb(applnk->file(),m_iPixmap.width(),m_iPixmap.height()); } @@ -407,3 +140,2 @@ LauncherItem::~LauncherItem() delete app; - if (m_EyeCallback) delete m_EyeCallback; } @@ -528,2 +260,140 @@ void LauncherItem::setEyePixmap(const QPixmap&aIcon) //=========================================================================== +// Implemantation of LauncherIconview start +//=========================================================================== +LauncherIconView::LauncherIconView( QWidget* parent, const char* name ) + : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white) +{ + m_EyeCallBack = 0; + sortmeth = Name; + hidden.setAutoDelete(TRUE); + ike = FALSE; + calculateGrid( Bottom ); +} + +LauncherIconView::~LauncherIconView() +{ +#if 0 // debuggery + QListIterator<AppLnk> it(hidden); + AppLnk* l; + while ((l=it.current())) { + ++it; + //odebug << "" << l << ": hidden (should remove)" << oendl; + } +#endif +} + +int LauncherIconView::compare(const AppLnk* a, const AppLnk* b) +{ + switch (sortmeth) { + case Name: + return a->name().lower().compare(b->name().lower()); + case Date: { + QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); + QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); + return fa.lastModified().secsTo(fb.lastModified()); + } + case Type: + return a->type().compare(b->type()); + } + return 0; +} + +void LauncherIconView::setSortMethod( SortMethod m ) +{ + if ( sortmeth != m ) { + sortmeth = m; + sort(); + } +} + +void LauncherIconView::setCategoryFilter( int catfilter, bool resort ) +{ + Categories cat; + cat.load( categoryFileName() ); + QString str; + if ( catfilter == -2 ) + cf = 0; + else + cf = catfilter; + hideOrShowItems(resort); +} + +void LauncherIconView::setTypeFilter(const QString& typefilter, bool resort) +{ + tf = QRegExp(typefilter,FALSE,TRUE); + hideOrShowItems(resort); +} + +void LauncherIconView::setItemTextPos( ItemTextPos pos ) +{ + calculateGrid( pos ); + QIconView::setItemTextPos( pos ); +} + +void LauncherIconView::drawBackground( QPainter *p, const QRect &r ) +{ + if ( !bgPixmap.isNull() ) { + p->drawTiledPixmap( r, bgPixmap, + QPoint( (r.x() + contentsX()) % bgPixmap.width(), + (r.y() + contentsY()) % bgPixmap.height() ) ); + } else { + p->fillRect( r, bgColor ); + } +} + +void LauncherIconView::addCatsAndMimes(AppLnk* app) + { + // QStringList c = app->categories(); + // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { + // cats.replace(*cit,(void*)1); + // } + QString maj=app->type(); + int sl=maj.find('/'); + if (sl>=0) { + QString k; + k = maj.left(12) == "application/" ? maj : maj.left(sl); + mimes.replace(k,(void*)1); + } +} + +void LauncherIconView::setBusy(bool on) +{ +#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY + if ( busyPix.isNull() ) { + int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); + busyPix.convertFromImage( Resource::loadImage( "busy" ).smoothScale( size * 16, size ) ); + } +#endif + + if ( on ) { + busyTimer = startTimer( 100 ); + } else { + if ( busyTimer ) { + killTimer( busyTimer ); + busyTimer = 0; + } + } + + LauncherItem *c = on ? (LauncherItem*)currentItem() : 0; + + if ( bsy != c ) { + LauncherItem *oldBusy = bsy; + bsy = c; + if ( oldBusy ) { + oldBusy->resetIcon(); + } + if ( bsy ) { + bsy->setBusyIndicatorType( busyType ) ; + bsy->animateIcon(); + } + } +} + +void LauncherIconView::clear() +{ + mimes.clear(); + cats.clear(); + QIconView::clear(); + hidden.clear(); +} @@ -541,2 +411,42 @@ QStringList LauncherIconView::mimeTypes() const +LauncherItem*LauncherIconView::findDocItem(const QString&fname) +{ + LauncherItem* item = (LauncherItem*)firstItem(); + while (item) { + if (item->appLnk()->file()==fname) { + break; + } + item = (LauncherItem*)item->nextItem(); + } + return item; +} + +void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile) +{ + LauncherItem*item = findDocItem(aFile); + if (!item||!item->isEyeImage()) return; + + item->setEyePixmap(aPixmap); +} + +void LauncherIconView::checkCallback() +{ + if (m_EyeCallBack) { + return; + } + m_EyeCallBack = new LauncherThumbReceiver(); + connect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&)), + this,SLOT(setEyePixmap(const QPixmap&,const QString&))); +} + +void LauncherIconView::addCheckItem(AppLnk* app) +{ + LauncherItem*item = new LauncherItem( this, app, bigIcns ); + if (item->isEyeImage()) { + checkCallback(); + int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); + m_EyeCallBack->requestThumb(app->file(),s,s); + } +} + void LauncherIconView::addItem(AppLnk* app, bool resort) @@ -544,12 +454,13 @@ void LauncherIconView::addItem(AppLnk* app, bool resort) addCatsAndMimes(app); - if ( (tf.isEmpty() || tf.match(app->type()) >= 0) && (cf == 0 || app->categories().contains(cf) - || cf == -1 && app->categories().count() == 0 ) ) - (void) new LauncherItem( this, app, bigIcns ); - else + || cf == -1 && app->categories().count() == 0 ) ) { + addCheckItem(app); + } else { hidden.append(app); - if ( resort ) + } + if ( resort ){ sort(); } +} @@ -605,6 +516,4 @@ bool LauncherIconView::removeLink(const QString& linkfile) LauncherItem *nextItem = (LauncherItem *)item->nextItem(); - if ( l->linkFileKnown() && l->linkFile() == linkfile - || l->fileKnown() && ( - l->file() == linkfile - || dl.isValid() && dl.file() == l->file() ) ) { + if ( l->linkFileKnown() && l->linkFile() == linkfile || l->fileKnown() && + ( l->file() == linkfile || dl.isValid() && dl.file() == l->file() ) ) { delete item; @@ -627,4 +536,63 @@ bool LauncherIconView::removeLink(const QString& linkfile) +void LauncherIconView::timerEvent( QTimerEvent *te ) +{ + if ( te->timerId() == busyTimer ) { + if ( bsy ) + bsy->animateIcon(); + } else { + QIconView::timerEvent( te ); + } +} + +void LauncherIconView::setBigIcons( bool bi ) +{ + bigIcns = bi; +#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY + busyPix.resize(0,0); +#endif +} + +QIconViewItem* LauncherIconView::busyItem() const +{ + return bsy; +} + +void LauncherIconView::setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } + +void LauncherIconView::calculateGrid( ItemTextPos pos ) +{ + int dw = QApplication::desktop()->width(); + int viewerWidth = dw-style().scrollBarExtent().width(); + if ( pos == Bottom ) { + int cols = 3; + if ( viewerWidth <= 200 ) + cols = 2; + else if ( viewerWidth >= 400 ) + cols = viewerWidth/96; + setSpacing( 4 ); + setGridX( (viewerWidth-(cols+1)*spacing())/cols ); + setGridY( fontMetrics().height()*2+24 ); + } else { + int cols = 2; + if ( viewerWidth < 150 ) + cols = 1; + else if ( viewerWidth >= 400 ) + cols = viewerWidth/150; + setSpacing( 2 ); + setGridX( (viewerWidth-(cols+1)*spacing())/cols ); + setGridY( fontMetrics().height()+2 ); + } +} + +void LauncherIconView::styleChange( QStyle &old ) +{ + QIconView::styleChange( old ); + calculateGrid( itemTextPos() ); +} //=========================================================================== +// Implemantation of LauncherIconview end +//=========================================================================== + +//=========================================================================== LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) @@ -1097,6 +1065,5 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { -LauncherThumbReceiver::LauncherThumbReceiver(LauncherItem*parent) +LauncherThumbReceiver::LauncherThumbReceiver() :QObject() { - m_parent = parent; QCopChannel * chan = new QCopChannel( "QPE/opie-eye",this ); @@ -1108,3 +1075,2 @@ LauncherThumbReceiver::LauncherThumbReceiver(LauncherItem*parent) } - m_waiting = false; } @@ -1122,3 +1088,3 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at ) QDataStream stream( at, IO_ReadOnly ); - if (!m_parent || !m_waiting) return; + /* we are just interested in thumbmails */ @@ -1128,7 +1094,4 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at ) for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it ) { - if ((*it).file==m_reqFile) { - m_parent->setEyePixmap((*it).pixmap); - m_waiting = false; - break; - } + odebug << "Pixinfos: " << (*it).file << " - " << (*it).width << oendl; + emit sig_Thumbnail((*it).pixmap,(*it).file); } @@ -1138,3 +1101,3 @@ void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height { - m_reqFile = file; + PixmapInfo rItem; rItem.file = file; @@ -1142,3 +1105,4 @@ void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height rItem.height = height; - QTimer::singleShot(1, this, SLOT(sendRequest())); + m_inThumbNail.append(rItem); + QTimer::singleShot(2, this, SLOT(sendRequest())); } @@ -1147,7 +1111,7 @@ void LauncherThumbReceiver::sendRequest() { - PixmapInfos m_inThumbNail; - m_inThumbNail.append(rItem); + if (m_inThumbNail.count()>0) { QCopEnvelope env("QPE/opie-eye_slave", "pixmapInfos(PixmapInfos)" ); env << m_inThumbNail; - m_waiting = true; + } + m_inThumbNail.clear(); } diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h index a9ff9eb..3cca7f7 100644 --- a/core/launcher/launcherview.h +++ b/core/launcher/launcherview.h @@ -26,2 +26,3 @@ #include <qvbox.h> +#include <qiconview.h> @@ -30,3 +31,2 @@ class LauncherIconView; class LauncherItem; -class QIconView; class QIconViewItem; @@ -119,4 +119,3 @@ private: -/* taken from opie-eye */ - +/* from opie-eye */ struct PixmapInfo { @@ -139,3 +138,3 @@ class LauncherThumbReceiver:public QObject public: - LauncherThumbReceiver(LauncherItem*parent); + LauncherThumbReceiver(); ~LauncherThumbReceiver(); @@ -147,7 +146,106 @@ protected slots: virtual void sendRequest(); + +signals: + void sig_Thumbnail(const QPixmap&,const QString&); + protected: - LauncherItem*m_parent; - QString m_reqFile; - PixmapInfo rItem; - bool m_waiting:1; + PixmapInfos m_inThumbNail; +}; + +class LauncherIconView : public QIconView { + Q_OBJECT +public: + LauncherIconView( QWidget* parent, const char* name=0 ); + ~LauncherIconView(); + QIconViewItem* busyItem() const; + +#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY + QPixmap busyPixmap() const { return busyPix; } +#endif + void setBigIcons( bool bi ); + void updateCategoriesAndMimeTypes(); + void setBusyIndicatorType ( BusyIndicatorType t ); + void doAutoScroll() + { + // We don't want rubberbanding (yet) + } + + void setBusy(bool on); + bool inKeyEvent() const { return ike; } + + void keyPressEvent(QKeyEvent* e) + { + ike = TRUE; + if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) { + if ( (e->state() & ShiftButton) ) + emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() ); + else + returnPressed(currentItem()); + } + + QIconView::keyPressEvent(e); + ike = FALSE; + } + + void addItem(AppLnk* app, bool resort=TRUE); + bool removeLink(const QString& linkfile); + + QStringList mimeTypes() const; + QStringList categories() const; + void clear(); + void addCatsAndMimes(AppLnk* app); + + void setBackgroundOrigin( QWidget::BackgroundOrigin ) {} + + void setBackgroundPixmap( const QPixmap &pm ) { + bgPixmap = pm; + } + + void setBackgroundColor( const QColor &c ) { + bgColor = c; + } + + void drawBackground( QPainter *p, const QRect &r ); + void setItemTextPos( ItemTextPos pos ); + void hideOrShowItems(bool resort); + + void setTypeFilter(const QString& typefilter, bool resort); + void setCategoryFilter( int catfilter, bool resort ); + + enum SortMethod { Name, Date, Type }; + + void setSortMethod( SortMethod m ); + int compare(const AppLnk* a, const AppLnk* b); + +protected: + void timerEvent( QTimerEvent *te ); + void styleChange( QStyle &old ); + void calculateGrid( ItemTextPos pos ); + void focusInEvent( QFocusEvent * ) {} + void focusOutEvent( QFocusEvent * ) {} + LauncherItem*findDocItem(const QString&); + void addCheckItem(AppLnk* app); + void checkCallback(); + +protected slots: + void setEyePixmap(const QPixmap&,const QString&); + +private: + QList<AppLnk> hidden; + QDict<void> mimes; + QDict<void> cats; + SortMethod sortmeth; + QRegExp tf; + int cf; + LauncherItem* bsy; + int busyTimer; + bool ike; + bool bigIcns; + QPixmap bgPixmap; + QColor bgColor; + LauncherThumbReceiver*m_EyeCallBack; +#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY + QPixmap busyPix; +#endif + BusyIndicatorType busyType; }; diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 3e74ab4..990e384 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro |