author | harlekin <harlekin> | 2003-03-30 22:28:09 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-30 22:28:09 (UTC) |
commit | 0b6d158a2a2b52d83ad4b1046ce9dbffff2190e6 (patch) (unidiff) | |
tree | e9e62695cf309a14bcffa31dc3dd70f652629211 /core/pim | |
parent | 608a9f1537af0f0f679ec5f7358e9a9716604f8b (diff) | |
download | opie-0b6d158a2a2b52d83ad4b1046ce9dbffff2190e6.zip opie-0b6d158a2a2b52d83ad4b1046ce9dbffff2190e6.tar.gz opie-0b6d158a2a2b52d83ad4b1046ce9dbffff2190e6.tar.bz2 |
layout changes
-rw-r--r-- | core/pim/today/today.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index d0cdd18..4ec690c 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -287,25 +287,25 @@ void Today::draw() { | |||
287 | if ( pluginList.count() == 0 ) { | 287 | if ( pluginList.count() == 0 ) { |
288 | QLabel *noPlugins = new QLabel( this ); | 288 | QLabel *noPlugins = new QLabel( this ); |
289 | noPlugins->setText( tr( "No plugins found" ) ); | 289 | noPlugins->setText( tr( "No plugins found" ) ); |
290 | layout->addWidget( noPlugins ); | 290 | layout->addWidget( noPlugins ); |
291 | return; | 291 | return; |
292 | } | 292 | } |
293 | 293 | ||
294 | uint count = 0; | 294 | uint count = 0; |
295 | TodayPlugin plugin; | 295 | TodayPlugin plugin; |
296 | for ( uint i = 0; i < pluginList.count(); i++ ) { | 296 | for ( uint i = 0; i < pluginList.count(); i++ ) { |
297 | plugin = pluginList[i]; | 297 | plugin = pluginList[i]; |
298 | 298 | ||
299 | if ( plugin.active ) { | 299 | if ( plugin.active ) { |
300 | // qDebug( plugin.name + " is ACTIVE " ); | 300 | // qDebug( plugin.name + " is ACTIVE " ); |
301 | plugin.guiBox->show(); | 301 | plugin.guiBox->show(); |
302 | } else { | 302 | } else { |
303 | // qDebug( plugin.name + " is INACTIVE" ); | 303 | // qDebug( plugin.name + " is INACTIVE" ); |
304 | plugin.guiBox->hide(); | 304 | plugin.guiBox->hide(); |
305 | } | 305 | } |
306 | count++; | 306 | count++; |
307 | } | 307 | } |
308 | 308 | ||
309 | if ( count == 0 ) { | 309 | if ( count == 0 ) { |
310 | QLabel *noPluginsActive = new QLabel( this ); | 310 | QLabel *noPluginsActive = new QLabel( this ); |
311 | noPluginsActive->setText( tr( "No plugins activated" ) ); | 311 | noPluginsActive->setText( tr( "No plugins activated" ) ); |
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index c896463..7beed34 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -21,50 +21,52 @@ | |||
21 | #include <qwhatsthis.h> | 21 | #include <qwhatsthis.h> |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | 24 | ||
25 | 25 | ||
26 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | 26 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) |
27 | : QWidget( parent, name, WStyle_ContextHelp ) { | 27 | : QWidget( parent, name, WStyle_ContextHelp ) { |
28 | 28 | ||
29 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo | 29 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo |
30 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla | 30 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla |
31 | QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon | 31 | QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon |
32 | 32 | ||
33 | layout = new QVBoxLayout( this ); | 33 | layout = 0L; |
34 | 34 | ||
35 | QPalette pal = this->palette(); | 35 | QPalette pal = this->palette(); |
36 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); | 36 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); |
37 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); | 37 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); |
38 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); | 38 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); |
39 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); | 39 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); |
40 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); | 40 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); |
41 | this->setPalette( pal ); | 41 | this->setPalette( pal ); |
42 | 42 | ||
43 | // --- logo Section --- | 43 | // --- logo Section --- |
44 | QPalette pal2; | 44 | QPalette pal2; |
45 | QColorGroup cg; | 45 | QColorGroup cg; |
46 | cg.setColor( QColorGroup::Text, white ); | 46 | cg.setColor( QColorGroup::Text, white ); |
47 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); | 47 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); |
48 | pal2.setActive( cg ); | 48 | pal2.setActive( cg ); |
49 | 49 | ||
50 | // today logo | 50 | // today logo |
51 | Frame = new QLabel( this, "Frame" ); | 51 | Frame = new QLabel( this, "Frame" ); |
52 | Frame->setPalette( pal2 ); | 52 | Frame->setPalette( pal2 ); |
53 | Frame->setFrameShape( QFrame::StyledPanel ); | 53 | Frame->setFrameShape( QFrame::StyledPanel ); |
54 | Frame->setFrameShadow( QFrame::Raised ); | 54 | Frame->setFrameShadow( QFrame::Raised ); |
55 | Frame->setLineWidth( 0 ); | 55 | Frame->setLineWidth( 0 ); |
56 | Frame->setMaximumHeight( 50 ); | ||
56 | 57 | ||
57 | QHBoxLayout *frameLayout = new QHBoxLayout( Frame ); | 58 | QHBoxLayout *frameLayout = new QHBoxLayout( Frame ); |
58 | QVBox *box1 = new QVBox( Frame ); | 59 | QVBox *box1 = new QVBox( Frame ); |
60 | box1->setMinimumWidth( 100 ); | ||
59 | // Today text | 61 | // Today text |
60 | TodayLabel = new QLabel( box1, "TodayText" ); | 62 | TodayLabel = new QLabel( box1, "TodayText" ); |
61 | QFont TodayLabel_font( TodayLabel->font() ); | 63 | QFont TodayLabel_font( TodayLabel->font() ); |
62 | TodayLabel_font.setBold( TRUE ); | 64 | TodayLabel_font.setBold( TRUE ); |
63 | TodayLabel_font.setPointSize( 40 ); | 65 | TodayLabel_font.setPointSize( 40 ); |
64 | TodayLabel->setFont( TodayLabel_font ); | 66 | TodayLabel->setFont( TodayLabel_font ); |
65 | TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin ); | 67 | TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin ); |
66 | TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); | 68 | TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); |
67 | 69 | ||
68 | // date | 70 | // date |
69 | DateLabel = new QLabel( box1, "TextLabel1" ); | 71 | DateLabel = new QLabel( box1, "TextLabel1" ); |
70 | QFont DateLabel_font( DateLabel->font() ); | 72 | QFont DateLabel_font( DateLabel->font() ); |