summaryrefslogtreecommitdiffstats
path: root/karm
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /karm
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'karm')
-rw-r--r--karm/support/karm.desktop1
-rw-r--r--karm/task.cpp8
2 files changed, 4 insertions, 5 deletions
diff --git a/karm/support/karm.desktop b/karm/support/karm.desktop
index 66b016af2..736f497ce 100644
--- a/karm/support/karm.desktop
+++ b/karm/support/karm.desktop
@@ -33,7 +33,6 @@ GenericName[hu]=Időfelhasználás-figyelő
GenericName[id]=Tracker Waktu Pribadi
GenericName[is]=Fylgjast með í hvað tíminn fer
GenericName[it]=Segnatempo personale
-GenericName[ka]=პერსონალური დროის აღმრიცხველი
GenericName[kk]=Дербес уақыт қадағалағышы
GenericName[km]=កម្មវិធី​តាមដាន​ពេលវេលា​ផ្ទាល់​ខ្លួន
GenericName[ko]=일하는 시간을 잴 수 있습니다
diff --git a/karm/task.cpp b/karm/task.cpp
index 5ade426f0..7d84bcd2c 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -183,12 +183,12 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage)
void Task::setPixmapProgress()
{
- TQPixmap* icon = new TQPixmap();
+ TQPixmap icon ;
if (_percentcomplete >= 100)
- *icon = UserIcon("task-complete.xpm");
+ icon = UserIcon("task-complete.xpm");
else
- *icon = UserIcon("task-incomplete.xpm");
- setPixmap(0, *icon);
+ icon = UserIcon("task-incomplete.xpm");
+ setPixmap(0, icon);
}
bool Task::isComplete() { return _percentcomplete == 100; }