4 files changed, 26 insertions, 28 deletions
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index f5f6ed6..7ab27a0 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp @@ -32,7 +32,7 @@ QString TodolistPlugin::pluginName() const { } double TodolistPlugin::versionNumber() const { - return 0.1; + return 0.7; } QString TodolistPlugin::pixmapNameWidget() const { @@ -40,7 +40,7 @@ QString TodolistPlugin::pixmapNameWidget() const { } QWidget* TodolistPlugin::widget( QWidget *wid ) { - return new TodolistPluginWidget( wid, "Todolist" ); + return new TodolistPluginWidget( wid, "Todolist" ); } QString TodolistPlugin::pixmapNameConfig() const { @@ -52,7 +52,7 @@ ConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { } QString TodolistPlugin::appName() const { - return "Todolist"; + return QObject::tr( "Todolist" ); } int TodolistPlugin::minHeight() const { @@ -63,9 +63,3 @@ int TodolistPlugin::maxHeight() const { return 100; } - - - - int main() { -} - diff --git a/core/pim/today/plugins/todolist/todopluginconfig.cpp b/core/pim/today/plugins/todolist/todopluginconfig.cpp index da81600..2d8f1b6 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.cpp +++ b/core/pim/today/plugins/todolist/todopluginconfig.cpp @@ -50,7 +50,7 @@ TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) } void TodolistPluginConfig::readConfig() { - Config cfg( "todaydatebookplugin" ); + Config cfg( "todaytodoplugin" ); cfg.setGroup( "config" ); m_max_lines_task = cfg.readNumEntry( "maxlinestask", 5 ); SpinBox2->setValue( m_max_lines_task ); @@ -58,8 +58,9 @@ void TodolistPluginConfig::readConfig() { void TodolistPluginConfig::writeConfig() { - Config cfg( "todaydatebookplugin" ); + Config cfg( "todaytodoplugin" ); cfg.setGroup( "config" ); + m_max_lines_task = SpinBox2->value(); cfg.writeEntry( "maxlinestask", m_max_lines_task ); cfg.write(); } diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp index 2a0e5a3..4731b43 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.cpp +++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp @@ -27,12 +27,12 @@ #include <qpe/timestring.h> #include <qpe/qcopenvelope_qws.h> -TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name) - : QWidget(parent, name ) { +TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) + : QWidget( parent, name ) { todoLabel= 0l; - todo = 0l; + if ( todo ) { delete todo; } @@ -47,10 +47,11 @@ TodolistPluginWidget::~TodolistPluginWidget() { delete todo; } + void TodolistPluginWidget::readConfig() { - Config cfg( "todaytodolistplugin" ); + Config cfg( "todaytodoplugin" ); cfg.setGroup( "config" ); - m_maxLinesTask = cfg.readNumEntry( "maxlinestask", 5 ); + m_maxLinesTask = cfg.readNumEntry( "maxlinestask", 5 ); } @@ -61,13 +62,14 @@ void TodolistPluginWidget::getTodo() { QVBoxLayout* layoutTodo = new QVBoxLayout( this ); - if ( todoLabel ) { + if ( todoLabel ) { delete todoLabel; } todoLabel = new OClickableLabel( this ); todoLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); - connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) ); + connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) ); + QString output; QString tmpout; int count = 0; @@ -75,15 +77,15 @@ void TodolistPluginWidget::getTodo() { // get overdue todos first QValueList<ToDoEvent> overDueList = todo->overDue(); - qBubbleSort(overDueList); + qBubbleSort( overDueList ); for ( QValueList<ToDoEvent>::Iterator it = overDueList.begin(); - it!=overDueList.end(); ++it ) { + it != overDueList.end(); ++it ) { if (!(*it).isCompleted() && ( ammount < m_maxLinesTask ) ) { QString desc = (*it).summary(); if( desc.isEmpty() ) { desc = (*it).description(); } - tmpout += "<font color=#e00000><b>-" + desc.mid(0, m_maxCharClip) + "</b></font><br>"; + tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; ammount++; } } @@ -91,8 +93,8 @@ void TodolistPluginWidget::getTodo() { // get total number of still open todos QValueList<ToDoEvent> openTodo = todo->rawToDos(); qBubbleSort( openTodo ); - for ( QValueList<ToDoEvent>::Iterator it=openTodo.begin(); - it!=openTodo.end(); ++it ) { + for ( QValueList<ToDoEvent>::Iterator it = openTodo.begin(); + it != openTodo.end(); ++it ) { if ( !(*it).isCompleted() ){ count +=1; // not the overdues, we allready got them, and not if we are @@ -102,7 +104,7 @@ void TodolistPluginWidget::getTodo() { if( desc.isEmpty() ) { desc = (*it).description(); } - tmpout += "<b>-</b>" + desc.mid(0, m_maxCharClip) + "<br>"; + tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>"; ammount++; } } @@ -113,12 +115,12 @@ void TodolistPluginWidget::getTodo() { if( count == 1 ) { output += QObject::tr( "There is <b> 1</b> active task: <br>" ); } else { - output += QObject::tr( "There are <b> %1</b> active tasks: <br>" ).arg(count); + output += QObject::tr( "There are <b> %1</b> active tasks: <br>" ).arg( count ); } output += tmpout; } else { output = QObject::tr( "No active tasks" ); - } + } todoLabel->setText( output ); layoutTodo->addWidget( todoLabel ); } @@ -127,6 +129,6 @@ void TodolistPluginWidget::getTodo() { * start the todolist */ void TodolistPluginWidget::startTodolist() { - QCopEnvelope e("QPE/System", "execute(QString)"); - e << QString("todolist"); + QCopEnvelope e( "QPE/System", "execute(QString)" ); + e << QString( "todolist" ); } diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h index ccc312a..970f430 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.h +++ b/core/pim/today/plugins/todolist/todopluginwidget.h @@ -38,6 +38,7 @@ protected slots: private: OClickableLabel *todoLabel; ToDoDB *todo; + void readConfig(); void getTodo(); int m_maxLinesTask; |