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

List:       kde-commits
Subject:    kdelibs/kdeui
From:       Meni Livne <livne () kde ! org>
Date:       2003-10-20 11:22:06
[Download RAW message or body]

CVS commit by livne: 

Use KCalendarSystem to determine which weekday(s) to highlight as "weekend".


  M +5 -8      kdatetbl.cpp   1.76


--- kdelibs/kdeui/kdatetbl.cpp  #1.75:1.76
@@ -182,12 +182,9 @@ KDateTable::paintCell(QPainter *painter,
       painter->setFont(font);
       bool normalday = true;
-      QString daystr;
       int firstWeekDay = KGlobal::locale()->weekStartDay();
-      if ( col+firstWeekDay < 8 )
-          daystr = calendar->weekDayName(col+firstWeekDay, true);
-      else
-          daystr = calendar->weekDayName(col+firstWeekDay-7, true);
-      // ### HPB Use the KCalendarSystem here?
-      if ( daystr==i18n("Sunday", "Sun") || daystr==i18n("Saturday", "Sat") )
+      int daynum = ( col+firstWeekDay < 8 ) ? col+firstWeekDay :
+                                              col+firstWeekDay-7;
+      if ( daynum == calendar->weekDayOfPray() ||
+         ( daynum == 6 && calendar->calendarName() == "gregorian" ) )
           normalday=false;
 
@@ -205,5 +202,5 @@ KDateTable::paintCell(QPainter *painter,
         }
       painter->drawText(0, 0, w, h-1, AlignCenter,
-                        daystr, -1, &rect);
+                        calendar->weekDayName(daynum, true), -1, &rect);
       painter->setPen(KGlobalSettings::textColor());
       painter->moveTo(0, h-1);


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