summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/oticker.cpp4
-rw-r--r--libopie/oticker.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index 9a7044d..4fb5945 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -38,54 +38,54 @@
38#include <qpainter.h> 38#include <qpainter.h>
39#include <qframe.h> 39#include <qframe.h>
40#include <qlayout.h> 40#include <qlayout.h>
41#include <qdir.h> 41#include <qdir.h>
42#include <stdlib.h> 42#include <stdlib.h>
43#include <stdio.h> 43#include <stdio.h>
44 44
45#include "oticker.h" 45#include "oticker.h"
46 46
47OTicker::OTicker( QWidget* parent ) 47OTicker::OTicker( QWidget* parent )
48 : QLabel( parent ) { 48 : QLabel( parent ) {
49 // : QFrame( parent ) { 49 // : QFrame( parent ) {
50 setTextFormat(Qt::RichText); 50 setTextFormat(Qt::RichText);
51 Config cfg("qpe"); 51 Config cfg("qpe");
52 cfg.setGroup("Appearance"); 52 cfg.setGroup("Appearance");
53 backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) ); 53 backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) );
54 foregroundcolor= Qt::black; 54 foregroundcolor= Qt::black;
55 updateTimerTime = 50; 55 updateTimerTime = 50;
56 scrollLength = 1; 56 scrollLength = 1;
57} 57}
58 58
59OTicker::~OTicker() { 59OTicker::~OTicker() {
60} 60}
61 61
62void OTicker::setBackgroundColor(QColor backcolor) { 62void OTicker::setBackgroundColor(const QColor& backcolor) {
63 backgroundcolor = backcolor; 63 backgroundcolor = backcolor;
64 update(); 64 update();
65} 65}
66 66
67void OTicker::setForegroundColor(QColor backcolor) { 67void OTicker::setForegroundColor(const QColor& backcolor) {
68 foregroundcolor = backcolor; 68 foregroundcolor = backcolor;
69 update(); 69 update();
70} 70}
71 71
72void OTicker::setFrame(int frameStyle) { 72void OTicker::setFrame(int frameStyle) {
73 setFrameStyle( frameStyle/*WinPanel | Sunken */); 73 setFrameStyle( frameStyle/*WinPanel | Sunken */);
74 update(); 74 update();
75} 75}
76 76
77void OTicker::setText( const QString& text ) { 77void OTicker::setText( const QString& text ) {
78 pos = 0; // reset it everytime the text is changed 78 pos = 0; // reset it everytime the text is changed
79 scrollText = text; 79 scrollText = text;
80qDebug(scrollText); 80qDebug(scrollText);
81 81
82 int pixelLen = 0; 82 int pixelLen = 0;
83 bool bigger = false; 83 bool bigger = false;
84 int contWidth = contentsRect().width(); 84 int contWidth = contentsRect().width();
85 int contHeight = contentsRect().height(); 85 int contHeight = contentsRect().height();
86 int pixelTextLen = fontMetrics().width( text ); 86 int pixelTextLen = fontMetrics().width( text );
87 printf("<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length()); 87 printf("<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length());
88 if( pixelTextLen < contWidth) 88 if( pixelTextLen < contWidth)
89 { 89 {
90 pixelLen = contWidth; 90 pixelLen = contWidth;
91 } 91 }
diff --git a/libopie/oticker.h b/libopie/oticker.h
index c52e317..0b88919 100644
--- a/libopie/oticker.h
+++ b/libopie/oticker.h
@@ -57,58 +57,56 @@ public:
57 * 57 *
58 * @param parent Pointer to parent of this control. 58 * @param parent Pointer to parent of this control.
59 59
60 * Constructs a new OTicker control with parent 60 * Constructs a new OTicker control with parent
61 */ 61 */
62 OTicker( QWidget* parent=0 ); 62 OTicker( QWidget* parent=0 );
63/*! 63/*!
64 * @fn ~OTicker() 64 * @fn ~OTicker()
65 * @brief Object destructor. 65 * @brief Object destructor.
66 */ 66 */
67 ~OTicker(); 67 ~OTicker();
68/*! 68/*!
69 * @fn setText(const QString& ) 69 * @fn setText(const QString& )
70 * @brief sets text to be displayed 70 * @brief sets text to be displayed
71 * @param text QString text to be displayed. 71 * @param text QString text to be displayed.
72 * 72 *
73 */ 73 */
74 void setText( const QString& text ) ; 74 void setText( const QString& text ) ;
75/*! 75/*!
76 * @fn setBackgroundColor(QColor color) 76 * @fn setBackgroundColor(QColor color)
77 * @brief sets color of the ticker's background 77 * @brief sets color of the ticker's background
78 * @param color QColor color to be set. 78 * @param color QColor color to be set.
79 * 79 *
80 */ 80 */
81 //FIXME const QColor& please -zecke 81 void setBackgroundColor(const QColor& color);
82 void setBackgroundColor(QColor color);
83/*! 82/*!
84 * @fn setForegroundColor(QColor color) 83 * @fn setForegroundColor(QColor color)
85 * @brief sets color of text 84 * @brief sets color of text
86 * @param color QColor color of text 85 * @param color QColor color of text
87 * 86 *
88 */ 87 */
89 // FIXME const QColor& please -zecke 88 void setForegroundColor(const QColor& color);
90 void setForegroundColor(QColor color);
91/*! 89/*!
92 * @fn setFrame(int style) 90 * @fn setFrame(int style)
93 * @brief sets frame style 91 * @brief sets frame style
94 * @param style int Frame style to be see. See Qt::WidgetFlags. 92 * @param style int Frame style to be see. See Qt::WidgetFlags.
95 * 93 *
96 */ 94 */
97 void setFrame(int style); 95 void setFrame(int style);
98/*! 96/*!
99 * @fn setUpdateTime(int timeout) 97 * @fn setUpdateTime(int timeout)
100 * @brief sets time of update 98 * @brief sets time of update
101 * @param timeout int time in milliseconds between updates. 99 * @param timeout int time in milliseconds between updates.
102 * 100 *
103 */ 101 */
104 void setUpdateTime(int timeout); 102 void setUpdateTime(int timeout);
105/*! 103/*!
106 * @fn setScrollLength(int length) 104 * @fn setScrollLength(int length)
107 * @brief sets amount of scrolling default is 1 105 * @brief sets amount of scrolling default is 1
108 * @param length int scroll length. 106 * @param length int scroll length.
109 * 107 *
110 */ 108 */
111 void setScrollLength(int length); 109 void setScrollLength(int length);
112signals: 110signals:
113/*! 111/*!
114 * @fn mousePressed() 112 * @fn mousePressed()