summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-29 02:08:31 (UTC)
committer sandman <sandman>2002-09-29 02:08:31 (UTC)
commitb7fcdc189dacc8e054a32090af4677bc86955491 (patch) (side-by-side diff)
tree43b500b48fb7718a8c84b7aab91398c568b64b5d
parentd6ac648c6f0f504f2f9c3b21d62524d3167682ae (diff)
downloadopie-b7fcdc189dacc8e054a32090af4677bc86955491.zip
opie-b7fcdc189dacc8e054a32090af4677bc86955491.tar.gz
opie-b7fcdc189dacc8e054a32090af4677bc86955491.tar.bz2
compromise for the new busy indicator:
old explosion + new highlight = exploding highlight ;)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp46
1 files changed, 36 insertions, 10 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index c2bde53..9f86136 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -46,107 +46,131 @@
class BgPixmap
{
public:
BgPixmap( const QPixmap &p ) : pm(p), ref(1) {}
QPixmap pm;
int ref;
};
static QMap<QString,BgPixmap*> *bgCache = 0;
class LauncherIconView : public QIconView {
public:
LauncherIconView( QWidget* parent, const char* name=0 ) :
QIconView(parent,name),
tf(""),
cf(0),
bsy(0),
bigIcns(TRUE),
bgColor(white)
{
sortmeth = Name;
hidden.setAutoDelete(TRUE);
ike = FALSE;
+ busytimer = 0;
calculateGrid( Bottom );
}
~LauncherIconView()
{
#if 0 // debuggery
QListIterator<AppLnk> it(hidden);
AppLnk* l;
while ((l=it.current())) {
++it;
//qDebug("%p: hidden (should remove)",l);
}
#endif
}
QPixmap* busyPixmap() const { return (QPixmap*)&bpm; }
QIconViewItem* busyItem() const { return bsy; }
void setBigIcons( bool bi ) { bigIcns = bi; }
void updateCategoriesAndMimeTypes();
void doAutoScroll()
{
// We don't want rubberbanding (yet)
}
void setBusy(bool on)
{
QIconViewItem *c = on ? currentItem() : 0;
if ( bsy != c ) {
- if ( c ) {
- QPixmap *src = c->pixmap();
+ if ( bsy )
+ bsy-> repaint ( );
+ bsy = c;
+
+ if ( bsy ) {
+ busytimer = startTimer ( 150 );
+ busystate = 50;
+ startTimer ( 0 );
+ }
+ else
+ killTimer ( busytimer );
+ }
+ }
+
+ virtual void timerEvent ( QTimerEvent *te )
+ {
+ if ( !te || ( te-> timerId ( ) == busytimer )) {
+ if ( bsy ) {
+ QPixmap *src = bsy-> QIconViewItem::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();
}
int rc, gc, bc;
+ int bs = ::abs ( busystate ) + 25;
colorGroup().highlight().rgb( &rc, &gc, &bc );
- int ri, gi, bi;
+ rc = rc * bs / 100;
+ gc = gc * bs / 100;
+ bc = bc * bs / 100;
+
for ( int r = 0; r < count; r++, rgb++ ) {
- int ri = (rc+qRed(*rgb))/2;
- int gi = (gc+qGreen(*rgb))/2;
- int bi = (bc+qBlue(*rgb))/2;
+ int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100;
+ int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100;
+ int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100;
int ai = qAlpha(*rgb);
*rgb = qRgba(ri,gi,bi,ai);
}
bpm.convertFromImage( img );
+
+ bsy-> repaint ( );
+
+ busystate += 10;
+ if ( busystate > 50 )
+ busystate = -40;
}
- QIconViewItem* o = bsy;
- bsy = c;
- if ( o ) o->repaint();
- if ( c ) c->repaint();
}
}
bool inKeyEvent() const { return ike; }
void keyPressEvent(QKeyEvent* e)
{
ike = TRUE;
if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space )
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();
@@ -266,48 +290,50 @@ protected:
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 );
}
}
private:
QList<AppLnk> hidden;
QDict<void> mimes;
QDict<void> cats;
SortMethod sortmeth;
QRegExp tf;
int cf;
QIconViewItem* bsy;
bool ike;
bool bigIcns;
QPixmap bgPixmap;
QPixmap bpm;
QColor bgColor;
+ int busytimer;
+ int busystate;
};
bool LauncherView::bsy=FALSE;
void LauncherView::setBusy(bool on)
{
icons->setBusy(on);
}
class LauncherItem : public QIconViewItem
{
public:
LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE );
~LauncherItem()
{
LauncherIconView* liv = (LauncherIconView*)iconView();
if ( liv->busyItem() == this )
liv->setBusy(FALSE);
delete app;
}
AppLnk* appLnk() const { return app; }
AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; }