author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (side-by-side diff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/today | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
4 files changed, 19 insertions, 10 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp index b79c679..8863192 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp @@ -80,2 +80,8 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* +// QHBox *box4 = new QHBox( this ); + +// QLabel* colorLabel = new QLabel( box4, "" ); +// colorLabel->setText( tr( "To activate settings: Restart application !" ) ); + + QHBox *box5 = new QHBox( this ); @@ -106,3 +112,3 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* - layout->addWidget( b_group ); + //layout->addWidget( box4 ); layout->addWidget( box1 ); diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index dad09db..d47bc0b 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp @@ -118,2 +118,6 @@ void AddressBookPluginWidget::getAddress() { lookAheadDate.toString().latin1() ); + } + + if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ + diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index bc412dd..2d303fc 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h @@ -25,2 +25,4 @@ +#include "datebookpluginconfigbase.h" + class DatebookPluginConfig : public TodayConfigWidget { @@ -29,2 +31,3 @@ class DatebookPluginConfig : public TodayConfigWidget { + public: @@ -41,9 +44,4 @@ private: - QCheckBox* CheckBox2; - QCheckBox* CheckBox1; - QCheckBox* CheckBox3; - QSpinBox* SpinBox1; - QSpinBox* SpinBox2; - + DatebookPluginConfigBase *m_gui; // how many lines should be showed in the datebook section diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index e09251c..54d35cf 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h @@ -19,3 +19,2 @@ -//#include <qwidget.h> #include <qspinbox.h> @@ -24,2 +23,4 @@ +#include "todopluginconfigbase.h" + class TodolistPluginConfig : public TodayConfigWidget { @@ -41,4 +42,4 @@ private: - QSpinBox* SpinBox2; - QSpinBox* SpinBoxClip; + TodoPluginConfigBase *m_gui; + |