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
@@ -685,375 +685,377 @@ void LauncherView::updateTools()
     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) {
                     intt1 = 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 );
         }
     }
 }