author | sandman <sandman> | 2002-10-23 23:51:11 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-23 23:51:11 (UTC) |
commit | 36e13db0a1d44abd5a160a34e4679b90d62826c7 (patch) (unidiff) | |
tree | 6996137d6ffd992e7eef8be1802d667b3184f62a | |
parent | 8d8ebc66cefd889c0cbc13d7d3d4158bdcb55962 (diff) | |
download | opie-36e13db0a1d44abd5a160a34e4679b90d62826c7.zip opie-36e13db0a1d44abd5a160a34e4679b90d62826c7.tar.gz opie-36e13db0a1d44abd5a160a34e4679b90d62826c7.tar.bz2 |
- fix for the busy indicator timer, in case someone switches to non-blink
style, while the indicator is blinking
- the launcher QIconView is now drawn flickerfree into a background QPixmap
-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 | |||
@@ -19,412 +19,454 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "launcherview.h" | 21 | #include "launcherview.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
25 | #include <qpe/qpedebug.h> | 25 | #include <qpe/qpedebug.h> |
26 | #include <qpe/categories.h> | 26 | #include <qpe/categories.h> |
27 | #include <qpe/categoryselect.h> | 27 | #include <qpe/categoryselect.h> |
28 | #include <qpe/menubutton.h> | 28 | #include <qpe/menubutton.h> |
29 | #include <qpe/mimetype.h> | 29 | #include <qpe/mimetype.h> |
30 | #include <qpe/resource.h> | 30 | #include <qpe/resource.h> |
31 | #include <qpe/qpetoolbar.h> | 31 | #include <qpe/qpetoolbar.h> |
32 | //#include <qtopia/private/palmtoprecord.h> | 32 | //#include <qtopia/private/palmtoprecord.h> |
33 | 33 | ||
34 | #include <qtimer.h> | 34 | #include <qtimer.h> |
35 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
36 | #include <qdict.h> | 36 | #include <qdict.h> |
37 | #include <qfile.h> | 37 | #include <qfile.h> |
38 | #include <qfileinfo.h> | 38 | #include <qfileinfo.h> |
39 | #include <qhbox.h> | 39 | #include <qhbox.h> |
40 | #include <qiconview.h> | 40 | #include <qiconview.h> |
41 | #include <qpainter.h> | 41 | #include <qpainter.h> |
42 | #include <qregexp.h> | 42 | #include <qregexp.h> |
43 | #include <qtoolbutton.h> | 43 | #include <qtoolbutton.h> |
44 | #include <qimage.h> | 44 | #include <qimage.h> |
45 | 45 | ||
46 | 46 | ||
47 | class BgPixmap | 47 | class BgPixmap |
48 | { | 48 | { |
49 | public: | 49 | public: |
50 | BgPixmap( const QPixmap &p ) : pm(p), ref(1) {} | 50 | BgPixmap( const QPixmap &p ) : pm(p), ref(1) {} |
51 | QPixmap pm; | 51 | QPixmap pm; |
52 | int ref; | 52 | int ref; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | enum BusyIndicatorType { | 55 | enum BusyIndicatorType { |
56 | BIT_Normal = 0, | 56 | BIT_Normal = 0, |
57 | BIT_Blinking | 57 | BIT_Blinking |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static QMap<QString,BgPixmap*> *bgCache = 0; | 60 | static QMap<QString,BgPixmap*> *bgCache = 0; |
61 | 61 | ||
62 | class LauncherIconView : public QIconView { | 62 | class LauncherIconView : public QIconView { |
63 | public: | 63 | public: |
64 | LauncherIconView( QWidget* parent, const char* name=0 ) : | 64 | LauncherIconView( QWidget* parent, const char* name=0 ) : |
65 | QIconView(parent,name), | 65 | QIconView(parent,name), |
66 | tf(""), | 66 | tf(""), |
67 | cf(0), | 67 | cf(0), |
68 | bsy(0), | 68 | bsy(0), |
69 | bigIcns(TRUE), | 69 | bigIcns(TRUE), |
70 | bgColor(white) | 70 | bgColor(white) |
71 | { | 71 | { |
72 | sortmeth = Name; | 72 | sortmeth = Name; |
73 | hidden.setAutoDelete(TRUE); | 73 | hidden.setAutoDelete(TRUE); |
74 | ike = FALSE; | 74 | ike = FALSE; |
75 | busytimer = 0; | 75 | busytimer = 0; |
76 | calculateGrid( Bottom ); | 76 | calculateGrid( Bottom ); |
77 | } | 77 | } |
78 | 78 | ||
79 | ~LauncherIconView() | 79 | ~LauncherIconView() |
80 | { | 80 | { |
81 | #if 0 // debuggery | 81 | #if 0 // debuggery |
82 | QListIterator<AppLnk> it(hidden); | 82 | QListIterator<AppLnk> it(hidden); |
83 | AppLnk* l; | 83 | AppLnk* l; |
84 | while ((l=it.current())) { | 84 | while ((l=it.current())) { |
85 | ++it; | 85 | ++it; |
86 | //qDebug("%p: hidden (should remove)",l); | 86 | //qDebug("%p: hidden (should remove)",l); |
87 | } | 87 | } |
88 | #endif | 88 | #endif |
89 | } | 89 | } |
90 | 90 | ||
91 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } | 91 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } |
92 | 92 | ||
93 | QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } | 93 | QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } |
94 | QIconViewItem* busyItem() const { return bsy; } | 94 | QIconViewItem* busyItem() const { return bsy; } |
95 | void setBigIcons( bool bi ) { bigIcns = bi; } | 95 | void setBigIcons( bool bi ) { bigIcns = bi; } |
96 | 96 | ||
97 | void updateCategoriesAndMimeTypes(); | 97 | void updateCategoriesAndMimeTypes(); |
98 | 98 | ||
99 | void doAutoScroll() | 99 | void doAutoScroll() |
100 | { | 100 | { |
101 | // We don't want rubberbanding (yet) | 101 | // We don't want rubberbanding (yet) |
102 | } | 102 | } |
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(); |
127 | } | 132 | } |
128 | int rc, gc, bc; | 133 | int rc, gc, bc; |
129 | int bs = ::abs ( i * 10 ) + 25; | 134 | int bs = ::abs ( i * 10 ) + 25; |
130 | colorGroup().highlight().rgb( &rc, &gc, &bc ); | 135 | colorGroup().highlight().rgb( &rc, &gc, &bc ); |
131 | rc = rc * bs / 100; | 136 | rc = rc * bs / 100; |
132 | gc = gc * bs / 100; | 137 | gc = gc * bs / 100; |
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 )); |
171 | } | 172 | } |
172 | } | 173 | } |
173 | } | 174 | } |
174 | 175 | ||
175 | bool inKeyEvent() const { return ike; } | 176 | bool inKeyEvent() const { return ike; } |
176 | void keyPressEvent(QKeyEvent* e) | 177 | void keyPressEvent(QKeyEvent* e) |
177 | { | 178 | { |
178 | ike = TRUE; | 179 | ike = TRUE; |
179 | if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) | 180 | if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) |
180 | returnPressed(currentItem()); | 181 | returnPressed(currentItem()); |
181 | QIconView::keyPressEvent(e); | 182 | QIconView::keyPressEvent(e); |
182 | ike = FALSE; | 183 | ike = FALSE; |
183 | } | 184 | } |
184 | 185 | ||
185 | void addItem(AppLnk* app, bool resort=TRUE); | 186 | void addItem(AppLnk* app, bool resort=TRUE); |
186 | bool removeLink(const QString& linkfile); | 187 | bool removeLink(const QString& linkfile); |
187 | 188 | ||
188 | QStringList mimeTypes() const; | 189 | QStringList mimeTypes() const; |
189 | QStringList categories() const; | 190 | QStringList categories() const; |
190 | 191 | ||
191 | void clear() | 192 | void clear() |
192 | { | 193 | { |
193 | mimes.clear(); | 194 | mimes.clear(); |
194 | cats.clear(); | 195 | cats.clear(); |
195 | QIconView::clear(); | 196 | QIconView::clear(); |
196 | hidden.clear(); | 197 | hidden.clear(); |
197 | } | 198 | } |
198 | 199 | ||
199 | void addCatsAndMimes(AppLnk* app) | 200 | void addCatsAndMimes(AppLnk* app) |
200 | { | 201 | { |
201 | // QStringList c = app->categories(); | 202 | // QStringList c = app->categories(); |
202 | // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { | 203 | // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { |
203 | // cats.replace(*cit,(void*)1); | 204 | // cats.replace(*cit,(void*)1); |
204 | // } | 205 | // } |
205 | QString maj=app->type(); | 206 | QString maj=app->type(); |
206 | int sl=maj.find('/'); | 207 | int sl=maj.find('/'); |
207 | if (sl>=0) { | 208 | if (sl>=0) { |
208 | QString k; | 209 | QString k; |
209 | k = maj.left(12) == "application/" ? maj : maj.left(sl); | 210 | k = maj.left(12) == "application/" ? maj : maj.left(sl); |
210 | mimes.replace(k,(void*)1); | 211 | mimes.replace(k,(void*)1); |
211 | } | 212 | } |
212 | } | 213 | } |
213 | 214 | ||
214 | void setBackgroundPixmap( const QPixmap &pm ) { | 215 | void setBackgroundPixmap( const QPixmap &pm ) { |
215 | if ( pm. isNull ( )) { | 216 | if ( pm. isNull ( )) { |
216 | bgPixmap = pm; | 217 | bgPixmap = pm; |
217 | } | 218 | } |
218 | else { | 219 | else { |
219 | // This is need for bg images with alpha channel | 220 | // This is need for bg images with alpha channel |
220 | 221 | ||
221 | QPixmap tmp ( pm. size ( ), pm. depth ( )); | 222 | QPixmap tmp ( pm. size ( ), pm. depth ( )); |
222 | 223 | ||
223 | QPainter p ( &tmp ); | 224 | QPainter p ( &tmp ); |
224 | p. fillRect ( 0, 0, pm. width ( ), pm. height ( ), bgColor. isValid ( ) ? bgColor : white ); | 225 | p. fillRect ( 0, 0, pm. width ( ), pm. height ( ), bgColor. isValid ( ) ? bgColor : white ); |
225 | p. drawPixmap ( 0, 0, pm ); | 226 | p. drawPixmap ( 0, 0, pm ); |
226 | p. end ( ); | 227 | p. end ( ); |
227 | 228 | ||
228 | bgPixmap = tmp; | 229 | bgPixmap = tmp; |
229 | } | 230 | } |
230 | } | 231 | } |
231 | 232 | ||
232 | void setBackgroundColor( const QColor &c ) { | 233 | void setBackgroundColor( const QColor &c ) { |
233 | bgColor = c; | 234 | bgColor = c; |
234 | } | 235 | } |
235 | 236 | ||
236 | void drawBackground( QPainter *p, const QRect &r ) | 237 | void drawBackground( QPainter *p, const QRect &r ) |
237 | { | 238 | { |
238 | if ( !bgPixmap.isNull() ) { | 239 | if ( !bgPixmap.isNull() ) { |
239 | //p-> fillRect ( r, bgColor ); | 240 | //p-> fillRect ( r, bgColor ); |
240 | p->drawTiledPixmap( r, bgPixmap, | 241 | p->drawTiledPixmap( r, bgPixmap, |
241 | QPoint( (r.x() + contentsX()) % bgPixmap.width(), | 242 | QPoint( (r.x() + contentsX()) % bgPixmap.width(), |
242 | (r.y() + contentsY()) % bgPixmap.height() ) ); | 243 | (r.y() + contentsY()) % bgPixmap.height() ) ); |
243 | } else { | 244 | } else { |
244 | p->fillRect( r, bgColor ); | 245 | p->fillRect( r, bgColor ); |
245 | } | 246 | } |
246 | } | 247 | } |
247 | 248 | ||
248 | void setItemTextPos( ItemTextPos pos ) | 249 | void setItemTextPos( ItemTextPos pos ) |
249 | { | 250 | { |
250 | calculateGrid( pos ); | 251 | calculateGrid( pos ); |
251 | QIconView::setItemTextPos( pos ); | 252 | QIconView::setItemTextPos( pos ); |
252 | } | 253 | } |
253 | 254 | ||
254 | void hideOrShowItems(bool resort); | 255 | void hideOrShowItems(bool resort); |
255 | 256 | ||
256 | void setTypeFilter(const QString& typefilter, bool resort) | 257 | void setTypeFilter(const QString& typefilter, bool resort) |
257 | { | 258 | { |
258 | tf = QRegExp(typefilter,FALSE,TRUE); | 259 | tf = QRegExp(typefilter,FALSE,TRUE); |
259 | hideOrShowItems(resort); | 260 | hideOrShowItems(resort); |
260 | } | 261 | } |
261 | 262 | ||
262 | void setCategoryFilter( int catfilter, bool resort ) | 263 | void setCategoryFilter( int catfilter, bool resort ) |
263 | { | 264 | { |
264 | Categories cat; | 265 | Categories cat; |
265 | cat.load( categoryFileName() ); | 266 | cat.load( categoryFileName() ); |
266 | QString str; | 267 | QString str; |
267 | if ( catfilter == -2 ) | 268 | if ( catfilter == -2 ) |
268 | cf = 0; | 269 | cf = 0; |
269 | else | 270 | else |
270 | cf = catfilter; | 271 | cf = catfilter; |
271 | hideOrShowItems(resort); | 272 | hideOrShowItems(resort); |
272 | } | 273 | } |
273 | 274 | ||
274 | enum SortMethod { Name, Date, Type }; | 275 | enum SortMethod { Name, Date, Type }; |
275 | 276 | ||
276 | void setSortMethod( SortMethod m ) | 277 | void setSortMethod( SortMethod m ) |
277 | { | 278 | { |
278 | if ( sortmeth != m ) { | 279 | if ( sortmeth != m ) { |
279 | sortmeth = m; | 280 | sortmeth = m; |
280 | sort(); | 281 | sort(); |
281 | } | 282 | } |
282 | } | 283 | } |
283 | 284 | ||
284 | int compare(const AppLnk* a, const AppLnk* b) | 285 | int compare(const AppLnk* a, const AppLnk* b) |
285 | { | 286 | { |
286 | switch (sortmeth) { | 287 | switch (sortmeth) { |
287 | case Name: | 288 | case Name: |
288 | return a->name().compare(b->name()); | 289 | return a->name().compare(b->name()); |
289 | case Date: { | 290 | case Date: { |
290 | QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); | 291 | QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); |
291 | QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); | 292 | QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); |
292 | return fa.lastModified().secsTo(fb.lastModified()); | 293 | return fa.lastModified().secsTo(fb.lastModified()); |
293 | } | 294 | } |
294 | case Type: | 295 | case Type: |
295 | return a->type().compare(b->type()); | 296 | return a->type().compare(b->type()); |
296 | } | 297 | } |
297 | return 0; | 298 | return 0; |
298 | } | 299 | } |
299 | 300 | ||
300 | QString getAllDocLinkInfo() const; | 301 | QString getAllDocLinkInfo() const; |
301 | 302 | ||
302 | protected: | 303 | protected: |
303 | 304 | ||
304 | void styleChange( QStyle &old ) | 305 | void styleChange( QStyle &old ) |
305 | { | 306 | { |
306 | QIconView::styleChange( old ); | 307 | QIconView::styleChange( old ); |
307 | calculateGrid( itemTextPos() ); | 308 | calculateGrid( itemTextPos() ); |
308 | } | 309 | } |
309 | 310 | ||
310 | void calculateGrid( ItemTextPos pos ) | 311 | void calculateGrid( ItemTextPos pos ) |
311 | { | 312 | { |
312 | int dw = QApplication::desktop()->width(); | 313 | int dw = QApplication::desktop()->width(); |
313 | int viewerWidth = dw-style().scrollBarExtent().width(); | 314 | int viewerWidth = dw-style().scrollBarExtent().width(); |
314 | if ( pos == Bottom ) { | 315 | if ( pos == Bottom ) { |
315 | int cols = 3; | 316 | int cols = 3; |
316 | if ( viewerWidth <= 200 ) | 317 | if ( viewerWidth <= 200 ) |
317 | cols = 2; | 318 | cols = 2; |
318 | else if ( viewerWidth >= 400 ) | 319 | else if ( viewerWidth >= 400 ) |
319 | cols = viewerWidth/96; | 320 | cols = viewerWidth/96; |
320 | setSpacing( 4 ); | 321 | setSpacing( 4 ); |
321 | setGridX( (viewerWidth-(cols+1)*spacing())/cols ); | 322 | setGridX( (viewerWidth-(cols+1)*spacing())/cols ); |
322 | setGridY( fontMetrics().height()*2+24 ); | 323 | setGridY( fontMetrics().height()*2+24 ); |
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]; |
347 | QColor bgColor; | 389 | QColor bgColor; |
348 | int busytimer; | 390 | int busytimer; |
349 | int busystate; | 391 | int busystate; |
350 | BusyIndicatorType busyType; | 392 | BusyIndicatorType busyType; |
351 | }; | 393 | }; |
352 | 394 | ||
353 | 395 | ||
354 | bool LauncherView::bsy=FALSE; | 396 | bool LauncherView::bsy=FALSE; |
355 | 397 | ||
356 | void LauncherView::setBusy(bool on) | 398 | void LauncherView::setBusy(bool on) |
357 | { | 399 | { |
358 | icons->setBusy(on); | 400 | icons->setBusy(on); |
359 | } | 401 | } |
360 | 402 | ||
361 | class LauncherItem : public QIconViewItem | 403 | class LauncherItem : public QIconViewItem |
362 | { | 404 | { |
363 | public: | 405 | public: |
364 | LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE ); | 406 | LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE ); |
365 | ~LauncherItem() | 407 | ~LauncherItem() |
366 | { | 408 | { |
367 | LauncherIconView* liv = (LauncherIconView*)iconView(); | 409 | LauncherIconView* liv = (LauncherIconView*)iconView(); |
368 | if ( liv->busyItem() == this ) | 410 | if ( liv->busyItem() == this ) |
369 | liv->setBusy(FALSE); | 411 | liv->setBusy(FALSE); |
370 | delete app; | 412 | delete app; |
371 | } | 413 | } |
372 | 414 | ||
373 | AppLnk* appLnk() const { return app; } | 415 | AppLnk* appLnk() const { return app; } |
374 | AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; } | 416 | AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; } |
375 | 417 | ||
376 | virtual int compare ( QIconViewItem * i ) const; | 418 | virtual int compare ( QIconViewItem * i ) const; |
377 | 419 | ||
378 | void paintItem( QPainter *p, const QColorGroup &cg ) | 420 | void paintItem( QPainter *p, const QColorGroup &cg ) |
379 | { | 421 | { |
380 | LauncherIconView* liv = (LauncherIconView*)iconView(); | 422 | LauncherIconView* liv = (LauncherIconView*)iconView(); |
381 | QBrush oldBrush( liv->itemTextBackground() ); | 423 | QBrush oldBrush( liv->itemTextBackground() ); |
382 | QColorGroup mycg( cg ); | 424 | QColorGroup mycg( cg ); |
383 | if ( liv->currentItem() == this ) { | 425 | if ( liv->currentItem() == this ) { |
384 | liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) ); | 426 | liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) ); |
385 | mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) ); | 427 | mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) ); |
386 | } | 428 | } |
387 | QIconViewItem::paintItem(p,mycg); | 429 | QIconViewItem::paintItem(p,mycg); |
388 | if ( liv->currentItem() == this ) | 430 | if ( liv->currentItem() == this ) |
389 | liv->setItemTextBackground( oldBrush ); | 431 | liv->setItemTextBackground( oldBrush ); |
390 | } | 432 | } |
391 | 433 | ||
392 | virtual QPixmap* pixmap () const | 434 | virtual QPixmap* pixmap () const |
393 | { | 435 | { |
394 | const LauncherIconView* liv = (LauncherIconView*)iconView(); | 436 | const LauncherIconView* liv = (LauncherIconView*)iconView(); |
395 | if ( (const LauncherItem *)liv->busyItem() == this ) | 437 | if ( (const LauncherItem *)liv->busyItem() == this ) |
396 | return liv->busyPixmap(); | 438 | return liv->busyPixmap(); |
397 | return QIconViewItem::pixmap(); | 439 | return QIconViewItem::pixmap(); |
398 | } | 440 | } |
399 | 441 | ||
400 | protected: | 442 | protected: |
401 | AppLnk* app; | 443 | AppLnk* app; |
402 | }; | 444 | }; |
403 | 445 | ||
404 | 446 | ||
405 | LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) | 447 | LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) |
406 | : QIconViewItem( parent, applnk->name(), | 448 | : QIconViewItem( parent, applnk->name(), |
407 | bigIcon ? applnk->bigPixmap() :applnk->pixmap() ), | 449 | bigIcon ? applnk->bigPixmap() :applnk->pixmap() ), |
408 | app(applnk) // Takes ownership | 450 | app(applnk) // Takes ownership |
409 | { | 451 | { |
410 | } | 452 | } |
411 | 453 | ||
412 | int LauncherItem::compare ( QIconViewItem * i ) const | 454 | int LauncherItem::compare ( QIconViewItem * i ) const |
413 | { | 455 | { |
414 | LauncherIconView* view = (LauncherIconView*)iconView(); | 456 | LauncherIconView* view = (LauncherIconView*)iconView(); |
415 | return view->compare(app,((LauncherItem *)i)->appLnk()); | 457 | return view->compare(app,((LauncherItem *)i)->appLnk()); |
416 | } | 458 | } |
417 | 459 | ||
418 | QStringList LauncherIconView::mimeTypes() const | 460 | QStringList LauncherIconView::mimeTypes() const |
419 | { | 461 | { |
420 | QStringList r; | 462 | QStringList r; |
421 | QDictIterator<void> it(mimes); | 463 | QDictIterator<void> it(mimes); |
422 | while (it.current()) { | 464 | while (it.current()) { |
423 | r.append(it.currentKey()); | 465 | r.append(it.currentKey()); |
424 | ++it; | 466 | ++it; |
425 | } | 467 | } |
426 | r.sort(); | 468 | r.sort(); |
427 | return r; | 469 | return r; |
428 | } | 470 | } |
429 | 471 | ||
430 | void LauncherIconView::addItem(AppLnk* app, bool resort) | 472 | void LauncherIconView::addItem(AppLnk* app, bool resort) |
@@ -838,96 +880,97 @@ void LauncherView::selectionChanged() | |||
838 | } | 880 | } |
839 | 881 | ||
840 | void LauncherView::returnPressed( QIconViewItem *item ) | 882 | void LauncherView::returnPressed( QIconViewItem *item ) |
841 | { | 883 | { |
842 | if ( item ) { | 884 | if ( item ) { |
843 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 885 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
844 | emit clicked( appLnk ); | 886 | emit clicked( appLnk ); |
845 | } | 887 | } |
846 | } | 888 | } |
847 | 889 | ||
848 | void LauncherView::itemClicked( int btn, QIconViewItem *item ) | 890 | void LauncherView::itemClicked( int btn, QIconViewItem *item ) |
849 | { | 891 | { |
850 | if ( item ) { | 892 | if ( item ) { |
851 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 893 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
852 | if ( btn == LeftButton ) { | 894 | if ( btn == LeftButton ) { |
853 | // Make sure it's the item we execute that gets highlighted | 895 | // Make sure it's the item we execute that gets highlighted |
854 | icons->setCurrentItem( item ); | 896 | icons->setCurrentItem( item ); |
855 | emit clicked( appLnk ); | 897 | emit clicked( appLnk ); |
856 | } | 898 | } |
857 | item->setSelected(FALSE); | 899 | item->setSelected(FALSE); |
858 | } | 900 | } |
859 | } | 901 | } |
860 | 902 | ||
861 | void LauncherView::itemPressed( int btn, QIconViewItem *item ) | 903 | void LauncherView::itemPressed( int btn, QIconViewItem *item ) |
862 | { | 904 | { |
863 | if ( item ) { | 905 | if ( item ) { |
864 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 906 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
865 | if ( btn == RightButton ) | 907 | if ( btn == RightButton ) |
866 | emit rightPressed( appLnk ); | 908 | emit rightPressed( appLnk ); |
867 | /* | 909 | /* |
868 | else if ( btn == LeftButton ) | 910 | else if ( btn == LeftButton ) |
869 | emit clicked( appLnk ); | 911 | emit clicked( appLnk ); |
870 | */ | 912 | */ |
871 | item->setSelected(FALSE); | 913 | item->setSelected(FALSE); |
872 | } | 914 | } |
873 | } | 915 | } |
874 | 916 | ||
875 | void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) | 917 | void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) |
876 | { | 918 | { |
877 | QListIterator<AppLnk> it( folder->children() ); | 919 | QListIterator<AppLnk> it( folder->children() ); |
878 | icons->setTypeFilter(typefilter,FALSE); | 920 | icons->setTypeFilter(typefilter,FALSE); |
879 | 921 | ||
880 | while ( it.current() ) { | 922 | while ( it.current() ) { |
881 | // show only the icons for existing files | 923 | // show only the icons for existing files |
882 | if (QFile(it.current()->file()).exists() || ( it.current()->file().left(4) == "http" )) { | 924 | if (QFile(it.current()->file()).exists() || ( it.current()->file().left(4) == "http" )) { |
883 | icons->addItem(*it,FALSE); | 925 | icons->addItem(*it,FALSE); |
884 | } | 926 | } |
885 | else { | 927 | else { |
886 | //maybe insert some .desktop file deletion code later | 928 | //maybe insert some .desktop file deletion code later |
887 | //maybe dir specific | 929 | //maybe dir specific |
888 | } | 930 | } |
889 | ++it; | 931 | ++it; |
890 | } | 932 | } |
891 | 933 | ||
892 | icons->sort(); | 934 | icons->sort(); |
893 | } | 935 | } |
894 | 936 | ||
895 | bool LauncherView::removeLink(const QString& linkfile) | 937 | bool LauncherView::removeLink(const QString& linkfile) |
896 | { | 938 | { |
897 | return icons->removeLink(linkfile); | 939 | return icons->removeLink(linkfile); |
898 | } | 940 | } |
899 | 941 | ||
900 | void LauncherView::sort() | 942 | void LauncherView::sort() |
901 | { | 943 | { |
902 | icons->sort(); | 944 | icons->sort(); |
903 | } | 945 | } |
904 | 946 | ||
905 | void LauncherView::addItem(AppLnk* app, bool resort) | 947 | void LauncherView::addItem(AppLnk* app, bool resort) |
906 | { | 948 | { |
907 | icons->addItem(app,resort); | 949 | icons->addItem(app,resort); |
908 | } | 950 | } |
909 | 951 | ||
910 | void LauncherView::setFileSystems(const QList<FileSystem> &) | 952 | void LauncherView::setFileSystems(const QList<FileSystem> &) |
911 | { | 953 | { |
912 | // ### does nothing now... | 954 | // ### does nothing now... |
913 | } | 955 | } |
914 | 956 | ||
915 | void LauncherView::paletteChange( const QPalette &p ) | 957 | void LauncherView::paletteChange( const QPalette &p ) |
916 | { | 958 | { |
917 | icons->unsetPalette(); | 959 | icons->unsetPalette(); |
918 | QVBox::paletteChange( p ); | 960 | QVBox::paletteChange( p ); |
919 | if ( bgType == Ruled ) | 961 | if ( bgType == Ruled ) |
920 | setBackgroundType( Ruled, QString::null ); | 962 | setBackgroundType( Ruled, QString::null ); |
921 | QColorGroup cg = icons->colorGroup(); | 963 | QColorGroup cg = icons->colorGroup(); |
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 | |||