-rw-r--r-- | korganizer/kotodoviewitem.cpp | 2 | ||||
-rw-r--r-- | libkcal/todo.cpp | 16 | ||||
-rw-r--r-- | microkde/kglobalsettings.cpp | 10 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 1 |
4 files changed, 27 insertions, 2 deletions
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 66f8d06..8cb6b83 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -129,7 +129,7 @@ void KOTodoViewItem::construct() | |||
129 | QTime t = mTodo->runStart().time(); | 129 | QTime t = mTodo->runStart().time(); |
130 | skeyt.sprintf("%02d%02d",t.hour(),t.minute()); | 130 | skeyt.sprintf("%02d%02d",t.hour(),t.minute()); |
131 | skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); | 131 | skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); |
132 | keyd = KGlobal::locale()->formatDate( d ); | 132 | keyd = KGlobal::locale()->formatDate( d , true); |
133 | keyt = KGlobal::locale()->formatTime( t ); | 133 | keyt = KGlobal::locale()->formatTime( t ); |
134 | 134 | ||
135 | } else { | 135 | } else { |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 7dee4cd..c008fe1 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -19,8 +19,10 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <kglobal.h> | 21 | #include <kglobal.h> |
22 | #include <kglobalsettings.h> | ||
22 | #include <klocale.h> | 23 | #include <klocale.h> |
23 | #include <kdebug.h> | 24 | #include <kdebug.h> |
25 | #include <qregexp.h> | ||
24 | 26 | ||
25 | #include "todo.h" | 27 | #include "todo.h" |
26 | 28 | ||
@@ -75,7 +77,19 @@ void Todo::setRunning( bool run ) | |||
75 | 77 | ||
76 | void Todo::saveRunningInfoToFile() | 78 | void Todo::saveRunningInfoToFile() |
77 | { | 79 | { |
78 | qDebug("Todo::saveRunningInfoToFile() "); | 80 | qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
81 | |||
82 | QString dir = KGlobalSettings::timeTrackerDir(); | ||
83 | qDebug("%s ", dir.latin1()); | ||
84 | QString file = "%1-%2-%3-%4-%5-%6-%7.tt"; | ||
85 | |||
86 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ).arg( mRunStart.time().msec(), 3 ); | ||
87 | file.replace ( QRegExp (" "), "0" ); | ||
88 | file = dir +"/" +file; | ||
89 | qDebug("%s ", file.latin1()); | ||
90 | |||
91 | |||
92 | |||
79 | } | 93 | } |
80 | 94 | ||
81 | int Todo::runTime() | 95 | int Todo::runTime() |
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index b837b23..e54b0d9 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -37,6 +37,16 @@ QFont KGlobalSettings::generalMaxFont() | |||
37 | f.setPointSize( size ); | 37 | f.setPointSize( size ); |
38 | return f; | 38 | return f; |
39 | } | 39 | } |
40 | |||
41 | QString KGlobalSettings::timeTrackerDir() | ||
42 | { | ||
43 | static QString dir; | ||
44 | if ( dir.isEmpty() ) { | ||
45 | dir = locateLocal( "data", "timetracker" ); | ||
46 | } | ||
47 | return dir; | ||
48 | } | ||
49 | |||
40 | QFont KGlobalSettings::toolBarFont() | 50 | QFont KGlobalSettings::toolBarFont() |
41 | { | 51 | { |
42 | return QApplication::font(); | 52 | return QApplication::font(); |
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index 075bb1c..3eeda35 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h | |||
@@ -17,6 +17,7 @@ class KGlobalSettings | |||
17 | 17 | ||
18 | static QColor toolBarHighlightColor(); | 18 | static QColor toolBarHighlightColor(); |
19 | static QRect desktopGeometry( QWidget * ); | 19 | static QRect desktopGeometry( QWidget * ); |
20 | static QString timeTrackerDir(); | ||
20 | 21 | ||
21 | /** | 22 | /** |
22 | * Returns whether KDE runs in single (default) or double click | 23 | * Returns whether KDE runs in single (default) or double click |