summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-04 01:31:07 (UTC)
committer wimpie <wimpie>2005-01-04 01:31:07 (UTC)
commit0f3d74b472817e6b4f9d80adc122281b84629c1f (patch) (side-by-side diff)
tree2016f779dfacb383963b1249b30e76dc33d0491b
parentbe2b938724a08036dd43480f10b7b88174147062 (diff)
downloadopie-0f3d74b472817e6b4f9d80adc122281b84629c1f.zip
opie-0f3d74b472817e6b4f9d80adc122281b84629c1f.tar.gz
opie-0f3d74b472817e6b4f9d80adc122281b84629c1f.tar.bz2
CONTROL file : changed VERSION string
added oledbox widget (like a checkbox but better suitable for visible non editable boolean feedback)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/libopieui2.control2
-rw-r--r--libopie2/opieui/oledbox.cpp277
-rw-r--r--libopie2/opieui/oledbox.h56
-rw-r--r--libopie2/opieui/opieui.pro2
4 files changed, 336 insertions, 1 deletions
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control
index 07dafb9..51cabf7 100644
--- a/libopie2/opieui/libopieui2.control
+++ b/libopie2/opieui/libopieui2.control
@@ -3,8 +3,8 @@ Files: lib/libopieui2.so.*
Priority: optional
Section: opie/system
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Version: 1.8.5-$SUB_VERSION.1
+Version: $QPE_VERSION$EXTRAVERSION
Depends: libqpe1, libopiecore2 (1.8.5)
Provides: libopieui2
Description: Opie library 2.0 UI
diff --git a/libopie2/opieui/oledbox.cpp b/libopie2/opieui/oledbox.cpp
new file mode 100644
index 0000000..52826f1
--- a/dev/null
+++ b/libopie2/opieui/oledbox.cpp
@@ -0,0 +1,277 @@
+
+#include <qbitmap.h>
+#include <qpainter.h>
+
+#include "oledbox.h"
+
+
+#ifdef _QTE_IS_TOO_DUMB_TO_DRAW_AN_ARC
+
+/* XPM */
+static const char * ledborder_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #626562",
+"+ c #7B7D7B",
+"@ c #949594",
+"# c #ACAEAC",
+"$ c #CDCACD",
+"% c #CDCECD",
+"; c #E6E6E6",
+"> c #FFFFFF",
+", c #E6E2E6",
+"' c #FFFAFF",
+" .++@@# ",
+" ...++@@##$ ",
+" .....+@##$$% ",
+" ..... #$%%% ",
+" ... %%; ",
+".... ;;;;",
+"++. ;>>",
+"+++ >>>",
+"@@@ >>>",
+"@@# >>>",
+"#### >>>>",
+" #$$ >>> ",
+" $$,,' >>>>> ",
+" ,,,''>>>>>>> ",
+" ,''>>>>>>> ",
+" '>>>>> "};
+
+
+QPixmap *OLedBox::s_border_pix = 0;
+
+#endif
+
+
+OLedBox::OLedBox ( const QColor &col, QWidget *parent, const char *name ) : QWidget ( parent, name )
+{
+ m_color = col;
+ m_on = false;
+ m_readonly = true;
+
+ m_pix [ 0 ] = m_pix [ 1 ] = 0;
+
+ setBackgroundMode ( PaletteBackground );
+
+#ifdef _QTE_IS_TOO_DUMB_TO_DRAW_AN_ARC
+ if ( !s_border_pix )
+ s_border_pix = new QPixmap ( ledborder_xpm );
+#endif
+}
+
+OLedBox::~OLedBox ( )
+{
+ delete m_pix [ 0 ];
+ delete m_pix [ 1 ];
+}
+
+QSize OLedBox::sizeHint ( ) const
+{
+ return QSize ( 16, 16 );
+}
+
+bool OLedBox::isOn ( ) const
+{
+ return m_on;
+}
+
+QColor OLedBox::color ( ) const
+{
+ return m_color;
+}
+
+void OLedBox::setOn ( bool b )
+{
+ if ( m_on != b ) {
+ m_on = b;
+ update ( );
+ }
+}
+
+void OLedBox::toggle ( )
+{
+ setOn ( !isOn ( ) );
+}
+
+void OLedBox::setColor ( const QColor &col )
+{
+ if ( m_color != col ) {
+ m_color = col;
+
+ delete m_pix [ 0 ];
+ delete m_pix [ 1 ];
+ m_pix[0] = m_pix[1] = 0;
+ update ( );
+ }
+}
+
+void OLedBox::mousePressEvent ( QMouseEvent *e )
+{
+ if ( ! m_readonly &&
+ e-> button ( ) == LeftButton ) {
+ m_on = !m_on;
+ update ( );
+ emit toggled ( m_on );
+ }
+}
+
+
+void OLedBox::resizeEvent ( QResizeEvent * )
+{
+ delete m_pix [ 0 ];
+ delete m_pix [ 1 ];
+ m_pix[0] = m_pix[1] = 0;
+
+ update ( );
+}
+
+void OLedBox::paintEvent ( QPaintEvent *e )
+{
+ int ind = m_on ? 1 : 0;
+
+ if ( !m_pix [ ind ] ) {
+ m_pix [ ind ] = new QPixmap ( size ( ));
+
+ drawLed ( m_pix [ ind ], m_on ? m_color : m_color. dark ( 300 ) );
+ }
+ if ( !e-> erased ( ))
+ erase ( );
+
+ QPainter p ( this );
+ p. drawPixmap ( 0, 0, *m_pix [ ind ] );
+}
+
+// From KDE libkdeui / led.cpp
+
+void OLedBox::drawLed ( QPixmap *pix, const QColor &col ) // paint a ROUND SUNKEN led lamp
+{
+ QPainter paint;
+ QColor color;
+ QBrush brush;
+ QPen pen;
+
+ pix-> fill ( black );
+
+ // First of all we want to know what area should be updated
+ // Initialize coordinates, width, and height of the LED
+ int width = pix-> width ( );
+
+ // Make sure the LED is round!
+ if ( width > pix-> height ( ))
+ width = pix-> height ( );
+ width -= 2; // leave one pixel border
+ if ( width < 0 )
+ width = 0;
+
+ // maybe we could stop HERE, if width <=0 ?
+
+ // start painting widget
+ //
+ paint.begin( pix );
+
+ // Set the color of the LED according to given parameters
+ color = col;
+
+ // Set the brush to SolidPattern, this fills the entire area
+ // of the ellipse which is drawn first
+ brush.setStyle( QBrush::SolidPattern );
+ brush.setColor( color );
+ paint.setBrush( brush ); // Assign the brush to the painter
+
+ // Draws a "flat" LED with the given color:
+ paint.drawEllipse( 1, 1, width, width );
+
+ // Draw the bright light spot of the LED now, using modified "old"
+ // painter routine taken from KDEUIs KLed widget:
+
+ // Setting the new width of the pen is essential to avoid "pixelized"
+ // shadow like it can be observed with the old LED code
+ pen.setWidth( 2 );
+
+ // shrink the light on the LED to a size about 2/3 of the complete LED
+ int pos = width / 5 + 1;
+ int light_width = width;
+ light_width *= 2;
+ light_width /= 3;
+
+ // Calculate the LEDs "light factor":
+ int light_quote = ( 130 * 2 / ( light_width ? light_width : 1 ) ) + 100;
+
+ // Now draw the bright spot on the LED:
+ while ( light_width )
+ {
+ color = color.light( light_quote ); // make color lighter
+ pen.setColor( color ); // set color as pen color
+ paint.setPen( pen ); // select the pen for drawing
+ paint.drawEllipse( pos, pos, light_width, light_width ); // draw the ellipse (circle)
+ light_width--;
+ if ( !light_width )
+ break;
+ paint.drawEllipse( pos, pos, light_width, light_width );
+ light_width--;
+ if ( !light_width )
+ break;
+ paint.drawEllipse( pos, pos, light_width, light_width );
+ pos++;
+ light_width--;
+ }
+
+ // Drawing of bright spot finished, now draw a thin border
+ // around the LED which resembles a shadow with light coming
+ // from the upper left.
+
+#ifdef _QTE_IS_TOO_DUMB_TO_DRAW_AN_ARC
+ paint. drawPixmap ( 0, 0, *s_border_pix );
+ paint. end ( );
+
+ pix-> setMask ( pix-> createHeuristicMask ( ));
+
+#else
+ pen.setWidth( 3 );
+ brush.setStyle( QBrush::NoBrush ); // Switch off the brush
+ paint.setBrush( brush ); // This avoids filling of the ellipse
+
+ // Set the initial color value to 200 (bright) and start
+ // drawing the shadow border at 45 (45*16 = 720).
+ int shadow_color = 200, angle;
+
+ for ( angle = 720; angle < 6480; angle += 240 )
+ {
+ color.setRgb( shadow_color, shadow_color, shadow_color );
+ pen.setColor( color );
+ paint.setPen( pen );
+ paint.drawArc( 0, 0, width+2, width+2, angle, 240 );
+ paint.drawArc( 1, 1, width, width, angle, 240 );
+ paint.drawArc( 2, 2, width-2, width-2, angle, 240 );
+ if ( angle < 2320 ) {
+ shadow_color -= 25; // set color to a darker value
+ if ( shadow_color < 100 )
+ shadow_color = 100;
+ }
+ else if ( ( angle > 2320 ) && ( angle < 5760 ) ) {
+ shadow_color += 25; // set color to a brighter value
+ if ( shadow_color > 255 )
+ shadow_color = 255;
+ }
+ else {
+ shadow_color -= 25; // set color to a darker value again
+ if ( shadow_color < 100 )
+ shadow_color = 100;
+ } // end if ( angle < 2320 )
+ } // end for ( angle = 720; angle < 6480; angle += 160 )
+ paint.end();
+ //
+ // painting done
+
+ QBitmap mask ( pix-> width ( ), pix-> height ( ), true );
+ QPainter mp ( &mask );
+ mp. setPen ( Qt::NoPen );
+ mp. setBrush ( Qt::color1 );
+ mp. drawEllipse ( 0, 0, width + 2, width + 2 );
+ mp. end ( );
+
+ pix-> setMask ( mask );
+#endif
+}
+
diff --git a/libopie2/opieui/oledbox.h b/libopie2/opieui/oledbox.h
new file mode 100644
index 0000000..dd930bd
--- a/dev/null
+++ b/libopie2/opieui/oledbox.h
@@ -0,0 +1,56 @@
+#ifndef __OPIE_OLED_H__
+#define __OPIE_OLED_H__
+
+#include <qwidget.h>
+#include <qcolor.h>
+
+class QPixmap;
+
+#define _QTE_IS_TOO_DUMB_TO_DRAW_AN_ARC
+
+class OLedBox : public QWidget {
+ Q_OBJECT
+
+public:
+ OLedBox ( const QColor &col = red, QWidget *parent = 0, const char *name = 0 );
+ virtual ~OLedBox ( );
+
+ QColor color ( ) const;
+ bool isOn ( ) const;
+ void setReadOnly( bool R )
+ { m_readonly = R; }
+ inline bool readOnly( void ) const
+ { return m_readonly; }
+
+ virtual QSize sizeHint ( ) const;
+
+public slots:
+ void toggle ( );
+ void setOn ( bool on );
+ void setColor ( const QColor &col );
+
+signals:
+ void toggled ( bool );
+
+protected:
+ virtual void paintEvent ( QPaintEvent *e );
+ virtual void resizeEvent ( QResizeEvent *e );
+
+ virtual void mousePressEvent ( QMouseEvent *e );
+
+private:
+ void drawLed ( QPixmap *, const QColor &col );
+
+private:
+ QPixmap *m_pix [2];
+
+ QColor m_color;
+ bool m_on;
+ bool m_readonly;
+
+#ifdef _QTE_IS_TOO_DUMB_TO_DRAW_AN_ARC
+ static QPixmap *s_border_pix;
+#endif
+};
+
+#endif
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 8cae43f..24157a1 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -14,8 +14,9 @@ HEADERS = oclickablelabel.h \
oseparator.h \
otabinfo.h \
otabbar.h \
otabwidget.h \
+ oledbox.h \
otaskbarapplet.h \
otimepicker.h \
oversatileview.h \
oversatileviewitem.h \
@@ -33,8 +34,9 @@ SOURCES = oclickablelabel.cpp \
oselector.cpp \
oseparator.cpp \
otabbar.cpp \
otabwidget.cpp \
+ oledbox.cpp \
otaskbarapplet.cpp \
otimepicker.cpp \
oversatileview.cpp \
oversatileviewitem.cpp \