author | sandman <sandman> | 2002-10-01 22:44:28 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-01 22:44:28 (UTC) |
commit | 8f904d99e7b6e04b6043226a63f6c417171a7cad (patch) (unidiff) | |
tree | 07d5f2b7e1338cf1035fe92436328a9c74208b03 | |
parent | 895280b5ff189fff2e77d6f5f27668e7dad0d88d (diff) | |
download | opie-8f904d99e7b6e04b6043226a63f6c417171a7cad.zip opie-8f904d99e7b6e04b6043226a63f6c417171a7cad.tar.gz opie-8f904d99e7b6e04b6043226a63f6c417171a7cad.tar.bz2 |
busyindicator type can now be changed at run-time
-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 | |||
@@ -238,24 +238,27 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, | |||
238 | docview = newView( "Documents", // No tr | 238 | docview = newView( "Documents", // No tr |
239 | pm, tr("Documents")); | 239 | pm, tr("Documents")); |
240 | docview->populate( docFolder, QString::null ); | 240 | docview->populate( docFolder, QString::null ); |
241 | docFolder->detachChildren(); | 241 | docFolder->detachChildren(); |
242 | docview->setFileSystems(fs); | 242 | docview->setFileSystems(fs); |
243 | docview->setToolsEnabled(TRUE); | 243 | docview->setToolsEnabled(TRUE); |
244 | setTabAppearance( "Documents", cfg ); // No tr | 244 | setTabAppearance( "Documents", cfg ); // No tr |
245 | 245 | ||
246 | connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) ); | 246 | connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) ); |
247 | 247 | ||
248 | ((LauncherView*)stack->widget(0))->setFocus(); | 248 | ((LauncherView*)stack->widget(0))->setFocus(); |
249 | 249 | ||
250 | cfg. setGroup ( "GUI" ); | ||
251 | setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null )); | ||
252 | |||
250 | categoryBar->show(); | 253 | categoryBar->show(); |
251 | stack->show(); | 254 | stack->show(); |
252 | } | 255 | } |
253 | 256 | ||
254 | void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg ) | 257 | void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg ) |
255 | { | 258 | { |
256 | QString grp( "Tab %1" ); // No tr | 259 | QString grp( "Tab %1" ); // No tr |
257 | cfg.setGroup( grp.arg(id) ); | 260 | cfg.setGroup( grp.arg(id) ); |
258 | LauncherView *v = view( id ); | 261 | LauncherView *v = view( id ); |
259 | int idx = ids.findIndex( id ); | 262 | int idx = ids.findIndex( id ); |
260 | CategoryTab *tab = (CategoryTab *)categoryBar->tab( idx ); | 263 | CategoryTab *tab = (CategoryTab *)categoryBar->tab( idx ); |
261 | 264 | ||
@@ -362,24 +365,30 @@ void CategoryTabWidget::setBusy(bool on) | |||
362 | ((LauncherView*)stack->visibleWidget())->setBusy(TRUE); | 365 | ((LauncherView*)stack->visibleWidget())->setBusy(TRUE); |
363 | else | 366 | else |
364 | for (int i=0; i<tabs; i++) | 367 | for (int i=0; i<tabs; i++) |
365 | ((LauncherView*)stack->widget(i))->setBusy(FALSE); | 368 | ((LauncherView*)stack->widget(i))->setBusy(FALSE); |
366 | } | 369 | } |
367 | 370 | ||
368 | LauncherView *CategoryTabWidget::view( const QString &id ) | 371 | LauncherView *CategoryTabWidget::view( const QString &id ) |
369 | { | 372 | { |
370 | int idx = ids.findIndex( id ); | 373 | int idx = ids.findIndex( id ); |
371 | return (LauncherView *)stack->widget(idx); | 374 | return (LauncherView *)stack->widget(idx); |
372 | } | 375 | } |
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 | //=========================================================================== |
375 | 384 | ||
376 | CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name ) | 385 | CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name ) |
377 | : QTabBar( parent, name ) | 386 | : QTabBar( parent, name ) |
378 | { | 387 | { |
379 | setFocusPolicy( NoFocus ); | 388 | setFocusPolicy( NoFocus ); |
380 | connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) ); | 389 | connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) ); |
381 | } | 390 | } |
382 | 391 | ||
383 | CategoryTabBar::~CategoryTabBar() | 392 | CategoryTabBar::~CategoryTabBar() |
384 | { | 393 | { |
385 | } | 394 | } |
@@ -1158,24 +1167,29 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data) | |||
1158 | QString fam; | 1167 | QString fam; |
1159 | stream >> fam; | 1168 | stream >> fam; |
1160 | int size; | 1169 | int size; |
1161 | stream >> size; | 1170 | stream >> size; |
1162 | int weight; | 1171 | int weight; |
1163 | stream >> weight; | 1172 | stream >> weight; |
1164 | int italic; | 1173 | int italic; |
1165 | stream >> italic; | 1174 | stream >> italic; |
1166 | if ( tabs->view(id) ) | 1175 | if ( tabs->view(id) ) |
1167 | tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); | 1176 | tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); |
1168 | qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic ); | 1177 | qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic ); |
1169 | } | 1178 | } |
1179 | else if ( msg == "setBusyIndicatorType(QString)" ) { | ||
1180 | QString type; | ||
1181 | stream >> type; | ||
1182 | tabs->setBusyIndicatorType(type); | ||
1183 | } | ||
1170 | } | 1184 | } |
1171 | 1185 | ||
1172 | void Launcher::storageChanged() | 1186 | void Launcher::storageChanged() |
1173 | { | 1187 | { |
1174 | if ( in_lnk_props ) { | 1188 | if ( in_lnk_props ) { |
1175 | got_lnk_change = TRUE; | 1189 | got_lnk_change = TRUE; |
1176 | lnk_change = QString::null; | 1190 | lnk_change = QString::null; |
1177 | } else { | 1191 | } else { |
1178 | updateLink( QString::null ); | 1192 | updateLink( QString::null ); |
1179 | } | 1193 | } |
1180 | } | 1194 | } |
1181 | 1195 | ||
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 | |||
@@ -54,25 +54,25 @@ protected: | |||
54 | class CategoryTabWidget : public QVBox { | 54 | class CategoryTabWidget : public QVBox { |
55 | // can't use a QTabWidget, since it won't let us set the frame style. | 55 | // can't use a QTabWidget, since it won't let us set the frame style. |
56 | Q_OBJECT | 56 | Q_OBJECT |
57 | public: | 57 | public: |
58 | CategoryTabWidget( QWidget* parent ); | 58 | CategoryTabWidget( QWidget* parent ); |
59 | void initializeCategories(AppLnkSet* rootFolder, AppLnkSet* docFolder, | 59 | void initializeCategories(AppLnkSet* rootFolder, AppLnkSet* docFolder, |
60 | const QList<FileSystem> &); | 60 | const QList<FileSystem> &); |
61 | void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs); | 61 | void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs); |
62 | void updateLink(const QString& linkfile); | 62 | void updateLink(const QString& linkfile); |
63 | void setBusy(bool on); | 63 | void setBusy(bool on); |
64 | QString getAllDocLinkInfo() const; | 64 | QString getAllDocLinkInfo() const; |
65 | LauncherView *view( const QString &id ); | 65 | LauncherView *view( const QString &id ); |
66 | 66 | void setBusyIndicatorType ( const QString &type ); | |
67 | signals: | 67 | signals: |
68 | void selected(const QString&); | 68 | void selected(const QString&); |
69 | void clicked(const AppLnk*); | 69 | void clicked(const AppLnk*); |
70 | void rightPressed(AppLnk*); | 70 | void rightPressed(AppLnk*); |
71 | 71 | ||
72 | public slots: | 72 | public slots: |
73 | void nextTab(); | 73 | void nextTab(); |
74 | void prevTab(); | 74 | void prevTab(); |
75 | 75 | ||
76 | protected slots: | 76 | protected slots: |
77 | void tabProperties(); | 77 | void tabProperties(); |
78 | 78 | ||
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 | |||
@@ -43,24 +43,29 @@ | |||
43 | #include <qtoolbutton.h> | 43 | #include <qtoolbutton.h> |
44 | #include <qimage.h> | 44 | #include <qimage.h> |
45 | 45 | ||
46 | 46 | ||
47 | class BgPixmap | 47 | class BgPixmap |
48 | { | 48 | { |
49 | public: | 49 | public: |
50 | BgPixmap( const QPixmap &p ) : pm(p), ref(1) {} | 50 | BgPixmap( const QPixmap &p ) : pm(p), ref(1) {} |
51 | QPixmap pm; | 51 | QPixmap pm; |
52 | int ref; | 52 | int ref; |
53 | }; | 53 | }; |
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; |
56 | 61 | ||
57 | class LauncherIconView : public QIconView { | 62 | class LauncherIconView : public QIconView { |
58 | public: | 63 | public: |
59 | LauncherIconView( QWidget* parent, const char* name=0 ) : | 64 | LauncherIconView( QWidget* parent, const char* name=0 ) : |
60 | QIconView(parent,name), | 65 | QIconView(parent,name), |
61 | tf(""), | 66 | tf(""), |
62 | cf(0), | 67 | cf(0), |
63 | bsy(0), | 68 | bsy(0), |
64 | bigIcns(TRUE), | 69 | bigIcns(TRUE), |
65 | bgColor(white) | 70 | bgColor(white) |
66 | { | 71 | { |
@@ -73,40 +78,41 @@ public: | |||
73 | 78 | ||
74 | ~LauncherIconView() | 79 | ~LauncherIconView() |
75 | { | 80 | { |
76 | #if 0 // debuggery | 81 | #if 0 // debuggery |
77 | QListIterator<AppLnk> it(hidden); | 82 | QListIterator<AppLnk> it(hidden); |
78 | AppLnk* l; | 83 | AppLnk* l; |
79 | while ((l=it.current())) { | 84 | while ((l=it.current())) { |
80 | ++it; | 85 | ++it; |
81 | //qDebug("%p: hidden (should remove)",l); | 86 | //qDebug("%p: hidden (should remove)",l); |
82 | } | 87 | } |
83 | #endif | 88 | #endif |
84 | } | 89 | } |
90 | |||
91 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } | ||
85 | 92 | ||
86 | QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } | 93 | QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } |
87 | QIconViewItem* busyItem() const { return bsy; } | 94 | QIconViewItem* busyItem() const { return bsy; } |
88 | void setBigIcons( bool bi ) { bigIcns = bi; } | 95 | void setBigIcons( bool bi ) { bigIcns = bi; } |
89 | 96 | ||
90 | void updateCategoriesAndMimeTypes(); | 97 | void updateCategoriesAndMimeTypes(); |
91 | 98 | ||
92 | void doAutoScroll() | 99 | void doAutoScroll() |
93 | { | 100 | { |
94 | // We don't want rubberbanding (yet) | 101 | // We don't want rubberbanding (yet) |
95 | } | 102 | } |
96 | 103 | ||
97 | void setBusy(bool on) | 104 | void setBusy(bool on) |
98 | { | 105 | { |
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 | ||
102 | if ( bsy != c ) { | 108 | if ( bsy != c ) { |
103 | QIconViewItem *oldbsy = bsy; | 109 | QIconViewItem *oldbsy = bsy; |
104 | bsy = c; | 110 | bsy = c; |
105 | 111 | ||
106 | if ( oldbsy ) | 112 | if ( oldbsy ) |
107 | oldbsy-> repaint ( ); | 113 | oldbsy-> repaint ( ); |
108 | 114 | ||
109 | if ( bsy ) { | 115 | if ( bsy ) { |
110 | QPixmap *src = bsy-> QIconViewItem::pixmap(); | 116 | QPixmap *src = bsy-> QIconViewItem::pixmap(); |
111 | for ( int i = 0; i <= 5; i++ ) { | 117 | for ( int i = 0; i <= 5; i++ ) { |
112 | QImage img = src->convertToImage(); | 118 | QImage img = src->convertToImage(); |
@@ -127,29 +133,33 @@ public: | |||
127 | bc = bc * bs / 100; | 133 | bc = bc * bs / 100; |
128 | 134 | ||
129 | for ( int r = 0; r < count; r++, rgb++ ) { | 135 | for ( int r = 0; r < count; r++, rgb++ ) { |
130 | int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100; | 136 | int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100; |
131 | int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100; | 137 | int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100; |
132 | int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100; | 138 | int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100; |
133 | int ai = qAlpha ( *rgb ); | 139 | int ai = qAlpha ( *rgb ); |
134 | *rgb = qRgba ( ri, gi, bi, ai ); | 140 | *rgb = qRgba ( ri, gi, bi, ai ); |
135 | } | 141 | } |
136 | 142 | ||
137 | bpm [i].convertFromImage( img ); | 143 | bpm [i].convertFromImage( img ); |
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 | } |
145 | else { | 155 | else { |
146 | killTimer ( busytimer ); | 156 | killTimer ( busytimer ); |
147 | busytimer = 0; | 157 | busytimer = 0; |
148 | } | 158 | } |
149 | } | 159 | } |
150 | } | 160 | } |
151 | 161 | ||
152 | virtual void timerEvent ( QTimerEvent *te ) | 162 | virtual void timerEvent ( QTimerEvent *te ) |
153 | { | 163 | { |
154 | if ( !te || ( te-> timerId ( ) == busytimer )) { | 164 | if ( !te || ( te-> timerId ( ) == busytimer )) { |
155 | if ( bsy ) { | 165 | if ( bsy ) { |
@@ -328,24 +338,25 @@ private: | |||
328 | QDict<void> cats; | 338 | QDict<void> cats; |
329 | SortMethod sortmeth; | 339 | SortMethod sortmeth; |
330 | QRegExp tf; | 340 | QRegExp tf; |
331 | int cf; | 341 | int cf; |
332 | QIconViewItem* bsy; | 342 | QIconViewItem* bsy; |
333 | bool ike; | 343 | bool ike; |
334 | bool bigIcns; | 344 | bool bigIcns; |
335 | QPixmap bgPixmap; | 345 | QPixmap bgPixmap; |
336 | QPixmap bpm [6]; | 346 | QPixmap bpm [6]; |
337 | QColor bgColor; | 347 | QColor bgColor; |
338 | int busytimer; | 348 | int busytimer; |
339 | int busystate; | 349 | int busystate; |
350 | BusyIndicatorType busyType; | ||
340 | }; | 351 | }; |
341 | 352 | ||
342 | 353 | ||
343 | bool LauncherView::bsy=FALSE; | 354 | bool LauncherView::bsy=FALSE; |
344 | 355 | ||
345 | void LauncherView::setBusy(bool on) | 356 | void LauncherView::setBusy(bool on) |
346 | { | 357 | { |
347 | icons->setBusy(on); | 358 | icons->setBusy(on); |
348 | } | 359 | } |
349 | 360 | ||
350 | class LauncherItem : public QIconViewItem | 361 | class LauncherItem : public QIconViewItem |
351 | { | 362 | { |
@@ -904,12 +915,20 @@ void LauncherView::setFileSystems(const QList<FileSystem> &) | |||
904 | 915 | ||
905 | void LauncherView::paletteChange( const QPalette &p ) | 916 | void LauncherView::paletteChange( const QPalette &p ) |
906 | { | 917 | { |
907 | icons->unsetPalette(); | 918 | icons->unsetPalette(); |
908 | QVBox::paletteChange( p ); | 919 | QVBox::paletteChange( p ); |
909 | if ( bgType == Ruled ) | 920 | if ( bgType == Ruled ) |
910 | setBackgroundType( Ruled, QString::null ); | 921 | setBackgroundType( Ruled, QString::null ); |
911 | QColorGroup cg = icons->colorGroup(); | 922 | QColorGroup cg = icons->colorGroup(); |
912 | cg.setColor( QColorGroup::Text, textCol ); | 923 | cg.setColor( QColorGroup::Text, textCol ); |
913 | icons->setPalette( QPalette(cg,cg,cg) ); | 924 | icons->setPalette( QPalette(cg,cg,cg) ); |
914 | } | 925 | } |
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 | |||
@@ -56,24 +56,26 @@ public: | |||
56 | void setViewMode( ViewMode m ); | 56 | void setViewMode( ViewMode m ); |
57 | ViewMode viewMode() const { return vmode; } | 57 | ViewMode viewMode() const { return vmode; } |
58 | 58 | ||
59 | enum BackgroundType { Ruled, SolidColor, Image }; | 59 | enum BackgroundType { Ruled, SolidColor, Image }; |
60 | void setBackgroundType( BackgroundType t, const QString & ); | 60 | void setBackgroundType( BackgroundType t, const QString & ); |
61 | BackgroundType backgroundType() const { return bgType; } | 61 | BackgroundType backgroundType() const { return bgType; } |
62 | 62 | ||
63 | void setTextColor( const QColor & ); | 63 | void setTextColor( const QColor & ); |
64 | QColor textColor() const { return textCol; } | 64 | QColor textColor() const { return textCol; } |
65 | 65 | ||
66 | void setViewFont( const QFont & ); | 66 | void setViewFont( const QFont & ); |
67 | 67 | ||
68 | void setBusyIndicatorType ( const QString &type ); | ||
69 | |||
68 | public slots: | 70 | public slots: |
69 | void populate( AppLnkSet *folder, const QString& categoryfilter ); | 71 | void populate( AppLnkSet *folder, const QString& categoryfilter ); |
70 | 72 | ||
71 | signals: | 73 | signals: |
72 | void clicked( const AppLnk * ); | 74 | void clicked( const AppLnk * ); |
73 | void rightPressed( AppLnk * ); | 75 | void rightPressed( AppLnk * ); |
74 | 76 | ||
75 | protected slots: | 77 | protected slots: |
76 | void selectionChanged(); | 78 | void selectionChanged(); |
77 | void returnPressed( QIconViewItem *item ); | 79 | void returnPressed( QIconViewItem *item ); |
78 | void itemClicked( int, QIconViewItem * ); | 80 | void itemClicked( int, QIconViewItem * ); |
79 | void itemPressed( int, QIconViewItem * ); | 81 | void itemPressed( int, QIconViewItem * ); |
@@ -88,15 +90,16 @@ protected: | |||
88 | 90 | ||
89 | private: | 91 | private: |
90 | static bool bsy; | 92 | static bool bsy; |
91 | QWidget* tools; | 93 | QWidget* tools; |
92 | LauncherIconView* icons; | 94 | LauncherIconView* icons; |
93 | QComboBox *typemb; | 95 | QComboBox *typemb; |
94 | QStringList typelist; | 96 | QStringList typelist; |
95 | CategorySelect *catmb; | 97 | CategorySelect *catmb; |
96 | ViewMode vmode; | 98 | ViewMode vmode; |
97 | BackgroundType bgType; | 99 | BackgroundType bgType; |
98 | QString bgName; | 100 | QString bgName; |
99 | QColor textCol; | 101 | QColor textCol; |
102 | int busyType; | ||
100 | }; | 103 | }; |
101 | 104 | ||
102 | #endif // LAUNCHERVIEW_H | 105 | #endif // LAUNCHERVIEW_H |