From 7f271d89922254226280f039ae53c5fee63ef94d Mon Sep 17 00:00:00 2001 From: llornkcor Date: Wed, 05 Nov 2003 10:50:43 +0000 Subject: fix compile. probably wont work. who knows. --- (limited to 'core/pim') diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro index 2139f63..1f75964 100644 --- a/core/pim/today/plugins/datebook/datebook.pro +++ b/core/pim/today/plugins/datebook/datebook.pro @@ -1,11 +1,12 @@ TEMPLATE = lib CONFIG -= moc -CONFIG += qt plugin release +CONFIG += qt release # Input HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ datebookevent.h datebookpluginwidget.h SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ datebookevent.cpp datebookpluginwidget.cpp +INTERFACES = datebookpluginconfigbase.ui INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index 0477122..54f820b 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp @@ -28,53 +28,11 @@ DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) : TodayConfigWidget( parent, name ) { - QVBoxLayout * layout = new QVBoxLayout( this ); - layout->setMargin( 20 ); + QVBoxLayout *layout = new QVBoxLayout( this ); - QHBox *box1 = new QHBox( this ); - QLabel* TextLabel4 = new QLabel( box1, "TextLabel4" ); - TextLabel4->setText( tr( "Show location" ) ); - CheckBox1 = new QCheckBox( box1, "CheckBox1" ); - QWhatsThis::add( CheckBox1 , tr( "Check this if the location of an appointment should be shown for each one" ) ); + m_gui = new DatebookPluginConfigBase( this ); - QHBox *box2 = new QHBox( this ); - QLabel* TextLabel5 = new QLabel( box2 , "TextLabel5" ); - TextLabel5->setText( tr( "Show notes" ) ); - CheckBox2 = new QCheckBox( box2, "CheckBox2" ); - QWhatsThis::add( CheckBox2 , tr( "Check this if the note attached to an appointment should be shown for each one" ) ); - - QHBox *box3 = new QHBox( this ); - QLabel* TextLabel6 = new QLabel( box3, "All Day"); - TextLabel6->setText( tr( "Show only later\n appointments") ); - CheckBox3 = new QCheckBox ( box3, "CheckBox3" ); - QWhatsThis::add( CheckBox3 , tr( "Check this if only appointments later then current time should be shown" ) ); - - - - QHBox *box4 = new QHBox( this ); - QLabel *TextLabel3 = new QLabel( box4, "TextLabel3" ); - TextLabel3->setText( tr( "How many \nappointment\n" - "should be \nshown?" ) ); - SpinBox1 = new QSpinBox( box4, "SpinBox1" ); - QWhatsThis::add( SpinBox1 , tr( "How many appointments should be shown maximal. In chronical order" ) ); - SpinBox1->setMaxValue( 10 ); - SpinBox1->setValue( 5 ); - - - QHBox *box5 = new QHBox( this ); - QLabel *TextLabelDays = new QLabel( box5 ); - TextLabelDays->setText( tr( "How many more days" ) ); - SpinBox2 = new QSpinBox( box5, "SpinBox2" ); - QWhatsThis::add( SpinBox2 , tr( "How many more days should be in the range" ) ); - SpinBox2->setMaxValue( 21 ); - SpinBox2->setSuffix( tr( " day(s)" ) ); - SpinBox2->setSpecialValueText ( tr("only today") ); - - layout->addWidget( box1 ); - layout->addWidget( box2 ); - layout->addWidget( box3 ); - layout->addWidget( box4 ); - layout->addWidget( box5 ); + layout->addWidget( m_gui ); readConfig(); } @@ -84,15 +42,16 @@ void DatebookPluginConfig::readConfig() { cfg.setGroup( "config" ); m_max_lines_meet = cfg.readNumEntry( "maxlinesmeet", 5 ); - SpinBox1->setValue( m_max_lines_meet ); + m_gui->SpinBox1->setValue( m_max_lines_meet ); m_show_location = cfg.readNumEntry( "showlocation", 1 ); - CheckBox1->setChecked( m_show_location ); + m_gui->CheckBox1->setChecked( m_show_location ); m_show_notes = cfg.readNumEntry( "shownotes", 0 ); - CheckBox2->setChecked( m_show_notes ); + m_gui->CheckBox2->setChecked( m_show_notes ); m_only_later = cfg.readNumEntry( "onlylater", 1 ); - CheckBox3->setChecked( m_only_later ); + m_gui->CheckBox4->setChecked( cfg.readNumEntry( "timeextraline", 1 ) ); + m_gui->CheckBox3->setChecked( m_only_later ); m_more_days = cfg.readNumEntry( "moredays", 0 ); - SpinBox2->setValue( m_more_days ); + m_gui->SpinBox2->setValue( m_more_days ); } @@ -100,15 +59,16 @@ void DatebookPluginConfig::writeConfig() { Config cfg( "todaydatebookplugin" ); cfg.setGroup( "config" ); - m_max_lines_meet = SpinBox1->value(); + m_max_lines_meet = m_gui->SpinBox1->value(); cfg.writeEntry( "maxlinesmeet", m_max_lines_meet); - m_show_location = CheckBox1->isChecked(); + m_show_location = m_gui->CheckBox1->isChecked(); cfg.writeEntry( "showlocation", m_show_location); - m_show_notes = CheckBox2->isChecked(); + m_show_notes = m_gui->CheckBox2->isChecked(); cfg.writeEntry( "shownotes", m_show_notes ); - m_only_later = CheckBox3->isChecked(); + m_only_later = m_gui->CheckBox3->isChecked(); + cfg.writeEntry( "timeextraline", m_gui->CheckBox4->isChecked() ); cfg.writeEntry( "onlylater", m_only_later ); - m_more_days = SpinBox2->value(); + m_more_days = m_gui->SpinBox2->value(); cfg.writeEntry( "moredays", m_more_days ); cfg.write(); } diff --git a/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui b/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui new file mode 100644 index 0000000..943e8ec --- a/dev/null +++ b/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui @@ -0,0 +1,218 @@ + +DatebookPluginConfigBase + + QWidget + + name + DatebookPluginConfigBase + + + geometry + + 0 + 0 + 228 + 267 + + + + caption + DatebookPluginConfigBase + + + whatsThis + + + + + margin + 11 + + + spacing + 6 + + + QCheckBox + + name + CheckBox1 + + + text + Show location + + + whatsThis + Check this if the location of an appointment should be shown for each one + + + + QCheckBox + + name + CheckBox2 + + + text + Show notes + + + whatsThis + Check this if the note attached to an appointment should be shown for each one + + + + QCheckBox + + name + CheckBox3 + + + text + Show only later appointments + + + whatsThis + Check this if only appointments later then current time should be shown + + + + QCheckBox + + name + CheckBox4 + + + text + Show time in extra line + + + + QLayoutWidget + + name + Layout3 + + + + margin + 0 + + + spacing + 6 + + + QSpinBox + + name + SpinBox1 + + + maxValue + 10 + + + whatsThis + How many appointments should be shown maximal. In chronical order + + + + QLabel + + name + TextLabel1 + + + text + How many appointment should be shown? + + + alignment + WordBreak|AlignVCenter|AlignLeft + + + wordwrap + + + + + + QLayoutWidget + + name + Layout2 + + + + margin + 0 + + + spacing + 6 + + + QSpinBox + + name + SpinBox2 + + + specialValueText + only today + + + maxValue + 21 + + + whatsThis + How many more days should be in the range + + + + QLabel + + name + TextLabel2 + + + text + How many more days + + + alignment + WordBreak|AlignVCenter|AlignLeft + + + wordwrap + + + + + + + name + Spacer2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro index c8730bb..6a63f4e 100644 --- a/core/pim/today/plugins/todolist/todolist.pro +++ b/core/pim/today/plugins/todolist/todolist.pro @@ -1,12 +1,13 @@ TEMPLATE = lib CONFIG -= moc -CONFIG += qt plugin release +CONFIG += qt release # Input HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ todopluginwidget.h SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ todopluginwidget.cpp +INTERFACES= todopluginconfigbase.ui INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library diff --git a/core/pim/today/plugins/todolist/todopluginconfig.cpp b/core/pim/today/plugins/todolist/todopluginconfig.cpp index c83f83b..4821776 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.cpp +++ b/core/pim/today/plugins/todolist/todopluginconfig.cpp @@ -19,39 +19,17 @@ #include #include -#include -#include #include - TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) : TodayConfigWidget(parent, name ) { QVBoxLayout * layout = new QVBoxLayout( this ); - layout->setMargin( 20 ); - - QHBox *box1 = new QHBox( this ); - - QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" ); - TextLabel6->setText( tr( "tasks shown " ) ); - - SpinBox2 = new QSpinBox( box1, "SpinBox2" ); - SpinBox2->setMaxValue( 40 ); - QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of task that should be shown" ) ); - - - - QHBox *box2 = new QHBox( this ); - QLabel* clipLabel = new QLabel( box2, "" ); - clipLabel->setText( tr( "Clip line after X chars" ) ); + m_gui = new TodoPluginConfigBase( this ); - 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" ) ); - layout->addWidget( box1 ); - layout->addWidget( box2 ); + layout->addWidget( m_gui ); readConfig(); } @@ -60,18 +38,18 @@ void TodolistPluginConfig::readConfig() { Config cfg( "todaytodoplugin" ); cfg.setGroup( "config" ); m_max_lines_task = cfg.readNumEntry( "maxlinestask", 5 ); - SpinBox2->setValue( m_max_lines_task ); + m_gui->SpinBox2->setValue( m_max_lines_task ); m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 ); - SpinBoxClip->setValue( m_maxCharClip ); + m_gui->SpinBoxClip->setValue( m_maxCharClip ); } void TodolistPluginConfig::writeConfig() { Config cfg( "todaytodoplugin" ); cfg.setGroup( "config" ); - m_max_lines_task = SpinBox2->value(); + m_max_lines_task = m_gui->SpinBox2->value(); cfg.writeEntry( "maxlinestask", m_max_lines_task ); - m_maxCharClip = SpinBoxClip->value(); + m_maxCharClip = m_gui->SpinBoxClip->value(); cfg.writeEntry( "maxcharclip", m_maxCharClip ); cfg.write(); } diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index 54d35cf..a2d7d2c 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h @@ -24,7 +24,6 @@ #include "todopluginconfigbase.h" class TodolistPluginConfig : public TodayConfigWidget { - Q_OBJECT public: diff --git a/core/pim/today/plugins/todolist/todopluginconfigbase.ui b/core/pim/today/plugins/todolist/todopluginconfigbase.ui new file mode 100644 index 0000000..d3dcfb7 --- a/dev/null +++ b/core/pim/today/plugins/todolist/todopluginconfigbase.ui @@ -0,0 +1,142 @@ + +TodoPluginConfigBase + + QWidget + + name + TodoPluginConfigBase + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout1 + + + + margin + 0 + + + spacing + 6 + + + QSpinBox + + name + SpinBox2 + + + maxValue + 40 + + + whatsThis + Set the maximum number of task that should be shown + + + + QLabel + + name + TextLabel1 + + + text + tasks shown + + + whatsThis + Set the maximum number of task that should be shown + + + + + + QLayoutWidget + + name + Layout2 + + + + margin + 0 + + + spacing + 6 + + + QSpinBox + + name + SpinBoxClip + + + maxValue + 200 + + + whatsThis + After how many chars should be the info about the task be cut off + + + + QLabel + + name + TextLabel2 + + + text + Clip line after X chars + + + alignment + WordBreak|AlignVCenter|AlignLeft + + + whatsThis + After how many chars should be the info about the task be cut off + + + wordwrap + + + + + + + name + Spacer1 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + -- cgit v0.9.0.2