Ticket #7947: time_weekday_27082011.patch

src/preferences/time/DateTimeView.h

@@ -34 +34 @@
     virtual                     ~DateTimeView();
 
     virtual void                AttachedToWindow();
-    virtual void                Draw(BRect updaterect);
     virtual void                MessageReceived(BMessage* message);
 
             bool                CheckCanRevert();

src/preferences/time/DateTimeView.cpp

@@ -46 +46 @@
 
 
 DateTimeView::DateTimeView(const char* name)
-    : 
+    :
     BGroupView(name, B_HORIZONTAL, 5),
     fGmtTime(NULL),
     fUseGmtTime(false),
@@ -82 +82 @@
 
 
 void
-DateTimeView::Draw(BRect /*updateRect*/)
-{
-    rgb_color viewcolor = ViewColor();
-    rgb_color dark = tint_color(viewcolor, B_DARKEN_4_TINT);
-    rgb_color light = tint_color(viewcolor, B_LIGHTEN_MAX_TINT);
-
-    // draw a separator line
-    BRect bounds(Bounds());
-    BPoint start(bounds.Width() / 2.0f, bounds.top + 5.0f);
-    BPoint end(bounds.Width() / 2.0, bounds.bottom - 5.0f);
-
-    BeginLineArray(2);
-        AddLine(start, end, dark);
-        start.x++;
-        end.x++;
-        AddLine(start, end, light);
-    EndLineArray();
-
-    fTimeEdit->Draw(bounds);
-    fDateEdit->Draw(bounds);
-}
-
-
-void
 DateTimeView::MessageReceived(BMessage* message)
 {
     int32 change;
@@ -211 +187 @@
 void
 DateTimeView::_InitView()
 {
-    fCalendarView = new BCalendarView("calendar");
+    BPrivate::week_start weekStart = (BPrivate::week_start)
+        BLocale::Default()->StartOfWeek();
+    fCalendarView = new BCalendarView("calendar", weekStart);
     fCalendarView->SetWeekNumberHeaderVisible(false);
     fCalendarView->SetSelectionMessage(new BMessage(kDayChanged));
     fCalendarView->SetInvocationMessage(new BMessage(kDayChanged));
@@ -219 +197 @@
     fDateEdit = new TDateEdit("dateEdit", 3);
     fTimeEdit = new TTimeEdit("timeEdit", 4);
     fClock = new TAnalogClock("analogClock");
-    
+
     BTime time(BTime::CurrentTime(B_LOCAL_TIME));
     fClock->SetTime(time.Hour(), time.Minute(), time.Second());
 

headers/private/shared/CalendarView.h

@@ -36 +36 @@
                                 BCalendarView(BRect frame, const char *name, week_start start,
                                     uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
                                     uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
-                                
+
                                 BCalendarView(const char* name,
                                     uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
 
+                                BCalendarView(const char* name, week_start start,
+                                    uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
+
         virtual                 ~BCalendarView();
 
                                 BCalendarView(BMessage *archive);
@@ -91 +94 @@
 
         virtual void            ResizeToPreferred();
         virtual void            GetPreferredSize(float *width, float *height);
-        
+
         virtual BSize           MaxSize();
         virtual BSize           MinSize();
         virtual BSize           PreferredSize();

src/kits/shared/CalendarView.cpp

@@ -91 +91 @@
 }
 
 
+BCalendarView::BCalendarView(const char* name, week_start start,
+    uint32 flags)
+    :
+    BView(name, flags),
+    BInvoker(),
+    fSelectionMessage(NULL),
+    fDay(0),
+    fYear(0),
+    fMonth(0),
+    fFocusChanged(false),
+    fSelectionChanged(false),
+    fWeekStart(start),
+    fDayNameHeaderVisible(true),
+    fWeekNumberHeaderVisible(true)
+{
+    _InitObject();
+}
+
+
 BCalendarView::~BCalendarView()
 {
     SetSelectionMessage(NULL);