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 | |||
@@ -31,14 +31,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
31 | : TodayConfigWidget(parent, name ) { | 31 | : TodayConfigWidget(parent, name ) { |
32 | 32 | ||
33 | QVBoxLayout * layout = new QVBoxLayout( this ); | 33 | QVBoxLayout * layout = new QVBoxLayout( this ); |
34 | layout->setMargin( 20 ); | 34 | layout->setMargin( 5 ); |
35 | |||
36 | #if 0 | ||
37 | // Informational stuff | ||
38 | QHBox *box4 = new QHBox( this ); | ||
39 | QLabel* colorLabel = new QLabel( box4, "" ); | ||
40 | colorLabel->setText( tr( "To activate settings: Restart application !" ) ); | ||
41 | #endif | ||
42 | 35 | ||
43 | // Buttongroup to enable/disable shown stuff | 36 | // Buttongroup to enable/disable shown stuff |
44 | QVGroupBox* b_group = new QVGroupBox( this, "name" ); | 37 | QVGroupBox* b_group = new QVGroupBox( this, "name" ); |
@@ -59,16 +52,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
59 | SpinBox2->setMaxValue( 40 ); | 52 | SpinBox2->setMaxValue( 40 ); |
60 | QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of lines that should be shown for each anniversaries/birthdays" ) ); | 53 | QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of lines that should be shown for each anniversaries/birthdays" ) ); |
61 | 54 | ||
62 | #if 0 | ||
63 | // Clip settings (currently not used) | ||
64 | QHBox *box2 = new QHBox( this ); | ||
65 | QLabel* clipLabel = new QLabel( box2, "" ); | ||
66 | clipLabel->setText( tr( "Clip line after X chars: " ) ); | ||
67 | SpinBoxClip = new QSpinBox( box2, "SpinClip" ); | ||
68 | SpinBoxClip->setMaxValue( 200 ); | ||
69 | QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) ); | ||
70 | #endif | ||
71 | |||
72 | // Look ahead settings | 55 | // Look ahead settings |
73 | QHBox *box3 = new QHBox( this ); | 56 | QHBox *box3 = new QHBox( this ); |
74 | QLabel* daysLabel = new QLabel( box3, "" ); | 57 | QLabel* daysLabel = new QLabel( box3, "" ); |
@@ -77,11 +60,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
77 | SpinDaysClip->setMaxValue( 200 ); | 60 | SpinDaysClip->setMaxValue( 200 ); |
78 | QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); | 61 | QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); |
79 | 62 | ||
80 | // QHBox *box4 = new QHBox( this ); | ||
81 | |||
82 | // QLabel* colorLabel = new QLabel( box4, "" ); | ||
83 | // colorLabel->setText( tr( "To activate settings: Restart application !" ) ); | ||
84 | |||
85 | 63 | ||
86 | QHBox *box5 = new QHBox( this ); | 64 | QHBox *box5 = new QHBox( this ); |
87 | QLabel* colorLabel2 = new QLabel( box5, "" ); | 65 | QLabel* colorLabel2 = new QLabel( box5, "" ); |
@@ -109,13 +87,19 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
109 | QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) ); | 87 | QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) ); |
110 | 88 | ||
111 | 89 | ||
112 | //layout->addWidget( box4 ); | 90 | layout->addWidget( b_group ); |
113 | layout->addWidget( box1 ); | 91 | layout->addWidget( box1 ); |
114 | //layout->addWidget( box2 ); | ||
115 | layout->addWidget( box3 ); | 92 | layout->addWidget( box3 ); |
116 | layout->addWidget( box5 ); | 93 | layout->addWidget( box5 ); |
117 | layout->addWidget( box6 ); | 94 | layout->addWidget( box6 ); |
118 | layout->addWidget( box7 ); | 95 | layout->addWidget( box7 ); |
96 | |||
97 | /* | ||
98 | * pack the widgets together | ||
99 | */ | ||
100 | QSpacerItem *item = new QSpacerItem( 1, 2, QSizePolicy::Minimum, | ||
101 | QSizePolicy::MinimumExpanding ); | ||
102 | layout->addItem( item ); | ||
119 | 103 | ||
120 | readConfig(); | 104 | readConfig(); |
121 | 105 | ||
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 | |||
@@ -30,11 +30,6 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* | |||
30 | m_contactdb = 0l; | 30 | m_contactdb = 0l; |
31 | layoutTodo = 0l; | 31 | layoutTodo = 0l; |
32 | 32 | ||
33 | // Hä ? Nonsense ! (se) | ||
34 | if ( m_contactdb ) { | ||
35 | delete m_contactdb; | ||
36 | } | ||
37 | |||
38 | m_contactdb = new Opie::OPimContactAccess("addressplugin"); | 33 | m_contactdb = new Opie::OPimContactAccess("addressplugin"); |
39 | 34 | ||
40 | connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ), | 35 | connect( m_contactdb, SIGNAL( signalChanged(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 | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | 29 | ||
30 | class AddressBookPluginWidget : public QWidget { | 30 | class AddressBookPluginWidget : public QWidget { |
31 | |||
32 | Q_OBJECT | 31 | Q_OBJECT |
33 | 32 | ||
34 | public: | 33 | public: |