Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1
kdepim4
display-events-in-localtime.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File display-events-in-localtime.diff of Package kdepim4
Index: korganizer/views/monthview/monthitem.cpp =================================================================== --- korganizer/views/monthview/monthitem.cpp (revision 895193) +++ korganizer/views/monthview/monthitem.cpp (working copy) @@ -503,22 +503,23 @@ { QString ret = mIncidence->summary(); if ( !allDay() ) { // Prepend the time str to the text - QTime time; + QString timeStr; if ( mIsTodo ) { Todo *todo = static_cast<Todo*>( mIncidence ); - time = todo->dtDue().time(); + timeStr = todo->dtDueTimeStr( true, KOPrefs::instance()->timeSpec() ); } else { if ( !end ) { - time = mIncidence->dtStart().time(); + timeStr = mIncidence->dtStartTimeStr( true, KOPrefs::instance()->timeSpec() ); } else { - time = mIncidence->dtEnd().time(); + Event *event = static_cast<Event*>( mIncidence ); + timeStr = event->dtEndTimeStr( true, KOPrefs::instance()->timeSpec() ); } } - if ( time.isValid() ) { + if ( !timeStr.isEmpty() ) { if ( !end ) { - ret = KGlobal::locale()->formatTime( time ) + ' ' + ret; + ret = timeStr + ' ' + ret; } else { - ret = ret + ' ' + KGlobal::locale()->formatTime( time ); + ret = ret + ' ' + timeStr; } } } @@ -528,7 +529,8 @@ QString IncidenceMonthItem::toolTipText() const { - return IncidenceFormatter::toolTipString( mIncidence ); + return IncidenceFormatter::toolTipStr( + mIncidence, true, KOPrefs::instance()->timeSpec() ); } QList<QPixmap *> IncidenceMonthItem::icons() const Index: korganizer/CMakeLists.txt =================================================================== --- korganizer/CMakeLists.txt (revision 895193) +++ korganizer/CMakeLists.txt (working copy) @@ -103,7 +103,7 @@ kde4_add_library(korganizer_eventviewer SHARED ${korganizer_eventviewer_LIB_SRCS}) add_dependencies(korganizer_eventviewer kmail_xml) -target_link_libraries(korganizer_eventviewer ${KDE4_KPARTS_LIBS} ${KDE4_KCAL_LIBS}) +target_link_libraries(korganizer_eventviewer ${KDE4_KPARTS_LIBS} ${KDE4_KCAL_LIBS} kdepim) set_target_properties(korganizer_eventviewer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS korganizer_eventviewer DESTINATION ${LIB_INSTALL_DIR}) Index: korganizer/koeventviewer.cpp =================================================================== --- korganizer/koeventviewer.cpp (revision 895193) +++ korganizer/koeventviewer.cpp (working copy) @@ -29,6 +29,7 @@ #include "koglobals.h" #include <libkdepim/kdepimprotocols.h> +#include <libkdepim/kpimprefs.h> #include <kcal/incidence.h> #include <kcal/incidenceformatter.h> @@ -94,8 +95,8 @@ bool KOEventViewer::appendIncidence( Incidence *incidence ) { - QString codeForIncidence = IncidenceFormatter::extensiveDisplayString( incidence ); - addText( codeForIncidence ); + addText( IncidenceFormatter::extensiveDisplayStr( + incidence, KPIM::KPimPrefs::timeSpec() ) ); return true; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor