summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp34
-rw-r--r--core/launcher/launcherview.h4
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
@@ -113,2 +113,4 @@ private:
+static bool s_IgnoreNextPix = false;
+
LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
@@ -143,3 +145,3 @@ QPixmap*LauncherItem::pixmap()const
{
- if (m_EyeImage && m_EyeImageSet == BASE_ICON) {
+ if (m_EyeImage && m_EyeImageSet == BASE_ICON && s_IgnoreNextPix==false) {
LauncherIconView* liv = (LauncherIconView*)iconView();
@@ -296,3 +298,3 @@ LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
config.setGroup( "GUI" );
- setStaticBackgroundPicture( config.readBoolEntry( "StaticBackground", true ) );
+ setStaticBackgroundPicture( config.readBoolEntry( "StaticBackground", true ) );
}
@@ -312,2 +314,16 @@ LauncherIconView::~LauncherIconView()
+void LauncherIconView::unsetPalette()
+{
+ s_IgnoreNextPix = true;
+ QIconView::unsetPalette();
+ s_IgnoreNextPix = false;
+}
+
+void LauncherIconView::setPalette(const QPalette & palette)
+{
+ s_IgnoreNextPix = true;
+ QIconView::setPalette(palette);
+ s_IgnoreNextPix = false;
+}
+
void LauncherIconView::setStaticBackgroundPicture( bool enable )
@@ -324,4 +340,4 @@ void LauncherIconView::setStaticBackgroundPicture( bool enable )
verticalScrollBar()->setTracking( true );
- }
-}
+ }
+}
@@ -488,4 +504,4 @@ void LauncherIconView::checkCallback()
this,SLOT(setEyePixmap(const QPixmap&,const QString&,int)));
+ m_eyeTimer.changeInterval(600000);
}
- m_eyeTimer.changeInterval(600000);
}
@@ -1210,4 +1226,6 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
LauncherThumbReceiver::LauncherThumbReceiver()
- :QObject()
+ :QObject(),requestTimer(this)
{
+
+ connect(&requestTimer,SIGNAL(timeout()),SLOT(sendRequest()));
QCopChannel * chan = new QCopChannel( "QPE/opie-eye",this );
@@ -1249,3 +1267,5 @@ void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height
m_inThumbNail.append(rItem);
- QTimer::singleShot(2, this, SLOT(sendRequest()));
+ if (!requestTimer.isActive()) {
+ requestTimer.start(100,true);
+ }
}
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
@@ -155,2 +155,3 @@ signals:
protected:
+ QTimer requestTimer;
PixmapInfos m_inThumbNail;
@@ -216,2 +217,5 @@ public:
+ virtual void setPalette(const QPalette & palette);
+ virtual void unsetPalette();
+
protected: