[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam
From:       Antonio Larrosa Jimenez <larrosa () kde ! org>
Date:       2007-04-10 19:33:20
Message-ID: 1176233600.441760.4906.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 652359 by antlarr:

Fixed the previous broken commit so that it compiles
(changed KLocale::ShortDate to ShortFormat which has the
advantage that it exists :) )


 M  +2 -2      digikam/albumfiletip.cpp  
 M  +1 -1      digikam/albumiconitem.cpp  
 M  +2 -2      digikam/kdateedit.cpp  
 M  +2 -2      libs/imageproperties/cameraitempropertiestab.cpp  
 M  +2 -2      libs/imageproperties/imagepropertiestab.cpp  
 M  +1 -1      libs/thumbbar/thumbbar.cpp  
 M  +1 -1      utilities/slideshow/slideshow.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumfiletip.cpp #652358:652359
@@ -350,7 +350,7 @@
         if (settings->getToolTipsShowFileDate())
         {
             QDateTime modifiedDate = fileInfo.lastModified();
-            str = KGlobal::locale()->formatDateTime(modifiedDate, \
KLocale::ShortDate, true); +            str = \
KGlobal::locale()->formatDateTime(modifiedDate, KLocale::ShortFormat, true);  tip += \
cellBeg + i18n("Modified:") + cellMid + str + cellEnd;  }
 
@@ -432,7 +432,7 @@
             {
                 if (photoInfo.dateTime.isValid())
                 {
-                    str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, \
KLocale::ShortDate, true); +                    str = \
                KGlobal::locale()->formatDateTime(photoInfo.dateTime, \
                KLocale::ShortFormat, true);
                     if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) \
                + "...";
                     metaStr += cellBeg + i18n("Created:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd;  }
--- trunk/extragear/graphics/digikam/digikam/albumiconitem.cpp #652358:652359
@@ -75,7 +75,7 @@
 
 static void dateToString(const QDateTime& datetime, QString& str)
 {
-    str = KGlobal::locale()->formatDateTime(datetime, KLocale::ShortDate, false);
+    str = KGlobal::locale()->formatDateTime(datetime, KLocale::ShortFormat, false);
 }
 
 AlbumIconItem::AlbumIconItem(IconGroupItem* parent, ImageInfo* info)
--- trunk/extragear/graphics/digikam/digikam/kdateedit.cpp #652358:652359
@@ -82,7 +82,7 @@
   setMaxCount( 1 );
 
   mDate = QDate::currentDate();
-  QString today = KGlobal::locale()->formatDate( mDate, KLocale::ShortDate );
+  QString today = KGlobal::locale()->formatDate( mDate, KLocale::ShortFormat );
 
   insertItem( today );
   setCurrentItem( 0 );
@@ -364,7 +364,7 @@
 {
   QString dateString;
   if ( mDate.isValid() )
-    dateString = KGlobal::locale()->formatDate( mDate, KLocale::ShortDate );
+    dateString = KGlobal::locale()->formatDate( mDate, KLocale::ShortFormat );
 
   // We do not want to generate a signal here,
   // since we explicitly setting the date
--- trunk/extragear/graphics/digikam/libs/imageproperties/cameraitempropertiestab.cpp \
#652358:652359 @@ -345,7 +345,7 @@
 
     QDateTime date;
     date.setTime_t(itemInfo->mtime);
-    d->labelFileDate->setText(KGlobal::locale()->formatDateTime(date, \
KLocale::ShortDate, true)); +    \
d->labelFileDate->setText(KGlobal::locale()->formatDateTime(date, \
KLocale::ShortFormat, true));  
     str = i18n("%1 (%2)").arg(KIO::convertSize(itemInfo->size))
                          .arg(KGlobal::locale()->formatNumber(itemInfo->size, 0));
@@ -465,7 +465,7 @@
 
     if (photoInfo.dateTime.isValid())
     {
-        str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, \
KLocale::ShortDate, true); +        str = \
KGlobal::locale()->formatDateTime(photoInfo.dateTime, KLocale::ShortFormat, true);  \
d->labelPhotoDateTime->setText(str);  }
     else
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiestab.cpp \
#652358:652359 @@ -361,7 +361,7 @@
     d->labelFolder->setText(url.directory());
 
     QDateTime modifiedDate = fileInfo.lastModified();
-    str = KGlobal::locale()->formatDateTime(modifiedDate, KLocale::ShortDate, true);
+    str = KGlobal::locale()->formatDateTime(modifiedDate, KLocale::ShortFormat, \
true);  d->labelFileModifiedDate->setText(str);
 
     str = QString("%1 (%2)").arg(KIO::convertSize(fi.size()))
@@ -498,7 +498,7 @@
 
     if (photoInfo.dateTime.isValid())
     {
-        str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, \
KLocale::ShortDate, true); +        str = \
KGlobal::locale()->formatDateTime(photoInfo.dateTime, KLocale::ShortFormat, true);  \
d->labelPhotoDateTime->setText(str);  }
     else
--- trunk/extragear/graphics/digikam/libs/thumbbar/thumbbar.cpp #652358:652359
@@ -784,7 +784,7 @@
     QDateTime date;
     date.setTime_t(fileItem.time(KIO::UDS_MODIFICATION_TIME));
     tipText += cellBeg + i18n("Modification Date:") + cellMid +
-               KGlobal::locale()->formatDateTime(date, KLocale::ShortDate, true)
+               KGlobal::locale()->formatDateTime(date, KLocale::ShortFormat, true)
                + cellEnd;
 
     tipText += cellBeg + i18n("Size:") + cellMid;
--- trunk/extragear/graphics/digikam/utilities/slideshow/slideshow.cpp #652358:652359
@@ -403,7 +403,7 @@
             {
                 if (photoInfo.dateTime.isValid())
                 {
-                    str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, \
KLocale::ShortDate, true); +                    str = \
KGlobal::locale()->formatDateTime(photoInfo.dateTime, KLocale::ShortFormat, true);  \
printInfoText(p, offset, str);  }
             }


[prev in list] [next in list] [prev in thread] [next in thread]