author | harlekin <harlekin> | 2002-11-27 14:35:21 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-27 14:35:21 (UTC) |
commit | 4d7272423782dc2f9f7dbde36b848f55eb323c79 (patch) (unidiff) | |
tree | 93fee7538aca84be74f81406776cec7c6867cc4a | |
parent | 5f0c90d4b6972c1ad22ba20b45cd1d3f88298099 (diff) | |
download | opie-4d7272423782dc2f9f7dbde36b848f55eb323c79.zip opie-4d7272423782dc2f9f7dbde36b848f55eb323c79.tar.gz opie-4d7272423782dc2f9f7dbde36b848f55eb323c79.tar.bz2 |
fix for bug #494 which is imho a flat style bug
-rw-r--r-- | core/pim/today/today.cpp | 1 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index e6f8c93..76bd6de 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -75,33 +75,32 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) | |||
75 | } | 75 | } |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * Qcop receive method. | 78 | * Qcop receive method. |
79 | */ | 79 | */ |
80 | void Today::channelReceived( const QCString &msg, const QByteArray & data ) { | 80 | void Today::channelReceived( const QCString &msg, const QByteArray & data ) { |
81 | QDataStream stream( data, IO_ReadOnly ); | 81 | QDataStream stream( data, IO_ReadOnly ); |
82 | if ( msg == "message(QString)" ) { | 82 | if ( msg == "message(QString)" ) { |
83 | QString message; | 83 | QString message; |
84 | stream >> message; | 84 | stream >> message; |
85 | setOwnerField( message ); | 85 | setOwnerField( message ); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | void Today::setRefreshTimer( int interval ) { | 89 | void Today::setRefreshTimer( int interval ) { |
90 | 90 | ||
91 | |||
92 | disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | 91 | disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); |
93 | 92 | ||
94 | // 0 is "never" case | 93 | // 0 is "never" case |
95 | if ( !interval == 0 ) { | 94 | if ( !interval == 0 ) { |
96 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | 95 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); |
97 | m_refreshTimer->changeInterval( interval ); | 96 | m_refreshTimer->changeInterval( interval ); |
98 | } | 97 | } |
99 | } | 98 | } |
100 | 99 | ||
101 | 100 | ||
102 | /** | 101 | /** |
103 | * Initialises the owner field with the default value, the username | 102 | * Initialises the owner field with the default value, the username |
104 | */ | 103 | */ |
105 | void Today::setOwnerField() { | 104 | void Today::setOwnerField() { |
106 | QString file = Global::applicationFileName( "addressbook", "businesscard.vcf" ); | 105 | QString file = Global::applicationFileName( "addressbook", "businesscard.vcf" ); |
107 | if ( QFile::exists( file ) ) { | 106 | if ( QFile::exists( file ) ) { |
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 12e8411..9a93b56 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -45,62 +45,62 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | |||
45 | 45 | ||
46 | // --- logo Section --- | 46 | // --- logo Section --- |
47 | QPalette pal2; | 47 | QPalette pal2; |
48 | QColorGroup cg; | 48 | QColorGroup cg; |
49 | cg.setColor( QColorGroup::Text, white ); | 49 | cg.setColor( QColorGroup::Text, white ); |
50 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); | 50 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); |
51 | pal2.setActive( cg ); | 51 | pal2.setActive( cg ); |
52 | // today logo | 52 | // today logo |
53 | Frame = new QLabel( this, "Frame" ); | 53 | Frame = new QLabel( this, "Frame" ); |
54 | Frame->setPalette( pal2 ); | 54 | Frame->setPalette( pal2 ); |
55 | Frame->setFrameShape( QFrame::StyledPanel ); | 55 | Frame->setFrameShape( QFrame::StyledPanel ); |
56 | Frame->setFrameShadow( QFrame::Raised ); | 56 | Frame->setFrameShadow( QFrame::Raised ); |
57 | Frame->setLineWidth( 0 ); | 57 | Frame->setLineWidth( 0 ); |
58 | Frame->setMaximumHeight( 50 ); | 58 | Frame->setMaximumHeight( 50 ); |
59 | Frame->setMinimumHeight( 50 ); | 59 | Frame->setMinimumHeight( 50 ); |
60 | 60 | ||
61 | // Today text | 61 | // Today text |
62 | QLabel* TodayLabel = new QLabel( Frame, "TodayText" ); | 62 | QLabel* TodayLabel = new QLabel( Frame, "TodayText" ); |
63 | TodayLabel->setGeometry( QRect( 10, 0, 168, 40 ) ); | 63 | TodayLabel->setGeometry( QRect( 10, 1, 168, 40 ) ); |
64 | QFont TodayLabel_font( TodayLabel->font() ); | 64 | QFont TodayLabel_font( TodayLabel->font() ); |
65 | TodayLabel_font.setBold( TRUE ); | 65 | TodayLabel_font.setBold( TRUE ); |
66 | TodayLabel_font.setPointSize( 40 ); | 66 | TodayLabel_font.setPointSize( 40 ); |
67 | TodayLabel->setFont( TodayLabel_font ); | 67 | TodayLabel->setFont( TodayLabel_font ); |
68 | TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin ); | 68 | TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin ); |
69 | TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); | 69 | TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" ); |
70 | 70 | ||
71 | // date | 71 | // date |
72 | DateLabel = new QLabel( Frame, "TextLabel1" ); | 72 | DateLabel = new QLabel( Frame, "TextLabel1" ); |
73 | DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) ); | 73 | DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) ); |
74 | QFont DateLabel_font( DateLabel->font() ); | 74 | QFont DateLabel_font( DateLabel->font() ); |
75 | DateLabel_font.setBold( TRUE ); | 75 | DateLabel_font.setBold( TRUE ); |
76 | DateLabel->setFont( DateLabel_font ); | 76 | DateLabel->setFont( DateLabel_font ); |
77 | DateLabel->setBackgroundOrigin( QLabel::ParentOrigin ); | 77 | DateLabel->setBackgroundOrigin( QLabel::ParentOrigin ); |
78 | DateLabel->setTextFormat( RichText ); | 78 | DateLabel->setTextFormat( RichText ); |
79 | 79 | ||
80 | // Opiezilla | 80 | // Opiezilla |
81 | QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" ); | 81 | QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" ); |
82 | Opiezilla->setPixmap( opiezilla ); | 82 | Opiezilla->setPixmap( opiezilla ); |
83 | Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 ); | 83 | Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 ); |
84 | QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); | 84 | QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); |
85 | Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); | 85 | Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); |
86 | 86 | ||
87 | // Ownerfield | 87 | // Ownerfield |
88 | OwnerField = new OClickableLabel( this , "Owner" ); | 88 | OwnerField = new OClickableLabel( this , "Owner" ); |
89 | OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) ); | 89 | OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) ); |
90 | OwnerField->setAlignment( int (QLabel::AlignTop | QLabel::AlignLeft ) ); | 90 | OwnerField->setAlignment( int (QLabel::AlignTop | QLabel::AlignLeft ) ); |
91 | OwnerField->setMaximumHeight(12); | 91 | OwnerField->setMaximumHeight(12); |
92 | 92 | ||
93 | // config | 93 | // config |
94 | ConfigButton = new OClickableLabel ( Frame, "PushButton1" ); | 94 | ConfigButton = new OClickableLabel ( Frame, "PushButton1" ); |
95 | ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 30, 25, 21 ) ); | 95 | ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 29, 25, 20 ) ); |
96 | ConfigButton->setPixmap( config ); | 96 | ConfigButton->setPixmap( config ); |
97 | QWhatsThis::add( ConfigButton, tr( "Click here to get to the config dialog" ) ); | 97 | QWhatsThis::add( ConfigButton, tr( "Click here to get to the config dialog" ) ); |
98 | ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin ); | 98 | ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin ); |
99 | } | 99 | } |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * D' tor | 102 | * D' tor |
103 | */ | 103 | */ |
104 | TodayBase::~TodayBase() { | 104 | TodayBase::~TodayBase() { |
105 | } | 105 | } |
106 | 106 | ||