author | harlekin <harlekin> | 2002-02-21 16:16:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-21 16:16:13 (UTC) |
commit | 4c965fa187f642cb3db4cd32d70a68cfa8c41022 (patch) (side-by-side diff) | |
tree | f1f65a4b0b332b838fef9f0fda95c92dfc93247e | |
parent | 17e96f64d6b66fac5f0e206492149d461e2ad900 (diff) | |
download | opie-4c965fa187f642cb3db4cd32d70a68cfa8c41022.zip opie-4c965fa187f642cb3db4cd32d70a68cfa8c41022.tar.gz opie-4c965fa187f642cb3db4cd32d70a68cfa8c41022.tar.bz2 |
added scrollbars to dates and todo
-rw-r--r-- | core/pim/today/today.cpp | 6 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 165 |
2 files changed, 103 insertions, 68 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index bed3a74..9e5c27e 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -145,17 +145,16 @@ void Today::startConfig() cfg.writeEntry("onlylater", onlylater); // sync it to "disk" cfg.write(); draw(); } - /* * Get all events that are in the datebook xml file for today */ void Today::getDates() { QDate date = QDate::currentDate(); QTime time = QTime::currentTime(); QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); @@ -171,35 +170,34 @@ void Today::getDates() for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) { count++; if ( count <= MAX_LINES_MEET ) { - //only get events past current time (start or end??) //cout << time.toString() << endl; //cout << TimeString::dateString((*it).event().end()) << endl; - // still some bug in here, 1 h off - + // decide if to get all day or only later appointments if (!ONLY_LATER) { msg += "<B>" + (*it).description() + "</B>"; if ( (*it).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } // include location or not if (SHOW_LOCATION == 1) { msg+= "<BR>" + (*it).location(); } msg += "<BR>" + // start time of event + TimeString::timeString(QTime((*it).event().start().time()) ) // end time of event + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) + "<BR>"; // include possible note or not if (SHOW_NOTES == 1) { diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 32b45f7..ff6001a 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -24,134 +24,171 @@ #include <qlayout.h> #include <qvariant.h> #include <qtooltip.h> #include <qwhatsthis.h> #include <qimage.h> #include <qpixmap.h> #include <qscrollview.h> #include <qvbox.h> +#include <qapplication.h> #include <qpe/resource.h> /* * Constructs a TodayBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) : QWidget( parent, name, fl ) { - // logo - QPixmap logo = Resource::loadPixmap( "today/today_logo"); - // datebook - QPixmap datebook = Resource::loadPixmap("DateBook"); - // todo - QPixmap todo = Resource::loadPixmap( "TodoList" ); - // config icon - QPixmap config = Resource::loadPixmap( "today/config" ); - // mail icon - QPixmap mail = Resource::loadPixmap( "today/mail" ); - - - QPalette pal2; - QColorGroup cg; - cg.setColor( QColorGroup::Text, white ); - cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); - pal2.setActive( cg ); - + QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo + QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook + QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo + QPixmap config = Resource::loadPixmap( "today/config" ); // config icon + QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon QPalette pal = this->palette(); QColor col = pal.color(QPalette::Active, QColorGroup::Background); pal.setColor(QPalette::Active, QColorGroup::Button, col); this->setPalette(pal); - QVBoxLayout * layout = new QVBoxLayout(this); + QWidget *d = QApplication::desktop(); + int w=d->width(); + int h=d->height(); + resize( w , h ); // not good, what happens on rotation - Frame4 = new QFrame( this, "Frame4" ); - Frame4->setPalette( pal ); - Frame4->setFrameShape( QScrollView::StyledPanel ); - Frame4->setFrameShadow( QScrollView::Sunken ); - Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); - // hehe, qt is ... - getridoffuckingstrippeldlinesbutton = new QPushButton (Frame4, "asdfsad" ); + getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" ); getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) ); - DatesButton = new QPushButton (Frame4, "DatesButton" ); - DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) ); - DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); - DatesButton->setPalette( pal ); - DatesButton->setPixmap( datebook ); - DatesButton->setFlat( TRUE ); - DatesField = new QLabel( Frame4, "DatesField" ); - DatesField->setGeometry( QRect( 40, 4, 203, 120 ) ); - DatesField->setText( tr( "No appointments today" ) ); - DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + QVBoxLayout * layout = new QVBoxLayout(this); + + + + // --- logo Section --- + QPalette pal2; + QColorGroup cg; + cg.setColor( QColorGroup::Text, white ); + cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); + pal2.setActive( cg ); // today logo Frame = new QLabel( this, "Frame" ); Frame->setPalette( pal2 ); Frame->setFrameShape( QFrame::StyledPanel ); Frame->setFrameShadow( QFrame::Raised ); Frame->setLineWidth( 0 ); Frame->setMaximumHeight(50); Frame->setMinimumHeight(50); - // date TextLabel1 = new QLabel( Frame, "TextLabel1" ); 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->setTextFormat( RichText ); - - // todo - Frame15 = new QFrame( this, "Frame15" ); - Frame15->setFrameShape( QFrame::StyledPanel ); - Frame15->setFrameShadow( QFrame::Sunken ); + + + // --- dates section --- + Frame4 = new QFrame( this, "Frame4" ); + Frame4->setPalette( pal ); + Frame4->setFrameShape( QScrollView::StyledPanel ); + Frame4->setFrameShadow( QScrollView::Sunken ); + Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); + Frame4->setFrameStyle( QFrame::NoFrame ); + Frame4->setGeometry (QRect( 0, 0, this->width() , this->height()) ); - TodoButton = new QPushButton (Frame15, "TodoButton" ); - TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); - TodoButton->setPalette( pal ); - TodoButton->setPixmap( todo ); - TodoButton->setFlat( TRUE ); + QScrollView* sv1 = new QScrollView( Frame4 ); + sv1->setResizePolicy(QScrollView::AutoOneFit); + sv1->setHScrollBarMode( QScrollView::AlwaysOff ); + // need to find a better way!!! + sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) ); + sv1->setFrameShape(QFrame::NoFrame); + + DatesButton = new QPushButton (Frame4, "DatesButton" ); + DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) ); + DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); + DatesButton->setPalette( pal ); + DatesButton->setPixmap( datebook ); + DatesButton->setFlat( TRUE ); - TodoField = new QLabel( Frame15, "TodoField" ); - TodoField->setGeometry( QRect( 40, 4, 196, 120 ) ); - TodoField->setFrameShadow( QLabel::Plain ); - TodoField->setText( tr( "No current todos" ) ); - TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + DatesField = new QLabel( sv1->viewport(), "DatesField" ); + sv1->addChild(DatesField); + DatesField->setText( tr( "No appointments today" ) ); + DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); - PushButton1 = new QPushButton (Frame15, "PushButton1" ); - PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); - PushButton1->setPixmap( config ); - PushButton1->setPalette( pal ); - PushButton1->setAutoDefault( TRUE ); - PushButton1->setFlat( TRUE ); - // mail + // --- mail section --- MailFrame = new QFrame( this ,"MailFrame" ); - MailFrame->setFrameShape( QScrollView::StyledPanel ); - MailFrame->setFrameShadow( QScrollView::Sunken ); + //MailFrame->setPalette( pal ); + MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); + //MailFrame->setFrameShape( QScrollView::StyledPanel ); + //MailFrame->setFrameShadow( QScrollView::Sunken ); + MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); + MailFrame->setFrameStyle( QFrame::NoFrame ); + QFrame* Line1 = new QFrame( MailFrame); + Line1->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) ); + Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + MailButton = new QPushButton (MailFrame, "MailButton" ); MailButton->setGeometry( QRect( 2, 3, 36, 19 ) ); MailButton->setPalette( pal ); MailButton->setPixmap( mail ); MailButton->setFlat( TRUE ); - MailField = new QLabel( MailFrame, "DatesField" ); - MailField->setGeometry( QRect( 40, 4, 203, 120 ) ); + MailField = new QLabel( MailFrame, "MailField" ); + MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) ); MailField->setText( tr( "Opiemail not installed" ) ); MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); MailField->setMaximumHeight(40); - MailField->setMinimumHeight(30); + MailField->setMinimumHeight(15); + + + // --- todo section -- + Frame15 = new QFrame( this, "Frame15" ); + //Frame15->setFrameShape( QFrame::StyledPanel ); + //Frame15->setFrameShadow( QFrame::Sunken ); + Frame15->setFrameStyle( QFrame::NoFrame ); + Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); + + QFrame* Line2 = new QFrame( Frame15); + Line2->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) ); + Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + + TodoButton = new QPushButton (Frame15, "TodoButton" ); + TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); + TodoButton->setPalette( pal ); + TodoButton->setPixmap( todo ); + TodoButton->setFlat( TRUE ); + + QScrollView* sv2 = new QScrollView( Frame15 ); + sv2->setResizePolicy(QScrollView::AutoOneFit); + sv2->setHScrollBarMode( QScrollView::AlwaysOff ); + sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) ); + sv2->setFrameShape(QFrame::NoFrame); + + TodoField = new QLabel( sv2->viewport(), "TodoField" ); + sv2->addChild(TodoField); + //TodoField->setGeometry( QRect( 40, 4, 196, 120 ) ); + TodoField->setFrameShadow( QLabel::Plain ); + //TodoField->setText( tr( "No current todos" ) ); + TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + + PushButton1 = new QPushButton (Frame15, "PushButton1" ); + PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) ); + PushButton1->setPixmap( config ); + PushButton1->setPalette( pal ); + PushButton1->setAutoDefault( TRUE ); + PushButton1->setFlat( TRUE ); + // -- layout -- layout->addWidget(Frame); layout->addWidget(Frame4); layout->addWidget(MailFrame); layout->addWidget(Frame15); layout->setStretchFactor(Frame4,5); layout->setStretchFactor(MailFrame,1); layout->setStretchFactor(Frame15,4); |