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

List:       kde-commits
Subject:    kdebase/konqueror/listview
From:       David Faure <faure () kde ! org>
Date:       2004-12-20 21:40:34
Message-ID: 20041220214034.AD2B81CFD9 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Use formatDateTime again, now that it's a short format - thanks to Andre'
for noticing that Alexxx made that change _before_ KLocale had support for short \
datetime formats.


  M +6 -7      konq_infolistviewitem.cc   1.14
  M +2 -4      konq_listviewitems.cc   1.72
  M +1 -2      konq_listviewwidget.cc   1.259
  M +1 -2      konq_textviewitem.cc   1.33


--- kdebase/konqueror/listview/konq_infolistviewitem.cc  #1.13:1.14
@@ -104,6 +104,5 @@ void KonqInfoListViewItem::updateContent
                {
                    dt.setTime_t( _time );
-                   setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDate(dt.date(),TRUE)+" \
                "+KGlobal::locale()->formatTime(dt.time())+" ");
-                   //setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
 +                   \
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));  }
             }

--- kdebase/konqueror/listview/konq_listviewitems.cc  #1.71:1.72
@@ -128,6 +128,5 @@ void KonqListViewItem::updateContents()
                {
                    dt.setTime_t( _time );
-                   setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDate(dt.date(),TRUE)+" \
                "+KGlobal::locale()->formatTime(dt.time())+" ");
-                   //setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
 +                   \
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));  }
             }
@@ -140,6 +139,5 @@ void KonqListViewItem::updateContents()
                  QDateTime dt = QDateTime::fromString( entryStr, Qt::ISODate );
                  setText(tmpColumn->displayInColumn,
-                         KGlobal::locale()->formatDate(dt.date(),TRUE)+" "+
-                         KGlobal::locale()->formatTime(dt.time())+" ");
+                         KGlobal::locale()->formatDateTime(dt));
              }
              else // if ( tmpColumn->type == QVariant::String )

--- kdebase/konqueror/listview/konq_listviewwidget.cc  #1.258:1.259
@@ -306,6 +306,5 @@ void KonqBaseListViewWidget::readProtoco
                {
                   QDateTime dt( QDate( 2000, 10, 10 ), QTime( 20, 20, 20 ) );
-                  str = KGlobal::locale()->formatDate( dt.date(), true ) +
-                        KGlobal::locale()->formatTime( dt.time() ) + "----";
+                  str = KGlobal::locale()->formatDateTime( dt ) + "--";
                }
                else

--- kdebase/konqueror/listview/konq_textviewitem.cc  #1.32:1.33
@@ -184,6 +184,5 @@ void KonqTextViewItem::updateContents()
                   QDateTime dt;
                   dt.setTime_t((time_t) (*it).m_long);
-                  //setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
                
-                  setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDate(dt.date(),TRUE)+" \
"+KGlobal::locale()->formatTime(dt.time())+" "); +                  \
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));  break;
                };


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