author | ulf69 <ulf69> | 2004-09-15 17:48:36 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-09-15 17:48:36 (UTC) |
commit | 0af70ae5fee7b71aecf5ac742fdd65e31237eb5a (patch) (unidiff) | |
tree | 08a51756744591056fd74f3658afe940f5823265 /microkde/kdecore | |
parent | c151151ccaffe54510e58731dc6d8f9d441bd31c (diff) | |
download | kdepimpi-0af70ae5fee7b71aecf5ac742fdd65e31237eb5a.zip kdepimpi-0af70ae5fee7b71aecf5ac742fdd65e31237eb5a.tar.gz kdepimpi-0af70ae5fee7b71aecf5ac742fdd65e31237eb5a.tar.bz2 |
small changes to accommodate pwManager
-rw-r--r-- | microkde/kdecore/klocale.cpp | 51 | ||||
-rw-r--r-- | microkde/kdecore/klocale.h | 11 |
2 files changed, 48 insertions, 14 deletions
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index 9d7e60b..4960b9a 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp | |||
@@ -89,2 +89,3 @@ KLocale::KLocale() : mCalendarSystem( 0 ) | |||
89 | mIntDateFormat = Default; | 89 | mIntDateFormat = Default; |
90 | mIntTimeFormat = Default; | ||
90 | mLanguage = 0; | 91 | mLanguage = 0; |
@@ -141,2 +142,3 @@ void KLocale::setWeekStartMonday( bool b ) | |||
141 | } | 142 | } |
143 | |||
142 | KLocale::IntDateFormat KLocale::getIntDateFormat( ) | 144 | KLocale::IntDateFormat KLocale::getIntDateFormat( ) |
@@ -150,2 +152,12 @@ void KLocale::setIntDateFormat( KLocale::IntDateFormat i ) | |||
150 | } | 152 | } |
153 | KLocale::IntDateFormat KLocale::getIntTimeFormat( ) | ||
154 | { | ||
155 | return mIntTimeFormat; | ||
156 | |||
157 | } | ||
158 | void KLocale::setIntTimeFormat( KLocale::IntDateFormat i ) | ||
159 | { | ||
160 | mIntTimeFormat = i; | ||
161 | } | ||
162 | |||
151 | void KLocale::setLanguage( int i ) | 163 | void KLocale::setLanguage( int i ) |
@@ -164,5 +176,5 @@ QString KLocale::translate( const char *, const char *fallback) const | |||
164 | 176 | ||
165 | QString KLocale::formatTime(const QTime &pTime, bool includeSecs) const | 177 | QString KLocale::formatTime(const QTime &pTime, bool includeSecs, IntDateFormat intIntDateFormat) const |
166 | { | 178 | { |
167 | const QString rst = timeFormat(); | 179 | const QString rst = timeFormat(intIntDateFormat); |
168 | 180 | ||
@@ -317,12 +329,13 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime, | |||
317 | bool shortFormat, | 329 | bool shortFormat, |
318 | bool includeSeconds) const | 330 | bool includeSeconds, |
331 | IntDateFormat intIntDateFormat) const | ||
319 | { | 332 | { |
320 | return QString( "%1 %2") | 333 | return QString( "%1 %2") |
321 | .arg( formatDate( pDateTime.date(), shortFormat ) ) | 334 | .arg( formatDate( pDateTime.date(), shortFormat, intIntDateFormat ) ) |
322 | .arg( formatTime( pDateTime.time(), includeSeconds ) ); | 335 | .arg( formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ) ); |
323 | } | 336 | } |
324 | 337 | ||
325 | QString KLocale::formatDateTime(const QDateTime &pDateTime) const | 338 | QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const |
326 | { | 339 | { |
327 | return formatDateTime(pDateTime, true); | 340 | return formatDateTime(pDateTime, true, intIntDateFormat); |
328 | } | 341 | } |
@@ -458,2 +471,3 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const | |||
458 | int hour = -1, minute = -1, second = seconds ? -1 : 0; // don't require seconds | 471 | int hour = -1, minute = -1, second = seconds ? -1 : 0; // don't require seconds |
472 | |||
459 | bool g_12h = false; | 473 | bool g_12h = false; |
@@ -684,7 +698,24 @@ QString KLocale::dateFormatShort(IntDateFormat intIntDateFormat) const | |||
684 | 698 | ||
685 | QString KLocale::timeFormat() const | 699 | QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const |
686 | { | 700 | { |
687 | if ( mHourF24Format) | 701 | const IntDateFormat tformat = (intIntTimeFormat == Undefined)?mIntTimeFormat:intIntTimeFormat; |
702 | |||
703 | if ( tformat == Default ) | ||
704 | if ( mHourF24Format) | ||
705 | return "%H:%M:%S"; | ||
706 | else | ||
707 | return "%I:%M:%S%p"; | ||
708 | |||
709 | else if ( tformat == Format1 ) | ||
710 | if ( mHourF24Format) | ||
711 | return "%H:%M:%S"; | ||
712 | else | ||
713 | return "%I:%M:%S%p"; | ||
714 | |||
715 | else if ( tformat == ISODate ) // = Qt::ISODate | ||
716 | if ( mHourF24Format) | ||
688 | return "%H:%M:%S"; | 717 | return "%H:%M:%S"; |
689 | return "%I:%M:%S%p"; | 718 | else |
719 | return "%I:%M:%S%p"; | ||
720 | |||
690 | } | 721 | } |
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h index f6c0253..153b12a 100644 --- a/microkde/kdecore/klocale.h +++ b/microkde/kdecore/klocale.h | |||
@@ -46,7 +46,7 @@ class KLocale | |||
46 | QString formatDate(const QDate &pDate, bool shortFormat = false, IntDateFormat intIntDateFormat = Undefined) const; | 46 | QString formatDate(const QDate &pDate, bool shortFormat = false, IntDateFormat intIntDateFormat = Undefined) const; |
47 | QString formatTime(const QTime &pTime, bool includeSecs = false) const; | 47 | QString formatTime(const QTime &pTime, bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const; |
48 | QString formatDateTime(const QDateTime &pDateTime) const; | 48 | QString formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat = Undefined) const; |
49 | QString formatDateTime(const QDateTime &pDateTime, | 49 | QString formatDateTime(const QDateTime &pDateTime, |
50 | bool shortFormat, | 50 | bool shortFormat, |
51 | bool includeSecs = false) const; | 51 | bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const; |
52 | 52 | ||
@@ -67,3 +67,3 @@ class KLocale | |||
67 | QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const; | 67 | QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const; |
68 | QString timeFormat() const; | 68 | QString timeFormat(IntDateFormat intIntDateFormat = Undefined) const; |
69 | 69 | ||
@@ -75,3 +75,5 @@ class KLocale | |||
75 | void setIntDateFormat( IntDateFormat ); | 75 | void setIntDateFormat( IntDateFormat ); |
76 | void setIntTimeFormat( IntDateFormat ); | ||
76 | IntDateFormat getIntDateFormat( ); | 77 | IntDateFormat getIntDateFormat( ); |
78 | IntDateFormat getIntTimeFormat( ); | ||
77 | void setLanguage( int ); | 79 | void setLanguage( int ); |
@@ -100,2 +102,3 @@ class KLocale | |||
100 | IntDateFormat mIntDateFormat; | 102 | IntDateFormat mIntDateFormat; |
103 | IntDateFormat mIntTimeFormat; | ||
101 | int mLanguage; | 104 | int mLanguage; |