Diffstat (limited to 'core/launcher/launcherview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/launcher/launcherview.cpp | 28 |
1 files changed, 24 insertions, 4 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 | |||
@@ -112,4 +112,6 @@ private: | |||
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(), |
@@ -142,5 +144,5 @@ LauncherItem::~LauncherItem() | |||
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); |
@@ -311,4 +313,18 @@ LauncherIconView::~LauncherIconView() | |||
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 | { |
@@ -487,7 +503,7 @@ void LauncherIconView::checkCallback() | |||
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))); |
489 | } | ||
490 | m_eyeTimer.changeInterval(600000); | 505 | m_eyeTimer.changeInterval(600000); |
491 | } | 506 | } |
507 | } | ||
492 | 508 | ||
493 | void LauncherIconView::addCheckItem(AppLnk* app) | 509 | void LauncherIconView::addCheckItem(AppLnk* app) |
@@ -1209,6 +1225,8 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | |||
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&)), |
@@ -1248,5 +1266,7 @@ void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height | |||
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 | ||