2 files changed, 23 insertions, 14 deletions

diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index a44f598..b60c915 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -29,3 +29,3 @@
 #include <qpixmap.h>
-#include <qscrollview.h>
+//#include <qscrollview.h>
 
@@ -53,4 +53,5 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
 
+  QVBoxLayout * layout = new QVBoxLayout(this);
+  
   Frame4 = new QFrame( this, "Frame4" );
-  Frame4->setGeometry( QRect( -9, 50, 250, 150 ) ); 
   Frame4->setFrameShape( QScrollView::StyledPanel );
@@ -61,6 +62,6 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   getridoffuckingstrippeldlinesbutton =  new QPushButton (Frame4, "asdfsad" );
-  getridoffuckingstrippeldlinesbutton->setGeometry( QRect( 2, 10, 0, 0 ) );
+  getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
 
   DatesButton = new QPushButton (Frame4, "DatesButton" );
-  DatesButton->setGeometry( QRect( 10, 10, 36, 32 ) );
+  DatesButton->setGeometry( QRect( 2, 10, 36, 32 ) );
   DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
@@ -70,3 +71,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   DatesField = new QLabel( Frame4, "DatesField" );
-  DatesField->setGeometry( QRect( 47, 10, 203, 120 ) ); 
+  DatesField->setGeometry( QRect( 40, 10, 203, 120 ) ); 
   DatesField->setText( tr( "No appointments today" ) );
@@ -74,4 +75,4 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
 
+  // today logo
   Frame = new QLabel( this, "Frame" );
-  Frame->setGeometry( QRect( 0, 0, 240, 50 ) ); 
   QPalette pal;
@@ -81,3 +82,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   pal.setActive( cg );
-
+  
   Frame->setPalette( pal );
@@ -86,4 +87,5 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   Frame->setLineWidth( 0 );
-
-  // datum
+  Frame->setMaximumHeight(50);
+  Frame->setMinimumHeight(50);
+  // date
   TextLabel1 = new QLabel( Frame, "TextLabel1" );
@@ -99,3 +101,2 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   Frame15 = new QFrame( this, "Frame15" );
-  Frame15->setGeometry( QRect( -9, 200, 250, 130 ) ); 
   Frame15->setFrameShape( QFrame::StyledPanel );
@@ -104,3 +105,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   TodoButton = new QPushButton (Frame15, "TodoButton" );
-  TodoButton->setGeometry( QRect( 10, 4, 36, 32 ) );
+  TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
   TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
@@ -110,3 +111,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   TodoField = new QLabel( Frame15, "TodoField" );
-  TodoField->setGeometry( QRect( 47, 10, 196, 120 ) ); 
+  TodoField->setGeometry( QRect( 40, 10, 196, 120 ) ); 
   TodoField->setFrameShadow( QLabel::Plain );
@@ -116,3 +117,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   PushButton1 = new QPushButton (Frame15, "PushButton1" );
-  PushButton1->setGeometry( QRect( 225, 68, 25, 21 ) ); 
+  PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); 
   PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin );
@@ -121,2 +122,9 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   PushButton1->setFlat( TRUE );
+
+  layout->addWidget(Frame);
+  layout->addWidget(Frame4);
+  layout->addWidget(Frame15);
+  
+  layout->setStretchFactor(Frame4,3);
+  layout->setStretchFactor(Frame15,2);
 }
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 947efc5..69c6363 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -33,3 +33,4 @@ public:
     QLabel* DatesField;
-    QFrame* Frame;
+    QLabel* Frame;
+    //QFrame* Frame;
     QLabel* TextLabel1;