-rw-r--r-- | core/launcher/launcherview.cpp | 57 |
1 files changed, 50 insertions, 7 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 6e63fca..9fc4565 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -103,24 +103,29 @@ public: | |||
103 | 103 | ||
104 | void setBusy(bool on) | 104 | void setBusy(bool on) |
105 | { | 105 | { |
106 | QIconViewItem *c = on ? currentItem() : 0; | 106 | QIconViewItem *c = on ? currentItem() : 0; |
107 | 107 | ||
108 | if ( bsy != c ) { | 108 | if ( bsy != c ) { |
109 | QIconViewItem *oldbsy = bsy; | 109 | QIconViewItem *oldbsy = bsy; |
110 | bsy = c; | 110 | bsy = c; |
111 | 111 | ||
112 | if ( oldbsy ) | 112 | if ( oldbsy ) |
113 | oldbsy-> repaint ( ); | 113 | oldbsy-> repaint ( ); |
114 | 114 | ||
115 | if ( busytimer ) { | ||
116 | killTimer ( busytimer ); | ||
117 | busytimer = 0; | ||
118 | } | ||
119 | |||
115 | if ( bsy ) { | 120 | if ( bsy ) { |
116 | QPixmap *src = bsy-> QIconViewItem::pixmap(); | 121 | QPixmap *src = bsy-> QIconViewItem::pixmap(); |
117 | for ( int i = 0; i <= 5; i++ ) { | 122 | for ( int i = 0; i <= 5; i++ ) { |
118 | QImage img = src->convertToImage(); | 123 | QImage img = src->convertToImage(); |
119 | QRgb* rgb; | 124 | QRgb* rgb; |
120 | int count; | 125 | int count; |
121 | if ( img.depth() == 32 ) { | 126 | if ( img.depth() == 32 ) { |
122 | rgb = (QRgb*)img.bits(); | 127 | rgb = (QRgb*)img.bits(); |
123 | count = img.bytesPerLine()/sizeof(QRgb)*img.height(); | 128 | count = img.bytesPerLine()/sizeof(QRgb)*img.height(); |
124 | } else { | 129 | } else { |
125 | rgb = img.colorTable(); | 130 | rgb = img.colorTable(); |
126 | count = img.numColors(); | 131 | count = img.numColors(); |
@@ -133,38 +138,34 @@ public: | |||
133 | bc = bc * bs / 100; | 138 | bc = bc * bs / 100; |
134 | 139 | ||
135 | for ( int r = 0; r < count; r++, rgb++ ) { | 140 | for ( int r = 0; r < count; r++, rgb++ ) { |
136 | int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100; | 141 | int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100; |
137 | int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100; | 142 | int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100; |
138 | int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100; | 143 | int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100; |
139 | int ai = qAlpha ( *rgb ); | 144 | int ai = qAlpha ( *rgb ); |
140 | *rgb = qRgba ( ri, gi, bi, ai ); | 145 | *rgb = qRgba ( ri, gi, bi, ai ); |
141 | } | 146 | } |
142 | 147 | ||
143 | bpm [i].convertFromImage( img ); | 148 | bpm [i].convertFromImage( img ); |
144 | } | 149 | } |
150 | |||
145 | if ( busyType == BIT_Blinking ) { | 151 | if ( busyType == BIT_Blinking ) { |
146 | busystate = 0; | 152 | busystate = 0; |
147 | if ( busytimer ) | ||
148 | killTimer ( busytimer ); | ||
149 | busytimer = startTimer ( 200 ); | 153 | busytimer = startTimer ( 200 ); |
150 | } | 154 | } |
151 | else | 155 | else { |
152 | busystate = 3; | 156 | busystate = 3; |
157 | } | ||
153 | timerEvent ( 0 ); | 158 | timerEvent ( 0 ); |
154 | } | 159 | } |
155 | else { | ||
156 | killTimer ( busytimer ); | ||
157 | busytimer = 0; | ||
158 | } | ||
159 | } | 160 | } |
160 | } | 161 | } |
161 | 162 | ||
162 | virtual void timerEvent ( QTimerEvent *te ) | 163 | virtual void timerEvent ( QTimerEvent *te ) |
163 | { | 164 | { |
164 | if ( !te || ( te-> timerId ( ) == busytimer )) { | 165 | if ( !te || ( te-> timerId ( ) == busytimer )) { |
165 | if ( bsy ) { | 166 | if ( bsy ) { |
166 | busystate++; | 167 | busystate++; |
167 | if ( busystate > 5 ) | 168 | if ( busystate > 5 ) |
168 | busystate = -4; | 169 | busystate = -4; |
169 | 170 | ||
170 | QScrollView::updateContents ( bsy-> pixmapRect ( false )); | 171 | QScrollView::updateContents ( bsy-> pixmapRect ( false )); |
@@ -323,24 +324,65 @@ protected: | |||
323 | } else { | 324 | } else { |
324 | int cols = 2; | 325 | int cols = 2; |
325 | if ( viewerWidth < 150 ) | 326 | if ( viewerWidth < 150 ) |
326 | cols = 1; | 327 | cols = 1; |
327 | else if ( viewerWidth >= 400 ) | 328 | else if ( viewerWidth >= 400 ) |
328 | cols = viewerWidth/150; | 329 | cols = viewerWidth/150; |
329 | setSpacing( 2 ); | 330 | setSpacing( 2 ); |
330 | setGridX( (viewerWidth-(cols+1)*spacing())/cols ); | 331 | setGridX( (viewerWidth-(cols+1)*spacing())/cols ); |
331 | setGridY( fontMetrics().height()+2 ); | 332 | setGridY( fontMetrics().height()+2 ); |
332 | } | 333 | } |
333 | } | 334 | } |
334 | 335 | ||
336 | |||
337 | // flicker free redrawing of busy indicator | ||
338 | // code was taken from QScrollView::viewportPaintEvent | ||
339 | void viewportPaintEvent( QPaintEvent* pe ) | ||
340 | { | ||
341 | static QPixmap *pix = new QPixmap ( ); | ||
342 | |||
343 | QWidget* vp = viewport(); | ||
344 | |||
345 | if ( vp-> size ( ) != pix-> size ( )) | ||
346 | pix-> resize ( vp-> size ( )); | ||
347 | |||
348 | QPainter p(pix, vp); | ||
349 | QRect r = pe->rect(); | ||
350 | if ( clipper ( ) != vp ) { | ||
351 | QRect rr( | ||
352 | -vp->x(), -vp->y(), | ||
353 | clipper()->width(), clipper()->height() | ||
354 | ); | ||
355 | r &= rr; | ||
356 | if ( r.isValid() ) { | ||
357 | int ex = r.x() + vp->x() + contentsX(); | ||
358 | int ey = r.y() + vp->y() + contentsY(); | ||
359 | int ew = r.width(); | ||
360 | int eh = r.height(); | ||
361 | drawContentsOffset(&p, | ||
362 | contentsX()+vp->x(), | ||
363 | contentsY()+vp->y(), | ||
364 | ex, ey, ew, eh); | ||
365 | } | ||
366 | } else { | ||
367 | r &= clipper()->rect(); | ||
368 | int ex = r.x() + contentsX(); | ||
369 | int ey = r.y() + contentsY(); | ||
370 | int ew = r.width(); | ||
371 | int eh = r.height(); | ||
372 | drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh); | ||
373 | } | ||
374 | bitBlt ( vp, r.topLeft(), pix, r ); | ||
375 | } | ||
376 | |||
335 | private: | 377 | private: |
336 | QList<AppLnk> hidden; | 378 | QList<AppLnk> hidden; |
337 | QDict<void> mimes; | 379 | QDict<void> mimes; |
338 | QDict<void> cats; | 380 | QDict<void> cats; |
339 | SortMethod sortmeth; | 381 | SortMethod sortmeth; |
340 | QRegExp tf; | 382 | QRegExp tf; |
341 | int cf; | 383 | int cf; |
342 | QIconViewItem* bsy; | 384 | QIconViewItem* bsy; |
343 | bool ike; | 385 | bool ike; |
344 | bool bigIcns; | 386 | bool bigIcns; |
345 | QPixmap bgPixmap; | 387 | QPixmap bgPixmap; |
346 | QPixmap bpm [6]; | 388 | QPixmap bpm [6]; |
@@ -922,12 +964,13 @@ void LauncherView::paletteChange( const QPalette &p ) | |||
922 | cg.setColor( QColorGroup::Text, textCol ); | 964 | cg.setColor( QColorGroup::Text, textCol ); |
923 | icons->setPalette( QPalette(cg,cg,cg) ); | 965 | icons->setPalette( QPalette(cg,cg,cg) ); |
924 | } | 966 | } |
925 | 967 | ||
926 | 968 | ||
927 | void LauncherView::setBusyIndicatorType ( const QString &type ) | 969 | void LauncherView::setBusyIndicatorType ( const QString &type ) |
928 | { | 970 | { |
929 | if ( type. lower ( ) == "blink" ) | 971 | if ( type. lower ( ) == "blink" ) |
930 | icons-> setBusyIndicatorType ( BIT_Blinking ); | 972 | icons-> setBusyIndicatorType ( BIT_Blinking ); |
931 | else | 973 | else |
932 | icons-> setBusyIndicatorType ( BIT_Normal ); | 974 | icons-> setBusyIndicatorType ( BIT_Normal ); |
933 | } | 975 | } |
976 | |||