4 files changed, 76 insertions, 15 deletions

diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 4cbec94..ba41f6c 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -104,16 +104,35 @@ QString KConfig::readEntry( const QString &key, const QString &def )
   
   if ( it == mStringMap.end() ) {
     return def;
   }
   
   return *it;
 }
 
+QSize KConfig::readSizeEntry( const QString &key, QSize* def )
+{
+  QValueList<int> intlist = readIntListEntry(key);
+
+  if (intlist.count() < 2)
+    {
+      if (def)
+      return *def;
+      else
+      return QSize();
+    } 
+ 
+  QSize ret;
+  ret.setWidth(intlist[0]);
+  ret.setHeight(intlist[1]);
+
+  return ret;
+}
+
 QStringList KConfig::readListEntry( const QString &key )
 {
     QMap<QString,QString>::ConstIterator it = mStringMap.find( mGroup + key );
     
     if ( it == mStringMap.end() ) {
         return QStringList();
     }
     return  QStringList::split(":",  *it );
@@ -217,16 +236,23 @@ void KConfig::writeEntry( const QString & e, const QColor & c )
 {
     QStringList l;
     l.append( QString::number ( c.red() ) );
     l.append( QString::number ( c.green() ) );
     l.append( QString::number ( c.blue() ) );
     writeEntry(  e, l );
 }
 
+void KConfig::writeEntry( const QString & e, const QSize & s )
+{
+  QValueList<int> intlist;
+  intlist << s.width() << s.height();
+  writeEntry(  e, intlist );
+}
+
 void KConfig::writeEntry( const QString & e , const QFont & f )
 {
     QStringList font;
     font.append( f.family());
     font.append( (!f.bold ()?"nonbold":"bold") );
     font.append( QString::number ( f.pointSize () ) );
     font.append( !f.italic ()?"nonitalic":"italic" );
     writeEntry( e, font );
diff --git a/microkde/kconfig.h b/microkde/kconfig.h
index a01b1a5..1a1038f 100644
--- a/microkde/kconfig.h
+++ b/microkde/kconfig.h
@@ -61,32 +61,33 @@ class KConfig
     
     int readNumEntry( const QString &, int def=0 );
     QString readEntry( const QString &, const QString &def=QString::null );
     QStringList readListEntry( const QString & );
     bool readBoolEntry( const QString &, bool def=false );
     QColor readColorEntry( const QString &, QColor * );
     QFont readFontEntry( const QString &, QFont * );
     QDateTime readDateTimeEntry( const QString &, const QDateTime *pDefault = 0 );
-
+    QSize readSizeEntry(const QString &, QSize* );
     bool hasKey( const QString &);
         
     void writeEntry( const QString &, const QValueList<int>& );
     void writeEntry( const QString &, int );
     void writeEntry( const QString &key , unsigned int value) { writeEntry( key, int( value ) ); }
     void writeEntry( const char *key , unsigned int value) { writeEntry( QString( key ), value ); }
     void writeEntry( const char *key, int value ) { writeEntry( QString( key ), value ); } 
     void writeEntry( const QString &, const QString & );
     void writeEntry( const char *key, const QString &value ) { writeEntry( QString( key ), value ); }
     void writeEntry( const QString &, const QStringList & );
     void writeEntry( const QString &, bool );
     void writeEntry( const char *key, bool value ) { writeEntry( QString( key ), value ); } 
     void writeEntry( const QString &, const QColor & );
     void writeEntry( const QString &, const QFont & );
     void writeEntry( const QString &, const QDateTime & );
+    void writeEntry( const QString &, const QSize & );
 
     void deleteEntry( const QString &);
         
     void load();
     void sync();
 
   private:  
     static QString mGroup;
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
@@ -82,16 +82,17 @@ KLocale::KLocale() : mCalendarSystem( 0 )
     m_thousandsSeparator = ",";
 
 
 
 
     mWeekStartsMonday = true;
     mHourF24Format = true;
     mIntDateFormat = Default;
+    mIntTimeFormat = Default;
     mLanguage = 0;  
     mDateFormat = "%a %Y %b %d";
     mDateFormatShort = "%Y-%m-%d"; 
     mTimeZoneList << i18n ("-11:00 US/Samoa")
             << i18n ("-10:00 US/Hawaii")
             << i18n ("-09:00 US/Alaska")
             << i18n ("-08:00 US/Pacific")
             << i18n ("-07:00 US/Mountain")
@@ -134,42 +135,53 @@ void KLocale::setDateFormatShort( QString s )
 void KLocale::setHore24Format ( bool b )
 {
     mHourF24Format = b;
 }
 void KLocale::setWeekStartMonday( bool b )
 {
     mWeekStartsMonday = b;
 }
+
 KLocale::IntDateFormat KLocale::getIntDateFormat( )
 {
     return mIntDateFormat;
 
 }
 void KLocale::setIntDateFormat( KLocale::IntDateFormat i )
 {
     mIntDateFormat = i;
 }
+KLocale::IntDateFormat KLocale::getIntTimeFormat( )
+{
+    return mIntTimeFormat;
+
+}
+void KLocale::setIntTimeFormat( KLocale::IntDateFormat i )
+{
+    mIntTimeFormat = i;
+}
+
 void KLocale::setLanguage( int i )
 {
     mLanguage = i;
 }
 QString KLocale::translate( const char *index ) const
 {
   return i18n( index );
 }
 
 QString KLocale::translate( const char *, const char *fallback) const
 {
   return i18n( fallback );
 }
 
-QString KLocale::formatTime(const QTime &pTime, bool includeSecs) const
+QString KLocale::formatTime(const QTime &pTime, bool includeSecs, IntDateFormat intIntDateFormat) const
 {
-    const QString rst = timeFormat();
+    const QString rst = timeFormat(intIntDateFormat);
 
     // only "pm/am" here can grow, the rest shrinks, but
     // I'm rather safe than sorry
     QChar *buffer = new QChar[rst.length() * 3 / 2 + 30];
 
     uint index = 0;
     bool escape = false;
     int number = 0;
@@ -310,26 +322,27 @@ QString KLocale::formatDate(const QDate &pDate, bool shortFormat, IntDateFormat
     }
   QString ret( buffer, index );
   delete [] buffer;
   return ret;
 }
 
 QString KLocale::formatDateTime(const QDateTime &pDateTime,
                                 bool shortFormat,
-                                bool includeSeconds) const
+                                bool includeSeconds,
+                                IntDateFormat intIntDateFormat) const
 {
   return QString( "%1 %2")
-    .arg( formatDate( pDateTime.date(), shortFormat ) )
-    .arg( formatTime( pDateTime.time(), includeSeconds ) );
+    .arg( formatDate( pDateTime.date(), shortFormat, intIntDateFormat ) )
+    .arg( formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ) );
 }
 
