author | mickeyl <mickeyl> | 2004-02-21 12:25:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-21 12:25:50 (UTC) |
commit | 6155f1be5c19fc51a4929c9e173f9e5a24d193e6 (patch) (unidiff) | |
tree | c18ca863f82a559c60728f922519ac696387ec53 /libopie2/opieui | |
parent | a570c2824fcecaf1c278e1b5a592fa14cc0647f8 (diff) | |
download | opie-6155f1be5c19fc51a4929c9e173f9e5a24d193e6.zip opie-6155f1be5c19fc51a4929c9e173f9e5a24d193e6.tar.gz opie-6155f1be5c19fc51a4929c9e173f9e5a24d193e6.tar.bz2 |
the usual cosmetics
-rw-r--r-- | libopie2/opieui/otabwidget.h | 14 | ||||
-rw-r--r-- | libopie2/opieui/owait.cpp | 91 | ||||
-rw-r--r-- | libopie2/opieui/owait.h | 67 |
3 files changed, 98 insertions, 74 deletions
diff --git a/libopie2/opieui/otabwidget.h b/libopie2/opieui/otabwidget.h index 51d1c6d..c7d32c2 100644 --- a/libopie2/opieui/otabwidget.h +++ b/libopie2/opieui/otabwidget.h | |||
@@ -1,10 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | Copyright (C) 2002 Dan Williams <williamsdr@acm.org> | |
4 | Copyright (c) 2002 Dan Williams <williamsdr@acm.org> | ||
5 | =. | 4 | =. |
6 | .=l. | 5 | .=l. |
7 | .>+-= | 6 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
@@ -66,14 +65,14 @@ class OTabBar; | |||
66 | * children into it, set up geometry management for it, and use addTab() | 65 | * children into it, set up geometry management for it, and use addTab() |
67 | * to add the widget. | 66 | * to add the widget. |
68 | */ | 67 | */ |
69 | class OTabWidget : public QWidget | 68 | class OTabWidget : public QWidget |
70 | { | 69 | { |
71 | Q_OBJECT | 70 | Q_OBJECT |
72 | public: | 71 | |
73 | 72 | public: | |
74 | /** | 73 | /** |
75 | * @enum TabStyle | 74 | * @enum TabStyle |
76 | * @brief Defines how the widget selection control is displayed. | 75 | * @brief Defines how the widget selection control is displayed. |
77 | * | 76 | * |
78 | * Valid values: | 77 | * Valid values: |
79 | * - Global: use globally selected options (qpe.conf - TabStyle & TabPosition) | 78 | * - Global: use globally selected options (qpe.conf - TabStyle & TabPosition) |
@@ -104,13 +103,12 @@ public: | |||
104 | * @param s Style of widget selection control. | 103 | * @param s Style of widget selection control. |
105 | * @param p Position of the widget selection control. | 104 | * @param p Position of the widget selection control. |
106 | * | 105 | * |
107 | * Constructs a new OTabWidget control with parent and name. The style and position parameters | 106 | * Constructs a new OTabWidget control with parent and name. The style and position parameters |
108 | * determine how the widget selection control will be displayed. | 107 | * determine how the widget selection control will be displayed. |
109 | */ | 108 | */ |
110 | // FIXME WFlags? -zecke | ||
111 | OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top ); | 109 | OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top ); |
112 | 110 | ||
113 | /** | 111 | /** |
114 | * @fn ~OTabWidget() | 112 | * @fn ~OTabWidget() |
115 | * @brief Object destructor. | 113 | * @brief Object destructor. |
116 | */ | 114 | */ |
@@ -259,22 +257,22 @@ private: | |||
259 | * @fn setUpLayout() | 257 | * @fn setUpLayout() |
260 | * @brief Internal function to adjust layout. | 258 | * @brief Internal function to adjust layout. |
261 | */ | 259 | */ |
262 | void setUpLayout(); | 260 | void setUpLayout(); |
263 | 261 | ||
264 | 262 | ||
265 | signals: | 263 | signals: |
266 | /** | 264 | /** |
267 | * @fn currentChanegd( QWidget *widget ) | 265 | * @fn currentChanegd( QWidget *widget ) |
268 | * @brief This signal is emitted whenever the widget has changed. | 266 | * @brief This signal is emitted whenever the widget has changed. |
269 | * | 267 | * |
270 | * @param widget Pointer to new current widget. | 268 | * @param widget Pointer to new current widget. |
271 | */ | 269 | */ |
272 | void currentChanged( QWidget * ); | 270 | void currentChanged( QWidget * ); |
273 | 271 | ||
274 | private slots: | 272 | private slots: |
275 | 273 | ||
276 | /** | 274 | /** |
277 | * @fn slotTabBarSelected( int id ) | 275 | * @fn slotTabBarSelected( int id ) |
278 | * @brief Slot which is called when a tab is selected. | 276 | * @brief Slot which is called when a tab is selected. |
279 | * | 277 | * |
280 | * @param id ID of widget selected. | 278 | * @param id ID of widget selected. |
diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp index 0fdf08d..8bb4ed6 100644 --- a/libopie2/opieui/owait.cpp +++ b/libopie2/opieui/owait.cpp | |||
@@ -1,51 +1,63 @@ | |||
1 | /* This file is part of the OPIE libraries | 1 | /* |
2 | Copyright (C) 2003 Maximilian Reiss (harlekin@handhelds.org) | 2 | This file is part of the Opie Project |
3 | 3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | |
4 | This library is free software; you can redistribute it and/or | 4 | =. |
5 | modify it under the terms of the GNU Library General Public | 5 | .=l. |
6 | License as published by the Free Software Foundation; either | 6 | .>+-= |
7 | version 2 of the License, or (at your option) any later version. | 7 | _;:, .> :=|. This program is free software; you can |
8 | 8 | .> <`_, > . <= redistribute it and/or modify it under | |
9 | This library is distributed in the hope that it will be useful, | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | Library General Public License for more details. | 12 | ._= =} : or (at your option) any later version. |
13 | 13 | .%`+i> _;_. | |
14 | You should have received a copy of the GNU Library General Public License | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | : .. .:, . . . without even the implied warranty of |
17 | Boston, MA 02111-1307, USA. | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | */ | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | ||
20 | ++= -. .` .: details. | ||
21 | : = ...= . :.=- | ||
22 | -. .:....=;==+<; You should have received a copy of the GNU | ||
23 | -_. . . )=. = Library General Public License along with | ||
24 | -- :-=` this library; see the file COPYING.LIB. | ||
25 | If not, write to the Free Software Foundation, | ||
26 | Inc., 59 Temple Place - Suite 330, | ||
27 | Boston, MA 02111-1307, USA. | ||
19 | 28 | ||
20 | #include <qlabel.h> | 29 | */ |
21 | #include <qlayout.h> | ||
22 | #include <qtimer.h> | ||
23 | #include <qpe/qpeapplication.h> | ||
24 | #include <qpainter.h> | ||
25 | 30 | ||
26 | #include "owait.h" | 31 | #include "owait.h" |
27 | 32 | ||
33 | /* OPIE */ | ||
34 | #include <qpe/qpeapplication.h> | ||
28 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
29 | 36 | ||
37 | /* QT */ | ||
38 | #include <qlayout.h> | ||
39 | #include <qpainter.h> | ||
40 | |||
30 | static int frame = 0; | 41 | static int frame = 0; |
31 | 42 | ||
32 | /** | 43 | /** |
33 | * This will construct a modal dialog. | 44 | * This will construct a modal dialog. |
34 | * | 45 | * |
35 | * The default timer length is 10. | 46 | * The default timer length is 10. |
36 | * | 47 | * |
37 | * @param parent The parent of the widget | 48 | * @param parent The parent of the widget |
38 | * @param msg The name of the object | 49 | * @param msg The name of the object |
39 | * @param dispIcon Display Icon? | 50 | * @param dispIcon Display Icon? |
40 | */ | 51 | */ |
41 | OWait::OWait(QWidget *parent, const char* msg, bool dispIcon ) | 52 | OWait::OWait( QWidget *parent, const char* msg, bool dispIcon ) |
42 | :QDialog(parent, msg, TRUE,WStyle_Customize) { | 53 | :QDialog( parent, msg, TRUE, WStyle_Customize ) |
54 | { | ||
43 | 55 | ||
44 | 56 | ||
45 | QHBoxLayout *hbox = new QHBoxLayout( this ); | 57 | QHBoxLayout * hbox = new QHBoxLayout( this ); |
46 | 58 | ||
47 | m_lb = new QLabel( this ); | 59 | m_lb = new QLabel( this ); |
48 | m_lb->setBackgroundMode ( NoBackground ); | 60 | m_lb->setBackgroundMode ( NoBackground ); |
49 | 61 | ||
50 | hbox->addWidget( m_lb ); | 62 | hbox->addWidget( m_lb ); |
51 | hbox->activate(); | 63 | hbox->activate(); |
@@ -57,37 +69,42 @@ OWait::OWait(QWidget *parent, const char* msg, bool dispIcon ) | |||
57 | m_timerLength = 10; | 69 | m_timerLength = 10; |
58 | 70 | ||
59 | m_waitTimer = new QTimer( this ); | 71 | m_waitTimer = new QTimer( this ); |
60 | connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) ); | 72 | connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) ); |
61 | } | 73 | } |
62 | 74 | ||
63 | void OWait::timerEvent( QTimerEvent * ) { | 75 | void OWait::timerEvent( QTimerEvent * ) |
64 | frame = (++frame) % 4; | 76 | { |
77 | frame = ( ++frame ) % 4; | ||
65 | repaint(); | 78 | repaint(); |
66 | } | 79 | } |
67 | 80 | ||
68 | void OWait::paintEvent( QPaintEvent * ) { | 81 | void OWait::paintEvent( QPaintEvent * ) |
69 | QPainter p( m_lb ); | 82 | { |
70 | p.drawPixmap( 0, 0, m_pix, m_aniSize * frame, 0, m_aniSize, m_aniSize ); | 83 | QPainter p( m_lb ); |
84 | p.drawPixmap( 0, 0, m_pix, m_aniSize * frame, 0, m_aniSize, m_aniSize ); | ||
71 | } | 85 | } |
72 | 86 | ||
73 | void OWait::show() { | 87 | void OWait::show() |
88 | { | ||
74 | 89 | ||
75 | move( ( ( qApp->desktop()->width() ) / 2 ) - ( m_aniSize / 2 ), ( ( qApp->desktop()->height() ) / 2 ) - ( m_aniSize / 2 ) ); | 90 | move( ( ( qApp->desktop() ->width() ) / 2 ) - ( m_aniSize / 2 ), ( ( qApp->desktop() ->height() ) / 2 ) - ( m_aniSize / 2 ) ); |
76 | startTimer( 300 ); | 91 | startTimer( 300 ); |
77 | m_waitTimer->start( m_timerLength * 1000, true ); | 92 | m_waitTimer->start( m_timerLength * 1000, true ); |
78 | QDialog::show(); | 93 | QDialog::show(); |
79 | } | 94 | } |
80 | 95 | ||
81 | void OWait::hide() { | 96 | void OWait::hide() |
97 | { | ||
82 | killTimers(); | 98 | killTimers(); |
83 | m_waitTimer->stop(); | 99 | m_waitTimer->stop(); |
84 | frame = 0; | 100 | frame = 0; |
85 | QDialog::hide(); | 101 | QDialog::hide(); |
86 | } | 102 | } |
87 | 103 | ||
88 | void OWait::setTimerLength( int length ) { | 104 | void OWait::setTimerLength( int length ) |
105 | { | ||
89 | m_timerLength = length; | 106 | m_timerLength = length; |
90 | } | 107 | } |
91 | 108 | ||
92 | OWait::~OWait() { | 109 | OWait::~OWait() |
93 | } | 110 | {} |
diff --git a/libopie2/opieui/owait.h b/libopie2/opieui/owait.h index cbfc8d6..3267064 100644 --- a/libopie2/opieui/owait.h +++ b/libopie2/opieui/owait.h | |||
@@ -1,49 +1,58 @@ | |||
1 | /* This file is part of the OPIE libraries | 1 | /* |
2 | Copyright (C) 2003 Maximilian Reiss (harlekin@handhelds.org) | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | ||
4 | =. | ||
5 | .=l. | ||
6 | .>+-= | ||
7 | _;:, .> :=|. This program is free software; you can | ||
8 | .> <`_, > . <= redistribute it and/or modify it under | ||
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | ||
10 | .="- .-=="i, .._ License as published by the Free Software | ||
11 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
12 | ._= =} : or (at your option) any later version. | ||
13 | .%`+i> _;_. | ||
14 | .i_,=:_. -<s. This program is distributed in the hope that | ||
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
16 | : .. .:, . . . without even the implied warranty of | ||
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
19 | ..}^=.= = ; Library General Public License for more | ||
20 | ++= -. .` .: details. | ||
21 | : = ...= . :.=- | ||
22 | -. .:....=;==+<; You should have received a copy of the GNU | ||
23 | -_. . . )=. = Library General Public License along with | ||
24 | -- :-=` this library; see the file COPYING.LIB. | ||
25 | If not, write to the Free Software Foundation, | ||
26 | Inc., 59 Temple Place - Suite 330, | ||
27 | Boston, MA 02111-1307, USA. | ||
3 | 28 | ||
4 | This library is free software; you can redistribute it and/or | ||
5 | modify it under the terms of the GNU Library General Public | ||
6 | License as published by the Free Software Foundation; either | ||
7 | version 2 of the License, or (at your option) any later version. | ||
8 | |||
9 | This library is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | Library General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU Library General Public License | ||
15 | along with this library; see the file COPYING.LIB. If not, write to | ||
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | Boston, MA 02111-1307, USA. | ||
18 | */ | 29 | */ |
19 | 30 | ||
31 | #ifndef OWAIT_H | ||
32 | #define OWAIT_H | ||
20 | 33 | ||
21 | 34 | /* QT */ | |
22 | #ifndef WAITPOPUP_H | ||
23 | #define WAITPOPUP_H | ||
24 | |||
25 | #include <qdialog.h> | 35 | #include <qdialog.h> |
26 | #include <qpixmap.h> | ||
27 | #include <qlabel.h> | 36 | #include <qlabel.h> |
37 | #include <qpixmap.h> | ||
28 | #include <qtimer.h> | 38 | #include <qtimer.h> |
29 | 39 | ||
30 | /** | 40 | /** |
31 | * This class displays a animated waiting icon in the middle of the screen. | 41 | * This class displays a animated waiting icon in the middle of the screen. |
32 | * | 42 | * |
33 | * @short modal hour glass dialog | 43 | * @short modal hour glass dialog |
34 | * @see QDialog | 44 | * @see QDialog |
35 | * @author Maximilian Reiß | 45 | * @author Maximilian Reiß |
36 | */ | 46 | */ |
37 | class OWait : public QDialog { | 47 | class OWait : public QDialog |
38 | 48 | { | |
39 | Q_OBJECT | 49 | Q_OBJECT |
40 | 50 | ||
41 | public: | 51 | public: |
42 | // FIXME Wflags -zecke? | 52 | OWait( QWidget *parent = 0, const char* name = 0, bool dispIcon = TRUE ); |
43 | OWait(QWidget *parent=0,const char* name=0, bool dispIcon=TRUE); | ||
44 | ~OWait(); | 53 | ~OWait(); |
45 | 54 | ||
46 | /** | 55 | /** |
47 | * reimplemented for control reasons | 56 | * reimplemented for control reasons |
48 | */ | 57 | */ |
49 | void show(); | 58 | void show(); |
@@ -52,20 +61,20 @@ public: | |||
52 | * Set the time before the icon will be automaticly hidden | 61 | * Set the time before the icon will be automaticly hidden |
53 | * The timer will be started once the widget will be shown. | 62 | * The timer will be started once the widget will be shown. |
54 | * @param length - time in seconds | 63 | * @param length - time in seconds |
55 | */ | 64 | */ |
56 | void setTimerLength( int length ); | 65 | void setTimerLength( int length ); |
57 | 66 | ||
58 | public slots: | 67 | public slots: |
59 | /** | 68 | /** |
60 | * reimplemented for control reasons | 69 | * reimplemented for control reasons |
61 | */ | 70 | */ |
62 | void hide(); | 71 | void hide(); |
63 | 72 | ||
64 | private: | 73 | private: |
65 | void timerEvent( QTimerEvent * ) ; | 74 | void timerEvent( QTimerEvent * ); |
66 | void paintEvent( QPaintEvent * ); | 75 | void paintEvent( QPaintEvent * ); |
67 | 76 | ||
68 | QPixmap m_pix; | 77 | QPixmap m_pix; |
69 | QLabel *m_lb; | 78 | QLabel *m_lb; |
70 | QTimer *m_waitTimer; | 79 | QTimer *m_waitTimer; |
71 | int m_timerLength; | 80 | int m_timerLength; |