-rw-r--r-- | core/pim/today/today.cpp | 10 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 4ec690c..83d8601 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -349,46 +349,48 @@ void Today::startConfig() { | |||
349 | TodayConfigWidget *confWidget; | 349 | TodayConfigWidget *confWidget; |
350 | for ( confWidget = configWidgetList.first(); confWidget != 0; | 350 | for ( confWidget = configWidgetList.first(); confWidget != 0; |
351 | confWidget = configWidgetList.next() ) { | 351 | confWidget = configWidgetList.next() ) { |
352 | confWidget->writeConfig(); | 352 | confWidget->writeConfig(); |
353 | } | 353 | } |
354 | loadPlugins(); | 354 | loadPlugins(); |
355 | } else { | 355 | } else { |
356 | // since refresh is not called in that case , reconnect the signal | 356 | // since refresh is not called in that case , reconnect the signal |
357 | m_refreshTimer->start( 15000 ); // get the config value in here later | 357 | m_refreshTimer->start( 15000 ); // get the config value in here later |
358 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | 358 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); |
359 | } | 359 | } |
360 | } | 360 | } |
361 | 361 | ||
362 | 362 | ||
363 | /** | 363 | /** |
364 | * Refresh for the view. Reload all applets | 364 | * Refresh for the view. Reload all applets |
365 | * | 365 | * |
366 | */ | 366 | */ |
367 | void Today::refresh() { | 367 | void Today::refresh() { |
368 | 368 | ||
369 | init(); | 369 | init(); |
370 | 370 | ||
371 | QValueList<TodayPlugin>::Iterator it; | 371 | QValueList<TodayPlugin>::Iterator it; |
372 | for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { | 372 | for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { |
373 | if ( !(*it).excludeRefresh ) { | 373 | if ( !(*it).excludeRefresh ) { |
374 | (*it).guiPart->refresh(); | 374 | (*it).guiPart->refresh(); |
375 | qDebug( "refresh" ); | 375 | layout->addWidget( (*it).guiBox ); |
376 | } | 376 | qDebug( "refresh" ); |
377 | } | ||
377 | } | 378 | } |
379 | layout->addStretch(0); | ||
378 | } | 380 | } |
379 | 381 | ||
380 | void Today::startApplication() { | 382 | void Today::startApplication() { |
381 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 383 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
382 | e << QString( sender()->name() ); | 384 | e << QString( sender()->name() ); |
383 | } | 385 | } |
384 | 386 | ||
385 | /** | 387 | /** |
386 | * launch addressbook (personal card) | 388 | * launch addressbook (personal card) |
387 | */ | 389 | */ |
388 | void Today::editCard() { | 390 | void Today::editCard() { |
389 | QCopEnvelope env( "QPE/Application/addressbook", "editPersonalAndClose()" ); | 391 | QCopEnvelope env( "QPE/Application/addressbook", "editPersonalAndClose()" ); |
390 | } | 392 | } |
391 | 393 | ||
392 | Today::~Today() { | 394 | Today::~Today() { |
393 | } | 395 | } |
394 | 396 | ||
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 7beed34..41daa7d 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -32,49 +32,48 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | |||
32 | 32 | ||
33 | layout = 0L; | 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 ); | ||
57 | 56 | ||
58 | QHBoxLayout *frameLayout = new QHBoxLayout( Frame ); | 57 | QHBoxLayout *frameLayout = new QHBoxLayout( Frame ); |
59 | QVBox *box1 = new QVBox( Frame ); | 58 | QVBox *box1 = new QVBox( Frame ); |
60 | box1->setMinimumWidth( 100 ); | 59 | box1->setMinimumWidth( 100 ); |
61 | // Today text | 60 | // Today text |
62 | TodayLabel = new QLabel( box1, "TodayText" ); | 61 | TodayLabel = new QLabel( box1, "TodayText" ); |
63 | QFont TodayLabel_font( TodayLabel->font() ); | 62 | QFont TodayLabel_font( TodayLabel->font() ); |
64 | TodayLabel_font.setBold( TRUE ); | 63 | TodayLabel_font.setBold( TRUE ); |
65 | TodayLabel_font.setPointSize( 40 ); | 64 | TodayLabel_font.setPointSize( 40 ); |
66 | TodayLabel->setFont( TodayLabel_font ); | 65 | TodayLabel->setFont( TodayLabel_font ); |
67 | TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin ); | 66 | TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin ); |
68 | TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); | 67 | TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); |
69 | 68 | ||
70 | // date | 69 | // date |
71 | DateLabel = new QLabel( box1, "TextLabel1" ); | 70 | DateLabel = new QLabel( box1, "TextLabel1" ); |
72 | QFont DateLabel_font( DateLabel->font() ); | 71 | QFont DateLabel_font( DateLabel->font() ); |
73 | DateLabel_font.setBold( TRUE ); | 72 | DateLabel_font.setBold( TRUE ); |
74 | DateLabel->setFont( DateLabel_font ); | 73 | DateLabel->setFont( DateLabel_font ); |
75 | DateLabel->setBackgroundOrigin( QLabel::ParentOrigin ); | 74 | DateLabel->setBackgroundOrigin( QLabel::ParentOrigin ); |
76 | DateLabel->setTextFormat( RichText ); | 75 | DateLabel->setTextFormat( RichText ); |
77 | 76 | ||
78 | // Opiezilla | 77 | // Opiezilla |
79 | Opiezilla = new QLabel( Frame, "OpieZilla" ); | 78 | Opiezilla = new QLabel( Frame, "OpieZilla" ); |
80 | Opiezilla->setPixmap( opiezilla ); | 79 | Opiezilla->setPixmap( opiezilla ); |