author | alwin <alwin> | 2005-03-12 02:13:52 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-12 02:13:52 (UTC) |
commit | cd1b9f7c11c73ef0df0ce66c53466c979a3a4d42 (patch) (unidiff) | |
tree | d4ed9b082abe2aa645fbd58b86d65f5ce9c48348 | |
parent | 84af289057291a49a52a60b390bc5320c02b5a55 (diff) | |
download | opie-cd1b9f7c11c73ef0df0ce66c53466c979a3a4d42.zip opie-cd1b9f7c11c73ef0df0ce66c53466c979a3a4d42.tar.gz opie-cd1b9f7c11c73ef0df0ce66c53466c979a3a4d42.tar.bz2 |
And I'm wondering why opie sometimes is that slow. Hopefully reduced
the calls to opie-eye for images in documenttab when changing layout
and so on.
-rw-r--r-- | core/launcher/launcherview.cpp | 34 | ||||
-rw-r--r-- | core/launcher/launcherview.h | 4 |
2 files changed, 31 insertions, 7 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index a4c7561..d960908 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -102,24 +102,26 @@ protected: | |||
102 | bool isBigIcon; | 102 | bool isBigIcon; |
103 | int iteration; | 103 | int iteration; |
104 | AppLnk* app; | 104 | AppLnk* app; |
105 | 105 | ||
106 | private: | 106 | private: |
107 | void paintAnimatedIcon( QPainter *p ); | 107 | void paintAnimatedIcon( QPainter *p ); |
108 | BusyIndicatorType busyType; | 108 | BusyIndicatorType busyType; |
109 | int psize; | 109 | int psize; |
110 | bool m_EyeImage; | 110 | bool m_EyeImage; |
111 | iconstate_t m_EyeImageSet; | 111 | iconstate_t m_EyeImageSet; |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static bool s_IgnoreNextPix = false; | ||
115 | |||
114 | LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) | 116 | LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) |
115 | : QIconViewItem( parent, applnk->name(), | 117 | : QIconViewItem( parent, applnk->name(), |
116 | bigIcon ? applnk->bigPixmap() :applnk->pixmap() ), | 118 | bigIcon ? applnk->bigPixmap() :applnk->pixmap() ), |
117 | isBigIcon( bigIcon ), | 119 | isBigIcon( bigIcon ), |
118 | iteration(0), | 120 | iteration(0), |
119 | app(applnk), // Takes ownership | 121 | app(applnk), // Takes ownership |
120 | psize( (bigIcon ? applnk->bigPixmap().width() :applnk->pixmap().width() ) ), | 122 | psize( (bigIcon ? applnk->bigPixmap().width() :applnk->pixmap().width() ) ), |
121 | m_EyeImage(false), | 123 | m_EyeImage(false), |
122 | m_EyeImageSet(BASE_ICON) | 124 | m_EyeImageSet(BASE_ICON) |
123 | { | 125 | { |
124 | if (applnk->type().lower().startsWith("image/") && applnk->exec().contains("opie-eye",false)) { | 126 | if (applnk->type().lower().startsWith("image/") && applnk->exec().contains("opie-eye",false)) { |
125 | m_EyeImage = true; | 127 | m_EyeImage = true; |
@@ -132,25 +134,25 @@ LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) | |||
132 | } | 134 | } |
133 | 135 | ||
134 | LauncherItem::~LauncherItem() | 136 | LauncherItem::~LauncherItem() |
135 | { | 137 | { |
136 | LauncherIconView* liv = (LauncherIconView*)iconView(); | 138 | LauncherIconView* liv = (LauncherIconView*)iconView(); |
137 | if ( liv->busyItem() == this ) | 139 | if ( liv->busyItem() == this ) |
138 | liv->setBusy(FALSE); | 140 | liv->setBusy(FALSE); |
139 | delete app; | 141 | delete app; |
140 | } | 142 | } |
141 | 143 | ||
142 | QPixmap*LauncherItem::pixmap()const | 144 | QPixmap*LauncherItem::pixmap()const |
143 | { | 145 | { |
144 | if (m_EyeImage && m_EyeImageSet == BASE_ICON) { | 146 | if (m_EyeImage && m_EyeImageSet == BASE_ICON && s_IgnoreNextPix==false) { |
145 | LauncherIconView* liv = (LauncherIconView*)iconView(); | 147 | LauncherIconView* liv = (LauncherIconView*)iconView(); |
146 | liv->requestEyePix(this); | 148 | liv->requestEyePix(this); |
147 | } | 149 | } |
148 | return QIconViewItem::pixmap(); | 150 | return QIconViewItem::pixmap(); |
149 | } | 151 | } |
150 | 152 | ||
151 | int LauncherItem::compare ( QIconViewItem * i ) const | 153 | int LauncherItem::compare ( QIconViewItem * i ) const |
152 | { | 154 | { |
153 | LauncherIconView* view = (LauncherIconView*)iconView(); | 155 | LauncherIconView* view = (LauncherIconView*)iconView(); |
154 | return view->compare(app,((LauncherItem *)i)->appLnk()); | 156 | return view->compare(app,((LauncherItem *)i)->appLnk()); |
155 | } | 157 | } |
156 | 158 | ||
@@ -285,54 +287,68 @@ QMap<QString,QPixmap>* LauncherIconView::sm_EyeCache=0; | |||
285 | LauncherIconView::LauncherIconView( QWidget* parent, const char* name ) | 287 | LauncherIconView::LauncherIconView( QWidget* parent, const char* name ) |
286 | : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white),numColumns(0) | 288 | : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white),numColumns(0) |
287 | { | 289 | { |
288 | m_EyeCallBack = 0; | 290 | m_EyeCallBack = 0; |
289 | if (!sm_EyeCache) sm_EyeCache = new QMap<QString,QPixmap>(); | 291 | if (!sm_EyeCache) sm_EyeCache = new QMap<QString,QPixmap>(); |
290 | sortmeth = Name; | 292 | sortmeth = Name; |
291 | hidden.setAutoDelete(TRUE); | 293 | hidden.setAutoDelete(TRUE); |
292 | ike = FALSE; | 294 | ike = FALSE; |
293 | calculateGrid( Bottom ); | 295 | calculateGrid( Bottom ); |
294 | connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer())); | 296 | connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer())); |
295 | Config config( "Launcher" ); | 297 | Config config( "Launcher" ); |
296 | config.setGroup( "GUI" ); | 298 | config.setGroup( "GUI" ); |
297 | setStaticBackgroundPicture( config.readBoolEntry( "StaticBackground", true ) ); | 299 | setStaticBackgroundPicture( config.readBoolEntry( "StaticBackground", true ) ); |
298 | } | 300 | } |
299 | 301 | ||
300 | LauncherIconView::~LauncherIconView() | 302 | LauncherIconView::~LauncherIconView() |
301 | { | 303 | { |
302 | odebug << "LauncherIconView::~LauncherIconView()" << oendl; | 304 | odebug << "LauncherIconView::~LauncherIconView()" << oendl; |
303 | #if 0 // debuggery | 305 | #if 0 // debuggery |
304 | QListIterator<AppLnk> it(hidden); | 306 | QListIterator<AppLnk> it(hidden); |
305 | AppLnk* l; | 307 | AppLnk* l; |
306 | while ((l=it.current())) { | 308 | while ((l=it.current())) { |
307 | ++it; | 309 | ++it; |
308 | //odebug << "" << l << ": hidden (should remove)" << oendl; | 310 | //odebug << "" << l << ": hidden (should remove)" << oendl; |
309 | } | 311 | } |
310 | #endif | 312 | #endif |
311 | } | 313 | } |
312 | 314 | ||
315 | void LauncherIconView::unsetPalette() | ||
316 | { | ||
317 | s_IgnoreNextPix = true; | ||
318 | QIconView::unsetPalette(); | ||
319 | s_IgnoreNextPix = false; | ||
320 | } | ||
321 | |||
322 | void LauncherIconView::setPalette(const QPalette & palette) | ||
323 | { | ||
324 | s_IgnoreNextPix = true; | ||
325 | QIconView::setPalette(palette); | ||
326 | s_IgnoreNextPix = false; | ||
327 | } | ||
328 | |||
313 | void LauncherIconView::setStaticBackgroundPicture( bool enable ) | 329 | void LauncherIconView::setStaticBackgroundPicture( bool enable ) |
314 | { | 330 | { |
315 | staticBackground = enable; | 331 | staticBackground = enable; |
316 | if ( staticBackground ) | 332 | if ( staticBackground ) |
317 | { | 333 | { |
318 | setStaticBackground( true ); | 334 | setStaticBackground( true ); |
319 | verticalScrollBar()->setTracking( false ); | 335 | verticalScrollBar()->setTracking( false ); |
320 | } | 336 | } |
321 | else | 337 | else |
322 | { | 338 | { |
323 | setStaticBackground( false ); | 339 | setStaticBackground( false ); |
324 | verticalScrollBar()->setTracking( true ); | 340 | verticalScrollBar()->setTracking( true ); |
325 | } | 341 | } |
326 | } | 342 | } |
327 | 343 | ||
328 | int LauncherIconView::compare(const AppLnk* a, const AppLnk* b) | 344 | int LauncherIconView::compare(const AppLnk* a, const AppLnk* b) |
329 | { | 345 | { |
330 | switch (sortmeth) { | 346 | switch (sortmeth) { |
331 | case Name: | 347 | case Name: |
332 | return a->name().lower().compare(b->name().lower()); | 348 | return a->name().lower().compare(b->name().lower()); |
333 | case Date: { | 349 | case Date: { |
334 | QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); | 350 | QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); |
335 | QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); | 351 | QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); |
336 | return fa.lastModified().secsTo(fb.lastModified()); | 352 | return fa.lastModified().secsTo(fb.lastModified()); |
337 | } | 353 | } |
338 | case Type: | 354 | case Type: |
@@ -477,26 +493,26 @@ void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,in | |||
477 | LauncherItem*item = findDocItem(aFile); | 493 | LauncherItem*item = findDocItem(aFile); |
478 | if (!item||!item->isEyeImage()) return; | 494 | if (!item||!item->isEyeImage()) return; |
479 | (*sm_EyeCache)[aFile]=aPixmap; | 495 | (*sm_EyeCache)[aFile]=aPixmap; |
480 | item->setEyePixmap(aPixmap); | 496 | item->setEyePixmap(aPixmap); |
481 | } | 497 | } |
482 | 498 | ||
483 | void LauncherIconView::checkCallback() | 499 | void LauncherIconView::checkCallback() |
484 | { | 500 | { |
485 | if (!m_EyeCallBack) { | 501 | if (!m_EyeCallBack) { |
486 | m_EyeCallBack = new LauncherThumbReceiver(); | 502 | m_EyeCallBack = new LauncherThumbReceiver(); |
487 | connect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)), | 503 | connect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)), |
488 | this,SLOT(setEyePixmap(const QPixmap&,const QString&,int))); | 504 | this,SLOT(setEyePixmap(const QPixmap&,const QString&,int))); |
505 | m_eyeTimer.changeInterval(600000); | ||
489 | } | 506 | } |
490 | m_eyeTimer.changeInterval(600000); | ||
491 | } | 507 | } |
492 | 508 | ||
493 | void LauncherIconView::addCheckItem(AppLnk* app) | 509 | void LauncherIconView::addCheckItem(AppLnk* app) |
494 | { | 510 | { |
495 | LauncherItem*item = new LauncherItem( this, app, bigIcns ); | 511 | LauncherItem*item = new LauncherItem( this, app, bigIcns ); |
496 | if (item->isEyeImage()) { | 512 | if (item->isEyeImage()) { |
497 | checkCallback(); | 513 | checkCallback(); |
498 | } | 514 | } |
499 | } | 515 | } |
500 | 516 | ||
501 | void LauncherIconView::requestEyePix(const LauncherItem*item) | 517 | void LauncherIconView::requestEyePix(const LauncherItem*item) |
502 | { | 518 | { |
@@ -1199,26 +1215,28 @@ void LauncherView::flushBgCache() | |||
1199 | 1215 | ||
1200 | /* special image handling - based on opie eye */ | 1216 | /* special image handling - based on opie eye */ |
1201 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { | 1217 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { |
1202 | s >> inf.file >> inf.pixmap >> inf.width >> inf.height; | 1218 | s >> inf.file >> inf.pixmap >> inf.width >> inf.height; |
1203 | return s; | 1219 | return s; |
1204 | } | 1220 | } |
1205 | 1221 | ||
1206 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | 1222 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { |
1207 | return s << inf.file << inf.width << inf.height; | 1223 | return s << inf.file << inf.width << inf.height; |
1208 | } | 1224 | } |
1209 | 1225 | ||
1210 | LauncherThumbReceiver::LauncherThumbReceiver() | 1226 | LauncherThumbReceiver::LauncherThumbReceiver() |
1211 | :QObject() | 1227 | :QObject(),requestTimer(this) |
1212 | { | 1228 | { |
1229 | |||
1230 | connect(&requestTimer,SIGNAL(timeout()),SLOT(sendRequest())); | ||
1213 | QCopChannel * chan = new QCopChannel( "QPE/opie-eye",this ); | 1231 | QCopChannel * chan = new QCopChannel( "QPE/opie-eye",this ); |
1214 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&)), | 1232 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&)), |
1215 | this, SLOT(recieve(const QCString&,const QByteArray&)) ); | 1233 | this, SLOT(recieve(const QCString&,const QByteArray&)) ); |
1216 | 1234 | ||
1217 | { | 1235 | { |
1218 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); | 1236 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); |
1219 | } | 1237 | } |
1220 | } | 1238 | } |
1221 | 1239 | ||
1222 | LauncherThumbReceiver::~LauncherThumbReceiver() | 1240 | LauncherThumbReceiver::~LauncherThumbReceiver() |
1223 | { | 1241 | { |
1224 | { | 1242 | { |
@@ -1238,23 +1256,25 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at ) | |||
1238 | for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it ) { | 1256 | for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it ) { |
1239 | emit sig_Thumbnail((*it).pixmap,(*it).file,(*it).width); | 1257 | emit sig_Thumbnail((*it).pixmap,(*it).file,(*it).width); |
1240 | } | 1258 | } |
1241 | } | 1259 | } |
1242 | 1260 | ||
1243 | void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height) | 1261 | void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height) |
1244 | { | 1262 | { |
1245 | PixmapInfo rItem; | 1263 | PixmapInfo rItem; |
1246 | rItem.file = file; | 1264 | rItem.file = file; |
1247 | rItem.width = width; | 1265 | rItem.width = width; |
1248 | rItem.height = height; | 1266 | rItem.height = height; |
1249 | m_inThumbNail.append(rItem); | 1267 | m_inThumbNail.append(rItem); |
1250 | QTimer::singleShot(2, this, SLOT(sendRequest())); | 1268 | if (!requestTimer.isActive()) { |
1269 | requestTimer.start(100,true); | ||
1270 | } | ||
1251 | } | 1271 | } |
1252 | 1272 | ||
1253 | void LauncherThumbReceiver::sendRequest() | 1273 | void LauncherThumbReceiver::sendRequest() |
1254 | { | 1274 | { |
1255 | if (m_inThumbNail.count()>0) { | 1275 | if (m_inThumbNail.count()>0) { |
1256 | QCopEnvelope env("QPE/opie-eye_slave", "pixmapInfos(PixmapInfos)" ); | 1276 | QCopEnvelope env("QPE/opie-eye_slave", "pixmapInfos(PixmapInfos)" ); |
1257 | env << m_inThumbNail; | 1277 | env << m_inThumbNail; |
1258 | m_inThumbNail.clear(); | 1278 | m_inThumbNail.clear(); |
1259 | } | 1279 | } |
1260 | } | 1280 | } |
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h index 6a2d197..792c6d1 100644 --- a/core/launcher/launcherview.h +++ b/core/launcher/launcherview.h | |||
@@ -144,24 +144,25 @@ public: | |||
144 | ~LauncherThumbReceiver(); | 144 | ~LauncherThumbReceiver(); |
145 | void requestThumb(const QString&file,int width,int height); | 145 | void requestThumb(const QString&file,int width,int height); |
146 | 146 | ||
147 | public slots: | 147 | public slots: |
148 | void recieve( const QCString&, const QByteArray& ); | 148 | void recieve( const QCString&, const QByteArray& ); |
149 | protected slots: | 149 | protected slots: |
150 | virtual void sendRequest(); | 150 | virtual void sendRequest(); |
151 | 151 | ||
152 | signals: | 152 | signals: |
153 | void sig_Thumbnail(const QPixmap&,const QString&,int); | 153 | void sig_Thumbnail(const QPixmap&,const QString&,int); |
154 | 154 | ||
155 | protected: | 155 | protected: |
156 | QTimer requestTimer; | ||
156 | PixmapInfos m_inThumbNail; | 157 | PixmapInfos m_inThumbNail; |
157 | }; | 158 | }; |
158 | 159 | ||
159 | class LauncherIconView : public QIconView { | 160 | class LauncherIconView : public QIconView { |
160 | Q_OBJECT | 161 | Q_OBJECT |
161 | public: | 162 | public: |
162 | LauncherIconView( QWidget* parent, const char* name=0 ); | 163 | LauncherIconView( QWidget* parent, const char* name=0 ); |
163 | ~LauncherIconView(); | 164 | ~LauncherIconView(); |
164 | QIconViewItem* busyItem() const; | 165 | QIconViewItem* busyItem() const; |
165 | 166 | ||
166 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY | 167 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY |
167 | QPixmap busyPixmap() const { return busyPix; } | 168 | QPixmap busyPixmap() const { return busyPix; } |
@@ -205,24 +206,27 @@ public: | |||
205 | 206 | ||
206 | void setTypeFilter(const QString& typefilter, bool resort); | 207 | void setTypeFilter(const QString& typefilter, bool resort); |
207 | void setCategoryFilter( int catfilter, bool resort ); | 208 | void setCategoryFilter( int catfilter, bool resort ); |
208 | 209 | ||
209 | enum SortMethod { Name, Date, Type }; | 210 | enum SortMethod { Name, Date, Type }; |
210 | 211 | ||
211 | void setSortMethod( SortMethod m ); | 212 | void setSortMethod( SortMethod m ); |
212 | int compare(const AppLnk* a, const AppLnk* b); | 213 | int compare(const AppLnk* a, const AppLnk* b); |
213 | void requestEyePix(const LauncherItem*which); | 214 | void requestEyePix(const LauncherItem*which); |
214 | 215 | ||
215 | static QMap<QString,QPixmap>* sm_EyeCache; | 216 | static QMap<QString,QPixmap>* sm_EyeCache; |
216 | 217 | ||
218 | virtual void setPalette(const QPalette & palette); | ||
219 | virtual void unsetPalette(); | ||
220 | |||
217 | protected: | 221 | protected: |
218 | virtual void timerEvent( QTimerEvent *te ); | 222 | virtual void timerEvent( QTimerEvent *te ); |
219 | void styleChange( QStyle &old ); | 223 | void styleChange( QStyle &old ); |
220 | void calculateGrid( ItemTextPos pos ); | 224 | void calculateGrid( ItemTextPos pos ); |
221 | void focusInEvent( QFocusEvent * ) {} | 225 | void focusInEvent( QFocusEvent * ) {} |
222 | void focusOutEvent( QFocusEvent * ) {} | 226 | void focusOutEvent( QFocusEvent * ) {} |
223 | LauncherItem*findDocItem(const QString&); | 227 | LauncherItem*findDocItem(const QString&); |
224 | void addCheckItem(AppLnk* app); | 228 | void addCheckItem(AppLnk* app); |
225 | void checkCallback(); | 229 | void checkCallback(); |
226 | virtual void keyPressEvent(QKeyEvent* e); | 230 | virtual void keyPressEvent(QKeyEvent* e); |
227 | 231 | ||
228 | protected slots: | 232 | protected slots: |