#96494# Kwanzaa Holiday thrown out
This commit is contained in:
parent
07bfb1fd02
commit
e56b734f1b
8 changed files with 7 additions and 17 deletions
|
@ -115,6 +115,8 @@ Dim iThisMonth as Integer
|
|||
DlgCalendar.GetControl("lstHolidays").SelectItemPos(0,True)
|
||||
DlgCalModel.cmdGoOn.DefaultButton = True
|
||||
ToggleWindow(True)
|
||||
DlgCalendar.GetControl("lblHolidays").Visible = sCurLangLocale = cLANGUAGE_GERMAN
|
||||
DlgCalendar.GetControl("lstHolidays").Visible = sCurLangLocale = cLANGUAGE_GERMAN
|
||||
fHeightCorrFactor = DlgCalendar.GetControl("imgCountry").Size.Height/198
|
||||
fWidthCorrFactor = DlgCalendar.GetControl("imgCountry").Size.Width/166
|
||||
DlgCalendar.Execute()
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
|
||||
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="2" dlg:help-url="HID:34700">
|
||||
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:34700">
|
||||
<dlg:styles>
|
||||
<dlg:style dlg:style-id="0" dlg:border="none"/>
|
||||
<dlg:style dlg:style-id="1" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/>
|
||||
|
|
|
@ -8,7 +8,6 @@ Public fHeightCorrFactor as Double
|
|||
Public fWidthCorrFactor as Double
|
||||
|
||||
|
||||
' Todo: Adjustmentlistener an der Scrollbar anmelden
|
||||
|
||||
Sub Main()
|
||||
Call CalAutopilotTable()
|
||||
|
|
|
@ -23,9 +23,6 @@ Dim i as Integer
|
|||
Const dlgMonth = 1200
|
||||
' Abreviated months start 1225
|
||||
Const dlgShortMonth = 1225
|
||||
DlgCalendar.GetControl("lblHolidays").Visible = LangLocale = cLANGUAGE_GERMAN
|
||||
DlgCalendar.GetControl("lstHolidays").Visible = LangLocale = cLANGUAGE_GERMAN
|
||||
|
||||
If InitResources("schedule", "cal") Then
|
||||
If LangLocale = cLANGUAGE_GERMAN Then
|
||||
|
||||
|
|
|
@ -285,12 +285,6 @@ Dim lElectDate as Long
|
|||
CalInsertBankholiday(DateSerial(YearInt, 12, 7), "Pearl Harbor Remembrance Day", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 24), "Christmas Eve", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 25), "Christmas Day", cHolidayType_Full)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 26), "Kwanzaa", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 27), "Kwanzaa", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 28), "Kwanzaa", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 29), "Kwanzaa", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 30), "Kwanzaa", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 31), "Kwanzaa", cHolidayType_Half)
|
||||
CalInsertBankholiday(DateSerial(YearInt, 12, 31), "New Year's Eve", cHolidayType_Half)
|
||||
|
||||
CalInsertBankholiday(CalEasterTable(YearInt), "Easter Sunday", cHolidayType_Half)
|
||||
|
@ -491,7 +485,6 @@ Dim lDate as Long
|
|||
End Sub
|
||||
|
||||
|
||||
' Todo: Was passiert mit den Jahren vor 1980?
|
||||
Function CalculateJapaneseSpringDay(iSelYear as Integer)
|
||||
If (iSelYear > 1979) And (iSelYear < 2100) Then
|
||||
CalculateJapaneseSpringDay() = Int(20.8431 + 0.242194)* (iSelYear-1980) - (Int((iSelYear-1980)/4))
|
||||
|
|
|
@ -117,7 +117,6 @@ Dim CurEvDay as Integer
|
|||
CurEvMonth = CalGetMonthOfEvent(i)
|
||||
CurEvDay = CalGetDayOfEvent(i)
|
||||
If DateSerial(CurEvYear, CurEvMonth, CurEvDay) = NewDate Then
|
||||
' Todo: Abchecken wie das ist mit 'Ereignis einmalig' oder nicht
|
||||
DlgCalendar.GetControl("lstOwnData").RemoveItems(i,1)
|
||||
DlgCalendar.GetControl("lstOwnData").AddItem(DateStr, i)
|
||||
bInserted = True
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
|
||||
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="true" library:passwordprotected="false">
|
||||
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="false" library:passwordprotected="false">
|
||||
<library:element library:name="DlgCalendar"/>
|
||||
</library:library>
|
||||
</library:library>
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
|
||||
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="true" library:passwordprotected="false">
|
||||
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="false" library:passwordprotected="false">
|
||||
<library:element library:name="OwnEvents"/>
|
||||
<library:element library:name="CalendarMain"/>
|
||||
<library:element library:name="BankHoliday"/>
|
||||
|
@ -9,4 +9,4 @@
|
|||
<library:element library:name="CreateTable"/>
|
||||
<library:element library:name="GermanHolidays"/>
|
||||
<library:element library:name="LocalHolidays"/>
|
||||
</library:library>
|
||||
</library:library>
|
Loading…
Reference in a new issue