diff options
Diffstat (limited to 'konsolekalendar')
-rw-r--r-- | konsolekalendar/CMakeL10n.txt | 6 | ||||
-rw-r--r-- | konsolekalendar/CMakeLists.txt | 10 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendar.cpp | 10 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendar.desktop | 21 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendaradd.cpp | 4 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendarchange.cpp | 8 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendardelete.cpp | 4 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendarepoch.cpp | 6 | ||||
-rw-r--r-- | konsolekalendar/main.cpp | 12 | ||||
-rw-r--r-- | konsolekalendar/stdcalendar.h | 2 |
10 files changed, 35 insertions, 48 deletions
diff --git a/konsolekalendar/CMakeL10n.txt b/konsolekalendar/CMakeL10n.txt index 0edda372..da5b2828 100644 --- a/konsolekalendar/CMakeL10n.txt +++ b/konsolekalendar/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "konsolekalendar" ) + +tde_l10n_create_template( + CATALOG "desktop_files/konsolekalendar.desktop/" + SOURCES konsolekalendar.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt index 2c736bc5..d2952ba1 100644 --- a/konsolekalendar/CMakeLists.txt +++ b/konsolekalendar/CMakeLists.txt @@ -32,24 +32,24 @@ link_directories( ##### other data ################################ -install( FILES konsolekalendar.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( konsolekalendar.desktop ) ##### helper #################################### macro( process_kcfg _who _out _path _kcfg _kcfgc ) - add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${_path}/${_out} + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out} COMMAND - mkdir -p ${CMAKE_BINARY_DIR}/${_path} + mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${_path} COMMAND ${KDE3_KCFGC_EXECUTABLE} - -d ${CMAKE_BINARY_DIR}/${_path} + -d ${CMAKE_CURRENT_BINARY_DIR}/${_path} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} DEPENDS ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ) set_property( SOURCE ${_who} APPEND - PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/${_path}/${_out} ) + PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out} ) endmacro( ) diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index 535478cf..775f7b2d 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -272,11 +272,11 @@ bool KonsoleKalendar::showInstance() } else { if ( firstdate == lastdate ) { title = i18n( "Events: %1" ) - .arg( firstdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( TQt::TextDate ) ); } else { title = i18n( "Events: %1 - %2" ) - .arg( firstdate.toString( Qt::TextDate ) ) - .arg( lastdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( TQt::TextDate ) ) + .arg( lastdate.toString( TQt::TextDate ) ); } htmlSettings.setEventView( true ); } @@ -439,11 +439,11 @@ void KonsoleKalendar::printSpecs() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { diff --git a/konsolekalendar/konsolekalendar.desktop b/konsolekalendar/konsolekalendar.desktop index 179fd81b..a13e1ace 100644 --- a/konsolekalendar/konsolekalendar.desktop +++ b/konsolekalendar/konsolekalendar.desktop @@ -1,25 +1,6 @@ [Desktop Entry] Name=KonsoleKalendar -Name[af]=Konsole Kalender -Name[cs]=Konzolový kalendář -Name[de]=Konsolen-Kalender -Name[eo]=KonzolKalendaro -Name[fy]=Konsole-aginda -Name[hi]=कंसोल-कैलेंडर -Name[hu]=Konsole-naptár -Name[ja]=コンソールカレンダー -Name[mk]=КонзоленКалендар -Name[ms]=Kalendar Konsole -Name[nb]=KonsoleKalender -Name[nds]=Konsole-Kalenner -Name[ne]=कन्सोल क्यालेन्डर -Name[nl]=Konsole-agenda -Name[nn]=KonsoleKalender -Name[ro]=Calendar de consolă -Name[sr]=Конзолни календар -Name[sr@Latn]=Konzolni kalendar -Name[ta]=கான்சோல் நாள்காட்டி -Name[uk]=Календар для консолі + Exec=kdialog --sorry "konsolekalendar is a command-line only program. Please read the handbook at help:/konsolekalendar for more info." Icon=konsolekalendar Type=Application diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index d7b2774b..75828ed3 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -146,11 +146,11 @@ void KonsoleKalendarAdd::printSpecs() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 7c9e3b5e..820f11b4 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -136,11 +136,11 @@ void KonsoleKalendarChange::printSpecs( Event *event ) << endl; cout << i18n( " Begin: %1" ). - arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). @@ -163,11 +163,11 @@ void KonsoleKalendarChange::printSpecs() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 4da76100..1a274d36 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -101,11 +101,11 @@ void KonsoleKalendarDelete::printSpecs( Event *event ) << endl; cout << i18n( " Begin: %1" ). - arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp index 6aebd9a9..a58ad3a5 100644 --- a/konsolekalendar/konsolekalendarepoch.cpp +++ b/konsolekalendar/konsolekalendarepoch.cpp @@ -53,7 +53,7 @@ KonsoleKalendarEpoch::~KonsoleKalendarEpoch() TQDateTime KonsoleKalendarEpoch::epoch2TQDateTime( uint epoch ) { TQDateTime dt; - dt.setTime_t( epoch, Qt::UTC ); + dt.setTime_t( epoch, TQt::UTC ); return( dt ); } @@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::TQDateTime2epoch( TQDateTime dt ) // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME. // Compute #seconds to subtract for local timezone difference from UTC. - int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t() - - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t(); + int offset = TQDateTime::currentDateTime( TQt::UTC ).toTime_t() + - TQDateTime::currentDateTime( TQt::LocalTime ).toTime_t(); return( dt.toTime_t() - offset ); } diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index fc805764..a68af033 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -472,7 +472,7 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - startdate = TQDate::fromString( option, Qt::ISODate ); + startdate = TQDate::fromString( option, TQt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). arg( option ).local8Bit().data() @@ -497,7 +497,7 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - starttime = TQTime::fromString( option, Qt::ISODate ); + starttime = TQTime::fromString( option, TQt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). arg( option ).local8Bit().data() @@ -527,7 +527,7 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - enddate = TQDate::fromString( option, Qt::ISODate ); + enddate = TQDate::fromString( option, TQt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). arg( option ).local8Bit().data() @@ -579,7 +579,7 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - endtime = TQTime::fromString( option, Qt::ISODate ); + endtime = TQTime::fromString( option, TQt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). arg( option ).local8Bit().data() @@ -854,10 +854,10 @@ int main( int argc, char *argv[] ) // Some more debug prints kdDebug() << "main | datetimestamp | StartDate=" - << startdatetime.toString( Qt::TextDate ) + << startdatetime.toString( TQt::TextDate ) << endl; kdDebug() << "main | datetimestamp | EndDate=" - << enddatetime.toString( Qt::TextDate ) + << enddatetime.toString( TQt::TextDate ) << endl; /*************************************************************************** diff --git a/konsolekalendar/stdcalendar.h b/konsolekalendar/stdcalendar.h index b1f43472..555beb5b 100644 --- a/konsolekalendar/stdcalendar.h +++ b/konsolekalendar/stdcalendar.h @@ -27,7 +27,7 @@ namespace KCal { -class KDE_EXPORT StdCalendar : public KCal::CalendarResources +class TDE_EXPORT StdCalendar : public KCal::CalendarResources { public: StdCalendar(); |