print fix

3 files changed, 9 insertions, 15 deletions

diff --git a/korganizer/calprintbase.cpp b/korganizer/calprintbase.cpp
index f66fddc..7b7d54c 100644
--- a/korganizer/calprintbase.cpp
+++ b/korganizer/calprintbase.cpp
@@ -653,17 +653,5 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
   // This has to be localized
   if (fullDate) {
-    /*int index;
-    dayNumStr= qd.toString();
-    index = dayNumStr.find(' ');
-    dayNumStr.remove(0, index);
-    index = dayNumStr.findRev(' ');
-    dayNumStr.truncate(index);*/
-
-    const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
-    dayNumStr = i18n("weekday month date", "%1 %2 %3")
-        .arg( calSys->weekDayName( qd ) )
-        .arg( calSys->monthName( qd ) )
-        .arg( qd.day() );
-//    dayNumStr = local->formatDate(qd);
+    dayNumStr = local->formatDate(qd);
   } else {
     dayNumStr = QString::number( qd.day() );
@@ -687,4 +675,10 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
   }
   p.setFont(QFont("helvetica", 10, QFont::Bold));
+  if ( fullDate) {
+      // use short date format, if long date is too long
+      QFontMetrics fm ( p.font() );
+      if ( fm.width( dayNumStr ) > width -10 )
+          dayNumStr = local->formatDate(qd, true);
+  }
   p.drawText(x+5, y, width-10, mSubHeaderHeight, AlignRight | AlignVCenter,
              dayNumStr);
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index e8b7c94..8c2996b 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -2005,5 +2005,5 @@ void KOAgenda::printSelection()
     QPaintDeviceMetrics m = QPaintDeviceMetrics ( printer ); 
     QString date = i18n("Date range: ")+KGlobal::locale()->formatDate( mSelectedDates.first()  )+" - "+KGlobal::locale()->formatDate( mSelectedDates.last()  );
-    date += " --- printing time: " + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), true );
+    //date += " --- printing time: " + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), true );
     int hei = p.boundingRect(0,0, 5, 5, Qt::AlignLeft, date ).height();
     // p.drawText( 0, 0, date );
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index ac7d205..a09b278 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -58,5 +58,5 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false);
-  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
+  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%AK %d. %b %y");
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");