started to make the gui a qvbox layout

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
@@ -6,126 +6,134 @@
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "todaybase.h"
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
-#include <qscrollview.h>
+//#include <qscrollview.h>
 
 #include <qpe/resource.h>
 
 /* 
  *  Constructs a TodayBase which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   : QWidget( parent, name, fl )
 {
   // logo
   QPixmap logo = Resource::loadPixmap( "today/today_logo");
   // datebook
   QPixmap datebook = Resource::loadPixmap("DateBook");
   // todo
   QPixmap todo = Resource::loadPixmap( "TodoList" );
   // config icon
   QPixmap config = Resource::loadPixmap( "today/config" );
   
   if ( !name )
     setName( "TodayBase" );
   resize( 223, 307 ); 
 
+  QVBoxLayout * layout = new QVBoxLayout(this);
+  
   Frame4 = new QFrame( this, "Frame4" );
-  Frame4->setGeometry( QRect( -9, 50, 250, 150 ) ); 
   Frame4->setFrameShape( QScrollView::StyledPanel );
   Frame4->setFrameShadow( QScrollView::Sunken );
   Frame4->setBackgroundOrigin( QScrollView::ParentOrigin );
 
   // hehe, qt is ...
   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 );
   DatesButton->setPixmap( datebook  );
   DatesButton->setFlat( TRUE );
 
   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" ) );
   DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
+  // today logo
   Frame = new QLabel( this, "Frame" );
-  Frame->setGeometry( QRect( 0, 0, 240, 50 ) ); 
   QPalette pal;
   QColorGroup cg;
   cg.setColor( QColorGroup::Text, white );
   cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
   pal.setActive( cg );
-
+  
   Frame->setPalette( pal );
   Frame->setFrameShape( QFrame::StyledPanel );
   Frame->setFrameShadow( QFrame::Raised );
   Frame->setLineWidth( 0 );
-
-  // datum
+  Frame->setMaximumHeight(50);
+  Frame->setMinimumHeight(50);
+  // date
   TextLabel1 = new QLabel( Frame, "TextLabel1" );
   TextLabel1->setPalette( pal );
   TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); 
   QFont TextLabel1_font(  TextLabel1->font() );
   TextLabel1_font.setBold( TRUE );
   TextLabel1->setFont( TextLabel1_font ); 
   TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
   TextLabel1->setTextFormat( QLabel::AutoText );
    
   // todo
   Frame15 = new QFrame( this, "Frame15" );
-  Frame15->setGeometry( QRect( -9, 200, 250, 130 ) ); 
   Frame15->setFrameShape( QFrame::StyledPanel );
   Frame15->setFrameShadow( QFrame::Sunken );
   
   TodoButton = new QPushButton (Frame15, "TodoButton" );
-  TodoButton->setGeometry( QRect( 10, 4, 36, 32 ) );
+  TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
   TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
   TodoButton->setPixmap( todo  );
   TodoButton->setFlat( TRUE );
 
   TodoField = new QLabel( Frame15, "TodoField" );
-  TodoField->setGeometry( QRect( 47, 10, 196, 120 ) ); 
+  TodoField->setGeometry( QRect( 40, 10, 196, 120 ) ); 
   TodoField->setFrameShadow( QLabel::Plain );
   TodoField->setText( tr( "No current todos" ) );
   TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
   PushButton1 = new QPushButton (Frame15, "PushButton1" );
-  PushButton1->setGeometry( QRect( 225, 68, 25, 21 ) ); 
+  PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); 
   PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin );
   PushButton1->setPixmap( config  );
   PushButton1->setAutoDefault( TRUE );
   PushButton1->setFlat( TRUE );
+
+  layout->addWidget(Frame);
+  layout->addWidget(Frame4);
+  layout->addWidget(Frame15);
+  
+  layout->setStretchFactor(Frame4,3);
+  layout->setStretchFactor(Frame15,2);
 }
 
 /*  
  *  Destroys the object and frees any allocated resources
  */
 TodayBase::~TodayBase()
 {
   // no need to delete child widgets, Qt does it all for us
 }
 
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
@@ -10,37 +10,38 @@
 #define TODAYBASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qscrollview.h>
 
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QFrame;
 class QLabel;
 class QPushButton;
 
 class TodayBase : public QWidget
 { 
     Q_OBJECT
 
 public:
     TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~TodayBase();
 
     QFrame* Frame4;
     QPushButton* DatesButton;
     QLabel* DatesField;
-    QFrame* Frame;
+    QLabel* Frame;
+    //QFrame* Frame;
     QLabel* TextLabel1;
     QFrame* Frame15;
     QLabel* TodoField;
     QPushButton* PushButton1;
     QPushButton* TodoButton;
     QPushButton* getridoffuckingstrippeldlinesbutton;
 
 protected:
 
 };
 
 #endif // TODAYBASE_H