From b85a4a9d0cf9871b72023e6128ecf205bf7f52b2 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Wed, 25 Mar 2009 09:25:50 +0000
Subject: [PATCH] qt: correct showing header for calendar + formatting

git-svn-id: trunk@19096 -
---
 lcl/interfaces/qt/qtwscalendar.pp | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/lcl/interfaces/qt/qtwscalendar.pp b/lcl/interfaces/qt/qtwscalendar.pp
index 00e8aa76ad..b5fe7dd92c 100644
--- a/lcl/interfaces/qt/qtwscalendar.pp
+++ b/lcl/interfaces/qt/qtwscalendar.pp
@@ -73,8 +73,9 @@ begin
   QtCalendar := TQtCalendar(ACalendar.Handle);
 
   if AReadOnly then
-   QCalendarWidget_setSelectionMode(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoSelection)
-  else QCalendarWidget_setSelectionMode(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetSingleSelection);
+    QCalendarWidget_setSelectionMode(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoSelection)
+  else
+    QCalendarWidget_setSelectionMode(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetSingleSelection);
 
   QCalendarWidget_setDateEditEnabled(QCalendarWidgetH(QtCalendar.Widget), not AReadOnly);
 end;
@@ -110,6 +111,13 @@ begin
   try
     QCalendarWidget_setCurrentPage(QCalendarWidgetH(QtCalendar.Widget), QtCalendar.AYear, QtCalendar.AMonth);
     QCalendarWidget_setSelectedDate(QCalendarWidgetH(QtCalendar.Widget), ADate);
+    { TODO: implement
+    if (dsNoMonthChange in ADisplaySettings) then
+    begin
+       QCalendarWidget_setMinimumDate();
+       QCalendarWidget_setMaximumDate();
+    end;
+    }
   finally
     QDate_destroy(ADate);
   end;
@@ -122,23 +130,24 @@ var
 begin
   QtCalendar := TQtCalendar(ACalendar.Handle);
 
-  QCalendarWidget_setHeaderVisible(QCalendarWidgetH(QtCalendar.Widget), dsShowHeadings in ADisplaySettings);
-
   if dsShowDayNames in ADisplaySettings then
-   QCalendarWidget_setHorizontalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget),QCalendarWidgetShortDayNames)
-  else QCalendarWidget_setHorizontalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoHorizontalHeader);
+    QCalendarWidget_setHorizontalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetShortDayNames)
+  else
+    QCalendarWidget_setHorizontalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoHorizontalHeader);
   
-  QCalendarWidget_setNavigationBarVisible(QCalendarWidgetH(QtCalendar.Widget), not (dsNoMonthChange in ADisplaySettings));
+  QCalendarWidget_setNavigationBarVisible(QCalendarWidgetH(QtCalendar.Widget), (dsShowHeadings in ADisplaySettings));
 
   if dsShowWeekNumbers in ADisplaySettings then
-   QCalendarWidget_setVerticalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetISOWeekNumbers)
-  else QCalendarWidget_setVerticalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoVerticalHeader);
+    QCalendarWidget_setVerticalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetISOWeekNumbers)
+  else
+    QCalendarWidget_setVerticalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoVerticalHeader);
   
   QCalendarWidget_setGridVisible(QCalendarWidgetH(QtCalendar.Widget), dsShowWeekNumbers in ADisplaySettings);
 
   if dsStartMonday in ADisplaySettings then
-   QCalendarWidget_setFirstDayOfWeek(QCalendarWidgetH(QtCalendar.Widget), QtMonday)
-  else QCalendarWidget_setFirstDayOfWeek(QCalendarWidgetH(QtCalendar.Widget), QtSunday);
+    QCalendarWidget_setFirstDayOfWeek(QCalendarWidgetH(QtCalendar.Widget), QtMonday)
+  else
+    QCalendarWidget_setFirstDayOfWeek(QCalendarWidgetH(QtCalendar.Widget), QtSunday);
 end;