summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/changelog7
-rw-r--r--core/pim/today/opie-today.control2
-rw-r--r--core/pim/today/today.cpp8
-rw-r--r--core/pim/today/todaybase.cpp26
4 files changed, 21 insertions, 22 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index 500090d..a77e581 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,7 +1,12 @@
10.6.2
2
3* header can now be made smaller
4* changed header to different layout mode to play nicer with life rotation
5
10.6.1 60.6.1
2 7
3* datebook plugin now can now also show following days 8* datebook plugin now can now also show following days
4+ changed refresh 9* changed refresh
5* fixed one mem leak 10* fixed one mem leak
6 11
70.6 120.6
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 40c2cdf..0e79d69 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -3,7 +3,7 @@ Priority: optional
3Section: opie/applications 3Section: opie/applications
4Maintainer: Maximilian Reiß <harlekin@handhelds.org> 4Maintainer: Maximilian Reiß <harlekin@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: 0.6-$SUB_VERSION 6Version: 0.6,2-$SUB_VERSION
7Depends: opie-base, libopie1 7Depends: opie-base, libopie1
8License: GPL 8License: GPL
9Description: today screen 9Description: today screen
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0b61bf8..d0cdd18 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -145,17 +145,9 @@ void Today::init() {
145 if ( m_hideBanner ) { 145 if ( m_hideBanner ) {
146 Opiezilla->hide(); 146 Opiezilla->hide();
147 TodayLabel->hide(); 147 TodayLabel->hide();
148 Frame->setMaximumHeight( 18 );
149 Frame->setMinimumHeight( 18 );
150 DateLabel->setGeometry( QRect( 10, 2, 168, 12 ) );
151 ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-20, 0, 25, 20 ) );
152 } else { 148 } else {
153 Opiezilla->show(); 149 Opiezilla->show();
154 TodayLabel->show(); 150 TodayLabel->show();
155 Frame->setMaximumHeight( 50 );
156 Frame->setMinimumHeight( 50 );
157 DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) );
158 ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 29, 25, 20 ) );
159 } 151 }
160 152
161 layout = new QVBoxLayout( this ); 153 layout = new QVBoxLayout( this );
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index a36ecaa..c896463 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,7 +1,7 @@
1/* 1/*
2 * todaybase.cpp 2 * todaybase.cpp
3 * 3 *
4 * copyright : (c) 2002 by Maximilian Reiß 4 * copyright : (c) 2002, 2003 by Maximilian Reiß
5 * email : harlekin@handhelds.org 5 * email : harlekin@handhelds.org
6 * 6 *
7 */ 7 */
@@ -16,10 +16,8 @@
16 16
17#include "todaybase.h" 17#include "todaybase.h"
18 18
19#include <qvbox.h>
19#include <qlabel.h> 20#include <qlabel.h>
20#include <qimage.h>
21#include <qpixmap.h>
22#include <qapplication.h>
23#include <qwhatsthis.h> 21#include <qwhatsthis.h>
24 22
25#include <qpe/resource.h> 23#include <qpe/resource.h>
@@ -48,18 +46,18 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
48 cg.setColor( QColorGroup::Text, white ); 46 cg.setColor( QColorGroup::Text, white );
49 cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); 47 cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) );
50 pal2.setActive( cg ); 48 pal2.setActive( cg );
49
51 // today logo 50 // today logo
52 Frame = new QLabel( this, "Frame" ); 51 Frame = new QLabel( this, "Frame" );
53 Frame->setPalette( pal2 ); 52 Frame->setPalette( pal2 );
54 Frame->setFrameShape( QFrame::StyledPanel ); 53 Frame->setFrameShape( QFrame::StyledPanel );
55 Frame->setFrameShadow( QFrame::Raised ); 54 Frame->setFrameShadow( QFrame::Raised );
56 Frame->setLineWidth( 0 ); 55 Frame->setLineWidth( 0 );
57 Frame->setMaximumHeight( 50 );
58 Frame->setMinimumHeight( 50 );
59 56
57 QHBoxLayout *frameLayout = new QHBoxLayout( Frame );
58 QVBox *box1 = new QVBox( Frame );
60 // Today text 59 // Today text
61 TodayLabel = new QLabel( Frame, "TodayText" ); 60 TodayLabel = new QLabel( box1, "TodayText" );
62 TodayLabel->setGeometry( QRect( 10, 1, 168, 40 ) );
63 QFont TodayLabel_font( TodayLabel->font() ); 61 QFont TodayLabel_font( TodayLabel->font() );
64 TodayLabel_font.setBold( TRUE ); 62 TodayLabel_font.setBold( TRUE );
65 TodayLabel_font.setPointSize( 40 ); 63 TodayLabel_font.setPointSize( 40 );
@@ -68,8 +66,7 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
68 TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); 66 TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" );
69 67
70 // date 68 // date
71 DateLabel = new QLabel( Frame, "TextLabel1" ); 69 DateLabel = new QLabel( box1, "TextLabel1" );
72 DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) );
73 QFont DateLabel_font( DateLabel->font() ); 70 QFont DateLabel_font( DateLabel->font() );
74 DateLabel_font.setBold( TRUE ); 71 DateLabel_font.setBold( TRUE );
75 DateLabel->setFont( DateLabel_font ); 72 DateLabel->setFont( DateLabel_font );
@@ -79,10 +76,10 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
79 // Opiezilla 76 // Opiezilla
80 Opiezilla = new QLabel( Frame, "OpieZilla" ); 77 Opiezilla = new QLabel( Frame, "OpieZilla" );
81 Opiezilla->setPixmap( opiezilla ); 78 Opiezilla->setPixmap( opiezilla );
82 Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 );
83 QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); 79 QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) );
84 Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); 80 Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
85 81
82
86 // Ownerfield 83 // Ownerfield
87 OwnerField = new OClickableLabel( this , "Owner" ); 84 OwnerField = new OClickableLabel( this , "Owner" );
88 OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) ); 85 OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) );
@@ -91,12 +88,17 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
91 88
92 // config 89 // config
93 ConfigButton = new OClickableLabel ( Frame, "PushButton1" ); 90 ConfigButton = new OClickableLabel ( Frame, "PushButton1" );
94 ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 29, 25, 20 ) );
95 ConfigButton->setPixmap( config ); 91 ConfigButton->setPixmap( config );
96 QWhatsThis::add( ConfigButton, tr( "Click here to get to the config dialog" ) ); 92 QWhatsThis::add( ConfigButton, tr( "Click here to get to the config dialog" ) );
97 ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin ); 93 ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin );
94
95 frameLayout->addWidget( box1 );
96 frameLayout->addStretch( 2 );
97 frameLayout->addWidget( ConfigButton, 0, AlignBottom );
98 frameLayout->addWidget( Opiezilla );
98} 99}
99 100
101
100/** 102/**
101 * D' tor 103 * D' tor
102 */ 104 */