author | harlekin <harlekin> | 2003-03-30 22:05:20 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-30 22:05:20 (UTC) |
commit | 608a9f1537af0f0f679ec5f7358e9a9716604f8b (patch) (side-by-side diff) | |
tree | 7b08904230c170f9679937e3419149e3a82cee96 /core/pim | |
parent | 9f185c144aa92c08d4d24721e1eba7782b51d366 (diff) | |
download | opie-608a9f1537af0f0f679ec5f7358e9a9716604f8b.zip opie-608a9f1537af0f0f679ec5f7358e9a9716604f8b.tar.gz opie-608a9f1537af0f0f679ec5f7358e9a9716604f8b.tar.bz2 |
changed header (gui) to layouts
-rw-r--r-- | core/pim/today/changelog | 7 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 8 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 26 |
4 files changed, 21 insertions, 22 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 500090d..a77e581 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -1 +1,6 @@ +0.6.2 + +* header can now be made smaller +* changed header to different layout mode to play nicer with life rotation + 0.6.1 @@ -3,3 +8,3 @@ * datebook plugin now can now also show following days -+ changed refresh +* changed refresh * fixed one mem leak diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 40c2cdf..0e79d69 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -5,3 +5,3 @@ Maintainer: Maximilian Reiß <harlekin@handhelds.org> Architecture: arm -Version: 0.6-$SUB_VERSION +Version: 0.6,2-$SUB_VERSION Depends: opie-base, libopie1 diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 0b61bf8..d0cdd18 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -147,6 +147,2 @@ void Today::init() { TodayLabel->hide(); - Frame->setMaximumHeight( 18 ); - Frame->setMinimumHeight( 18 ); - DateLabel->setGeometry( QRect( 10, 2, 168, 12 ) ); - ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-20, 0, 25, 20 ) ); } else { @@ -154,6 +150,2 @@ void Today::init() { TodayLabel->show(); - Frame->setMaximumHeight( 50 ); - Frame->setMinimumHeight( 50 ); - DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) ); - ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 29, 25, 20 ) ); } diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index a36ecaa..c896463 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003 by Maximilian Reiß * email : harlekin@handhelds.org @@ -18,6 +18,4 @@ +#include <qvbox.h> #include <qlabel.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qapplication.h> #include <qwhatsthis.h> @@ -50,2 +48,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) pal2.setActive( cg ); + // today logo @@ -56,8 +55,7 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) Frame->setLineWidth( 0 ); - Frame->setMaximumHeight( 50 ); - Frame->setMinimumHeight( 50 ); + QHBoxLayout *frameLayout = new QHBoxLayout( Frame ); + QVBox *box1 = new QVBox( Frame ); // Today text - TodayLabel = new QLabel( Frame, "TodayText" ); - TodayLabel->setGeometry( QRect( 10, 1, 168, 40 ) ); + TodayLabel = new QLabel( box1, "TodayText" ); QFont TodayLabel_font( TodayLabel->font() ); @@ -70,4 +68,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) // date - DateLabel = new QLabel( Frame, "TextLabel1" ); - DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) ); + DateLabel = new QLabel( box1, "TextLabel1" ); QFont DateLabel_font( DateLabel->font() ); @@ -81,3 +78,2 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) Opiezilla->setPixmap( opiezilla ); - Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 ); QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); @@ -85,2 +81,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) + // Ownerfield @@ -93,3 +90,2 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) ConfigButton = new OClickableLabel ( Frame, "PushButton1" ); - ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 29, 25, 20 ) ); ConfigButton->setPixmap( config ); @@ -97,4 +93,10 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin ); + + frameLayout->addWidget( box1 ); + frameLayout->addStretch( 2 ); + frameLayout->addWidget( ConfigButton, 0, AlignBottom ); + frameLayout->addWidget( Opiezilla ); } + /** |