summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-12 15:48:44 (UTC)
committer zecke <zecke>2004-09-12 15:48:44 (UTC)
commit12730b959f92a9d601d81bf28ab87fb265effe55 (patch) (side-by-side diff)
treebadea4f89e235f42f4565f5b625259649a177117
parent8f22819ca6e53edaa1b80c25d34e7df5e60981a4 (diff)
downloadopie-12730b959f92a9d601d81bf28ab87fb265effe55.zip
opie-12730b959f92a9d601d81bf28ab87fb265effe55.tar.gz
opie-12730b959f92a9d601d81bf28ab87fb265effe55.tar.bz2
-Fix layout for http://handhelds.org/scap/port.32003.png
-Remove old code -Remove bogus code as commented by Stefan Eilers
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.cpp34
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.cpp5
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h1
3 files changed, 9 insertions, 31 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index 81bb8fd..7b6117e 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -28,20 +28,13 @@
AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* name)
: TodayConfigWidget(parent, name ) {
QVBoxLayout * layout = new QVBoxLayout( this );
- layout->setMargin( 20 );
-
-#if 0
- // Informational stuff
- QHBox *box4 = new QHBox( this );
- QLabel* colorLabel = new QLabel( box4, "" );
- colorLabel->setText( tr( "To activate settings: Restart application !" ) );
-#endif
+ layout->setMargin( 5 );
// Buttongroup to enable/disable shown stuff
QVGroupBox* b_group = new QVGroupBox( this, "name" );
b_group -> setTitle( tr("Enable/Disable Views") );
m_showBirthdayButton = new QRadioButton( b_group );
m_showBirthdayButton -> setText( tr( "Show &Birthdays" ) );
@@ -56,35 +49,20 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" );
TextLabel6->setText( tr( "Max Lines: " ) );
SpinBox2 = new QSpinBox( box1, "SpinBox2" );
SpinBox2->setMaxValue( 40 );
QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of lines that should be shown for each anniversaries/birthdays" ) );
-#if 0
- // Clip settings (currently not used)
- QHBox *box2 = new QHBox( this );
- QLabel* clipLabel = new QLabel( box2, "" );
- clipLabel->setText( tr( "Clip line after X chars: " ) );
- SpinBoxClip = new QSpinBox( box2, "SpinClip" );
- SpinBoxClip->setMaxValue( 200 );
- QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) );
-#endif
-
// Look ahead settings
QHBox *box3 = new QHBox( this );
QLabel* daysLabel = new QLabel( box3, "" );
daysLabel->setText( tr( "Days look ahead: " ) );
SpinDaysClip = new QSpinBox( box3, "SpinDays" );
SpinDaysClip->setMaxValue( 200 );
QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
-// QHBox *box4 = new QHBox( this );
-
-// QLabel* colorLabel = new QLabel( box4, "" );
-// colorLabel->setText( tr( "To activate settings: Restart application !" ) );
-
QHBox *box5 = new QHBox( this );
QLabel* colorLabel2 = new QLabel( box5, "" );
colorLabel2->setText( tr( "Set Headline Color: " ) );
headlineColor = new Opie::OColorButton( box5, black , "headlineColor" );
QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
@@ -106,19 +84,25 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
colorLabel6->setText( tr( " days: " ) );
urgentColor = new Opie::OColorButton( box7, red , "urgentColor" );
QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) );
- //layout->addWidget( box4 );
+ layout->addWidget( b_group );
layout->addWidget( box1 );
- //layout->addWidget( box2 );
layout->addWidget( box3 );
layout->addWidget( box5 );
layout->addWidget( box6 );
layout->addWidget( box7 );
+
+ /*
+ * pack the widgets together
+ */
+ QSpacerItem *item = new QSpacerItem( 1, 2, QSizePolicy::Minimum,
+ QSizePolicy::MinimumExpanding );
+ layout->addItem( item );
readConfig();
}
void AddressBookPluginConfig::readConfig() {
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index d76a29a..df7c5e1 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -27,17 +27,12 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char*
: QWidget( parent, name ) {
addressLabel = 0l;
m_contactdb = 0l;
layoutTodo = 0l;
- // Hä ? Nonsense ! (se)
- if ( m_contactdb ) {
- delete m_contactdb;
- }
-
m_contactdb = new Opie::OPimContactAccess("addressplugin");
connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index b1c690d..25b3098 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -25,13 +25,12 @@
#include <qstring.h>
#include <qwidget.h>
#include <qlayout.h>
class AddressBookPluginWidget : public QWidget {
-
Q_OBJECT
public:
AddressBookPluginWidget( QWidget *parent, const char *name );
~AddressBookPluginWidget();