author | harlekin <harlekin> | 2002-02-15 16:58:37 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-15 16:58:37 (UTC) |
commit | 379e66393a2986e218baad0e585c1b4a0dd7d045 (patch) (side-by-side diff) | |
tree | f274d64cd949fd894adcc4795d7e78aed40db76d /core/pim | |
parent | bca491b8fbb2fe73abcf66c67ca0cd36099a714c (diff) | |
download | opie-379e66393a2986e218baad0e585c1b4a0dd7d045.zip opie-379e66393a2986e218baad0e585c1b4a0dd7d045.tar.gz opie-379e66393a2986e218baad0e585c1b4a0dd7d045.tar.bz2 |
brown paperbag release
-rw-r--r-- | core/pim/today/today.h | 22 | ||||
-rw-r--r-- | core/pim/today/today.pro | 10 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 53 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 5 |
4 files changed, 12 insertions, 78 deletions
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index a85917a..50a10f1 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -14,30 +14,13 @@ * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ -/* - * todaybase.h - * - * --------------------- - * - * begin : Sun 10 17:20:00 CEST 2002 - * copyright : (c) 2002 by Maximilian Reiß - * email : max.reiss@gmx.de - * - */ -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + #ifndef TODAY_H #define TODAY_H #include "todaybase.h" #include <qpe/datebookdb.h> @@ -53,13 +36,12 @@ class Today : public TodayBase public: Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Today(); private slots: void startConfig(); - void goodBye(); void startTodo(); void startDatebook(); private: void init(); void getDates(); @@ -71,11 +53,9 @@ class Today : public TodayBase //Config cfg; int MAX_LINES_TASK; int MAX_CHAR_CLIP; int MAX_LINES_MEET; int SHOW_LOCATION; int SHOW_NOTES; - - }; #endif // TODAY_H diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro new file mode 100644 index 0000000..d8efe5a --- a/dev/null +++ b/core/pim/today/today.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +#CONFIG = qt warn_on debug +CONFIG = qt warn_on release +HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h +SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp +INCLUDEPATH += $(QPEDIR)/include +DEPENDPATH += $(QPEDIR)/include +LIBS += -lqpe +INTERFACES = +TARGET = today diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index f61840b..a44f598 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -47,13 +47,12 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // config icon QPixmap config = Resource::loadPixmap( "today/config" ); if ( !name ) setName( "TodayBase" ); resize( 223, 307 ); - //setCaption( tr( "My Test App" ) ); Frame4 = new QFrame( this, "Frame4" ); Frame4->setGeometry( QRect( -9, 50, 250, 150 ) ); Frame4->setFrameShape( QScrollView::StyledPanel ); Frame4->setFrameShadow( QScrollView::Sunken ); Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); @@ -65,41 +64,23 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) DatesButton = new QPushButton (Frame4, "DatesButton" ); DatesButton->setGeometry( QRect( 10, 10, 36, 32 ) ); DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); DatesButton->setPixmap( datebook ); DatesButton->setFlat( TRUE ); - - //PixmapLabel7 = new QLabel( Frame4, "PixmapLabel7" ); - //PixmapLabel7->setGeometry( QRect( 10, 10, 36, 32 ) ); - //PixmapLabel7->setPixmap( datebook ); - //PixmapLabel7->setScaledContents( FALSE ); - DatesField = new QLabel( Frame4, "DatesField" ); DatesField->setGeometry( QRect( 47, 10, 203, 120 ) ); DatesField->setText( tr( "No appointments today" ) ); DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); Frame = new QLabel( this, "Frame" ); Frame->setGeometry( QRect( 0, 0, 240, 50 ) ); QPalette pal; QColorGroup cg; - //cg.setColor( QColorGroup::Foreground, white ); - // cg.setColor( QColorGroup::Button, QColor( 238, 234, 222) ); - //cg.setColor( QColorGroup::Light, white ); - //cg.setColor( QColorGroup::Midlight, QColor( 246, 244, 238) ); - // cg.setColor( QColorGroup::Dark, QColor( 119, 117, 111) ); - //cg.setColor( QColorGroup::Mid, QColor( 158, 155, 147) ); cg.setColor( QColorGroup::Text, white ); - //cg.setColor( QColorGroup::BrightText, white ); - //cg.setColor( QColorGroup::ButtonText, black ); - //cg.setColor( QColorGroup::Base, white ); cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); - //cg.setColor( QColorGroup::Shadow, black ); - //cg.setColor( QColorGroup::Highlight, QColor( 74, 121, 205) ); - //cg.setColor( QColorGroup::HighlightedText, white ); pal.setActive( cg ); Frame->setPalette( pal ); Frame->setFrameShape( QFrame::StyledPanel ); Frame->setFrameShadow( QFrame::Raised ); Frame->setLineWidth( 0 ); @@ -109,38 +90,19 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) TextLabel1->setPalette( pal ); TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); QFont TextLabel1_font( TextLabel1->font() ); TextLabel1_font.setBold( TRUE ); TextLabel1->setFont( TextLabel1_font ); TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); - //TextLabel1->setText( tr( "" ) ); TextLabel1->setTextFormat( QLabel::AutoText ); - //QToolTip::add( TextLabel1, tr( "Test" ) ); - - // todo Frame15 = new QFrame( this, "Frame15" ); Frame15->setGeometry( QRect( -9, 200, 250, 130 ) ); Frame15->setFrameShape( QFrame::StyledPanel ); Frame15->setFrameShadow( QFrame::Sunken ); - //Frame15->setBackgroundMode( PaletteBase ); - //Frame15->setBackgroundMode( PaletteBackground ); - - - // PixmapLabel1 = new QLabel( Frame15, "PixmapLabel1" ); - //PixmapLabel1->setGeometry( QRect( 10, 4, 36, 32 ) ); - //PixmapLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); - //PixmapLabel1->setPixmap( todo ); - //PixmapLabel1->setScaledContents( FALSE ); - - - TodoField = new QLabel( Frame15, "TodoButtonBack" ); - TodoField->setGeometry( QRect( 10, 4, 36, 32 ) ); - TodoField->setFrameShadow( QLabel::Plain ); - TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); TodoButton = new QPushButton (Frame15, "TodoButton" ); TodoButton->setGeometry( QRect( 10, 4, 36, 32 ) ); TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); TodoButton->setPixmap( todo ); TodoButton->setFlat( TRUE ); @@ -164,21 +126,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) */ TodayBase::~TodayBase() { // no need to delete child widgets, Qt does it all for us } -/* - * Main event handler. Reimplemented to handle application - * font changes - */ -bool TodayBase::event( QEvent* ev ) -{ - bool ret = QWidget::event( ev ); - //if ( ev->type() == QEvent::ApplicationFontChange ) { - // QFont TextLabel1_font( TextLabel1->font() ); - // TextLabel1_font.setBold( TRUE ); - // TextLabel1->setFont( TextLabel1_font ); - // } - return ret; -} - diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index 65d31de..947efc5 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h @@ -27,23 +27,20 @@ class TodayBase : public QWidget public: TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~TodayBase(); QFrame* Frame4; QPushButton* DatesButton; - //QLabel* PixmapLabel7; QLabel* DatesField; QFrame* Frame; QLabel* TextLabel1; QFrame* Frame15; - //QLabel* PixmapLabel1; QLabel* TodoField; QPushButton* PushButton1; QPushButton* TodoButton; - QLabel* todoback; QPushButton* getridoffuckingstrippeldlinesbutton; protected: - bool event( QEvent* ); + }; #endif // TODAYBASE_H |