-rw-r--r-- | core/launcher/launcher.cpp | 14 | ||||
-rw-r--r-- | core/launcher/launcher.h | 2 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 31 | ||||
-rw-r--r-- | core/launcher/launcherview.h | 3 |
4 files changed, 43 insertions, 7 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, | |||
249 | 249 | ||
250 | cfg. setGroup ( "GUI" ); | ||
251 | setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null )); | ||
252 | |||
250 | categoryBar->show(); | 253 | categoryBar->show(); |
@@ -373,2 +376,8 @@ LauncherView *CategoryTabWidget::view( const QString &id ) | |||
373 | 376 | ||
377 | void CategoryTabWidget::setBusyIndicatorType ( const QString &type ) | ||
378 | { | ||
379 | for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it ) | ||
380 | view ( *it )-> setBusyIndicatorType ( type ); | ||
381 | } | ||
382 | |||
374 | //=========================================================================== | 383 | //=========================================================================== |
@@ -1169,2 +1178,7 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data) | |||
1169 | } | 1178 | } |
1179 | else if ( msg == "setBusyIndicatorType(QString)" ) { | ||
1180 | QString type; | ||
1181 | stream >> type; | ||
1182 | tabs->setBusyIndicatorType(type); | ||
1183 | } | ||
1170 | } | 1184 | } |
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: | |||
65 | LauncherView *view( const QString &id ); | 65 | LauncherView *view( const QString &id ); |
66 | 66 | void setBusyIndicatorType ( const QString &type ); | |
67 | signals: | 67 | 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: | |||
54 | 54 | ||
55 | enum BusyIndicatorType { | ||
56 | BIT_Normal = 0, | ||
57 | BIT_Blinking | ||
58 | }; | ||
59 | |||
55 | static QMap<QString,BgPixmap*> *bgCache = 0; | 60 | static QMap<QString,BgPixmap*> *bgCache = 0; |
@@ -84,2 +89,4 @@ public: | |||
84 | } | 89 | } |
90 | |||
91 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } | ||
85 | 92 | ||
@@ -99,3 +106,2 @@ public: | |||
99 | QIconViewItem *c = on ? currentItem() : 0; | 106 | QIconViewItem *c = on ? currentItem() : 0; |
100 | qDebug ( "set busy %d -> %s", on, c ? c-> text ().latin1() : "(null)" ); | ||
101 | 107 | ||
@@ -138,7 +144,11 @@ public: | |||
138 | } | 144 | } |
139 | busystate = 0; | 145 | if ( busyType == BIT_Blinking ) { |
140 | if ( busytimer ) | 146 | busystate = 0; |
141 | killTimer ( busytimer ); | 147 | if ( busytimer ) |
142 | timerEvent ( 0 ); | 148 | killTimer ( busytimer ); |
143 | busytimer = startTimer ( 200 ); | 149 | busytimer = startTimer ( 200 ); |
150 | } | ||
151 | else | ||
152 | busystate = 3; | ||
153 | timerEvent ( 0 ); | ||
144 | } | 154 | } |
@@ -339,2 +349,3 @@ private: | |||
339 | int busystate; | 349 | int busystate; |
350 | BusyIndicatorType busyType; | ||
340 | }; | 351 | }; |
@@ -915 +926,9 @@ void LauncherView::paletteChange( const QPalette &p ) | |||
915 | 926 | ||
927 | |||
928 | void LauncherView::setBusyIndicatorType ( const QString &type ) | ||
929 | { | ||
930 | if ( type. lower ( ) == "blink" ) | ||
931 | icons-> setBusyIndicatorType ( BIT_Blinking ); | ||
932 | else | ||
933 | icons-> setBusyIndicatorType ( BIT_Normal ); | ||
934 | } | ||
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: | |||
67 | 67 | ||
68 | void setBusyIndicatorType ( const QString &type ); | ||
69 | |||
68 | public slots: | 70 | public slots: |
@@ -99,2 +101,3 @@ private: | |||
99 | QColor textCol; | 101 | QColor textCol; |
102 | int busyType; | ||
100 | }; | 103 | }; |