workaround launcherview problems with qt/e 2.3.8

1 files changed, 3 insertions, 1 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 71e8753..e86f389 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -429,631 +429,633 @@ void LauncherItem::paintAnimatedIcon( QPainter *p )
 	x1 = x() + (width() - w) / 2 - liv->contentsX();
 	y1 = y() - liv->contentsY();
     } else {
 	x1 = x() - liv->contentsX();
 	y1 = y() + (height() - h) / 2 - liv->contentsY();
     }
     y1 -= 2;
     p2.translate(-x1,-y1);
     liv->drawBackground( &p2, QRect(x1,y1,w,h+4) );
     int bounceY = 2;
 #ifdef BOUNCE_BUSY_ICON
     if ( busyType == BIT_Animated ) {
        bounceY = 4 - ((iteration+2)%8);
        bounceY = bounceY < 0 ? -bounceY : bounceY;
     }
 #endif
     p2.drawPixmap( x1, y1 + bounceY, *pixmap() );
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
 #endif
     p->drawPixmap( x1, y1, dblBuf );
 }
 
 void LauncherItem::animateIcon()
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
 
     if ( liv->busyItem() != this || !app )
 	return;
 
     // Highlight the icon
     if ( iteration == 0 ) {
 	QPixmap src = isBigIcon ? app->bigPixmap() : app->pixmap();
 	QImage img = src.convertToImage();
 	QRgb *rgb;
 	int count;
 	if ( img.depth() == 32 ) {
 	    rgb = (QRgb*)img.bits();
 	    count = img.bytesPerLine()/sizeof(QRgb)*img.height();
 	} else {
 	    rgb = img.colorTable();
 	    count = img.numColors();
 	}
 	for ( int r = 0; r < count; r++, rgb++ ) {
 #if defined(BRIGHTEN_BUSY_ICON)
 	    QColor c(*rgb);
 	    int h, s, v;
 	    c.hsv(&h,&s,&v);
 	    c.setHsv(h,QMAX(s-24,0),QMIN(v+48,255));
 	    *rgb = qRgba(c.red(),c.green(),c.blue(),qAlpha(*rgb));
 #elif defined(ALPHA_FADE_BUSY_ICON)
 	    *rgb = qRgba(qRed(*rgb),qGreen(*rgb),qBlue(*rgb),qAlpha(*rgb)/2);
 #endif
 	}
 	src.convertFromImage( img );
 	setPixmap( src );
     }
 
     iteration++;
 
     // Paint animation overlay
     QPainter p( liv->viewport() );
     paintAnimatedIcon( &p );
 }
 
 void LauncherItem::resetIcon()
 {
     iteration = 0;
     setPixmap( isBigIcon ? app->bigPixmap() : app->pixmap() );
 }
 
 //===========================================================================
 
 QStringList LauncherIconView::mimeTypes() const
 {
     QStringList r;
     QDictIterator<void> it(mimes);
     while (it.current()) {
 	r.append(it.currentKey());
 	++it;
     }
     r.sort();
     return r;
 }
 
 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
 	hidden.append(app);
     if ( resort )
 	sort();
 }
 
 void LauncherIconView::updateCategoriesAndMimeTypes()
 {
     mimes.clear();
     cats.clear();
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
 	addCatsAndMimes(item->appLnk());
 	item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
 	addCatsAndMimes(l);
 	++it;
     }
 }
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
     viewport()->setUpdatesEnabled( FALSE );
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
 	links.append(item->takeAppLnk());
 	item = (LauncherItem*)item->nextItem();
     }
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
 	addItem(l,FALSE);
 	++it;
     }
     if ( resort && !autoArrange() )
 	sort();
     viewport()->setUpdatesEnabled( TRUE );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
 	l = item->appLnk();
 	LauncherItem *nextItem = (LauncherItem *)item->nextItem();
 	if (  l->linkFileKnown() && l->linkFile() == linkfile
 		|| l->fileKnown() && (
 		    l->file() == linkfile
 		    || dl.isValid() && dl.file() == l->file() ) ) {
 	    delete item;
 	    did = TRUE;
 	}
 	item = nextItem;
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
 	++it;
 	if ( l->linkFileKnown() && l->linkFile() == linkfile
 		|| l->file() == linkfile
 		|| dl.isValid() && dl.file() == l->file() ) {
 	    hidden.removeRef(l);
 	   did = TRUE;
 	}
     }
     return did;
 }
 
 //===========================================================================
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     catmb = 0;
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
     icons->setResizeMode( QIconView::Fixed );
     vmode = (ViewMode)-1;
     setViewMode( Icon );
 
     connect( icons, SIGNAL(mouseButtonClicked(int,QIconViewItem*,const QPoint&)),
 		   SLOT(itemClicked(int,QIconViewItem*)) );
     connect( icons, SIGNAL(selectionChanged()),
 		   SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem*)),
 		   SLOT(returnPressed(QIconViewItem*)) );
     connect( icons, SIGNAL(mouseButtonPressed(int,QIconViewItem*,const QPoint&)),
 		   SLOT(itemPressed(int,QIconViewItem*)) );
 
     tools = 0;
     setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
     if ( bgCache && bgCache->contains( bgName ) )
 	(*bgCache)[bgName]->ref--;
 }
 
 void LauncherView::hideIcons()
 {
     icons->hide();
 }
 
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
 	if ( y ) {
 	    tools = new QHBox(this);
 
 	    // Type filter
 	    typemb = new QComboBox(tools);
 	    QSizePolicy p = typemb->sizePolicy();
 	    p.setHorData(QSizePolicy::Expanding);
 	    typemb->setSizePolicy(p);
 
 	    // Category filter
 	    updateTools();
 	    tools->show();
 
 	    // Always show vscrollbar
 	    icons->setVScrollBarMode( QScrollView::AlwaysOn );
 	} else {
 	    delete tools;
 	    tools = 0;
 	}
     }
 }
 
 void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(activated(int)),
 	        this, SLOT(showType(int)) );
     if ( catmb ) disconnect( catmb, SIGNAL(signalSelected(int)),
 	        this, SLOT(showCategory(int)) );
 
     // ### I want to remove this
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
 
     // Type filter
     QStringList types;
     typelist = icons->mimeTypes();
     for (QStringList::ConstIterator it = typelist.begin(); it!=typelist.end(); ++it) {
 	QString t = *it;
 	if ( t.left(12) == "application/" ) {
 	    MimeType mt(t);
 	    const AppLnk* app = mt.application();
 	    if ( app )
 		t = app->name();
 	    else
 		t = t.mid(12);
 	} else {
 	    t[0] = t[0].upper();
 	}
 	types += t;
     }
     types << tr("All types");
     prev = typemb->currentText();
     typemb->clear();
     typemb->insertStringList(types);
     for (int i=0; i<typemb->count(); i++) {
 	if ( typemb->text(i) == prev ) {
 	    typemb->setCurrentItem(i);
 	    break;
 	}
     }
     if ( prev.isNull() )
 	typemb->setCurrentItem(typemb->count()-1);
 
     int pcat = catmb ? catmb->currentCategory() : -2;
     if ( !catmb )
 	catmb = new CategorySelect(tools);
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
     catmb->setCategories( vl, "Document View", // No tr
 	tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
     catmb->setCurrentCategory(pcat);
 
     // if type has changed we need to redisplay
     if ( typemb->currentText() != prev )
 	showType( typemb->currentItem() );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
 void LauncherView::showType(int t)
 {
     if ( t >= (int)typelist.count() ) {
 	icons->setTypeFilter("",TRUE);
     } else {
 	QString ty = typelist[t];
 	if ( !ty.contains('/') )
 	    ty += "/*";
 	icons->setTypeFilter(ty,TRUE);
     }
 }
 
 void LauncherView::showCategory( int c )
 {
     icons->setCategoryFilter( c, TRUE );
 }
 
 void LauncherView::setViewMode( ViewMode m )
 {
     if ( vmode != m ) {
 	bool bigIcons = m == Icon;
 	icons->viewport()->setUpdatesEnabled( FALSE );
 	icons->setBigIcons( bigIcons );
 	switch ( m ) {
 	    case List:
 		icons->setItemTextPos( QIconView::Right );
 		break;
 	    case Icon:
 		icons->setItemTextPos( QIconView::Bottom );
 		break;
 	}
 	icons->hideOrShowItems( FALSE );
 	icons->viewport()->setUpdatesEnabled( TRUE );
 	vmode = m;
     }
 }
 
 //
 // User images may require scaling.
 //
 QImage LauncherView::loadBackgroundImage(QString &bgName)
 {
     QImageIO imgio;
     QSize   ds = qApp->desktop()->size();   // should be launcher, not desktop
     bool    further_scaling = TRUE;
 
     imgio.setFileName( bgName );
     imgio.setParameters("GetHeaderInformation");
 
     if (imgio.read() == FALSE) {
 	return imgio.image();
     }
 
     if (imgio.image().width() < ds.width() &&
 	    imgio.image().height() < ds.height()) {
 	further_scaling = FALSE;
     }
 
     if (!imgio.image().bits()) {
 	//
 	// Scale and load.  Note we don't scale up.
 	//
 	QString param( "Scale( %1, %2, ScaleMin )" ); // No tr
 	imgio.setParameters(further_scaling ?
 	    param.arg(ds.width()).arg(ds.height()).latin1() :
 	    "");
 	imgio.read();
     } else {
 	if (further_scaling) {
 	    int	t1 = imgio.image().width() * ds.height();
 	    int t2 = imgio.image().height() * ds.width();
 	    int dsth = ds.height();
 	    int dstw = ds.width();
 
 	    if (t1 > t2) {
 		dsth = t2 / imgio.image().width();
 	    } else {
 		dstw = t1 / imgio.image().height();
 	    }
 
 	    //
 	    // Loader didn't scale for us.  Do it manually.
 	    //
 	    return imgio.image().smoothScale(dstw, dsth);
 	}
     }
 
     return imgio.image();
 }
 
 void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
 {
     if ( !bgCache ) {
 	bgCache = new QMap<QString,BgPixmap*>;
 	qAddPostRoutine( cleanup_cache );
     }
 
     if ( bgCache->contains( bgName ) )
 	(*bgCache)[bgName]->ref--;
     bgName = "";
 
     QPixmap bg;
 
     switch ( t ) {
 	case Ruled: {
 	    bgName = QString("Ruled_%1").arg(colorGroup().background().name()); // No tr
 	    if ( bgCache->contains( bgName ) ) {
 		(*bgCache)[bgName]->ref++;
 		bg = (*bgCache)[bgName]->pm;
 	    } else {
 		bg.resize( width(), 9 );
 		QPainter painter( &bg );
 		for ( int i = 0; i < 3; i++ ) {
 		    painter.setPen( white );
 		    painter.drawLine( 0, i*3, width()-1, i*3 );
 		    painter.drawLine( 0, i*3+1, width()-1, i*3+1 );
 		    painter.setPen( colorGroup().background().light(105) );
 		    painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
 		}
 		painter.end();
 		bgCache->insert( bgName, new BgPixmap(bg) );
 	    }
 	    break;
 	}
 
 	case Image:
 	    if (!val.isEmpty()) {
 		bgName = val;
 		if ( bgCache->contains( bgName ) ) {
 		    (*bgCache)[bgName]->ref++;
 		    bg = (*bgCache)[bgName]->pm;
 		} else {
 		    QString imgFile = bgName;
 		    bool tile = FALSE;
 		    if ( imgFile[0]!='/' || !QFile::exists(imgFile) ) {
 			imgFile = Resource::findPixmap( imgFile );
 			tile = TRUE;
 		    }
 		    QImage img = loadBackgroundImage(imgFile);
 
 
 		    if ( img.depth() == 1 )
 			img = img.convertDepth(8);
 		    img.setAlphaBuffer(FALSE);
 		    bg.convertFromImage(img);
 		    bgCache->insert( bgName, new BgPixmap(bg) );
 		}
 	    }
 	    break;
 
 	case SolidColor:
 	default:
 	    break;
     }
 
     const QObjectList *list = queryList( "QWidget", 0, FALSE );
     QObject *obj;
     for ( QObjectListIt it( *list ); (obj=it.current()); ++it ) {
 	if ( obj->isWidgetType() ) {
 	    QWidget *w = (QWidget*)obj;
 	    w->setBackgroundPixmap( bg );
 	    if ( bgName.isEmpty() ) {
 		// Solid Color
 		if ( val.isEmpty() )
 		    w->setBackgroundColor( colorGroup().base() );
 		else
 		    w->setBackgroundColor( val );
 	    } else {
 		// Ruled or Image pixmap
 		w->setBackgroundOrigin( ParentOrigin );
 	    }
 	}
     }
     delete list;
 
     bgType = t;
     icons->viewport()->update();
 
     QTimer::singleShot( 1000, this, SLOT(flushBgCache()) );
 }
 
 void LauncherView::setTextColor( const QColor &tc )
 {
     textCol = tc;
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, tc );
     icons->setPalette( QPalette(cg,cg,cg) );
     icons->viewport()->update();
 }
 
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::clearViewFont()
 {
     icons->unsetFont();
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
+//	qDebug("LauncherView resize event");
     QVBox::resizeEvent( e );
-    if ( e->size().width() != e->oldSize().width() )
+// commented out for launcherview and qt/e 2.3.8 problems, probably needs real fixing somewhere...
+//    if ( e->size().width() != e->oldSize().width() )
 	sort();
 }
 
 void LauncherView::selectionChanged()
 {
     QIconViewItem* item = icons->currentItem();
     if ( item && item->isSelected() ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( icons->inKeyEvent() ) // not for mouse press
 	    emit clicked( appLnk );
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::returnPressed( QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	emit clicked( appLnk );
     }
 }
 
 void LauncherView::itemClicked( int btn, QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == LeftButton ) {
 	    // Make sure it's the item we execute that gets highlighted
 	    icons->setCurrentItem( item );
 	    emit clicked( appLnk );
 	}
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::itemPressed( int btn, QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == RightButton )
 	    emit rightPressed( appLnk );
 	else if ( btn == ShiftButton )
 	    emit rightPressed( appLnk );
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::removeAllItems()
 {
     icons->clear();
 }
 
 bool LauncherView::removeLink(const QString& linkfile)
 {
     return icons->removeLink(linkfile);
 }
 
 void LauncherView::setSortEnabled( bool v )
 {
     icons->setSorting( v );
     if ( v )
 	sort();
 }
 
 void LauncherView::setUpdatesEnabled( bool u )
 {
     icons->setUpdatesEnabled( u );
 }
 
 void LauncherView::sort()
 {
     icons->sort();
 }
 
 void LauncherView::addItem(AppLnk* app, bool resort)
 {
     icons->addItem(app,resort);
 }
 
 void LauncherView::paletteChange( const QPalette &p )
 {
     icons->unsetPalette();
     QVBox::paletteChange( p );
     if ( bgType == Ruled )
 	setBackgroundType( Ruled, QString::null );
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, textCol );
     icons->setPalette( QPalette(cg,cg,cg) );
 }
 
 void LauncherView::fontChanged(const QFont&)
 {
     odebug << "LauncherView::fontChanged()" << oendl;
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::relayout(void)
 {
     icons->hideOrShowItems(FALSE);
 }
 
 void LauncherView::flushBgCache()
 {
     if ( !bgCache )
 	return;
     // remove unreferenced backgrounds.
     QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
     while ( it != bgCache->end() ) {
 	QMap<QString,BgPixmap*>::Iterator curr = it;
 	++it;
 	if ( (*curr)->ref == 0 ) {
 	    delete (*curr);
 	    bgCache->remove( curr );
 	}
     }
 }