author | mickeyl <mickeyl> | 2004-03-02 16:47:24 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-02 16:47:24 (UTC) |
commit | 1b5a068f8532a63906f710787cd65e12f4e1fea7 (patch) (unidiff) | |
tree | e4b90e213dd20e227a87dc904b7610f9570af113 /libqtaux | |
parent | 42008f6bc88cde6d0ed49187e4c2df14f178d1c0 (diff) | |
download | opie-1b5a068f8532a63906f710787cd65e12f4e1fea7.zip opie-1b5a068f8532a63906f710787cd65e12f4e1fea7.tar.gz opie-1b5a068f8532a63906f710787cd65e12f4e1fea7.tar.bz2 |
reorder includes, printf-->qdebug, reformat source
-rw-r--r-- | libqtaux/oticker.cpp | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp index c05c2a8..2d8397e 100644 --- a/libqtaux/oticker.cpp +++ b/libqtaux/oticker.cpp | |||
@@ -28,16 +28,14 @@ | |||
28 | 28 | ||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qpe/config.h> | ||
32 | |||
33 | #include <stdlib.h> | ||
34 | #include <stdio.h> | ||
35 | |||
36 | #include "oticker.h" | 31 | #include "oticker.h" |
37 | 32 | ||
33 | /* OPIE */ | ||
34 | #include <qpe/config.h> | ||
35 | |||
38 | OTicker::OTicker( QWidget* parent ) | 36 | OTicker::OTicker( QWidget* parent ) |
39 | : QLabel( parent ) { | 37 | : QLabel( parent ) |
40 | // : QFrame( parent ) { | 38 | { |
41 | setTextFormat(Qt::RichText); | 39 | setTextFormat(Qt::RichText); |
42 | Config cfg("qpe"); | 40 | Config cfg("qpe"); |
43 | cfg.setGroup("Appearance"); | 41 | cfg.setGroup("Appearance"); |
@@ -47,25 +45,29 @@ OTicker::OTicker( QWidget* parent ) | |||
47 | scrollLength = 1; | 45 | scrollLength = 1; |
48 | } | 46 | } |
49 | 47 | ||
50 | OTicker::~OTicker() { | 48 | OTicker::~OTicker() |
51 | } | 49 | {} |
52 | 50 | ||
53 | void OTicker::setBackgroundColor(const QColor& backcolor) { | 51 | void OTicker::setBackgroundColor( const QColor& backcolor ) |
52 | { | ||
54 | backgroundcolor = backcolor; | 53 | backgroundcolor = backcolor; |
55 | update(); | 54 | update(); |
56 | } | 55 | } |
57 | 56 | ||
58 | void OTicker::setForegroundColor(const QColor& backcolor) { | 57 | void OTicker::setForegroundColor( const QColor& backcolor ) |
58 | { | ||
59 | foregroundcolor = backcolor; | 59 | foregroundcolor = backcolor; |
60 | update(); | 60 | update(); |
61 | } | 61 | } |
62 | 62 | ||
63 | void OTicker::setFrame(int frameStyle) { | 63 | void OTicker::setFrame( int frameStyle ) |
64 | { | ||
64 | setFrameStyle( frameStyle/*WinPanel | Sunken */); | 65 | setFrameStyle( frameStyle/*WinPanel | Sunken */); |
65 | update(); | 66 | update(); |
66 | } | 67 | } |
67 | 68 | ||
68 | void OTicker::setText( const QString& text ) { | 69 | void OTicker::setText( const QString& text ) |
70 | { | ||
69 | pos = 0; // reset it everytime the text is changed | 71 | pos = 0; // reset it everytime the text is changed |
70 | scrollText = text; | 72 | scrollText = text; |
71 | qDebug(scrollText); | 73 | qDebug(scrollText); |
@@ -75,7 +77,7 @@ qDebug(scrollText); | |||
75 | int contWidth = contentsRect().width(); | 77 | int contWidth = contentsRect().width(); |
76 | int contHeight = contentsRect().height(); | 78 | int contHeight = contentsRect().height(); |
77 | int pixelTextLen = fontMetrics().width( text ); | 79 | int pixelTextLen = fontMetrics().width( text ); |
78 | printf("<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length()); | 80 | qDebug( "<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length() ); |
79 | if( pixelTextLen < contWidth) | 81 | if( pixelTextLen < contWidth) |
80 | { | 82 | { |
81 | pixelLen = contWidth; | 83 | pixelLen = contWidth; |
@@ -103,28 +105,33 @@ qDebug(scrollText); | |||
103 | } | 105 | } |
104 | 106 | ||
105 | 107 | ||
106 | void OTicker::timerEvent( QTimerEvent * ) { | 108 | void OTicker::timerEvent( QTimerEvent * ) |
109 | { | ||
107 | pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength;//1; | 110 | pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength;//1; |
108 | repaint( FALSE ); | 111 | repaint( FALSE ); |
109 | } | 112 | } |
110 | 113 | ||
111 | void OTicker::drawContents( QPainter *p ) { | 114 | void OTicker::drawContents( QPainter *p ) |
115 | { | ||
112 | int pixelLen = scrollTextPixmap.width(); | 116 | int pixelLen = scrollTextPixmap.width(); |
113 | p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap ); | 117 | p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap ); |
114 | if ( pixelLen > contentsRect().width() ) // Scrolling | 118 | if ( pixelLen > contentsRect().width() ) // Scrolling |
115 | p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap ); | 119 | p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap ); |
116 | } | 120 | } |
117 | 121 | ||
118 | void OTicker::mouseReleaseEvent( QMouseEvent * ) { | 122 | void OTicker::mouseReleaseEvent( QMouseEvent * ) |
123 | { | ||
119 | // qDebug("<<<<<<<>>>>>>>>>"); | 124 | // qDebug("<<<<<<<>>>>>>>>>"); |
120 | emit mousePressed(); | 125 | emit mousePressed(); |
121 | } | 126 | } |
122 | 127 | ||
123 | void OTicker::setUpdateTime(int time) { | 128 | void OTicker::setUpdateTime( int time ) |
129 | { | ||
124 | updateTimerTime=time; | 130 | updateTimerTime=time; |
125 | } | 131 | } |
126 | 132 | ||
127 | void OTicker::setScrollLength(int len) { | 133 | void OTicker::setScrollLength( int len ) |
134 | { | ||
128 | scrollLength=len; | 135 | scrollLength=len; |
129 | } | 136 | } |
130 | 137 | ||