-QString KLocale::formatDateTime(const QDateTime &pDateTime) const
+QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const
 {
-  return formatDateTime(pDateTime, true);
+  return formatDateTime(pDateTime, true, intIntDateFormat);
 }
 
 QDate KLocale::readDate(const QString &intstr, bool* ok) const
 {
   QDate date;
   date = readDate(intstr, true, ok);
   if (date.isValid()) return date;
   return readDate(intstr, false, ok);
@@ -451,16 +464,17 @@ QTime KLocale::readTime(const QString &intstr, bool *ok) const
 QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
 {
   QString str = intstr.simplifyWhiteSpace().lower();
   QString Format = timeFormat().simplifyWhiteSpace();
   if (!seconds)
     Format.replace(QRegExp(QString::fromLatin1(".%S")), QString::null);
 
   int hour = -1, minute = -1, second = seconds ? -1 : 0; // don't require seconds
+
   bool g_12h = false;
   bool pm = false;
   uint strpos = 0;
   uint Formatpos = 0;
 
   while (Format.length() > Formatpos || str.length() > strpos)
     {
       if ( !(Format.length() > Formatpos && str.length() > strpos) ) goto error;
@@ -677,21 +691,38 @@ QString KLocale::dateFormatShort(IntDateFormat intIntDateFormat) const
         return "%m.%d.%Y"; 
     else  if ( dformat == ISODate )  // = Qt::ISODate
         return "%Y-%m-%d"; 
   return mDateFormatShort ;
 
 }
 
 
-QString KLocale::timeFormat() const
+QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const
 {
-    if ( mHourF24Format)
+    const IntDateFormat tformat = (intIntTimeFormat == Undefined)?mIntTimeFormat:intIntTimeFormat;
+ 
+    if ( tformat == Default )
+      if ( mHourF24Format)
+        return "%H:%M:%S";
+      else
+        return "%I:%M:%S%p";
+
+    else  if ( tformat == Format1 )
+      if ( mHourF24Format)
+        return "%H:%M:%S";
+      else
+        return "%I:%M:%S%p";
+
+    else  if ( tformat == ISODate )  // = Qt::ISODate
+      if ( mHourF24Format)
         return "%H:%M:%S";
-    return "%I:%M:%S%p";
+      else
+        return "%I:%M:%S%p";
+
 }
 
 void KLocale::insertCatalogue ( const QString & )
 {
 }
 
 KCalendarSystem *KLocale::calendar()
 {
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
@@ -39,46 +39,48 @@ class KLocale
 
 
     QString translate( const char *index ) const;
     QString translate( const char *index, const char *fallback) const;
 
     enum IntDateFormat { Undefined=-1, Default=0, Format1=1, ISODate=2, Userdefined=3 };
     
     QString formatDate(const QDate &pDate, bool shortFormat = false, IntDateFormat intIntDateFormat = Undefined) const;
-    QString formatTime(const QTime &pTime, bool includeSecs = false) const;
-    QString formatDateTime(const QDateTime &pDateTime) const;
+    QString formatTime(const QTime &pTime, bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const;
+    QString formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatDateTime(const QDateTime &pDateTime,
                            bool shortFormat,
-                           bool includeSecs = false) const;
+                           bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const;
 
     QDate readDate(const QString &str, bool* ok = 0) const;
     QDate readDate( const QString &intstr, const QString &fmt, bool* ok = 0) const;
     QTime readTime(const QString &str, bool* ok = 0) const;
 
     bool use12Clock() const;
     bool weekStartsMonday() const;
     int weekStartDay() const;
     
     QString weekDayName(int,bool=false) const;
     QString monthName(int,bool=false) const;
 
     QString country() const;
 
     QString dateFormat(IntDateFormat intIntDateFormat = Undefined) const;
     QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const;
-    QString timeFormat() const;
+    QString timeFormat(IntDateFormat intIntDateFormat = Undefined) const;
 
     void insertCatalogue ( const QString & );
 
     KCalendarSystem *calendar();
     void setHore24Format ( bool );
     void setWeekStartMonday( bool );
     void setIntDateFormat( IntDateFormat );
+    void setIntTimeFormat( IntDateFormat );
     IntDateFormat getIntDateFormat( );
+    IntDateFormat getIntTimeFormat( );
     void setLanguage( int );
     void setDateFormat( QString );
     void setDateFormatShort( QString );
 
   QString m_decimalSymbol;
   QString m_thousandsSeparator;
   QString m_currencySymbol;
   QString m_monetaryDecimalSymbol;
@@ -93,16 +95,17 @@ class KLocale
     void setTimezone( const QString &timeZone );
   private:
     QTime readTime(const QString &str, bool seconds, bool *ok) const;
     QDate readDate(const QString &str, bool shortFormat, bool *ok) const;
     KCalendarSystem *mCalendarSystem;
     bool mWeekStartsMonday;
     bool mHourF24Format;
     IntDateFormat mIntDateFormat;
+    IntDateFormat mIntTimeFormat;
     int mLanguage;
     QString mDateFormat;
     QString mDateFormatShort;
     QStringList mTimeZoneList;
     bool daylightEnabled;
     int mDaylightTZoffset;
     int mNondaylightTZoffset;
     bool mSouthDaylight;