busyindicator type can now be changed at run-time

4 files changed, 39 insertions, 3 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 6948976..66cc3e6 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -249,2 +249,5 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
 
+    cfg. setGroup ( "GUI" );
+    setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null ));
+
     categoryBar->show();
@@ -373,2 +376,8 @@ LauncherView *CategoryTabWidget::view( const QString &id )
 
+void CategoryTabWidget::setBusyIndicatorType ( const QString &type )
+{
+	for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
+		view ( *it )-> setBusyIndicatorType ( type );
+}
+
 //===========================================================================
@@ -1169,2 +1178,7 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
     }
+    else if ( msg == "setBusyIndicatorType(QString)" ) {
+	QString type;
+	stream >> type;	
+	tabs->setBusyIndicatorType(type);
+    }
 }
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index e3881ea..89bf6f3 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -65,3 +65,3 @@ public:
     LauncherView *view( const QString &id );
-
+    void setBusyIndicatorType ( const QString &type );
 signals:
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index e15b150..fa46543 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -54,2 +54,7 @@ public:
 
+enum BusyIndicatorType {
+	BIT_Normal = 0,
+	BIT_Blinking
+};
+
 static QMap<QString,BgPixmap*> *bgCache = 0;
@@ -85,2 +90,4 @@ public:
 
+    void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
+
     QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; }
@@ -99,3 +106,2 @@ public:
 	QIconViewItem *c = on ? currentItem() : 0;
-	qDebug ( "set busy %d -> %s", on, c ? c-> text ().latin1() : "(null)" );
 	
@@ -138,2 +144,3 @@ public:
 		}
+		if ( busyType == BIT_Blinking ) {
 	    	busystate = 0;	
@@ -141,5 +148,8 @@ public:
 	    	    killTimer ( busytimer );
-	    	timerEvent ( 0 );
 	    	busytimer = startTimer ( 200 );
 	    }
+		else
+		    busystate = 3;
+		timerEvent ( 0 );
+	    }
 	    else {
@@ -339,2 +349,3 @@ private:
     int busystate;
+    BusyIndicatorType busyType;
 };
@@ -915 +926,9 @@ void LauncherView::paletteChange( const QPalette &p )
 
+
+void LauncherView::setBusyIndicatorType ( const QString &type )
+{
+    if ( type. lower ( ) == "blink" )
+	icons-> setBusyIndicatorType ( BIT_Blinking );
+    else
+	icons-> setBusyIndicatorType ( BIT_Normal );
+}
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 2fb37b6..194e4a2 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -67,2 +67,4 @@ public:
 
+    void setBusyIndicatorType ( const QString &type );
+
 public slots:
@@ -99,2 +101,3 @@ private:
     QColor textCol;
+    int busyType;
 };